fix: Fixed documentation, and code in general

Author: Robin-Van-de-Merghel

diracx-db/src/diracx/db/sql/pilot_agents/db.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timezone
 from os import urandom
 
-from sqlalchemy import insert, select, update
+from sqlalchemy import DateTime, insert, select, update
 from sqlalchemy.exc import IntegrityError
 
 from diracx.core.exceptions import (
@@ -93,42 +93,17 @@ async def verify_pilot_secret(self, pilot_id: int, pilot_secret: str) -> None:
 
         # Increment the count
         await self.increment_pilot_secret_use(pilot_id=pilot_id)
-        return
 
     async def register_new_pilot(
         self,
         vo: str,
-        initial_job_id: int = 0,
-        current_job_id: int = 0,
-        benchmark: float = 0.0,
-        pilot_job_reference: str = "Unknown",
-        pilot_stamp: str = "",
-        status: str = "Unknown",
-        status_reason: str = "Unknown",
-        queue: str = "Unknown",
-        grid_site: str = "Unknown",
-        destination_site: str = "NotAssigned",
-        grid_type: str = "LCG",
-        submission_time: str | None = None,  # ?
-        last_update_time: str | None = None,  # = now?
-        accounting_sent: bool = False,
+        submission_time: DateTime | None = None,  # ?
+        last_update_time: DateTime | None = None,  # = now?
     ) -> int | None:
         stmt = insert(PilotAgents).values(
-            initial_job_id=initial_job_id,
-            current_job_id=current_job_id,
-            pilot_job_reference=pilot_job_reference,
-            pilot_stamp=pilot_stamp,
-            destination_site=destination_site,
-            queue=queue,
-            grid_site=grid_site,
             vo=vo,
-            grid_type=grid_type,
-            benchmark=benchmark,
             submission_time=submission_time,
             last_update_time=last_update_time,
-            status=status,
-            status_reason=status_reason,
-            accounting_sent=accounting_sent,
         )
 
         # Execute the request
@@ -163,11 +138,11 @@ async def add_pilot_credentials(self, pilot_id: int) -> str:
 
         return random_secret
 
-    async def get_pilots(self):
+    async def fetch_all_pilots(self):
         stmt = select(PilotRegistrations).with_for_update()
         result = await self.conn.execute(stmt)
 
-        # Convertir les résultats en dictionnaires
+        # Convert results into a dictionary
         pilots = [dict(row._mapping) for row in result]
 
         return pilots

diracx-db/tests/pilot_agents/test_pilot_agents_db.py

@@ -36,10 +36,7 @@ async def test_insert_and_select(pilot_agents_db: PilotAgentsDB):
 async def test_insert_and_select_single(pilot_agents_db: PilotAgentsDB):
 
     async with pilot_agents_db as pilot_agents_db:
-        # Add a pilot reference
-        new_pilot_id = await pilot_agents_db.register_new_pilot(
-            vo="pilot-vo", pilot_job_reference="pilot-ref"
-        )
+        new_pilot_id = await pilot_agents_db.register_new_pilot(vo="pilot-vo")
 
         res = await pilot_agents_db.get_pilot_by_id(new_pilot_id)
 
@@ -49,7 +46,6 @@ async def test_insert_and_select_single(pilot_agents_db: PilotAgentsDB):
         # Set values
         assert res["PilotID"] == new_pilot_id
         assert res["VO"] == "pilot-vo"
-        assert res["PilotJobReference"] == "pilot-ref"
 
         # Default values
         assert res["PilotStamp"] == ""
@@ -60,12 +56,7 @@ async def test_insert_and_select_single(pilot_agents_db: PilotAgentsDB):
 async def test_create_pilot_and_verify_secret(pilot_agents_db: PilotAgentsDB):
 
     async with pilot_agents_db as pilot_agents_db:
-        # Add a pilot reference
-        pilot_ref = "pilot-ref"
-
-        new_pilot_id = await pilot_agents_db.register_new_pilot(
-            vo="pilot-vo", pilot_job_reference=pilot_ref
-        )
+        new_pilot_id = await pilot_agents_db.register_new_pilot(vo="pilot-vo")
 
         # Add creds
         secret = await pilot_agents_db.add_pilot_credentials(new_pilot_id)

diracx-logic/src/diracx/logic/auth/token.py

@@ -106,7 +106,7 @@ async def get_oidc_token_info_from_device_flow(
     # TODO: use HTTPException while still respecting the standard format
     # required by the RFC
     if info["Status"] != FlowStatus.READY:
-        # That should exnever ever happen
+        # That should never ever happen
         raise NotImplementedError(f"Unexpected flow status {info['status']!r}")
     return (oidc_token_info, scope)
 

diracx-routers/src/diracx/routers/auth/__init__.py

@@ -5,7 +5,7 @@
 from .authorize_code_flow import router as authorize_code_flow_router
 from .device_flow import router as device_flow_router
 from .management import router as management_router
-from .pilot_auth import router as pilot_auth_router
+from .pilot import router as pilot_router
 from .token import router as token_router
 from .utils import has_properties
 
@@ -14,6 +14,6 @@
 router.include_router(management_router)
 router.include_router(authorize_code_flow_router)
 router.include_router(token_router)
-router.include_router(pilot_auth_router)
+router.include_router(pilot_router)
 
 __all__ = ["has_properties", "verify_dirac_access_token"]

diracx-routers/src/diracx/routers/auth/pilot_auth.py renamed to diracx-routers/src/diracx/routers/auth/pilot.py

@@ -43,7 +43,7 @@ async def policy(
             return
 
         raise HTTPException(
-            status.HTTP_401_UNAUTHORIZED, "you don't have the right properties"
+            status.HTTP_403_FORBIDDEN, "you don't have the right properties"
         )
         return
 

diracx-routers/src/diracx/routers/pilots/access_policies.py

@@ -35,14 +35,10 @@ async def test_create_pilot_and_verify_secret(test_client):
 
     # Add a pilot vo
     pilot_vo = "lhcb"
-    # Add a pilot reference
-    pilot_ref = "pilot-ref"
 
     async with db as pilot_agents_db:
         # Register a pilot
-        pilot_id = await pilot_agents_db.register_new_pilot(
-            vo=pilot_vo, pilot_job_reference=pilot_ref
-        )
+        pilot_id = await pilot_agents_db.register_new_pilot(vo=pilot_vo)
 
         # Add credentials to this pilot
         secret = await pilot_agents_db.add_pilot_credentials(pilot_id=pilot_id)