feat: We can search for pilots

Author: Robin-Van-de-Merghel

diracx-client/src/diracx/client/_generated/aio/operations/_operations.py

@@ -16,18 +16,16 @@
     BodyAuthGetOidcTokenGrantType,
     BodyAuthPilotLogin,
     BodyAuthRefreshPilotTokens,
+    BodyPilotsAddPilotStamps,
     BodyPilotsAssociatePilotWithJobs,
     BodyPilotsAssociatePilotsWithSecrets,
     BodyPilotsCreatePilotSecrets,
-    BodyPilotsRegisterNewPilotsToDb,
     GroupInfo,
     HTTPValidationError,
     HeartbeatData,
     InitiateDeviceFlowResponse,
     InsertedJob,
     JobCommand,
-    JobSearchParams,
-    JobSearchParamsSearchItem,
     JobStatusUpdate,
     JobSummaryParams,
     JobSummaryParamsSearchItem,
@@ -37,12 +35,14 @@
     PilotFieldsMapping,
     PilotSecretsInfo,
     PilotStampInfo,
-    ResponsePilotsRegisterNewPilotsToDb,
+    ResponsePilotsAddPilotStamps,
     SandboxDownloadResponse,
     SandboxInfo,
     SandboxUploadResponse,
     ScalarSearchSpec,
     ScalarSearchSpecValue,
+    SearchParams,
+    SearchParamsSearchItem,
     SetJobStatusReturn,
     SetJobStatusReturnSuccess,
     SortSpec,
@@ -75,18 +75,16 @@
     "BodyAuthGetOidcTokenGrantType",
     "BodyAuthPilotLogin",
     "BodyAuthRefreshPilotTokens",
+    "BodyPilotsAddPilotStamps",
     "BodyPilotsAssociatePilotWithJobs",
     "BodyPilotsAssociatePilotsWithSecrets",
     "BodyPilotsCreatePilotSecrets",
-    "BodyPilotsRegisterNewPilotsToDb",
     "GroupInfo",
     "HTTPValidationError",
     "HeartbeatData",
     "InitiateDeviceFlowResponse",
     "InsertedJob",
     "JobCommand",
-    "JobSearchParams",
-    "JobSearchParamsSearchItem",
     "JobStatusUpdate",
     "JobSummaryParams",
     "JobSummaryParamsSearchItem",
@@ -96,12 +94,14 @@
     "PilotFieldsMapping",
     "PilotSecretsInfo",
     "PilotStampInfo",
-    "ResponsePilotsRegisterNewPilotsToDb",
+    "ResponsePilotsAddPilotStamps",
     "SandboxDownloadResponse",
     "SandboxInfo",
     "SandboxUploadResponse",
     "ScalarSearchSpec",
     "ScalarSearchSpecValue",
+    "SearchParams",
+    "SearchParamsSearchItem",
     "SetJobStatusReturn",
     "SetJobStatusReturnSuccess",
     "SortSpec",

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

@@ -153,6 +153,76 @@ def __init__(self, *, refresh_token: str, **kwargs: Any) -> None:
         self.refresh_token = refresh_token
 
 
