From 95ab55c4283cb95c106ddd7365b4ee7a4ad1b1ab Mon Sep 17 00:00:00 2001 From: Lorenzo Venerandi Date: Sun, 1 Mar 2026 15:57:54 +0100 Subject: [PATCH] lint code --- src/database.py | 54 +++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/src/database.py b/src/database.py index 39b4581..e3c1406 100644 --- a/src/database.py +++ b/src/database.py @@ -1391,11 +1391,7 @@ class DatabaseManager: query = session.query(IpStats.ip, IpStats.total_requests) query = self._public_ip_filter(query, IpStats.ip, server_ip) - results = ( - query.order_by(IpStats.total_requests.desc()) - .limit(limit) - .all() - ) + results = query.order_by(IpStats.total_requests.desc()).limit(limit).all() return [(row.ip, row.total_requests) for row in results] finally: @@ -1591,9 +1587,8 @@ class DatabaseManager: # Count distinct paths per IP using SQL GROUP BY count_col = func.count(distinct(AccessLog.path)).label("path_count") - base_query = ( - session.query(AccessLog.ip, count_col) - .filter(AccessLog.is_honeypot_trigger == True) + base_query = session.query(AccessLog.ip, count_col).filter( + AccessLog.is_honeypot_trigger == True ) base_query = self._public_ip_filter(base_query, AccessLog.ip, server_ip) base_query = base_query.group_by(AccessLog.ip) @@ -1603,11 +1598,17 @@ class DatabaseManager: # Apply sorting if sort_by == "count": - order_expr = count_col.desc() if sort_order == "desc" else count_col.asc() + order_expr = ( + count_col.desc() if sort_order == "desc" else count_col.asc() + ) else: - order_expr = AccessLog.ip.desc() if sort_order == "desc" else AccessLog.ip.asc() + order_expr = ( + AccessLog.ip.desc() if sort_order == "desc" else AccessLog.ip.asc() + ) - ip_rows = base_query.order_by(order_expr).offset(offset).limit(page_size).all() + ip_rows = ( + base_query.order_by(order_expr).offset(offset).limit(page_size).all() + ) # Fetch distinct paths only for the paginated IPs paginated_ips = [row.ip for row in ip_rows] @@ -1820,18 +1821,23 @@ class DatabaseManager: count_col = func.count(AccessLog.id).label("count") # Get total number of distinct paths - total_paths = session.query(func.count(distinct(AccessLog.path))).scalar() or 0 - - # Build query with SQL-level sorting and pagination - query = ( - session.query(AccessLog.path, count_col) - .group_by(AccessLog.path) + total_paths = ( + session.query(func.count(distinct(AccessLog.path))).scalar() or 0 ) + # Build query with SQL-level sorting and pagination + query = session.query(AccessLog.path, count_col).group_by(AccessLog.path) + if sort_by == "count": - order_expr = count_col.desc() if sort_order == "desc" else count_col.asc() + order_expr = ( + count_col.desc() if sort_order == "desc" else count_col.asc() + ) else: - order_expr = AccessLog.path.desc() if sort_order == "desc" else AccessLog.path.asc() + order_expr = ( + AccessLog.path.desc() + if sort_order == "desc" + else AccessLog.path.asc() + ) results = query.order_by(order_expr).offset(offset).limit(page_size).all() total_pages = max(1, (total_paths + page_size - 1) // page_size) @@ -1879,7 +1885,8 @@ class DatabaseManager: total_uas = ( session.query(func.count(distinct(AccessLog.user_agent))) .filter(*base_filter) - .scalar() or 0 + .scalar() + or 0 ) # Build query with SQL-level sorting and pagination @@ -1890,10 +1897,13 @@ class DatabaseManager: ) if sort_by == "count": - order_expr = count_col.desc() if sort_order == "desc" else count_col.asc() + order_expr = ( + count_col.desc() if sort_order == "desc" else count_col.asc() + ) else: order_expr = ( - AccessLog.user_agent.desc() if sort_order == "desc" + AccessLog.user_agent.desc() + if sort_order == "desc" else AccessLog.user_agent.asc() )