fix: Regenerate client and fix some rebase errors

Author: Robin VAN DE MERGHEL

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

@@ -865,25 +865,16 @@ async def complete_authorization_flow(self, *, code: str, state: str, **kwargs:
 
     @overload
     async def perform_secret_exchange(
-<<<<<<< HEAD
         self, body: _models.PilotCredentials, *, content_type: str = "application/json", **kwargs: Any
-=======
-        self, body: _models.BodyAuthPerformSecretExchange, *, content_type: str = "application/json", **kwargs: Any
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
     ) -> _models.TokenResponse:
         """Perform Secret Exchange.
 
         This endpoint is used by the pilot to exchange a secret for a token.
 
-<<<<<<< HEAD
         This endpoint also acts as DIRAC's ``dirac-admin-add-pilot``.
 
         :param body: Required.
         :type body: ~_generated.models.PilotCredentials
-=======
-        :param body: Required.
-        :type body: ~_generated.models.BodyAuthPerformSecretExchange
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
         :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
         :paramtype content_type: str
@@ -900,11 +891,8 @@ async def perform_secret_exchange(
 
         This endpoint is used by the pilot to exchange a secret for a token.
 
-<<<<<<< HEAD
         This endpoint also acts as DIRAC's ``dirac-admin-add-pilot``.
 
-=======
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
         :param body: Required.
         :type body: IO[bytes]
         :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
@@ -917,25 +905,16 @@ async def perform_secret_exchange(
 
     @distributed_trace_async
     async def perform_secret_exchange(
-<<<<<<< HEAD
         self, body: Union[_models.PilotCredentials, IO[bytes]], **kwargs: Any
-=======
-        self, body: Union[_models.BodyAuthPerformSecretExchange, IO[bytes]], **kwargs: Any
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
     ) -> _models.TokenResponse:
         """Perform Secret Exchange.
 
         This endpoint is used by the pilot to exchange a secret for a token.
 
-<<<<<<< HEAD
         This endpoint also acts as DIRAC's ``dirac-admin-add-pilot``.
 
         :param body: Is either a PilotCredentials type or a IO[bytes] type. Required.
         :type body: ~_generated.models.PilotCredentials or IO[bytes]
-=======
-        :param body: Is either a BodyAuthPerformSecretExchange type or a IO[bytes] type. Required.
-        :type body: ~_generated.models.BodyAuthPerformSecretExchange or IO[bytes]
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
         :return: TokenResponse
         :rtype: ~_generated.models.TokenResponse
         :raises ~azure.core.exceptions.HttpResponseError:
@@ -960,11 +939,7 @@ async def perform_secret_exchange(
         if isinstance(body, (IOBase, bytes)):
             _content = body
         else:
-<<<<<<< HEAD
             _json = self._serialize.body(body, "PilotCredentials")
-=======
-            _json = self._serialize.body(body, "BodyAuthPerformSecretExchange")
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
 
         _request = build_auth_perform_secret_exchange_request(
             content_type=content_type,
@@ -2798,216 +2773,6 @@ async def update_secrets_constraints(
         if cls:
             return cls(pipeline_response, None, {})  # type: ignore
 
-    @overload
-    async def update_pilot_fields(
-        self, body: _models.BodyPilotsUpdatePilotFields, *, content_type: str = "application/json", **kwargs: Any
-    ) -> None:
-        """Update Pilot Fields.
-
-        Modify a field of a pilot.
-
-        Note: Only the fields in PilotFieldsMapping are mutable, except for the PilotStamp.
-
-        :param body: Required.
-        :type body: ~_generated.models.BodyPilotsUpdatePilotFields
-        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
-         Default value is "application/json".
-        :paramtype content_type: str
-        :return: None
-        :rtype: None
-    async def create_pilot_secrets(
-        self, body: _models.BodyPilotsCreatePilotSecrets, *, content_type: str = "application/json", **kwargs: Any
-    ) -> List[_models.PilotSecretsInfo]:
-        """Create Pilot Secrets.
-
-        Endpoint to create secrets.
-
-        :param body: Required.
-        :type body: ~_generated.models.BodyPilotsCreatePilotSecrets
-        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
-         Default value is "application/json".
-        :paramtype content_type: str
-        :return: list of PilotSecretsInfo
-        :rtype: list[~_generated.models.PilotSecretsInfo]
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-
-    @overload
-    async def create_pilot_secrets(
-        self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any
-    ) -> List[_models.PilotSecretsInfo]:
-        """Create Pilot Secrets.
-
-        Endpoint to create secrets.
-
-        :param body: Required.
-        :type body: IO[bytes]
-        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
-         Default value is "application/json".
-        :paramtype content_type: str
-        :return: list of PilotSecretsInfo
-        :rtype: list[~_generated.models.PilotSecretsInfo]
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-
-    @distributed_trace_async
-    async def create_pilot_secrets(
-        self, body: Union[_models.BodyPilotsCreatePilotSecrets, IO[bytes]], **kwargs: Any
-    ) -> List[_models.PilotSecretsInfo]:
-        """Create Pilot Secrets.
-
-        Endpoint to create secrets.
-
-        :param body: Is either a BodyPilotsCreatePilotSecrets type or a IO[bytes] type. Required.
-        :type body: ~_generated.models.BodyPilotsCreatePilotSecrets or IO[bytes]
-        :return: list of PilotSecretsInfo
-        :rtype: list[~_generated.models.PilotSecretsInfo]
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-        error_map: MutableMapping = {
-            401: ClientAuthenticationError,
-            404: ResourceNotFoundError,
-            409: ResourceExistsError,
-            304: ResourceNotModifiedError,
-        }
-        error_map.update(kwargs.pop("error_map", {}) or {})
-
-        _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
-        _params = kwargs.pop("params", {}) or {}
-
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[List[_models.PilotSecretsInfo]] = kwargs.pop("cls", None)
-
-        content_type = content_type or "application/json"
-        _json = None
-        _content = None
-        if isinstance(body, (IOBase, bytes)):
-            _content = body
-        else:
-            _json = self._serialize.body(body, "BodyPilotsCreatePilotSecrets")
-
-        _request = build_pilots_create_pilot_secrets_request(
-            content_type=content_type,
-            json=_json,
-            content=_content,
-            headers=_headers,
-            params=_params,
-        )
-        _request.url = self._client.format_url(_request.url)
-
-        _stream = False
-        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
-            _request, stream=_stream, **kwargs
-        )
-
-        response = pipeline_response.http_response
-
-        if response.status_code not in [200]:
-            map_error(status_code=response.status_code, response=response, error_map=error_map)
-            raise HttpResponseError(response=response)
-
-        deserialized = self._deserialize("[PilotSecretsInfo]", pipeline_response.http_response)
-
-        if cls:
-            return cls(pipeline_response, deserialized, {})  # type: ignore
-
-        return deserialized  # type: ignore
-
-    @overload
-    async def update_secrets_constraints(
-        self, body: Dict[str, _models.PilotSecretConstraints], *, content_type: str = "application/json", **kwargs: Any
-    ) -> None:
-        """Update Secrets Constraints.
-
-        Endpoint to associate pilots with secrets.
-
-        :param body: Required.
-        :type body: dict[str, ~_generated.models.PilotSecretConstraints]
-        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
-         Default value is "application/json".
-        :paramtype content_type: str
-        :return: None
-        :rtype: None
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-
-    @overload
-    async def update_secrets_constraints(
-        self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any
-    ) -> None:
-        """Update Secrets Constraints.
-
-        Endpoint to associate pilots with secrets.
-
-        :param body: Required.
-        :type body: IO[bytes]
-        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
-         Default value is "application/json".
-        :paramtype content_type: str
-        :return: None
-        :rtype: None
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-
-    @distributed_trace_async
-    async def update_secrets_constraints(
-        self, body: Union[Dict[str, _models.PilotSecretConstraints], IO[bytes]], **kwargs: Any
-    ) -> None:
-        """Update Secrets Constraints.
-
-        Endpoint to associate pilots with secrets.
-
-        :param body: Is either a {str: PilotSecretConstraints} type or a IO[bytes] type. Required.
-        :type body: dict[str, ~_generated.models.PilotSecretConstraints] or IO[bytes]
-        :return: None
-        :rtype: None
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-        error_map: MutableMapping = {
-            401: ClientAuthenticationError,
-            404: ResourceNotFoundError,
-            409: ResourceExistsError,
-            304: ResourceNotModifiedError,
-        }
-        error_map.update(kwargs.pop("error_map", {}) or {})
-
-        _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
-        _params = kwargs.pop("params", {}) or {}
-
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[None] = kwargs.pop("cls", None)
-
-        content_type = content_type or "application/json"
-        _json = None
-        _content = None
-        if isinstance(body, (IOBase, bytes)):
-            _content = body
-        else:
-            _json = self._serialize.body(body, "{PilotSecretConstraints}")
-
-        _request = build_pilots_update_secrets_constraints_request(
-            content_type=content_type,
-            json=_json,
-            content=_content,
-            headers=_headers,
-            params=_params,
-        )
-        _request.url = self._client.format_url(_request.url)
-
-        _stream = False
-        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
-            _request, stream=_stream, **kwargs
-        )
-
-        response = pipeline_response.http_response
-
-        if response.status_code not in [204]:
-            map_error(status_code=response.status_code, response=response, error_map=error_map)
-            raise HttpResponseError(response=response)
-
-        if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
-
     @overload
     async def update_pilot_fields(
         self, body: _models.BodyPilotsUpdatePilotFields, *, content_type: str = "application/json", **kwargs: Any

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

@@ -14,10 +14,6 @@
 from ._models import (  # type: ignore
     BodyAuthGetOidcToken,
     BodyAuthGetOidcTokenGrantType,
-<<<<<<< HEAD
-=======
-    BodyAuthPerformSecretExchange,
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
     BodyAuthRefreshPilotTokens,
     BodyPilotsAddJobsToPilot,
     BodyPilotsAddPilotStamps,
@@ -81,10 +77,6 @@
 __all__ = [
     "BodyAuthGetOidcToken",
     "BodyAuthGetOidcTokenGrantType",
-<<<<<<< HEAD
-=======
-    "BodyAuthPerformSecretExchange",
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
     "BodyAuthRefreshPilotTokens",
     "BodyPilotsAddJobsToPilot",
     "BodyPilotsAddPilotStamps",

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

@@ -94,42 +94,6 @@ class BodyAuthGetOidcTokenGrantType(_serialization.Model):
     """OAuth2 Grant type."""
 
 
-<<<<<<< HEAD
-=======
-class BodyAuthPerformSecretExchange(_serialization.Model):
-    """Body_auth_perform_secret_exchange.
-
-    All required parameters must be populated in order to send to server.
-
-    :ivar pilot_stamp: Stamp used by a pilot to login. Required.
-    :vartype pilot_stamp: str
-    :ivar pilot_secret: Pilot secret given by Dirac/DiracX. Required.
-    :vartype pilot_secret: str
-    """
-
-    _validation = {
-        "pilot_stamp": {"required": True},
-        "pilot_secret": {"required": True},
-    }
-
-    _attribute_map = {
-        "pilot_stamp": {"key": "pilot_stamp", "type": "str"},
-        "pilot_secret": {"key": "pilot_secret", "type": "str"},
-    }
-
-    def __init__(self, *, pilot_stamp: str, pilot_secret: str, **kwargs: Any) -> None:
-        """
-        :keyword pilot_stamp: Stamp used by a pilot to login. Required.
-        :paramtype pilot_stamp: str
-        :keyword pilot_secret: Pilot secret given by Dirac/DiracX. Required.
-        :paramtype pilot_secret: str
-        """
-        super().__init__(**kwargs)
-        self.pilot_stamp = pilot_stamp
-        self.pilot_secret = pilot_secret
-
-
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
 class BodyAuthRefreshPilotTokens(_serialization.Model):
     """Body_auth_refresh_pilot_tokens.
 
@@ -332,10 +296,7 @@ def __init__(
         self.n = n
         self.expiration_minutes = expiration_minutes
         self.pilot_secret_use_count_max = pilot_secret_use_count_max
-<<<<<<< HEAD
         self.vo = vo
-=======
->>>>>>> 4507b79 (refactor: Splitted endpoints into /pilots and /pilots/internal WITH auth in both)
 
 
 class BodyPilotsInternalSendMessage(_serialization.Model):