feat(node): Add more search parameters for nodes

Author: ImMohammad20000

app/db/crud/node.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 from typing import Optional, Union
 
-from sqlalchemy import and_, case, delete, func, select, update, bindparam
+from sqlalchemy import and_, case, delete, func, select, update, bindparam, or_
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.sql.functions import coalesce
 
@@ -69,14 +69,21 @@ async def get_nodes(
     core_id: int | None = None,
     offset: int | None = None,
     limit: int | None = None,
+    ids: list[int] | None = None,
+    search: str | None = None,
 ) -> list[Node]:
     """
-    Retrieves nodes based on optional status and enabled filters.
+    Retrieves nodes based on optional status, enabled, id, and search filters.
 
     Args:
         db (AsyncSession): The database session.
         status (Optional[Union[app.db.models.NodeStatus, list]]): The status or list of statuses to filter by.
         enabled (bool): If True, excludes disabled nodes.
+        core_id (int | None): Optional core/backend ID filter.
+        offset (int | None): Optional pagination offset.
+        limit (int | None): Optional pagination limit.
+        ids (list[int] | None): Optional list of node IDs to filter by.
+        search (str | None): Optional search term to match node names.
 
     Returns:
         List[Node]: A list of Node objects matching the criteria.
@@ -95,6 +102,15 @@ async def get_nodes(
     if core_id:
         query = query.where(Node.core_config_id == core_id)
 
+    if ids:
+        query = query.where(Node.id.in_(ids))
+
+    if search:
+        search_value = search.strip()
+        if search_value:
+            like_expression = f"%{search_value}%"
+            query = query.where(or_(Node.name.ilike(like_expression), Node.api_key.ilike(like_expression)))
+
     if offset:
         query = query.offset(offset)
     if limit:

app/operation/node.py

@@ -51,8 +51,20 @@ async def get_db_nodes(
         offset: int | None = None,
         limit: int | None = None,
         enabled: bool = False,
+        status: NodeStatus | list[NodeStatus] | None = None,
+        ids: list[int] | None = None,
+        search: str | None = None,
     ) -> list[Node]:
-        return await get_nodes(db=db, core_id=core_id, offset=offset, limit=limit, enabled=enabled)
+        return await get_nodes(
+            db=db,
+            core_id=core_id,
+            offset=offset,
+            limit=limit,
+            enabled=enabled,
+            status=status,
+            ids=ids,
+            search=search,
+        )
 
     @staticmethod
     async def _update_single_node_status(

app/routers/node.py

@@ -7,6 +7,7 @@
 from PasarGuardNodeBridge import NodeAPIError
 
 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.stats import NodeRealtimeStats, NodeStatsList, NodeUsageStatsList, Period
@@ -44,14 +45,28 @@ async def get_usage(
 
 @router.get("s", response_model=list[NodeResponse])
 async def get_nodes(
-    backend_id: int | None = None,
-    offset: int = None,
-    limit: int = None,
+    core_id: int | None = None,
+    offset: int | None = None,
+    limit: int | None = None,
+    status: list[NodeStatus] | None = Query(None),
+    enabled: bool = False,
+    ids: list[int] | None = Query(None),
+    search: str | None = None,
     db: AsyncSession = Depends(get_db),
     _: AdminDetails = Depends(check_sudo_admin),
 ):
     """Retrieve a list of all nodes. Accessible only to sudo admins."""
-    return await node_operator.get_db_nodes(db=db, core_id=backend_id, offset=offset, limit=limit)
+
+    return await node_operator.get_db_nodes(
+        db=db,
+        core_id=core_id,
+        offset=offset,
+        limit=limit,
+        status=status,
+        enabled=enabled,
+        ids=ids,
+        search=search,
+    )
 
 
 @router.post("s/reconnect")