feat(node): count

Author: M03ED

app/db/crud/node.py

@@ -71,7 +71,7 @@ async def get_nodes(
     limit: int | None = None,
     ids: list[int] | None = None,
     search: str | None = None,
-) -> list[Node]:
+) -> tuple[list[Node], int]:
     """
     Retrieves nodes based on optional status, enabled, id, and search filters.
 
@@ -86,7 +86,9 @@ async def get_nodes(
         search (str | None): Optional search term to match node names.
 
     Returns:
-        List[Node]: A list of Node objects matching the criteria.
+        tuple: A tuple containing:
+            - list[Node]: A list of Node objects matching the criteria.
+            - int: The total count of nodes matching the filters (before offset/limit).
     """
     query = select(Node)
 
@@ -111,6 +113,11 @@ async def get_nodes(
             like_expression = f"%{search_value}%"
             query = query.where(or_(Node.name.ilike(like_expression), Node.api_key.ilike(like_expression)))
 
+    # Get count before applying offset/limit
+    count_query = select(func.count()).select_from(query.subquery())
+    count = (await db.execute(count_query)).scalar_one()
+
+    # Apply pagination
     if offset:
         query = query.offset(offset)
     if limit:
@@ -120,7 +127,7 @@ async def get_nodes(
     for node in db_nodes:
         await load_node_attrs(node)
 
-    return db_nodes
+    return db_nodes, count
 
 
 async def get_limited_nodes(db: AsyncSession) -> list[Node]:

app/jobs/node_checker.py

@@ -10,7 +10,7 @@
 from app.utils.logger import get_logger
 from app.operation.node import NodeOperation
 from app.operation import OperatorType
-from app.db.crud.node import get_limited_nodes
+from app.db.crud.node import get_limited_nodes, get_nodes
 
 from config import JOB_CORE_HEALTH_CHECK_INTERVAL, JOB_CHECK_NODE_LIMITS_INTERVAL
 
@@ -161,7 +161,7 @@ async def node_health_check():
     Cron job that checks health of all enabled nodes.
     """
     async with GetDB() as db:
-        db_nodes = await node_operator.get_db_nodes(db=db, enabled=True)
+        db_nodes, _ = await get_nodes(db=db, enabled=True)
         dict_nodes = await node_manager.get_nodes()
 
         check_tasks = [process_node_health_check(db_node, dict_nodes.get(db_node.id)) for db_node in db_nodes]
@@ -173,7 +173,7 @@ async def initialize_nodes():
     logger.info("Starting nodes' cores...")
 
     async with GetDB() as db:
-        db_nodes = await node_operator.get_db_nodes(db=db, enabled=True)
+        db_nodes, _ = await get_nodes(db=db, enabled=True)
 
         if not db_nodes:
             logger.warning("Attention: You have no node, you need to have at least one node")

app/models/node.py

@@ -200,6 +200,11 @@ class NodeResponse(Node):
     model_config = ConfigDict(from_attributes=True)
 
 
+class NodesResponse(BaseModel):
+    nodes: list[NodeResponse]
+    total: int
+
+
 class NodeNotification(BaseModel):
     """Lightweight node model for sending notifications without database fetch."""
 

app/operation/node.py

@@ -29,6 +29,7 @@
     NodeModify,
     NodeNotification,
     NodeResponse,
+    NodesResponse,
     UsageTable,
     UserIPList,
     UserIPListAll,
@@ -54,8 +55,8 @@ async def get_db_nodes(
         status: NodeStatus | list[NodeStatus] | None = None,
         ids: list[int] | None = None,
         search: str | None = None,
-    ) -> list[Node]:
-        return await get_nodes(
+    ) -> NodesResponse:
+        db_nodes, count = await get_nodes(
             db=db,
             core_id=core_id,
             offset=offset,
@@ -65,6 +66,8 @@ async def get_db_nodes(
             ids=ids,
             search=search,
         )
+        node_responses = [NodeResponse.model_validate(node) for node in db_nodes]
+        return NodesResponse(nodes=node_responses, total=count)
 
     @staticmethod
     async def _update_single_node_status(
@@ -442,7 +445,7 @@ async def restart_node(self, db: AsyncSession, node_id: Node, admin: AdminDetail
         logger.info(f'Node "{node_id}" restarted by admin "{admin.username}"')
 
     async def restart_all_node(self, db: AsyncSession, admin: AdminDetails, core_id: int | None = None) -> None:
-        nodes: list[Node] = await self.get_db_nodes(db, core_id, enabled=True)
+        nodes, _ = await get_nodes(db, core_id=core_id, enabled=True)
         await self.connect_nodes_bulk(db, nodes)
         logger.info(f'All nodes restarted by admin "{admin.username}"')
 

app/routers/node.py

@@ -9,7 +9,7 @@
 from app.db import AsyncSession, get_db
 from app.db.models import NodeStatus
 from app.models.admin import AdminDetails
-from app.models.node import NodeCreate, NodeModify, NodeResponse, NodeSettings, UsageTable, UserIPList, UserIPListAll
+from app.models.node import NodeCreate, NodeModify, NodeResponse, NodesResponse, NodeSettings, UsageTable, UserIPList, UserIPListAll
 from app.models.stats import NodeRealtimeStats, NodeStatsList, NodeUsageStatsList, Period
 from app.operation import OperatorType
 from app.operation.node import NodeOperation
@@ -43,7 +43,7 @@ async def get_usage(
     )
 
 
-@router.get("s", response_model=list[NodeResponse])
+@router.get("s", response_model=NodesResponse)
 async def get_nodes(
     core_id: int | None = None,
     offset: int | None = None,

app/telegram/handlers/admin/main_menu.py

@@ -39,7 +39,8 @@ async def reload_data(event: CallbackQuery, db: AsyncSession, admin: AdminDetail
 @router.callback_query(IsAdminSUDO(), AdminPanel.Callback.filter(AdminPanelAction.sync_users == F.action))
 async def sync_users(event: CallbackQuery, db: AsyncSession, admin: AdminDetails):
     await event.answer(Texts.syncing)
-    for node in await node_operator.get_db_nodes(db):
+    nodes_response = await node_operator.get_db_nodes(db)
+    for node in nodes_response.nodes:
         await node_operator.sync_node_users(db, node.id, flush_users=True)
     try:
         stats = await system_operator.get_system_stats(db, admin)