unique_sdk 0.9.7__tar.gz → 0.9.9__tar.gz

{unique_sdk-0.9.7 → unique_sdk-0.9.9}/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.9.9] - 2024-10-23
+- Revert deletion of `Message.retrieve` method
+
+## [0.9.8] - 2024-10-16
+- Add `retries` for `_static_request` and `_static_request_async` in `APIResource` - When the error messages contains either  `"problem proxying the request"`,
+        or `"Upstream service reached a hard timeout"`,
 ## [0.9.7] - 2024-09-23
 - Add `completedAt` to `CreateParams` of `Message`
 

{unique_sdk-0.9.7 → unique_sdk-0.9.9}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: unique_sdk
-Version: 0.9.7
+Version: 0.9.9
 Summary: 
 License: MIT
-Author: Konstantin Krauss
-Author-email: konstantin@unique.ch
+Author: Martin Fadler
+Author-email: martin.fadler@unique.ch
 Requires-Python: >=3.11,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
@@ -894,6 +894,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.9.9] - 2024-10-23
+- Revert deletion of `Message.retrieve` method
+
+## [0.9.8] - 2024-10-16
+- Add `retries` for `_static_request` and `_static_request_async` in `APIResource` - When the error messages contains either  `"problem proxying the request"`,
+        or `"Upstream service reached a hard timeout"`,
 ## [0.9.7] - 2024-09-23
 - Add `completedAt` to `CreateParams` of `Message`
 

{unique_sdk-0.9.7 → unique_sdk-0.9.9}/pyproject.toml

@@ -1,8 +1,9 @@
 [tool.poetry]
 name = "unique_sdk"
-version = "0.9.7"
+version = "0.9.9"
 description = ""
 authors = [
+    "Martin Fadler <martin.fadler@unique.ch>",
     "Konstantin Krauss <konstantin@unique.ch>",
     "Andreas Hauri <andreas@unique.ch>",
 ]
@@ -16,10 +17,11 @@ typing-extensions = "^4.9.0"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "0.4.10"
-pytest = "^7.4.3"
+pytest = "^8.0"
 tox = "^4.11.4"
 pyright = "^1.1.341"
 pytest-cov = "^4.1.0"
+pytest-asyncio = "^0.24.0"
 
 [build-system]
 requires = ["poetry-core"]

{unique_sdk-0.9.7 → unique_sdk-0.9.9}/unique_sdk/_api_resource.py

@@ -14,10 +14,20 @@ from urllib.parse import quote_plus
 from unique_sdk._api_requestor import APIRequestor
 from unique_sdk._error import InvalidRequestError
 from unique_sdk._unique_object import UniqueObject
-from unique_sdk._util import convert_to_unique_object
+from unique_sdk._util import convert_to_unique_object, retry_on_error
 
 T = TypeVar("T", bound=UniqueObject)
 
+retry_dict = {
+    "error_messages": [
+        "problem proxying the request",
+        "Upstream service reached a hard timeout",
+    ],
+    "max_retries": 3,
+    "backoff_factor": 2,
+    "initial_delay": 1,
+}
+
 
 class APIResource(UniqueObject, Generic[T]):
     OBJECT_NAME: ClassVar[str]
@@ -164,6 +174,7 @@ class APIResource(UniqueObject, Generic[T]):
     # The `method_` and `url_` arguments are suffixed with an underscore to
     # avoid conflicting with actual request parameters in `params`.
     @classmethod
