diracx-client 0.0.1a15__py3-none-any.whl → 0.0.1a17__py3-none-any.whl

diracx/client/__init__.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/_client.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/_configuration.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/_patch.py

@@ -8,12 +8,14 @@ Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python
 """
 from __future__ import annotations
 
-from datetime import datetime
+from datetime import datetime, timezone
 import json
+import jwt
 import requests
 
 from pathlib import Path
 from typing import Any, Dict, List, Optional, cast
+from urllib import parse
 from azure.core.credentials import AccessToken
 from azure.core.credentials import TokenCredential
 from azure.core.pipeline import PipelineRequest
@@ -113,9 +115,12 @@ class DiracBearerTokenCredentialPolicy(BearerTokenCredentialPolicy):
 
         if not self._token:
             credentials = json.loads(self._credential.location.read_text())
-            self._token = self._credential.get_token(
-                "", refresh_token=credentials["refresh_token"]
-            )
+            refresh_token = credentials["refresh_token"]
+            if not is_refresh_token_valid(refresh_token):
+                # If we are here, it means the refresh token is not valid anymore
+                # we suppose it is not needed to perform the request
+                return
+            self._token = self._credential.get_token("", refresh_token=refresh_token)
 
         request.http_request.headers["Authorization"] = f"Bearer {self._token.token}"
 
@@ -134,7 +139,7 @@ class DiracClient(DiracGenerated):
         **kwargs: Any,
     ) -> None:
         diracx_preferences = diracx_preferences or get_diracx_preferences()
-        self._endpoint = endpoint or diracx_preferences.url
+        self._endpoint = str(endpoint or diracx_preferences.url)
         if verify is True and diracx_preferences.ca_path:
             verify = str(diracx_preferences.ca_path)
         kwargs["connection_verify"] = verify
@@ -211,7 +216,7 @@ def get_openid_configuration(
 ) -> Dict[str, str]:
     """Get the openid configuration from the .well-known endpoint"""
     response = requests.get(
-        url=f"{endpoint}/.well-known/openid-configuration",
+        url=parse.urljoin(endpoint, ".well-known/openid-configuration"),
         verify=verify,
     )
     if not response.ok:
@@ -242,8 +247,20 @@ def get_token(location: Path, token: AccessToken | None) -> AccessToken | None:
     return token
 
 
+def is_refresh_token_valid(refresh_token: str) -> bool:
+    """Check if the refresh token is still valid."""
+    # Decode the refresh token
+    refresh_payload = jwt.decode(refresh_token, options={"verify_signature": False})
+    if not refresh_payload or "exp" not in refresh_payload:
+        return False
+
+    # Check the expiration time
+    return refresh_payload["exp"] > datetime.now(tz=timezone.utc).timestamp()
+
+
 def is_token_valid(token: AccessToken) -> bool:
     """Condition to get a new token"""
     return (
-        datetime.utcfromtimestamp(token.expires_on) - datetime.utcnow()
+        datetime.fromtimestamp(token.expires_on, tz=timezone.utc)
+        - datetime.now(tz=timezone.utc)
     ).total_seconds() > 300

diracx/client/_serialization.py

@@ -1525,7 +1525,7 @@ class Deserializer(object):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

diracx/client/_vendor.py

@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/aio/__init__.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/aio/_client.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/aio/_configuration.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/aio/_patch.py

@@ -18,7 +18,12 @@ from azure.core.pipeline.policies import AsyncBearerTokenCredentialPolicy
 from diracx.core.preferences import get_diracx_preferences, DiracxPreferences
 
 from ._client import Dirac as DiracGenerated
-from .._patch import get_openid_configuration, get_token, refresh_token
+from .._patch import (
+    get_openid_configuration,
+    get_token,
+    refresh_token,
+    is_refresh_token_valid,
+)
 
 __all__: List[str] = [
     "DiracClient",
@@ -114,7 +119,6 @@ class DiracBearerTokenCredentialPolicy(AsyncBearerTokenCredentialPolicy):
         self._token: AccessToken | None
         self._credential: DiracTokenCredential
         credentials: dict[str, Any]
-
         try:
             self._token = get_token(self._credential.location, self._token)
         except RuntimeError:
@@ -124,8 +128,13 @@ class DiracBearerTokenCredentialPolicy(AsyncBearerTokenCredentialPolicy):
 
         if not self._token:
             credentials = json.loads(self._credential.location.read_text())
+            refresh_token = credentials["refresh_token"]
+            if not is_refresh_token_valid(refresh_token):
+                # If we are here, it means the refresh token is not valid anymore
+                # we suppose it is not needed to perform the request
+                return
             self._token = await self._credential.get_token(
-                "", refresh_token=credentials["refresh_token"]
+                "", refresh_token=refresh_token
             )
 
         request.http_request.headers["Authorization"] = f"Bearer {self._token.token}"
@@ -148,7 +157,7 @@ class DiracClient(DiracGenerated):
         if verify is True and diracx_preferences.ca_path:
             verify = str(diracx_preferences.ca_path)
         kwargs["connection_verify"] = verify
-        self._endpoint = endpoint or diracx_preferences.url
+        self._endpoint = str(endpoint or diracx_preferences.url)
         self._client_id = client_id or "myDIRACClientID"
 
         # Get .well-known configuration

diracx/client/aio/_vendor.py

@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/aio/operations/__init__.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

diracx/client/aio/operations/_operations.py

@@ -1,7 +1,7 @@
 # pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from io import IOBase
@@ -245,22 +245,25 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
         )
 
     @distributed_trace_async
-    async def do_device_flow(self, *, user_code: str, **kwargs: Any) -> Any:
-        """Do Device Flow.
+    async def initiate_device_flow(
+        self, *, client_id: str, scope: str, **kwargs: Any
+    ) -> _models.InitiateDeviceFlowResponse:
+        """Initiate Device Flow.
 
-        This is called as the verification URI for the device flow.
-        It will redirect to the actual OpenID server (IAM, CheckIn) to
-        perform a authorization code flow.
+        Initiate the device flow against DIRAC authorization Server.
+        Scope must have exactly up to one ``group`` (otherwise default) and
+        one or more ``property`` scope.
+        If no property, then get default one
 
-        We set the user_code obtained from the device flow in a cookie
-        to be able to map the authorization flow with the corresponding
-        device flow.
-        (note: it can't be put as parameter or in the URL).
+        Offers the user to go with the browser to
+        ``auth/<vo>/device?user_code=XYZ``.
 
-        :keyword user_code: Required.
-        :paramtype user_code: str
-        :return: any
-        :rtype: any
+        :keyword client_id: Required.
+        :paramtype client_id: str
+        :keyword scope: Required.
+        :paramtype scope: str
+        :return: InitiateDeviceFlowResponse
+        :rtype: ~client.models.InitiateDeviceFlowResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping[int, Type[HttpResponseError]] = {
@@ -274,10 +277,11 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
         _headers = kwargs.pop("headers", {}) or {}
         _params = kwargs.pop("params", {}) or {}
 
-        cls: ClsType[Any] = kwargs.pop("cls", None)
+        cls: ClsType[_models.InitiateDeviceFlowResponse] = kwargs.pop("cls", None)
 
-        _request = build_auth_do_device_flow_request(
-            user_code=user_code,
+        _request = build_auth_initiate_device_flow_request(
+            client_id=client_id,
+            scope=scope,
             headers=_headers,
             params=_params,
         )
@@ -300,7 +304,9 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
             )
             raise HttpResponseError(response=response)
 
-        deserialized = self._deserialize("object", pipeline_response)
+        deserialized = self._deserialize(
+            "InitiateDeviceFlowResponse", pipeline_response
+        )
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -308,25 +314,22 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def initiate_device_flow(
-        self, *, client_id: str, scope: str, **kwargs: Any
-    ) -> _models.InitiateDeviceFlowResponse:
-        """Initiate Device Flow.
+    async def do_device_flow(self, *, user_code: str, **kwargs: Any) -> Any:
+        """Do Device Flow.
 
-        Initiate the device flow against DIRAC authorization Server.
-        Scope must have exactly up to one ``group`` (otherwise default) and
-        one or more ``property`` scope.
-        If no property, then get default one
+        This is called as the verification URI for the device flow.
+        It will redirect to the actual OpenID server (IAM, CheckIn) to
+        perform a authorization code flow.
 
-        Offers the user to go with the browser to
-        ``auth/<vo>/device?user_code=XYZ``.
+        We set the user_code obtained from the device flow in a cookie
+        to be able to map the authorization flow with the corresponding
+        device flow.
+        (note: it can't be put as parameter or in the URL).
 
-        :keyword client_id: Required.
-        :paramtype client_id: str
-        :keyword scope: Required.
-        :paramtype scope: str
-        :return: InitiateDeviceFlowResponse
-        :rtype: ~client.models.InitiateDeviceFlowResponse
+        :keyword user_code: Required.
+        :paramtype user_code: str
+        :return: any
+        :rtype: any
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping[int, Type[HttpResponseError]] = {
@@ -340,11 +343,10 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
         _headers = kwargs.pop("headers", {}) or {}
         _params = kwargs.pop("params", {}) or {}
 
-        cls: ClsType[_models.InitiateDeviceFlowResponse] = kwargs.pop("cls", None)
+        cls: ClsType[Any] = kwargs.pop("cls", None)
 
-        _request = build_auth_initiate_device_flow_request(
-            client_id=client_id,
-            scope=scope,
+        _request = build_auth_do_device_flow_request(
+            user_code=user_code,
             headers=_headers,
             params=_params,
         )
@@ -367,9 +369,7 @@ class AuthOperations:  # pylint: disable=abstract-class-instantiated
             )
             raise HttpResponseError(response=response)
 
-        deserialized = self._deserialize(
-            "InitiateDeviceFlowResponse", pipeline_response
-        )
+        deserialized = self._deserialize("object", pipeline_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -939,70 +939,6 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
             input_args.pop(0) if input_args else kwargs.pop("deserializer")
         )
 
-    @distributed_trace_async
-    async def get_sandbox_file(
-        self, *, pfn: str, **kwargs: Any
-    ) -> _models.SandboxDownloadResponse:
-        """Get Sandbox File.
-
-        Get a presigned URL to download a sandbox file
-
-        This route cannot use a redirect response most clients will also send the
-        authorization header when following a redirect. This is not desirable as
-        it would leak the authorization token to the storage backend. Additionally,
-        most storage backends return an error when they receive an authorization
-        header for a presigned URL.
-
-        :keyword pfn: Required.
-        :paramtype pfn: str
-        :return: SandboxDownloadResponse
-        :rtype: ~client.models.SandboxDownloadResponse
-        :raises ~azure.core.exceptions.HttpResponseError:
-        """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
-            401: ClientAuthenticationError,
-            404: ResourceNotFoundError,
-            409: ResourceExistsError,
-            304: ResourceNotModifiedError,
-        }
-        error_map.update(kwargs.pop("error_map", {}) or {})
-
-        _headers = kwargs.pop("headers", {}) or {}
-        _params = kwargs.pop("params", {}) or {}
-
-        cls: ClsType[_models.SandboxDownloadResponse] = kwargs.pop("cls", None)
-
-        _request = build_jobs_get_sandbox_file_request(
-            pfn=pfn,
-            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]:
-            if _stream:
-                await response.read()  # Load the body in memory and close the socket
-            map_error(
-                status_code=response.status_code, response=response, error_map=error_map
-            )
-            raise HttpResponseError(response=response)
-
-        deserialized = self._deserialize("SandboxDownloadResponse", pipeline_response)
-
-        if cls:
-            return cls(pipeline_response, deserialized, {})  # type: ignore
-
-        return deserialized  # type: ignore
-
     @overload
     async def initiate_sandbox_upload(
         self,
@@ -1132,6 +1068,70 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
 
         return deserialized  # type: ignore
 
+    @distributed_trace_async
+    async def get_sandbox_file(
+        self, *, pfn: str, **kwargs: Any
+    ) -> _models.SandboxDownloadResponse:
+        """Get Sandbox File.
+
+        Get a presigned URL to download a sandbox file
+
+        This route cannot use a redirect response most clients will also send the
+        authorization header when following a redirect. This is not desirable as
+        it would leak the authorization token to the storage backend. Additionally,
+        most storage backends return an error when they receive an authorization
+        header for a presigned URL.
+
+        :keyword pfn: Required.
+        :paramtype pfn: str
+        :return: SandboxDownloadResponse
+        :rtype: ~client.models.SandboxDownloadResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = kwargs.pop("params", {}) or {}
+
+        cls: ClsType[_models.SandboxDownloadResponse] = kwargs.pop("cls", None)
+
+        _request = build_jobs_get_sandbox_file_request(
+            pfn=pfn,
+            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]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
+            map_error(
+                status_code=response.status_code, response=response, error_map=error_map
+            )
+            raise HttpResponseError(response=response)
+
+        deserialized = self._deserialize("SandboxDownloadResponse", pipeline_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
     @distributed_trace_async
     async def unassign_bulk_jobs_sandboxes(
         self, *, jobs_ids: List[int], **kwargs: Any
@@ -1369,7 +1369,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
     async def assign_sandbox_to_job(self, job_id: int, body: str, **kwargs: Any) -> Any:
         """Assign Sandbox To Job.
 
-        Mapp the pfn as output sandbox to job.
+        Map the pfn as output sandbox to job.
 
         :param job_id: Required.
         :type job_id: int
@@ -2072,7 +2072,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
         self,
         body: Optional[_models.JobSearchParams] = None,
         *,
-        page: int = 0,
+        page: int = 1,
         per_page: int = 100,
         content_type: str = "application/json",
         **kwargs: Any,
@@ -2085,7 +2085,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
 
         :param body: Default value is None.
         :type body: ~client.models.JobSearchParams
-        :keyword page: Default value is 0.
+        :keyword page: Default value is 1.
         :paramtype page: int
         :keyword per_page: Default value is 100.
         :paramtype per_page: int
@@ -2102,7 +2102,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
         self,
         body: Optional[IO[bytes]] = None,
         *,
-        page: int = 0,
+        page: int = 1,
         per_page: int = 100,
         content_type: str = "application/json",
         **kwargs: Any,
@@ -2115,7 +2115,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
 
         :param body: Default value is None.
         :type body: IO[bytes]
-        :keyword page: Default value is 0.
+        :keyword page: Default value is 1.
         :paramtype page: int
         :keyword per_page: Default value is 100.
         :paramtype per_page: int
@@ -2132,7 +2132,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
         self,
         body: Optional[Union[_models.JobSearchParams, IO[bytes]]] = None,
         *,
-        page: int = 0,
+        page: int = 1,
         per_page: int = 100,
         **kwargs: Any,
     ) -> List[JSON]:
@@ -2144,7 +2144,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
 
         :param body: Is either a JobSearchParams type or a IO[bytes] type. Default value is None.
         :type body: ~client.models.JobSearchParams or IO[bytes]
-        :keyword page: Default value is 0.
+        :keyword page: Default value is 1.
         :paramtype page: int
         :keyword per_page: Default value is 100.
         :paramtype per_page: int
@@ -2199,7 +2199,7 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
 
         response = pipeline_response.http_response
 
-        if response.status_code not in [200]:
+        if response.status_code not in [200, 206]:
             if _stream:
                 await response.read()  # Load the body in memory and close the socket
             map_error(
@@ -2207,10 +2207,19 @@ class JobsOperations:  # pylint: disable=too-many-public-methods
             )
             raise HttpResponseError(response=response)
 
-        deserialized = self._deserialize("[object]", pipeline_response)
+        response_headers = {}
+        if response.status_code == 200:
+            deserialized = self._deserialize("[object]", pipeline_response)
+
+        if response.status_code == 206:
+            response_headers["Content-Range"] = self._deserialize(
+                "str", response.headers.get("Content-Range")
+            )
+
+            deserialized = self._deserialize("[object]", pipeline_response)
 
         if cls:
-            return cls(pipeline_response, deserialized, {})  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
 
         return deserialized  # type: ignore
 

diracx/client/models/__init__.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------------
-# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.9)
+# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.13.19)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
@@ -25,7 +25,6 @@ from ._models import ScalarSearchSpec
 from ._models import ScalarSearchSpecValue
 from ._models import SetJobStatusReturn
 from ._models import SortSpec
-from ._models import SortSpecDirection
 from ._models import SupportInfo
 from ._models import TokenResponse
 from ._models import UserInfoResponse
@@ -38,8 +37,6 @@ from ._models import VectorSearchSpecValues
 from ._enums import ChecksumAlgorithm
 from ._enums import Enum0
 from ._enums import Enum1
-from ._enums import Enum11
-from ._enums import Enum12
 from ._enums import Enum2
 from ._enums import Enum3
 from ._enums import Enum4
@@ -47,6 +44,7 @@ from ._enums import JobStatus
 from ._enums import SandboxFormat
 from ._enums import SandboxType
 from ._enums import ScalarSearchOperator
+from ._enums import SortDirection
 from ._enums import VectorSearchOperator
 from ._patch import __all__ as _patch_all
 from ._patch import *  # pylint: disable=unused-wildcard-import
@@ -74,7 +72,6 @@ __all__ = [
     "ScalarSearchSpecValue",
     "SetJobStatusReturn",
     "SortSpec",
-    "SortSpecDirection",
     "SupportInfo",
     "TokenResponse",
     "UserInfoResponse",
@@ -86,8 +83,6 @@ __all__ = [
     "ChecksumAlgorithm",
     "Enum0",
     "Enum1",
-    "Enum11",
-    "Enum12",
     "Enum2",
     "Enum3",
     "Enum4",
@@ -95,6 +90,7 @@ __all__ = [
     "SandboxFormat",
     "SandboxType",
     "ScalarSearchOperator",
+    "SortDirection",
     "VectorSearchOperator",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])