syneto_api 0.2.43__tar.gz → 0.2.45__tar.gz

{syneto_api-0.2.43 → syneto_api-0.2.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syneto-api
-Version: 0.2.43
+Version: 0.2.45
 Summary: Syneto Client API library
 Home-page: https://github.com/SynetoNet/syneto-api
 License: Proprietary
@@ -11,13 +11,13 @@ Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Requires-Dist: aiodns (>=3,<4)
 Requires-Dist: aiohttp (>=3.7,<4.0)
 Requires-Dist: cchardet (>=2.1,<3.0)
 Requires-Dist: inflection (>=0.5,<0.6)
 Requires-Dist: python-dotenv (>=0.16,<0.17)
 Requires-Dist: requests[secure] (>=2.25,<3.0)
+Requires-Dist: tenacity (>=8.0.1,<9.0.0)
 Project-URL: Repository, https://github.com/SynetoNet/syneto-api
 Description-Content-Type: text/markdown
 

{syneto_api-0.2.43 → syneto_api-0.2.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "syneto_api"
-version = "0.2.43"
+version = "0.2.45"
 description = "Syneto Client API library"
 authors = ["Your Name <you@example.com>"]
 license = "Proprietary"
@@ -16,6 +16,7 @@ inflection = "^0.5"
 aiohttp = "^3.7"
 aiodns = "^3"
 cchardet = "^2.1"
+tenacity = "^8.0.1"
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.2"

{syneto_api-0.2.43 → syneto_api-0.2.45}/setup.py

@@ -16,11 +16,12 @@ install_requires = \
  'cchardet>=2.1,<3.0',
  'inflection>=0.5,<0.6',
  'python-dotenv>=0.16,<0.17',
- 'requests[secure]>=2.25,<3.0']
+ 'requests[secure]>=2.25,<3.0',
+ 'tenacity>=8.0.1,<9.0.0']
 
 setup_kwargs = {
     'name': 'syneto-api',
-    'version': '0.2.43',
+    'version': '0.2.45',
     'description': 'Syneto Client API library',
     'long_description': '# Syneto API\n\nSyneto Client API library: authentication, storage, virtualization and protection\n\n# Installation\n\n```\n$ pip install syneto-api\n```\n\n# Basic Usage\n\n```\nfrom syneto_api import Authentication, Virtualization, Storage, Protection\n\nauth_api = Authentication(url_base="https://syneto-instance-ip-address/api/auth", insecure_ssl=True)\nresponse = auth_api.login(username="admin", password="admin")\njwt = response[\'jwt\']\n\nvirt_api = Virtualization(url_base="https://syneto-instance-ip-address/api/virtualization", insecure_ssl=True)\nvirt_api.set_auth_jwt(jwt)\nprint(virt_api.get_vms())\n\nstorage_api = Storage(url_base="https://syneto-instance-ip-address/api/storage", insecure_ssl=True)\nstorage_api.set_auth_jwt(jwt)\nprint(storage_api.get_pools())\n```\n\n# Environment Variables\n\nFor conveninence, the base urls for the api endpoints are also accepted as environment variables, please see below.\n\n```\nAUTH_SERVICE=https://syneto-instance-ip-address/api/auth\nVIRTUALIZATION_SERVICE=https://syneto-instance-ip-address/api/virtualization\nSTORAGE_SERVICE=https://syneto-instance-ip-address/api/storage\nPROTECTION_SERVICE=https://syneto-instance-ip-address/api/protection\n```\n\nIf you are using self-signed SSL certificates, set the following env. so that the http request library does not perform ssl verification. \n\n```\nALLOW_INSECURE_SSL=True\n```\n',
     'author': 'Your Name',

{syneto_api-0.2.43 → syneto_api-0.2.45}/src/syneto_api/api_client.py

@@ -6,6 +6,8 @@ import urllib.parse
 import logging
 import traceback
 import urllib.parse
+import concurrent.futures as futures
+from tenacity import Retrying, AsyncRetrying, RetryError, stop_after_delay
 
 from .settings import get_env_flag
 from .keyring import KeyRing
@@ -102,17 +104,25 @@ class APIClientBase:
     ):
         try:
             logger.debug(f"Calling {method} {url} with aiohttp lib")
