unique_sdk 0.9.11__py3-none-any.whl → 0.9.13__py3-none-any.whl

unique_sdk/_api_requestor.py

@@ -339,13 +339,14 @@ class APIRequestor(object):
                 rcode,
                 rheaders,
             )
-        except Exception:
+        except Exception as e:
             raise _error.APIError(
                 "Invalid response body from API: %s "
                 "(HTTP response code was %d)" % (rbody, rcode),
                 cast(bytes, rbody),
                 rcode,
                 rheaders,
+                original_error=e,
             )
         if self._should_handle_code_as_error(rcode):
             self.handle_error_response(rbody, rcode, resp.data, rheaders)
@@ -374,33 +375,57 @@ class APIRequestor(object):
         raise err
 
     def specific_api_error(self, rbody, rcode, resp, rheaders, error_data):
+        cause = error_data.get("cause", {})
+        status = cause.get("status", rcode)
+
         _util.log_info(
             "Unique error received",
-            error_code=error_data.get("code"),
+            error_code=status,
             error_type=error_data.get("type"),
             error_message=error_data.get("message"),
             error_params=error_data.get("params"),
         )
 
-        if rcode in [400, 404]:
+        error = cause.get("error", {}) if cause else {}
+        error_code = error.get("code", "<Unknown code>")
+        error_message = error.get("message", "<No message>")
+        original_error = f"{error_code}: {error_message}"
+
+        if status in [400, 404]:
             return _error.InvalidRequestError(
-                error_data.get("message"),
-                error_data.get("params"),
-                error_data.get("code"),
-                rbody,
-                rcode,
-                resp,
-                rheaders,
+                message=error_data.get("message"),
+                params=error_data.get("params"),
+                code=error_data.get("code"),
+                http_body=rbody,
+                http_status=rcode,
+                json_body=resp,
+                headers=rheaders,
+                original_error=original_error,
             )
-        elif rcode == 401:
+        elif status == 401:
             return _error.AuthenticationError(
-                error_data.get("message"), rbody, rcode, resp, rheaders
+                message=error_data.get("message"),
+                http_body=rbody,
+                http_status=status,
+                json_body=resp,
+                headers=rheaders,
+                original_error=original_error,
             )
-        elif rcode == 403:
+        elif status == 403:
             return _error.PermissionError(
-                error_data.get("message"), rbody, rcode, resp, rheaders
+                message=error_data.get("message"),
+                http_body=rbody,
+                http_status=status,
+                json_body=resp,
+                headers=rheaders,
+                original_error=original_error,
             )
         else:
             return _error.APIError(
-                error_data.get("message"), rbody, rcode, resp, rheaders
+                message=error_data.get("message"),
+                http_body=rbody,
+                http_status=status,
+                json_body=resp,
+                headers=rheaders,
+                original_error=original_error,
             )

unique_sdk/_api_resource.py

@@ -22,10 +22,12 @@ retry_dict = {
     "error_messages": [
         "problem proxying the request",
         "Upstream service reached a hard timeout",
+        "Invalid response body from API",
     ],
     "max_retries": 3,
     "backoff_factor": 2,
     "initial_delay": 1,
+    "should_retry_5xx": True,
 }
 
 

unique_sdk/_error.py

@@ -9,6 +9,7 @@ class UniqueError(Exception):
     headers: Optional[Dict[str, str]]
     code: Optional[str]
     request_id: Optional[str]
+    original_error: Optional[Exception | str]
 
     def __init__(
         self,
@@ -18,6 +19,7 @@ class UniqueError(Exception):
         json_body: Optional[object] = None,
         headers: Optional[Dict[str, str]] = None,
         code: Optional[str] = None,
+        original_error: Optional[Exception | str] = None,
     ):
         super(UniqueError, self).__init__(message)
 
@@ -38,6 +40,13 @@ class UniqueError(Exception):
         self.headers = headers or {}
         self.code = code
         self.request_id = self.headers.get("request-id", None)
+        self.original_error = original_error
+
+    def __str__(self):
+        msg = self._message or "<empty message>"
+        if self.original_error:
+            msg += f"\n(Original error) {str(self.original_error)}"
+        return msg
 
 
 class UniqueErrorWithParamsCode(UniqueError):
@@ -72,9 +81,10 @@ class APIConnectionError(UniqueError):
         headers=None,
         code=None,
         should_retry=False,
+        original_error=None,
     ):
         super(APIConnectionError, self).__init__(
-            message, http_body, http_status, json_body, headers, code
+            message, http_body, http_status, json_body, headers, code, original_error
         )
         self.should_retry = should_retry
 
@@ -97,9 +107,10 @@ class InvalidRequestError(UniqueErrorWithParamsCode):
         http_status=None,
         json_body=None,
         headers=None,