+class BodyPilotsAddPilotStamps(_serialization.Model):
+    """Body_pilots_add_pilot_stamps.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar pilot_stamps: List of the pilot stamps we want to add to the db. Required.
+    :vartype pilot_stamps: list[str]
+    :ivar vo: Virtual Organisation associated with the inserted pilots. Required.
+    :vartype vo: str
+    :ivar grid_type: Grid type of the pilots.
+    :vartype grid_type: str
+    :ivar pilot_references: Association of a pilot reference with a pilot stamp.
+    :vartype pilot_references: dict[str, any]
+    :ivar generate_secrets: Boolean to allow secret creation or not.
+    :vartype generate_secrets: bool
+    :ivar pilot_secret_use_count_max: Number of times we can use a secret.
+    :vartype pilot_secret_use_count_max: int
+    """
+
+    _validation = {
+        "pilot_stamps": {"required": True},
+        "vo": {"required": True},
+    }
+
+    _attribute_map = {
+        "pilot_stamps": {"key": "pilot_stamps", "type": "[str]"},
+        "vo": {"key": "vo", "type": "str"},
+        "grid_type": {"key": "grid_type", "type": "str"},
+        "pilot_references": {"key": "pilot_references", "type": "{object}"},
+        "generate_secrets": {"key": "generate_secrets", "type": "bool"},
+        "pilot_secret_use_count_max": {
+            "key": "pilot_secret_use_count_max",
+            "type": "int",
+        },
+    }
+
+    def __init__(
+        self,
+        *,
+        pilot_stamps: List[str],
+        vo: str,
+        grid_type: str = "Dirac",
+        pilot_references: Optional[Dict[str, Any]] = None,
+        generate_secrets: bool = True,
+        pilot_secret_use_count_max: int = 1,
+        **kwargs: Any,
+    ) -> None:
+        """
+        :keyword pilot_stamps: List of the pilot stamps we want to add to the db. Required.
+        :paramtype pilot_stamps: list[str]
+        :keyword vo: Virtual Organisation associated with the inserted pilots. Required.
+        :paramtype vo: str
+        :keyword grid_type: Grid type of the pilots.
+        :paramtype grid_type: str
+        :keyword pilot_references: Association of a pilot reference with a pilot stamp.
+        :paramtype pilot_references: dict[str, any]
+        :keyword generate_secrets: Boolean to allow secret creation or not.
+        :paramtype generate_secrets: bool
+        :keyword pilot_secret_use_count_max: Number of times we can use a secret.
+        :paramtype pilot_secret_use_count_max: int
+        """
+        super().__init__(**kwargs)
+        self.pilot_stamps = pilot_stamps
+        self.vo = vo
+        self.grid_type = grid_type
+        self.pilot_references = pilot_references
+        self.generate_secrets = generate_secrets
+        self.pilot_secret_use_count_max = pilot_secret_use_count_max
+
+
 class BodyPilotsAssociatePilotsWithSecrets(_serialization.Model):
     """Body_pilots_associate_pilots_with_secrets.
 
@@ -283,76 +353,6 @@ def __init__(
         self.pilot_secret_use_count_max = pilot_secret_use_count_max
 
 
-class BodyPilotsRegisterNewPilotsToDb(_serialization.Model):
-    """Body_pilots_register_new_pilots_to_db.
-
-    All required parameters must be populated in order to send to server.
-
-    :ivar pilot_stamps: List of the pilot stamps we want to add to the db. Required.
-    :vartype pilot_stamps: list[str]
-    :ivar vo: Virtual Organisation associated with the inserted pilots. Required.
-    :vartype vo: str
-    :ivar grid_type: Grid type of the pilots.
-    :vartype grid_type: str
-    :ivar pilot_references: Association of a pilot reference with a pilot stamp.
-    :vartype pilot_references: dict[str, any]
-    :ivar generate_secrets: Boolean to allow secret creation or not.
-    :vartype generate_secrets: bool
-    :ivar pilot_secret_use_count_max: Number of times we can use a secret.
-    :vartype pilot_secret_use_count_max: int
-    """
-
-    _validation = {
-        "pilot_stamps": {"required": True},
-        "vo": {"required": True},
-    }
-
-    _attribute_map = {
-        "pilot_stamps": {"key": "pilot_stamps", "type": "[str]"},
-        "vo": {"key": "vo", "type": "str"},
-        "grid_type": {"key": "grid_type", "type": "str"},
-        "pilot_references": {"key": "pilot_references", "type": "{object}"},
-        "generate_secrets": {"key": "generate_secrets", "type": "bool"},
-        "pilot_secret_use_count_max": {
-            "key": "pilot_secret_use_count_max",
-            "type": "int",
-        },
-    }
-
-    def __init__(
-        self,
-        *,
-        pilot_stamps: List[str],
-        vo: str,
-        grid_type: str = "Dirac",
-        pilot_references: Optional[Dict[str, Any]] = None,
-        generate_secrets: bool = True,
-        pilot_secret_use_count_max: int = 1,
-        **kwargs: Any,
-    ) -> None:
-        """
-        :keyword pilot_stamps: List of the pilot stamps we want to add to the db. Required.
-        :paramtype pilot_stamps: list[str]
-        :keyword vo: Virtual Organisation associated with the inserted pilots. Required.
-        :paramtype vo: str
-        :keyword grid_type: Grid type of the pilots.
-        :paramtype grid_type: str
-        :keyword pilot_references: Association of a pilot reference with a pilot stamp.
-        :paramtype pilot_references: dict[str, any]
-        :keyword generate_secrets: Boolean to allow secret creation or not.
-        :paramtype generate_secrets: bool
-        :keyword pilot_secret_use_count_max: Number of times we can use a secret.
-        :paramtype pilot_secret_use_count_max: int
-        """
-        super().__init__(**kwargs)
-        self.pilot_stamps = pilot_stamps
-        self.vo = vo
-        self.grid_type = grid_type
-        self.pilot_references = pilot_references
-        self.generate_secrets = generate_secrets
-        self.pilot_secret_use_count_max = pilot_secret_use_count_max
-
-
 class GroupInfo(_serialization.Model):
     """GroupInfo.
 
