diracx-client 0.0.1a15__tar.gz → 0.0.1a16__tar.gz

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-client
-Version: 0.0.1a15
+Version: 0.0.1a16
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/diracx/client/_patch.py

@@ -8,8 +8,9 @@ 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
@@ -113,9 +114,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}"
 
@@ -242,8 +246,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-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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}"

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15/src/diracx/client → diracx_client-0.0.1a16/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from io import IOBase
@@ -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-0.0.1a15 → diracx_client-0.0.1a16}/src/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.17)
 # 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__])

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/diracx/client/models/_enums.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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
@@ -26,18 +26,6 @@ class Enum1(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     S256 = "S256"
 
 
-class Enum11(str, Enum, metaclass=CaseInsensitiveEnumMeta):
-    """Enum11."""
-
-    ASC = "asc"
-
-
-class Enum12(str, Enum, metaclass=CaseInsensitiveEnumMeta):
-    """Enum12."""
-
-    DSC = "dsc"
-
-
 class Enum2(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """Enum2."""
 
@@ -101,6 +89,13 @@ class ScalarSearchOperator(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     LIKE = "like"
 
 
+class SortDirection(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """An enumeration."""
+
+    ASC = "asc"
+    DESC = "desc"
+
+
 class VectorSearchOperator(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """An enumeration."""
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/diracx/client/models/_models.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 # pylint: disable=too-many-lines
 # --------------------------------------------------------------------------
-# 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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
@@ -816,8 +816,8 @@ class SortSpec(_serialization.Model):
 
     :ivar parameter: Parameter. Required.
     :vartype parameter: str
-    :ivar direction: Direction. Required.
-    :vartype direction: ~client.models.SortSpecDirection
+    :ivar direction: An enumeration. Required. Known values are: "asc" and "desc".
+    :vartype direction: str or ~client.models.SortDirection
     """
 
     _validation = {
@@ -827,27 +827,27 @@ class SortSpec(_serialization.Model):
 
     _attribute_map = {
         "parameter": {"key": "parameter", "type": "str"},
-        "direction": {"key": "direction", "type": "SortSpecDirection"},
+        "direction": {"key": "direction", "type": "str"},
     }
 
     def __init__(
-        self, *, parameter: str, direction: "_models.SortSpecDirection", **kwargs: Any
+        self,
+        *,
+        parameter: str,
+        direction: Union[str, "_models.SortDirection"],
+        **kwargs: Any,
     ) -> None:
         """
         :keyword parameter: Parameter. Required.
         :paramtype parameter: str
-        :keyword direction: Direction. Required.
-        :paramtype direction: ~client.models.SortSpecDirection
+        :keyword direction: An enumeration. Required. Known values are: "asc" and "desc".
+        :paramtype direction: str or ~client.models.SortDirection
         """
         super().__init__(**kwargs)
         self.parameter = parameter
         self.direction = direction
 
 
-class SortSpecDirection(_serialization.Model):
-    """Direction."""
-
-
 class SupportInfo(_serialization.Model):
     """SupportInfo.
 

{diracx_client-0.0.1a15/src/diracx/client/aio → diracx_client-0.0.1a16/src/diracx/client}/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 

{diracx_client-0.0.1a15 → diracx_client-0.0.1a16}/src/diracx/client/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.17)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from io import IOBase
@@ -672,7 +672,7 @@ def build_jobs_reschedule_single_job_request(job_id: int, **kwargs: Any) -> Http
 
 
 def build_jobs_search_request(
-    *, page: int = 0, per_page: int = 100, **kwargs: Any
+    *, page: int = 1, per_page: int = 100, **kwargs: Any
 ) -> HttpRequest:
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
@@ -2894,7 +2894,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,
@@ -2907,7 +2907,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
@@ -2924,7 +2924,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,
@@ -2937,7 +2937,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
@@ -2954,7 +2954,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]:
@@ -2966,7 +2966,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
@@ -3021,7 +3021,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:
                 response.read()  # Load the body in memory and close the socket
             map_error(
@@ -3029,10 +3029,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-0.0.1a15 → diracx_client-0.0.1a16}/src/diracx_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-client
-Version: 0.0.1a15
+Version: 0.0.1a16
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research