+    @retry_on_error(**retry_dict)
     def _static_request(
         cls,
         method_,
@@ -182,6 +193,7 @@ class APIResource(UniqueObject, Generic[T]):
     # The `method_` and `url_` arguments are suffixed with an underscore to
     # avoid conflicting with actual request parameters in `params`.
     @classmethod
+    @retry_on_error(**retry_dict)
     async def _static_request_async(
         cls,
         method_,

{unique_sdk-0.9.7 → unique_sdk-0.9.9}/unique_sdk/_util.py

@@ -1,13 +1,18 @@
+import asyncio
 import functools
 import logging
 import os
+import random
 import re
 import sys
-from typing import Any, Dict, List, Optional, TypeVar, Union, cast, overload
+import time
+from functools import wraps
+from typing import Any, Callable, Dict, List, Optional, TypeVar, Union, cast, overload
 
 from typing_extensions import TYPE_CHECKING, Type
 
 import unique_sdk  # noqa: F401
+from unique_sdk._error import APIError
 
 if TYPE_CHECKING:
     from unique_sdk._unique_object import UniqueObject
@@ -21,10 +26,9 @@ logger: logging.Logger = logging.getLogger("unique")
 def _console_log_level():
     if unique_sdk.log in ["debug", "info"]:
         return unique_sdk.log
-    elif UNIQUE_LOG in ["debug", "info"]:
+    if UNIQUE_LOG in ["debug", "info"]:
         return UNIQUE_LOG
-    else:
-        return None
+    return None
 
 
 def log_debug(message, **params):
@@ -188,3 +192,60 @@ class class_method_variant(object):
                 return class_method(*args, **kwargs)
 
         return _wrapper
+
+
+def retry_on_error(
+    error_messages: List[str],
+    max_retries: int = 3,
+    initial_delay: int = 1,
+    backoff_factor: int = 2,
+    error_class=APIError,
+):
+    def decorator(func: Callable) -> Callable:
+        @wraps(func)
+        async def async_wrapper(*args, **kwargs) -> Any:
+            attempts = 0
+            while attempts < max_retries:
+                try:
+                    return await func(*args, **kwargs)
+                except Exception as e:
+                    if not any(
+                        err_msg.lower() in str(e).lower() for err_msg in error_messages
+                    ):
+                        raise e  # Raise the error if none of the messages match
+
+                    attempts += 1
+                    if attempts >= max_retries:
+                        raise error_class(f"Failed after {max_retries} attempts: {e}")
+
+                    # Calculate exponential backoff with some randomness (jitter)
+                    delay = initial_delay * (backoff_factor ** (attempts - 1))
+                    jitter = random.uniform(0, 0.1 * delay)
+                    await asyncio.sleep(delay + jitter)
+
+        def sync_wrapper(*args, **kwargs) -> Any:
+            attempts = 0
+            while attempts < max_retries:
+                try:
+                    return func(*args, **kwargs)
+                except Exception as e:
+                    if not any(
+                        err_msg.lower() in str(e).lower() for err_msg in error_messages
+                    ):
+                        raise e  # Raise the error if none of the messages match
+
+                    attempts += 1
+                    if attempts >= max_retries:
+                        raise error_class(f"Failed after {max_retries} attempts: {e}")
+
+                    # Calculate exponential backoff with some randomness (jitter)
+                    delay = initial_delay * (backoff_factor ** (attempts - 1))
+                    jitter = random.uniform(0, 0.1 * delay)
+                    time.sleep(delay + jitter)
+
+        # Return the appropriate wrapper based on whether the function is async
+        if asyncio.iscoroutinefunction(func):
+            return async_wrapper
+        return sync_wrapper
+
+    return decorator

unique_sdk-0.9.9/unique_sdk/_version.py

@@ -0,0 +1 @@
+VERSION = "0.9.8"

{unique_sdk-0.9.7 → unique_sdk-0.9.9}/unique_sdk/api_resources/_message.py

@@ -115,6 +115,21 @@ class Message(APIResource["Message"]):
 
         return result
 
+    @classmethod
+    def retrieve(
+        cls,
+        user_id: str,
+        company_id: str,
+        id: str,
+        **params: Unpack["Message.RetrieveParams"],
+    ) -> "Message":
+        """
+        Retrieves a Message object.
+        """
+        instance = cls(user_id, company_id, id, **params)
+        instance.refresh(user_id, company_id)
+        return instance
+
     @classmethod
     async def retrieve_async(
         cls,

unique_sdk-0.9.7/unique_sdk/_version.py

@@ -1 +0,0 @@
-VERSION = "0.9.7"