@@ -635,56 +635,6 @@ def __init__(
         self.arguments = arguments
 
 
-class JobSearchParams(_serialization.Model):
-    """JobSearchParams.
-
-    :ivar parameters: Parameters.
-    :vartype parameters: list[str]
-    :ivar search: Search.
-    :vartype search: list[~_generated.models.JobSearchParamsSearchItem]
-    :ivar sort: Sort.
-    :vartype sort: list[~_generated.models.SortSpec]
-    :ivar distinct: Distinct.
-    :vartype distinct: bool
-    """
-
-    _attribute_map = {
-        "parameters": {"key": "parameters", "type": "[str]"},
-        "search": {"key": "search", "type": "[JobSearchParamsSearchItem]"},
-        "sort": {"key": "sort", "type": "[SortSpec]"},
-        "distinct": {"key": "distinct", "type": "bool"},
-    }
-
-    def __init__(
-        self,
-        *,
-        parameters: Optional[List[str]] = None,
-        search: List["_models.JobSearchParamsSearchItem"] = [],
-        sort: List["_models.SortSpec"] = [],
-        distinct: bool = False,
-        **kwargs: Any,
-    ) -> None:
-        """
-        :keyword parameters: Parameters.
-        :paramtype parameters: list[str]
-        :keyword search: Search.
-        :paramtype search: list[~_generated.models.JobSearchParamsSearchItem]
-        :keyword sort: Sort.
-        :paramtype sort: list[~_generated.models.SortSpec]
-        :keyword distinct: Distinct.
-        :paramtype distinct: bool
-        """
-        super().__init__(**kwargs)
-        self.parameters = parameters
-        self.search = search
-        self.sort = sort
-        self.distinct = distinct
-
-
-class JobSearchParamsSearchItem(_serialization.Model):
-    """JobSearchParamsSearchItem."""
-
-
 class JobStatusUpdate(_serialization.Model):
     """JobStatusUpdate.
 
@@ -1026,7 +976,7 @@ class PilotFieldsMapping(_serialization.Model):
     :ivar accounting_sent: Accountingsent.
     :vartype accounting_sent: bool
     :ivar current_job_id: Currentjobid.
-    :vartype current_job_id: bool
+    :vartype current_job_id: int
     """
 
     _validation = {
@@ -1043,7 +993,7 @@ class PilotFieldsMapping(_serialization.Model):
         "grid_site": {"key": "GridSite", "type": "str"},
         "grid_type": {"key": "GridType", "type": "str"},
         "accounting_sent": {"key": "AccountingSent", "type": "bool"},
-        "current_job_id": {"key": "CurrentJobID", "type": "bool"},
+        "current_job_id": {"key": "CurrentJobID", "type": "int"},
     }
 
     def __init__(
@@ -1058,7 +1008,7 @@ def __init__(
         grid_site: Optional[str] = None,
         grid_type: Optional[str] = None,
         accounting_sent: Optional[bool] = None,
-        current_job_id: Optional[bool] = None,
+        current_job_id: Optional[int] = None,
         **kwargs: Any,
     ) -> None:
         """
@@ -1082,7 +1032,7 @@ def __init__(
         :keyword accounting_sent: Accountingsent.
         :paramtype accounting_sent: bool
         :keyword current_job_id: Currentjobid.
-        :paramtype current_job_id: bool
+        :paramtype current_job_id: int
         """
         super().__init__(**kwargs)
         self.pilot_stamp = pilot_stamp
@@ -1158,8 +1108,8 @@ def __init__(self, *, pilot_stamp: str, **kwargs: Any) -> None:
         self.pilot_stamp = pilot_stamp
 
 
-class ResponsePilotsRegisterNewPilotsToDb(_serialization.Model):
-    """Response Pilots Register New Pilots To Db."""
+class ResponsePilotsAddPilotStamps(_serialization.Model):
+    """Response Pilots Add Pilot Stamps."""
 
 
 class SandboxDownloadResponse(_serialization.Model):
@@ -1348,6 +1298,56 @@ class ScalarSearchSpecValue(_serialization.Model):
     """Value."""
 
 
+class SearchParams(_serialization.Model):
+    """SearchParams.
+
+    :ivar parameters: Parameters.
+    :vartype parameters: list[str]
+    :ivar search: Search.
+    :vartype search: list[~_generated.models.SearchParamsSearchItem]
+    :ivar sort: Sort.
+    :vartype sort: list[~_generated.models.SortSpec]
+    :ivar distinct: Distinct.
+    :vartype distinct: bool
+    """
+
+    _attribute_map = {
+        "parameters": {"key": "parameters", "type": "[str]"},
+        "search": {"key": "search", "type": "[SearchParamsSearchItem]"},
+        "sort": {"key": "sort", "type": "[SortSpec]"},
+        "distinct": {"key": "distinct", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        parameters: Optional[List[str]] = None,
+        search: List["_models.SearchParamsSearchItem"] = [],
+        sort: List["_models.SortSpec"] = [],
+        distinct: bool = False,
+        **kwargs: Any,
+    ) -> None:
+        """
+        :keyword parameters: Parameters.
+        :paramtype parameters: list[str]
+        :keyword search: Search.
+        :paramtype search: list[~_generated.models.SearchParamsSearchItem]
+        :keyword sort: Sort.
+        :paramtype sort: list[~_generated.models.SortSpec]
+        :keyword distinct: Distinct.
+        :paramtype distinct: bool
+        """
+        super().__init__(**kwargs)
+        self.parameters = parameters
+        self.search = search
+        self.sort = sort
+        self.distinct = distinct
+
+
+class SearchParamsSearchItem(_serialization.Model):
+    """SearchParamsSearchItem."""
+
+
 class SetJobStatusReturn(_serialization.Model):
     """SetJobStatusReturn.