+        original_error=None,
     ):
         super(InvalidRequestError, self).__init__(
-            message, http_body, http_status, json_body, headers, code
+            message, http_body, http_status, json_body, headers, code, original_error
         )
         self.params = params
 

unique_sdk/_http_client.py

@@ -130,11 +130,12 @@ class RequestsClient(HTTPClient):
             content = result.content
             status_code = result.status_code
 
-        except Exception:
+        except Exception as e:
             raise _error.APIConnectionError(
                 "Unexpected error communicating with Unique. "
                 "If this problem persists, let us know at support@unique.ch",
                 http_status=500,
+                original_error=e,
             )
 
         return content, status_code, result.headers
@@ -186,11 +187,12 @@ class HTTPXClient(HTTPClient):
         args, kwargs = self._get_request_args_kwargs(method, url, headers, post_data)
         try:
             response = self._client.request(*args, **kwargs)
-        except Exception:
+        except Exception as e:
             raise _error.APIConnectionError(
                 "Unexpected error communicating with Unique. "
                 "If this problem persists, let us know at support@unique.ch",
                 http_status=500,
+                original_error=e,
             )
 
         content = response.content
@@ -208,11 +210,12 @@ class HTTPXClient(HTTPClient):
         args, kwargs = self._get_request_args_kwargs(method, url, headers, post_data)
         try:
             response = await self._client_async.request(*args, **kwargs)
-        except Exception:
+        except Exception as e:
             raise _error.APIConnectionError(
                 "Unexpected error communicating with Unique. "
                 "If this problem persists, let us know at support@unique.ch",
                 http_status=500,
+                original_error=e,
             )
 
         content = response.content
@@ -297,11 +300,12 @@ class AIOHTTPClient(HTTPClient):
         args, kwargs = self._get_request_args_kwargs(method, url, headers, post_data)
         try:
             response = await self._session.request(*args, **kwargs)
-        except Exception:
+        except Exception as e:
             raise _error.APIConnectionError(
                 "Unexpected error communicating with Unique. "
                 "If this problem persists, let us know at support@unique.ch",
                 http_status=500,
+                original_error=e,
             )
 
         content = response.content

unique_sdk/_util.py

@@ -200,6 +200,7 @@ def retry_on_error(
     initial_delay: int = 1,
     backoff_factor: int = 2,
     error_class=APIError,
+    should_retry_5xx=False,
 ):
     def decorator(func: Callable) -> Callable:
         @wraps(func)
