fix: Change from status reason to status (cf dirac-admin-add-pilot)

Author: Robin VAN DE MERGHEL

diracx-client/src/diracx/client/_generated/models/_models.py

@@ -144,8 +144,9 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
     :vartype destination_site: str
     :ivar pilot_references: Association of a pilot reference with a pilot stamp.
     :vartype pilot_references: dict[str, str]
-    :ivar status_reason: Status reason of the pilots.
-    :vartype status_reason: str
+    :ivar pilot_status: Status of the pilots. Known values are: "Submitted", "Waiting", "Running",
+     "Done", "Failed", "Deleted", "Aborted", and "Unknown".
+    :vartype pilot_status: str or ~_generated.models.PilotStatus
     """
 
     _validation = {
@@ -160,7 +161,7 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
         "grid_site": {"key": "grid_site", "type": "str"},
         "destination_site": {"key": "destination_site", "type": "str"},
         "pilot_references": {"key": "pilot_references", "type": "{str}"},
-        "status_reason": {"key": "status_reason", "type": "str"},
+        "pilot_status": {"key": "pilot_status", "type": "str"},
     }
 
     def __init__(
@@ -172,7 +173,7 @@ def __init__(
         grid_site: str = "Unknown",
         destination_site: str = "NotAssigned",
         pilot_references: Optional[Dict[str, str]] = None,
-        status_reason: str = "Unknown",
+        pilot_status: Optional[Union[str, "_models.PilotStatus"]] = None,
         **kwargs: Any
     ) -> None:
         """
@@ -188,8 +189,9 @@ def __init__(
         :paramtype destination_site: str
         :keyword pilot_references: Association of a pilot reference with a pilot stamp.
         :paramtype pilot_references: dict[str, str]
-        :keyword status_reason: Status reason of the pilots.
-        :paramtype status_reason: str
+        :keyword pilot_status: Status of the pilots. Known values are: "Submitted", "Waiting",
+         "Running", "Done", "Failed", "Deleted", "Aborted", and "Unknown".
+        :paramtype pilot_status: str or ~_generated.models.PilotStatus
         """
         super().__init__(**kwargs)
         self.pilot_stamps = pilot_stamps
@@ -198,7 +200,7 @@ def __init__(
         self.grid_site = grid_site
         self.destination_site = destination_site
         self.pilot_references = pilot_references
-        self.status_reason = status_reason
+        self.pilot_status = pilot_status
 
 
 class BodyPilotsUpdatePilotFields(_serialization.Model):

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

@@ -13,6 +13,7 @@
 )
 from diracx.core.models import (
     PilotFieldsMapping,
+    PilotStatus,
     SearchSpec,
     SortSpec,
 )
@@ -43,7 +44,7 @@ async def add_pilots(
         grid_site: str = "Unknown",
         destination_site: str = "NotAssigned",
         pilot_references: dict[str, str] | None = None,
-        status_reason: str = "Unknown",
+        status: str = PilotStatus.SUBMITTED,
     ):
         """Bulk add pilots in the DB.
 
@@ -64,8 +65,7 @@ async def add_pilots(
                 "DestinationSite": destination_site,
                 "SubmissionTime": now,
                 "LastUpdateTime": now,
-                "Status": "Submitted",
-                "StatusReason": status_reason,
+                "Status": status,
                 "PilotStamp": stamp,
             }
             for stamp in pilot_stamps

diracx-logic/src/diracx/logic/pilots/management.py

@@ -21,7 +21,7 @@ async def register_new_pilots(
     grid_type: str,
     grid_site: str,
     destination_site: str,
-    status_reason: str,
+    status: str,
     pilot_job_references: dict[str, str] | None,
 ):
     # [IMPORTANT] Check unicity of pilot references
@@ -43,7 +43,7 @@ async def register_new_pilots(
         grid_site=grid_site,
         destination_site=destination_site,
         pilot_references=pilot_job_references,
-        status_reason=status_reason,
+        status=status,
     )
 
 

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

@@ -12,6 +12,7 @@
 )
 from diracx.core.models import (
     PilotFieldsMapping,
+    PilotStatus,
 )
 from diracx.logic.pilots.management import (
     add_jobs_to_pilot as add_jobs_to_pilot_bl,
@@ -57,9 +58,9 @@ async def add_pilot_stamps(
         dict[str, str] | None,
         Body(description="Association of a pilot reference with a pilot stamp."),
     ] = None,
-    status_reason: Annotated[
-        str, Body(description="Status reason of the pilots.")
-    ] = "Unknown",
+    pilot_status: Annotated[
+        PilotStatus, Body(description="Status of the pilots.")
+    ] = PilotStatus.SUBMITTED,
 ):
     """Endpoint where a you can create pilots with their references.
 
@@ -77,7 +78,7 @@ async def add_pilot_stamps(
             grid_site=grid_site,
             destination_site=destination_site,
             pilot_job_references=pilot_references,
-            status_reason=status_reason,
+            status=pilot_status,
         )
     except PilotAlreadyExistsError as e:
         raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=str(e)) from e

extensions/gubbins/gubbins-client/src/gubbins/client/_generated/models/_models.py

@@ -144,8 +144,9 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
     :vartype destination_site: str
     :ivar pilot_references: Association of a pilot reference with a pilot stamp.
     :vartype pilot_references: dict[str, str]
-    :ivar status_reason: Status reason of the pilots.
-    :vartype status_reason: str
+    :ivar pilot_status: Status of the pilots. Known values are: "Submitted", "Waiting", "Running",
+     "Done", "Failed", "Deleted", "Aborted", and "Unknown".
+    :vartype pilot_status: str or ~_generated.models.PilotStatus
     """
 
     _validation = {
@@ -160,7 +161,7 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
         "grid_site": {"key": "grid_site", "type": "str"},
         "destination_site": {"key": "destination_site", "type": "str"},
         "pilot_references": {"key": "pilot_references", "type": "{str}"},
-        "status_reason": {"key": "status_reason", "type": "str"},
+        "pilot_status": {"key": "pilot_status", "type": "str"},
     }
 
     def __init__(
@@ -172,7 +173,7 @@ def __init__(
         grid_site: str = "Unknown",
         destination_site: str = "NotAssigned",
         pilot_references: Optional[Dict[str, str]] = None,
-        status_reason: str = "Unknown",
+        pilot_status: Optional[Union[str, "_models.PilotStatus"]] = None,
         **kwargs: Any
     ) -> None:
         """
@@ -188,8 +189,9 @@ def __init__(
         :paramtype destination_site: str
         :keyword pilot_references: Association of a pilot reference with a pilot stamp.
         :paramtype pilot_references: dict[str, str]
-        :keyword status_reason: Status reason of the pilots.
-        :paramtype status_reason: str
+        :keyword pilot_status: Status of the pilots. Known values are: "Submitted", "Waiting",
+         "Running", "Done", "Failed", "Deleted", "Aborted", and "Unknown".
+        :paramtype pilot_status: str or ~_generated.models.PilotStatus
         """
         super().__init__(**kwargs)
         self.pilot_stamps = pilot_stamps
@@ -198,7 +200,7 @@ def __init__(
         self.grid_site = grid_site
         self.destination_site = destination_site
         self.pilot_references = pilot_references
-        self.status_reason = status_reason
+        self.pilot_status = pilot_status
 
 
 class BodyPilotsUpdatePilotFields(_serialization.Model):