-            # loop = asyncio.get_event_loop()
-            # return loop.run_until_complete(self._async_request(method, url, body, success_codes, error_subject))
-            return await asyncio.wait_for(
-                self._unsafe_async_request(method, url, body, success_codes, error_subject, on_response_callback),
-                timeout=self.timeout,
-            )
+            async for attempt in AsyncRetrying(stop=stop_after_delay(self.timeout), reraise=True):
+                with attempt:
+                    return await asyncio.wait_for(
+                        self._unsafe_async_request(
+                            method, url, body, success_codes, error_subject, on_response_callback
+                        ),
+                        timeout=self.timeout,
+                    )
 
         except APIException as e:
             raise
 
-        except (aiohttp.ServerTimeoutError, requests.Timeout, asyncio.TimeoutError) as e:
+        except (
+            aiohttp.ServerTimeoutError,
+            requests.Timeout,
+            asyncio.TimeoutError,
+            futures.TimeoutError,
+            RetryError,
+        ) as e:
             logger.warning(f"Failed {method} request to {url}, network timeout: {str(e)}")
             error = self._append_url_if_not_local_service("network timeout")
             raise APIException(url=url, message=f"{error_subject} has failed ({error})", request_body=body) from e
@@ -184,12 +194,16 @@ class APIClientBase:
     ):
         try:
             logger.debug(f"Calling {method} {url} with requests lib")
-            return self._unsafe_sync_request(method, url, body, success_codes, error_subject, on_response_callback)
+            for attempt in Retrying(stop=stop_after_delay(self.timeout), reraise=True):
+                with attempt:
+                    return self._unsafe_sync_request(
+                        method, url, body, success_codes, error_subject, on_response_callback
+                    )
 
         except APIException as e:
             raise
 
-        except (aiohttp.ServerTimeoutError, requests.Timeout) as e:
+        except (aiohttp.ServerTimeoutError, requests.Timeout, futures.TimeoutError, RetryError) as e:
             logger.warning(f"Failed {method} request to {url}, network timeout: {str(e)}")
             error = self._append_url_if_not_local_service("network timeout")
             raise APIException(url=url, message=f"{error_subject} has failed ({error})", request_body=body) from e
@@ -225,7 +239,7 @@ class APIClientBase:
         if body is not None:
             method_args["json"] = body
 
-        response = method_func(url, timeout=60, **method_args)
+        response = method_func(url, timeout=self.timeout, **method_args)
         is_json = "json" in response.headers.get("content-type", "").lower()
         if response.status_code in success_codes:
             logger.debug(f"Received {response.status_code} from {method} {url}")
@@ -255,16 +269,19 @@ class APIClientBase:
     def _append_url_if_not_local_service(self, message):
         if self._is_local_service():
             return message
+
+        hostname = self._get_hostname()
+        if not hostname:
+            return f"{message}: <host not specified>"
         else:
-            hostname = self._get_hostname()
-            return f"{message}: {hostname}"
+            return f"{message}: {hostname.strip()}"
 
     def _get_hostname(self):
         parsed_uri = urllib.parse.urlparse(self.url_base)
         hostname = parsed_uri.netloc
         if ":" in hostname:
             hostname, port = parsed_uri.netloc.split(":")[:2]
-        return hostname
+        return hostname.strip() if hostname else hostname
 
     def _get_method_func(self, method):
         requests_methods = {

{syneto_api-0.2.43 → syneto_api-0.2.45}/src/syneto_api/central_api.py

@@ -6,6 +6,7 @@ from .api_client import APIClientBase
 class Central(APIClientBase):
     def __init__(self, url_base=None, **kwargs):
         super().__init__(url_base or os.environ.get("CENTRAL_SERVICE", ""), **kwargs)
+        self._force_json = False
 
     def activate_product(
         self, email: str, password: str, activation_key: Optional[str]