feat: (temporary, 3 fix typing) Restructured pilot logger + new broke…

…n test
DIRACGrid · Jan 15, 2025 · d6e882a · d6e882a
1 parent 58ad0c0
commit d6e882a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/diracx-routers/src/diracx/routers/pilots/access_policies.py b/diracx-routers/src/diracx/routers/pilots/access_policies.py
@@ -6,6 +6,7 @@
 
 from fastapi import Depends, HTTPException, status
 
+from diracx.core.models import ScalarSearchOperator, ScalarSearchSpec
 from diracx.core.properties import (
     NORMAL_USER,
 )
@@ -48,11 +49,14 @@ async def policy(
                 status.HTTP_400_BAD_REQUEST, detail="Action is a mandatory argument"
             )
         elif action == ActionType.QUERY:
+            assert pilot_id
+            search_params = ScalarSearchSpec(
+                parameter="PilotID",
+                operator=ScalarSearchOperator.EQUAL,
+                value=pilot_id,
+            )
 
-            search_params = [
-                {"parameter": "PilotID", "operator": "eq", "value": pilot_id}
-            ]
-            total, result = await pilot_agents_db.search(["VO"], search_params, [])
+            total, result = await pilot_agents_db.search(["VO"], [search_params], [])
             print("Total: ", total, "Result: ", result)
             if total != 1:
                 logger.error(

diff --git a/diracx-routers/src/diracx/routers/pilots/logging.py b/diracx-routers/src/diracx/routers/pilots/logging.py
@@ -5,6 +5,8 @@
 from fastapi import HTTPException, status
 from pydantic import BaseModel
 
+from diracx.core.models import ScalarSearchOperator, ScalarSearchSpec
+
 from ..access_policies import open_access
 from ..dependencies import PilotAgentsDB, PilotLogsDB
 from ..fastapi_classes import DiracxRouter
@@ -40,11 +42,14 @@ async def send_message(
 ) -> int:
 
     # expecting exactly one row:
-    search_params = [
-        {"parameter": "PilotStamp", "operator": "eq", "value": data.pilot_stamp}
-    ]
+    search_params = ScalarSearchSpec(
+        parameter="PilotStamp",
+        operator=ScalarSearchOperator.EQUAL,
+        value=data.pilot_stamp,
+    )
+
     total, result = await pilot_agents_db.search(
-        ["PilotID", "VO", "SubmissionTime"], search_params, []
+        ["PilotID", "VO", "SubmissionTime"], [search_params], []
     )
     if total != 1:
         logger.error(