sky-api-client 3.3.12__tar.gz → 3.4.0__tar.gz

{sky_api_client-3.3.12 → sky_api_client-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sky_api_client
-Version: 3.3.12
+Version: 3.4.0
 Summary: Python client for RENXT APIs
 Home-page: https://bitbucket.org/kalyanvarma/skyapi
 Author: Almabase Engineering

{sky_api_client-3.3.12 → sky_api_client-3.4.0}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r', encoding='utf-8') as fh:
 
 setuptools.setup(
     name='sky_api_client',
-    version='3.3.12',
+    version='3.4.0',
     author='Almabase Engineering',
     author_email='engineering@almabase.com',
     description='Python client for RENXT APIs',

{sky_api_client-3.3.12 → sky_api_client-3.4.0}/sky_api_client/client.py

@@ -1,12 +1,15 @@
+import random
 import time
 from typing import Dict, Any
 import requests
 from sky_api_client.entity.base import Entity
 from sky_api_client.entity.registry import EntityRegistry
-from sky_api_client.exceptions.exception import GeneralError
+from sky_api_client.exceptions.exception import GeneralError, RateLimitError
 
 BASE_URL = 'https://api.sky.blackbaud.com'
 DEFAULT_TIMEOUT = 300
+DEFAULT_RETRIES = 3
+MAX_RETRY_AFTER_SECONDS = 60
 
 
 class SkyApiClient(object):
@@ -14,7 +17,9 @@ class SkyApiClient(object):
         self.subscription_key = subscription_key
         self.access_token = access_token
 
-    def request(self, method: str, path: str, data: Dict[str, str] = None, params: Dict[str, Any] = None):
+    def request(
+        self, method: str, path: str, data: Dict[str, str] = None, params: Dict[str, Any] = None, retry_count: int = 0
+    ):
         response = requests.request(
             method=method,
             url='{}/{}'.format(BASE_URL, path),
@@ -25,11 +30,14 @@ class SkyApiClient(object):
         )
 
         if response.status_code == 429:
-            sleep_seconds = response.headers.get('Retry-After', 3)
-            time.sleep(int(sleep_seconds))
-
-            # retry the failed request. In the worst case, we'll exceed recursion limit and the job will fail
-            return self.request(method, path, data=data)
+            if retry_count >= DEFAULT_RETRIES:
+                raise RateLimitError('Rate limit exceeded after {} retries'.format(DEFAULT_RETRIES))
+            try:
+                sleep_seconds = int(response.headers.get('Retry-After', 3))
+            except (TypeError, ValueError):
+                sleep_seconds = 3
+            time.sleep(min(sleep_seconds, MAX_RETRY_AFTER_SECONDS) + random.uniform(0, 1))
+            return self.request(method, path, data=data, params=params, retry_count=retry_count + 1)
 
         if response.ok:
             try:

{sky_api_client-3.3.12 → sky_api_client-3.4.0}/sky_api_client/exceptions/exception.py

@@ -2,6 +2,10 @@ class GeneralError(Exception):
     pass
 
 
+class RateLimitError(GeneralError):
+    pass
+
+
 class MethodNotDefined(Exception):
     def __init__(self, method: str) -> None:
         self.method = method

{sky_api_client-3.3.12 → sky_api_client-3.4.0}/sky_api_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sky-api-client
-Version: 3.3.12
+Version: 3.4.0
 Summary: Python client for RENXT APIs
 Home-page: https://bitbucket.org/kalyanvarma/skyapi
 Author: Almabase Engineering