Sfoglia il codice sorgente

fix(agent): fix list_node_configurations enable parameter and tuple unpacking

jerry 2 mesi fa
parent
commit
f5d3b2b84b

+ 1 - 1
app/services/agent/tools/builtin/node_config_tools.py

@@ -31,7 +31,7 @@ async def list_node_configurations(
     enable_int = 1 if enable is True else (0 if enable is False else None)
 
     try:
-        entries, total = await NodeConfigurationService.list_entries(
+        total, entries = await NodeConfigurationService.list_entries(
             db=db,
             entry_type=clean_type,
             page=page,

+ 4 - 0
app/services/node_configuration_service.py

@@ -75,6 +75,7 @@ class NodeConfigurationService:
         identifier: Optional[str] = None,
         node_id: Optional[str] = None,
         order_id: Optional[str] = None,
+        enable: Optional[int] = None,
     ) -> Tuple[int, List[Any]]:
         model = cls.get_model(entry_type)
         stmt = select(model)
@@ -89,6 +90,9 @@ class NodeConfigurationService:
         if order_id and hasattr(model, "order_id"):
             stmt = stmt.where(model.order_id == order_id)
             count_stmt = count_stmt.where(model.order_id == order_id)
+        if enable is not None and hasattr(model, "enable"):
+            stmt = stmt.where(model.enable == enable)
+            count_stmt = count_stmt.where(model.enable == enable)
 
         total = await db.scalar(count_stmt) or 0
         offset = (page - 1) * page_size

+ 1 - 1
tests/test_agent.py

@@ -292,7 +292,7 @@ class TestOpsToolsPermissions(unittest.IsolatedAsyncioTestCase):
 
         admin_user = VasUser(id="admin_1", role="admin")
         mock_db = MagicMock(spec=AsyncSession)
-        mock_list_entries.return_value = ([], 0)
+        mock_list_entries.return_value = (0, [])
 
         res = await list_node_configurations(db=mock_db, current_user=admin_user)
         self.assertNotIn("error", res)