@@ -209,10 +210,15 @@ def retry_on_error(
                 try:
                     return await func(*args, **kwargs)
                 except Exception as e:
-                    if not any(
+                    should_retry = 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
+                    )
+                    # Add 5xx check if `should_retry_5xx` is True
+                    if should_retry_5xx and hasattr(e, "status_code"):
+                        should_retry = should_retry or (500 <= e.status_code < 600)
+
+                    if not should_retry:
+                        raise e  # Raise the error if no retry condition is met
 
                     attempts += 1
                     if attempts >= max_retries:
@@ -229,10 +235,15 @@ def retry_on_error(
                 try:
                     return func(*args, **kwargs)
                 except Exception as e:
-                    if not any(
+                    should_retry = 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
+                    )
+                    # Add 5xx check if `should_retry_5xx` is True
+                    if should_retry_5xx and hasattr(e, "status_code"):
+                        should_retry = should_retry or (500 <= e.status_code < 600)
+
+                    if not should_retry:
+                        raise e  # Raise the error if no retry condition is met
 
                     attempts += 1
                     if attempts >= max_retries:

unique_sdk/_version.py

@@ -1 +1 @@
-VERSION = "0.9.8"
+VERSION = "0.9.13"

{unique_sdk-0.9.11.dist-info → unique_sdk-0.9.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_sdk
-Version: 0.9.11
+Version: 0.9.13
 Summary: 
 License: MIT
 Author: Martin Fadler
@@ -899,6 +899,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.13] - 2024-10-23
+- Add retry for `5xx` errors, add additional error message.
+
+## [0.9.12] - 2024-11-21
+- Include original error message in returned exceptions
+
 ## [0.9.11] - 2024-11-18
 - Add  `ingestionConfig` to `UpsertParams.Input` parameters 
 

{unique_sdk-0.9.11.dist-info → unique_sdk-0.9.13.dist-info}/RECORD

@@ -1,17 +1,17 @@
 unique_sdk/__init__.py,sha256=Cv42hZ3dlsNACMIza7LDARXiY-w7a_ijlSuY_jADJD8,3072
-unique_sdk/_api_requestor.py,sha256=-Be3hCCjTrLsWgb9gW8Uq_wFFDxloOpZpTmp56zu858,13605
-unique_sdk/_api_resource.py,sha256=zKu-Sk1sJ6b9mr8ljrt9UBmi6y6lO7A29DNcBxdRYD4,6113
+unique_sdk/_api_requestor.py,sha256=O6iF_d_jc1ceTYVa3kOQHXjYKdmBp0kGW_pfMw1ClwE,14543
+unique_sdk/_api_resource.py,sha256=tE3J9sC5qwOdIMGLYEyvHjdQRYX-1unrLatO7CzgSfk,6185
 unique_sdk/_api_version.py,sha256=Ku4JPdeyJtnX5eJJvRCEc1_u44UObdVrvrL1T-WwWCs,46
-unique_sdk/_error.py,sha256=gQ2jaZYCdZa32zzDPPexc3u7N2j1gyjPc-AlMLWH_lY,2912
-unique_sdk/_http_client.py,sha256=BB5QUDHVBlj4sa4cbNu7Dp0t7bjLwheN9T5J9g3L1dk,10213
+unique_sdk/_error.py,sha256=j-deT0PJ-exLCwUkqORRaxaLLrGunDag9bKJSmBBKZI,3343
+unique_sdk/_http_client.py,sha256=CSc2gduhQ42v6G1oh4Jyg8XL7Sa3YQ7WdTpc6kAyTBI,10369
 unique_sdk/_list_object.py,sha256=k3fqWhD-37XHh6gZMHnuqOc1Bomq265Lmy2T7Rapxrk,3949
 unique_sdk/_object_classes.py,sha256=udAQucYaJBpgo7BAvga_JXAK92hu4Ohl2mOq1aN9J_A,270
 unique_sdk/_request_options.py,sha256=oHh2AKka6j9pO53Htur3Wj0VJSusEjq8zkXYY179B_E,255
 unique_sdk/_unique_object.py,sha256=PLaIzb6NPYghfMKHqDx_ZyojcDcuQzTrATXrktLqMa0,11442
 unique_sdk/_unique_ql.py,sha256=aUYXhYPA-_kPfImTapilCyDvB_53YpLd51kxILe7fDA,1707
 unique_sdk/_unique_response.py,sha256=q19hIxlsrkLAQylfHA0webp6bsCCHXkDJDwaC69Iev8,576
-unique_sdk/_util.py,sha256=ddCV4IDbbf2fh1Z09X7Y2REQmXMETLrM7tKLOc33w0o,8240
-unique_sdk/_version.py,sha256=bLj15cDf-jfrKLtrOqhC3kl-ZIlt9q8ieogbrosWe_g,18
+unique_sdk/_util.py,sha256=J8L4ynMM6_zzN5uaIxriShr9lYpYa_5RMQAWKuqIcC0,8806
+unique_sdk/_version.py,sha256=K80rxBhBBS3zPRQP96Dx9umWIad1LHJr2TPbKxFCbgE,19
 unique_sdk/_webhook.py,sha256=GYxbUibQN_W4XlNTHaMIksT9FQJk4LJmlKcxOu3jqiU,2855
 unique_sdk/api_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_sdk/api_resources/_acronyms.py,sha256=GIU1XH1flGWQYcpsFqTYwg4ioIGxVmb15tux84nmhEg,891
@@ -28,7 +28,7 @@ unique_sdk/utils/chat_history.py,sha256=5UqL9hF1O9pV7skbNOlEibF5rHdYsmG3m5-YEPUo
 unique_sdk/utils/file_io.py,sha256=tcS-5NA97AyiJPhKpWs3i0qKNFsZlttToxrvnWRDJrs,3857
 unique_sdk/utils/sources.py,sha256=wfboE-neMKa0Wuq9QzfAEFMkNLrIrmm0v-QF33sLo6k,4952
 unique_sdk/utils/token.py,sha256=AzKuAA1AwBtnvSFxGcsHLpxXr_wWE5Mj4jYBbOz2ljA,1740
-unique_sdk-0.9.11.dist-info/LICENSE,sha256=EJCWoHgrXVBUb47PnjeV4MFIEOR71MAdCOIgv61J-4k,1065
-unique_sdk-0.9.11.dist-info/METADATA,sha256=RjHhIAWryMqKEzBEqHDGI4SKMGWZDF1s6t_7jvMWOrU,27975
-unique_sdk-0.9.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_sdk-0.9.11.dist-info/RECORD,,
+unique_sdk-0.9.13.dist-info/LICENSE,sha256=EJCWoHgrXVBUb47PnjeV4MFIEOR71MAdCOIgv61J-4k,1065
+unique_sdk-0.9.13.dist-info/METADATA,sha256=FKP4b3n6sn6qVS3DUOoTIueOHBol5SodfydJ6hMcUrc,28143
+unique_sdk-0.9.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_sdk-0.9.13.dist-info/RECORD,,