celitech-sdk 2.0.6__tar.gz → 2.0.7__tar.gz

{celitech_sdk-2.0.6/src/celitech_sdk.egg-info → celitech_sdk-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celitech-sdk
-Version: 2.0.6
+Version: 2.0.7
 Summary: Welcome to the CELITECH API documentation!
 License: MIT
 Project-URL: Repository, https://github.com/Celitech/CelitechSDKPython
@@ -11,14 +11,14 @@ Requires-Dist: requests>=2.31.0
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Dynamic: license-file
 
-# Celitech Python SDK 2.0.6<a id="celitech-python-sdk-206"></a>
+# Celitech Python SDK 2.0.7<a id="celitech-python-sdk-207"></a>
 
 Welcome to the Celitech SDK documentation. This guide will help you get started with integrating and using the Celitech SDK in your project.
 
 ## Versions<a id="versions"></a>
 
-- API version: `2.0.6`
-- SDK version: `2.0.6`
+- API version: `2.0.7`
+- SDK version: `2.0.7`
 
 ## About the API<a id="about-the-api"></a>
 
@@ -102,7 +102,7 @@ You can set a custom timeout for the SDK's HTTP requests as follows:
 ```py
 from celitech import Celitech
 
-sdk = Celitech(timeout=10000)
+sdk = Celitech(timeout=10)
 ```
 
 # Sample Usage<a id="sample-usage"></a>

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/PyPI_README.md

@@ -1,11 +1,11 @@
-# Celitech Python SDK 2.0.6<a id="celitech-python-sdk-206"></a>
+# Celitech Python SDK 2.0.7<a id="celitech-python-sdk-207"></a>
 
 Welcome to the Celitech SDK documentation. This guide will help you get started with integrating and using the Celitech SDK in your project.
 
 ## Versions<a id="versions"></a>
 
-- API version: `2.0.6`
-- SDK version: `2.0.6`
+- API version: `2.0.7`
+- SDK version: `2.0.7`
 
 ## About the API<a id="about-the-api"></a>
 
@@ -89,7 +89,7 @@ You can set a custom timeout for the SDK's HTTP requests as follows:
 ```py
 from celitech import Celitech
 
-sdk = Celitech(timeout=10000)
+sdk = Celitech(timeout=10)
 ```
 
 # Sample Usage<a id="sample-usage"></a>

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/README.md

@@ -1,11 +1,11 @@
-# Celitech Python SDK 2.0.6
+# Celitech Python SDK 2.0.7
 
 Welcome to the Celitech SDK documentation. This guide will help you get started with integrating and using the Celitech SDK in your project.
 
 ## Versions
 
-- API version: `2.0.6`
-- SDK version: `2.0.6`
+- API version: `2.0.7`
+- SDK version: `2.0.7`
 
 ## About the API
 
@@ -90,7 +90,7 @@ You can set a custom timeout for the SDK's HTTP requests as follows:
 ```py
 from celitech import Celitech
 
-sdk = Celitech(timeout=10000)
+sdk = Celitech(timeout=10)
 ```
 
 # Sample Usage

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "celitech-sdk"
-version = "2.0.6"
+version = "2.0.7"
 license = { text = "MIT" }
 description = """Welcome to the CELITECH API documentation!\n\nUseful links: [Homepage](https://www.celitech.com) | [Support email](mailto:support@celitech.com) | [Blog](https://www.celitech.com/blog/)\n"""
 readme = "PyPI_README.md"

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/src/celitech/net/request_chain/handlers/http_handler.py

@@ -17,12 +17,12 @@ class HttpHandler(BaseHandler):
     :ivar int _timeout_in_seconds: The timeout for the HTTP request in seconds.
     """
 
-    def __init__(self, timeout=60000):
+    def __init__(self, timeout=60):
         """
         Initialize a new instance of HttpHandler.
         """
         super().__init__()
-        self._timeout_in_seconds = timeout / 1000
+        self._timeout_in_seconds = timeout
 
     def handle(
         self, request: Request
@@ -191,5 +191,5 @@ class HttpHandler(BaseHandler):
         :rtype: float
         """
         if request.config and "timeout" in request.config:
-            return request.config["timeout"] / 1000
+            return request.config["timeout"]
         return self._timeout_in_seconds

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/src/celitech/net/request_chain/handlers/retry_handler.py

@@ -1,5 +1,8 @@
 import random
+import re
 
+from datetime import datetime, timezone
+from email.utils import parsedate_to_datetime
 from typing import Generator, Optional, Tuple
 from time import sleep
 from .base_handler import BaseHandler
@@ -31,6 +34,7 @@ class RetryHandler(BaseHandler):
         self._max_attempts = 3
         self._delay_in_milliseconds = 150
         self._max_delay_in_milliseconds = 5000
+        self._max_retry_after_delay_in_milliseconds = 60000
         self._backoff_factor = 2
         self._jitter_in_milliseconds = 50
         self._status_codes_to_retry = None
@@ -62,7 +66,7 @@ class RetryHandler(BaseHandler):
 
         try_count = 0
         while try_count < max_attempts and self._should_retry(error, request):
-            self._delay(try_count, request)
+            self._delay(try_count, request, error)
             response, error = self._next_handler.handle(request)
             try_count += 1
 
@@ -92,7 +96,7 @@ class RetryHandler(BaseHandler):
             while True:
                 response, error = next(stream)
                 if try_count < max_attempts and self._should_retry(error, request):
-                    self._delay(try_count, request)
+                    self._delay(try_count, request, error)
                     try_count += 1
                     stream = self._next_handler.stream(request)  # Retry the request
                 elif try_count >= max_attempts:
@@ -104,16 +108,29 @@ class RetryHandler(BaseHandler):
         except StopIteration:
             pass
 
-    def _delay(self, try_count: int, request: Request) -> None:
+    def _delay(
+        self, try_count: int, request: Request, error: Optional[ApiError] = None
+    ) -> None:
         """
-        Calculate and apply delay before next retry attempt using exponential backoff.
-        Delay is capped at maximum delay and optional jitter is added.
+        Calculate and apply delay before next retry attempt.
+        A server rate-limit timing header (Retry-After / X-RateLimit-Reset) on the error,
+        when present, overrides the computed exponential backoff; otherwise exponential
+        backoff (capped at max delay, with optional jitter) is used.
         Per-request retry config overrides SDK defaults.
 
         :param int try_count: Current retry attempt number (0-indexed).
         :param Request request: The request being retried, used to read per-request retry config.
+        :param Optional[ApiError] error: The error that triggered the retry (carries headers).
         """
         retry_config = (request.config or {}).get("retry") or {}
+        max_retry_after = retry_config.get(
+            "max_retry_after_delay_ms", self._max_retry_after_delay_in_milliseconds
+        )
+        header_delay_ms = self._retry_after_delay(error, max_retry_after)
+        if header_delay_ms is not None:
+            sleep(header_delay_ms / 1000)
+            return
+
         base_delay = retry_config.get("delay_ms", self._delay_in_milliseconds)
         max_delay = retry_config.get("max_delay_ms", self._max_delay_in_milliseconds)
         backoff_factor = retry_config.get("backoff_factor", self._backoff_factor)
@@ -132,6 +149,82 @@ class RetryHandler(BaseHandler):
         # Convert to seconds and sleep
         sleep(delay / 1000)
 
+    def _retry_after_delay(
+        self, error: Optional[ApiError], max_retry_after_ms: float
+    ) -> Optional[float]:
+        """
+        Return the server-directed retry delay (in milliseconds) from rate-limit response
+        headers, honoring Retry-After (delta-seconds or HTTP-date) and, when absent,
+        X-RateLimit-Reset (epoch seconds), clamped to max_retry_after_ms. Returns None when
+        no usable header is present so the caller falls back to exponential backoff.
+
+        :param Optional[ApiError] error: The error that triggered the retry.
+        :param float max_retry_after_ms: Upper bound for a server-directed delay.
+        :return: The delay in milliseconds, or None to use exponential backoff.
+        :rtype: Optional[float]
+        """
+        headers = getattr(getattr(error, "response", None), "headers", None)
+        if headers is None or max_retry_after_ms <= 0:
+            return None
+
+        # retry-after-ms (milliseconds) is a non-standard but finer-grained hint some APIs
+        # send (e.g. OpenAI); it takes precedence over the whole-second Retry-After.
+        retry_after_ms = headers.get("retry-after-ms")
+        if retry_after_ms is not None and re.fullmatch(
+            r"\d+(\.\d+)?", str(retry_after_ms).strip()
+        ):
+            return min(float(str(retry_after_ms).strip()), max_retry_after_ms)
+
+        seconds = self._parse_retry_after(headers.get("Retry-After"))
+        if seconds is not None:
+            return min(max(seconds * 1000, 0), max_retry_after_ms)
+
+        # X-RateLimit-Reset is interpreted as epoch seconds (the common convention).
+        reset = headers.get("X-RateLimit-Reset")
+        if reset is not None and str(reset).strip() != "":
+            try:
+                epoch = float(reset)
+            except (TypeError, ValueError):
+                epoch = None
+            if epoch is not None:
+                delta_ms = epoch * 1000 - datetime.now(timezone.utc).timestamp() * 1000
+                if delta_ms > 0:
+                    return min(delta_ms, max_retry_after_ms)
+
+        return None
+
+    def _parse_retry_after(self, value: Optional[str]) -> Optional[float]:
+        """
+        Parse a Retry-After header value: an integer/float number of seconds, or an
+        HTTP-date (a past date yields 0). Returns the delay in seconds, or None if the
+        value is empty or unparseable.
+
+        :param Optional[str] value: The raw Retry-After header value.
+        :return: The delay in seconds, or None.
+        :rtype: Optional[float]
+        """
+        if value is None:
+            return None
+        trimmed = str(value).strip()
+        if trimmed == "":
+            return None
+        if re.fullmatch(r"\d+(\.\d+)?", trimmed):
+            return float(trimmed)
+        # Parsing and the timestamp math both run under the guard: a pathological but
+        # well-formed HTTP-date (e.g. year 9999) can raise OverflowError/OSError from
+        # timestamp(), and a malformed value can raise beyond TypeError/ValueError. A bad
+        # server header must never crash the retry layer, so treat any failure as "no delay".
+        try:
+            parsed = parsedate_to_datetime(trimmed)
+            if parsed is None:
+                return None
+            if parsed.tzinfo is None:
+                parsed = parsed.replace(tzinfo=timezone.utc)
+            delta = parsed.timestamp() - datetime.now(timezone.utc).timestamp()
+        except (TypeError, ValueError, OverflowError, OSError):
+            return None
+        return delta if delta > 0 else 0.0
+
     def _should_retry(self, error: Optional[ApiError], request: Request) -> bool:
         """
         Determine whether the request should be retried based on status code and HTTP method.

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/src/celitech/net/sdk_config.py

@@ -14,6 +14,7 @@ class RetryConfig(TypedDict, total=False):
     :ivar int jitter_ms: Maximum random jitter in milliseconds to add to retry delays.
     :ivar list[int] status_codes_to_retry: Specific HTTP status codes to retry (overrides default 5xx + 408, 429).
     :ivar list[str] http_methods_to_retry: HTTP methods to retry (e.g., ['GET', 'POST']).
+    :ivar int max_retry_after_delay_ms: Upper bound (ms) for a server-directed retry delay parsed from Retry-After / X-RateLimit-Reset response headers.
     """
 
     attempts: int
@@ -23,6 +24,7 @@ class RetryConfig(TypedDict, total=False):
     jitter_ms: int
     status_codes_to_retry: list[int]
     http_methods_to_retry: list[str]
+    max_retry_after_delay_ms: int
 
 
 class ValidationConfig(TypedDict, total=False):
@@ -47,7 +49,7 @@ class SdkConfig(TypedDict, total=False):
 
     :ivar str base_url: Base URL for API requests. Can be a string URL or Environment enum.
     :ivar Environment environment: Environment enum value for base URL.
-    :ivar int timeout: Request timeout in milliseconds.
+    :ivar float timeout: Request timeout in seconds.
     :ivar str client_id: OAuth client ID.
     :ivar str client_secret: OAuth client secret.
     :ivar RetryConfig retry: Retry configuration.
@@ -56,7 +58,7 @@ class SdkConfig(TypedDict, total=False):
 
     base_url: str
     environment: Environment
-    timeout: int
+    timeout: float
     client_id: str
     client_secret: str
     retry: RetryConfig

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/src/celitech/net/transport/serializer.py

@@ -45,7 +45,7 @@ class Serializer:
         self.errors: dict[int, ApiError] = {}
         self.config: Optional["SdkConfig"] = config
 
-        self.headers["User-Agent"] = "postman-codegen/1.7.0 celitech-sdk/2.0.6 (python)"
+        self.headers["User-Agent"] = "postman-codegen/2.6.0 celitech-sdk/2.0.7 (python)"
 
         # Apply default headers
         for header in default_headers:

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/src/celitech/sdk.py

@@ -1,3 +1,4 @@
+import warnings
 from typing import Union
 from .services.destinations import DestinationsService
 from .services.packages import PackagesService
@@ -17,10 +18,13 @@ class Celitech:
 
     def __init__(
         self,
+        *,
         client_id: str = None,
         client_secret: str = None,
         base_url: Union[Environment, str, None] = None,
-        timeout: int = 60000,
+        timeout: float = None,
+        timeout_ms: int = None,
+        retry: "RetryConfig" = None,
         base_oauth_url: str = None,
     ):
         """
@@ -52,7 +56,18 @@ class Celitech:
         )
         self.set_client_id(client_id)
         self.set_client_secret(client_secret)
+        if timeout_ms is not None:
+            warnings.warn(
+                "`timeout_ms` is deprecated; use `timeout` (in seconds) instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            timeout = timeout_ms / 1000 if timeout is None else timeout
+        if timeout is None:
+            timeout = 60
         self.set_timeout(timeout)
+        if retry is not None:
+            self.set_retry(retry)
 
     def set_base_url(self, base_url: Union[Environment, str]):
         """
@@ -83,11 +98,11 @@ class Celitech:
 
         return self
 
-    def set_timeout(self, timeout: int):
+    def set_timeout(self, timeout: float):
         """
         Sets the timeout for the entire SDK.
 
-        :param int timeout: The timeout (ms) to be set.
+        :param float timeout: The timeout (in seconds) to be set.
         :return: The SDK instance.
         """
         self.destinations.set_timeout(timeout)
@@ -98,6 +113,21 @@ class Celitech:
 
         return self
 
+    def set_retry(self, retry: "RetryConfig"):
+        """
+        Sets the retry configuration for the entire SDK.
+
+        :param RetryConfig retry: The retry configuration to be set.
+        :return: The SDK instance.
+        """
+        self.destinations.set_retry(retry)
+        self.packages.set_retry(retry)
+        self.purchases.set_retry(retry)
+        self.e_sim.set_retry(retry)
+        self.i_frame.set_retry(retry)
+
+        return self
+
     def set_client_id(self, client_id: str):
         """
         Sets the client_id for the entire SDK.

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/src/celitech/sdk_async.py

@@ -16,10 +16,13 @@ class CelitechAsync(Celitech):
 
     def __init__(
         self,
+        *,
         client_id: str = None,
         client_secret: str = None,
         base_url: Union[Environment, str, None] = None,
-        timeout: int = 60000,
+        timeout: float = None,
+        timeout_ms: int = None,
+        retry: "RetryConfig" = None,
         base_oauth_url: str = None,
     ):
         super().__init__(
@@ -27,6 +30,8 @@ class CelitechAsync(Celitech):
             client_secret=client_secret,
             base_url=base_url,
             timeout=timeout,
+            timeout_ms=timeout_ms,
+            retry=retry,
             base_oauth_url=base_oauth_url,
         )
 
@@ -48,3 +53,5 @@ class CelitechAsync(Celitech):
         self.o_auth = OAuthServiceAsync(
             base_url=self._base_url, token_manager=self._token_manager
         )
+        if retry is not None:
+            self.set_retry(retry)

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7}/src/celitech/services/utils/base_service.py

@@ -11,7 +11,7 @@ from ...net.oauth.token_manager import TokenManager
 from ...net.request_chain.handlers.oauth_handler import OauthHandler
 
 if TYPE_CHECKING:
-    from ...net.sdk_config import SdkConfig
+    from ...net.sdk_config import SdkConfig, RetryConfig
 
 
 class BaseService:
@@ -30,18 +30,18 @@ class BaseService:
         """
         self.base_url = base_url.rstrip("/") if base_url else base_url
         self._default_headers = DefaultHeaders()
-        self._timeout = 60000
+        self._timeout = 60
         self._service_config: "SdkConfig" = {}
 
         self._token_manager = token_manager
 
         self._update_request_handler()
 
-    def set_timeout(self, timeout: int):
+    def set_timeout(self, timeout: float):
         """
         Sets the timeout for the service.
 
-        :param int timeout: The timeout (ms) to be set.
+        :param float timeout: The timeout (in seconds) to be set.
         :return: The service instance.
         """
         self._timeout = timeout
@@ -69,6 +69,18 @@ class BaseService:
         self._service_config = config
         return self
 
+    def set_retry(self, retry: "RetryConfig"):
+        """
+        Sets the service-level retry configuration, merging it into any existing config.
+
+        :param RetryConfig retry: The retry configuration to be set.
+        :return: The service instance for method chaining.
+        """
+        self._service_config = self._deep_merge(
+            self._service_config or {}, {"retry": retry}
+        )
+        return self
+
     @staticmethod
     def _deep_merge(base: dict, override: dict) -> dict:
         """

{celitech_sdk-2.0.6 → celitech_sdk-2.0.7/src/celitech_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celitech-sdk
-Version: 2.0.6
+Version: 2.0.7
 Summary: Welcome to the CELITECH API documentation!
 License: MIT
 Project-URL: Repository, https://github.com/Celitech/CelitechSDKPython
@@ -11,14 +11,14 @@ Requires-Dist: requests>=2.31.0
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Dynamic: license-file
 
-# Celitech Python SDK 2.0.6<a id="celitech-python-sdk-206"></a>
+# Celitech Python SDK 2.0.7<a id="celitech-python-sdk-207"></a>
 
 Welcome to the Celitech SDK documentation. This guide will help you get started with integrating and using the Celitech SDK in your project.
 
 ## Versions<a id="versions"></a>
 
-- API version: `2.0.6`
-- SDK version: `2.0.6`
+- API version: `2.0.7`
+- SDK version: `2.0.7`
 
 ## About the API<a id="about-the-api"></a>
 
@@ -102,7 +102,7 @@ You can set a custom timeout for the SDK's HTTP requests as follows:
 ```py
 from celitech import Celitech
 
-sdk = Celitech(timeout=10000)
+sdk = Celitech(timeout=10)
 ```
 
 # Sample Usage<a id="sample-usage"></a>