fix: Use also VO as parameter (in case DIRAC has a bad VO)

Author: Robin-Van-de-Merghel

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

@@ -101,6 +101,8 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
 
     :ivar pilot_stamps: List of the pilot stamps we want to add to the db. Required.
     :vartype pilot_stamps: list[str]
+    :ivar vo: Pilot virtual organization. Required.
+    :vartype vo: str
     :ivar grid_type: Grid type of the pilots.
     :vartype grid_type: str
     :ivar grid_site: Pilots grid site.
@@ -116,10 +118,12 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
 
     _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"},
         "grid_site": {"key": "grid_site", "type": "str"},
         "destination_site": {"key": "destination_site", "type": "str"},
@@ -131,6 +135,7 @@ def __init__(
         self,
         *,
         pilot_stamps: List[str],
+        vo: str,
         grid_type: str = "Dirac",
         grid_site: str = "Unknown",
         destination_site: str = "NotAssigned",
@@ -141,6 +146,8 @@ def __init__(
         """
         :keyword pilot_stamps: List of the pilot stamps we want to add to the db. Required.
         :paramtype pilot_stamps: list[str]
+        :keyword vo: Pilot virtual organization. Required.
+        :paramtype vo: str
         :keyword grid_type: Grid type of the pilots.
         :paramtype grid_type: str
         :keyword grid_site: Pilots grid site.
@@ -155,6 +162,7 @@ def __init__(
         """
         super().__init__(**kwargs)
         self.pilot_stamps = pilot_stamps
+        self.vo = vo
         self.grid_type = grid_type
         self.grid_site = grid_site
         self.destination_site = destination_site

diracx-client/src/diracx/client/patches/pilots/common.py

@@ -98,6 +98,7 @@ class AddPilotStampsBody(TypedDict, total=False):
     grid_site: str
     pilot_references: dict[str, str]
     pilot_status: PilotStatus
+    vo: str
 
 class AddPilotStampsKwargs(AddPilotStampsBody, ResponseExtra): ...
 
@@ -111,7 +112,7 @@ def make_add_pilot_stamps_body(**kwargs: Unpack[AddPilotStampsKwargs]) -> Underl
     for key in AddPilotStampsBody.__optional_keys__:
         if key not in kwargs:
             continue
-        key = cast(Literal["pilot_stamps", "grid_type", "grid_site", "pilot_references", "pilot_status"], key)
+        key = cast(Literal["pilot_stamps", "grid_type", "grid_site", "pilot_references", "pilot_status", "vo"], key)
         value = kwargs.pop(key)
         if value is not None:
             body[key] = value

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

@@ -41,6 +41,7 @@ async def add_pilot_stamps(
         list[str],
         Body(description="List of the pilot stamps we want to add to the db."),
     ],
+    vo: Annotated[str, Body(description="Pilot virtual organization.")],
     check_permissions: CheckPilotManagementPolicyCallable,
     user_info: Annotated[AuthorizedUserInfo, Depends(verify_dirac_access_token)],
     grid_type: Annotated[str, Body(description="Grid type of the pilots.")] = "Dirac",
@@ -79,7 +80,7 @@ async def add_pilot_stamps(
         await register_new_pilots(
             pilot_db=pilot_db,
             pilot_stamps=pilot_stamps,
-            vo=user_info.vo,
+            vo=vo,
             grid_type=grid_type,
             grid_site=grid_site,
             destination_site=destination_site,

diracx-routers/tests/pilots/test_pilot_creation.py

@@ -41,7 +41,7 @@ async def test_create_pilots(normal_test_client):
     pilot_stamps = [f"stamps_{i}" for i in range(N)]
 
     #  -------------- Bulk insert --------------
-    body = {"pilot_stamps": pilot_stamps}
+    body = {"pilot_stamps": pilot_stamps, "vo": MAIN_VO}
 
     r = normal_test_client.post(
         "/api/pilots/",
@@ -54,6 +54,7 @@ async def test_create_pilots(normal_test_client):
 
     body = {
         "pilot_stamps": [pilot_stamps[0], pilot_stamps[0] + "_new_one"],
+        "vo": MAIN_VO,
     }
 
     r = normal_test_client.post(
@@ -73,7 +74,7 @@ async def test_create_pilots(normal_test_client):
     #  -------------- Register a pilot that does not exists **but** was called before in an error --------------
     # To prove that, if I tried to register a pilot that does not exist with one that already exists,
     # i can normally add the one that did not exist before (it should not have added it before)
-    body = {"pilot_stamps": [pilot_stamps[0] + "_new_one"]}
+    body = {"pilot_stamps": [pilot_stamps[0] + "_new_one"], "vo": MAIN_VO}
 
     r = normal_test_client.post(
         "/api/pilots/",
@@ -90,7 +91,7 @@ async def test_create_pilot_and_delete_it(normal_test_client):
     pilot_stamp = "stamps_1"
 
     #  -------------- Insert --------------
-    body = {"pilot_stamps": [pilot_stamp]}
+    body = {"pilot_stamps": [pilot_stamp], "vo": MAIN_VO}
 
     # Create a pilot
     r = normal_test_client.post(
@@ -134,7 +135,7 @@ async def test_create_pilot_and_modify_it(normal_test_client):
     pilot_stamps = ["stamps_1", "stamp_2"]
 
     #  -------------- Insert --------------
-    body = {"pilot_stamps": pilot_stamps}
+    body = {"pilot_stamps": pilot_stamps, "vo": MAIN_VO}
 
     # Create pilots
     r = normal_test_client.post(
@@ -191,7 +192,7 @@ async def test_delete_pilots_by_age_and_stamp(normal_test_client):
     pilot_stamps = [f"stamp_{i}" for i in range(100)]
 
     # -------------- Insert all pilots --------------
-    body = {"pilot_stamps": pilot_stamps}
+    body = {"pilot_stamps": pilot_stamps, "vo": MAIN_VO}
     r = normal_test_client.post("/api/pilots/", json=body)
     assert r.status_code == 200, r.json()
 

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

@@ -101,6 +101,8 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
 
     :ivar pilot_stamps: List of the pilot stamps we want to add to the db. Required.
     :vartype pilot_stamps: list[str]
+    :ivar vo: Pilot virtual organization. Required.
+    :vartype vo: str
     :ivar grid_type: Grid type of the pilots.
     :vartype grid_type: str
     :ivar grid_site: Pilots grid site.
@@ -116,10 +118,12 @@ class BodyPilotsAddPilotStamps(_serialization.Model):
 
     _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"},
         "grid_site": {"key": "grid_site", "type": "str"},
         "destination_site": {"key": "destination_site", "type": "str"},
@@ -131,6 +135,7 @@ def __init__(
         self,
         *,
         pilot_stamps: List[str],
+        vo: str,
         grid_type: str = "Dirac",
         grid_site: str = "Unknown",
         destination_site: str = "NotAssigned",
@@ -141,6 +146,8 @@ def __init__(
         """
         :keyword pilot_stamps: List of the pilot stamps we want to add to the db. Required.
         :paramtype pilot_stamps: list[str]
+        :keyword vo: Pilot virtual organization. Required.
+        :paramtype vo: str
         :keyword grid_type: Grid type of the pilots.
         :paramtype grid_type: str
         :keyword grid_site: Pilots grid site.
@@ -155,6 +162,7 @@ def __init__(
         """
         super().__init__(**kwargs)
         self.pilot_stamps = pilot_stamps
+        self.vo = vo
         self.grid_type = grid_type
         self.grid_site = grid_site
         self.destination_site = destination_site