automizor 0.4.16__tar.gz → 0.4.18__tar.gz

{automizor-0.4.16/automizor.egg-info → automizor-0.4.18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: automizor
-Version: 0.4.16
+Version: 0.4.18
 Summary: Python Automizor framework
 Home-page: https://github.com/automizor/automizor-python
 Author: Christian Fischer
@@ -16,3 +16,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE
 Requires-Dist: requests
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary

automizor-0.4.18/automizor/__init__.py

@@ -0,0 +1,18 @@
+import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
+
+retry_strategy = Retry(
+    total=6,
+    backoff_factor=1,
+    status_forcelist=[429, 500, 502, 503, 504, 520, 521, 522, 523, 524],
+    allowed_methods=["GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS"],
+    raise_on_status=False,
+)
+
+adapter = HTTPAdapter(max_retries=retry_strategy)
+session = requests.Session()
+session.mount("https://", adapter)
+session.mount("http://", adapter)
+
+version = "0.4.18"

{automizor-0.4.16 → automizor-0.4.18}/automizor/action/_action.py

@@ -1,7 +1,6 @@
 from typing import Optional
 
-import requests
-
+from automizor import session
 from automizor.exceptions import AutomizorError
 from automizor.utils import JSON, get_api_config, get_headers
 
@@ -79,13 +78,7 @@ class Action:
             AutomizorError: If there is an error executing the action.
         """
         url = f"https://{self.url}/api/v2/action/{name}/execute?workspace={workspace}"
-        try:
-            response = requests.put(url, headers=self.headers, data=payload, timeout=90)
-            response.raise_for_status()
-            return response.json()
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to execute action"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to execute action: {exc}") from exc
+        response = session.put(url, headers=self.headers, data=payload, timeout=90)
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to execute action")
+        return response.json()

{automizor-0.4.16 → automizor-0.4.18}/automizor/datastore/_datastore.py

@@ -1,7 +1,6 @@
 from typing import Optional
 
-import requests
-
+from automizor import session
 from automizor.exceptions import AutomizorError
 from automizor.utils import JSON, get_api_config, get_headers
 
@@ -76,27 +75,18 @@ class DataStore:
             else {}
         )
         url = f"https://{self.url}/api/v1/workflow/datastore/{name}/values/"
-        try:
-            response = requests.get(
-                url, headers=self.headers, params=params, timeout=10
-            )
-            response.raise_for_status()
-            return response.json()
-        except requests.HTTPError as exc:
+        response = session.get(url, headers=self.headers, params=params, timeout=60)
+        if response.status_code >= 400:
             raise AutomizorError.from_response(
-                exc.response, "Failed to get datastore values"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to get datastore values: {exc}") from exc
+                response, "Failed to get datastore values"
+            )
+
+        return response.json()
 
     def _set_values(self, name: str, values: JSON) -> None:
         url = f"https://{self.url}/api/v1/workflow/datastore/{name}/values/"
-        try:
-            response = requests.post(url, headers=self.headers, json=values, timeout=10)
-            response.raise_for_status()
-        except requests.HTTPError as exc:
+        response = session.post(url, headers=self.headers, json=values, timeout=60)
+        if response.status_code >= 400:
             raise AutomizorError.from_response(
-                exc.response, "Failed to set datastore values"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to set datastore values: {exc}") from exc
+                response, "Failed to set datastore values"
+            )

automizor-0.4.18/automizor/exceptions.py

@@ -0,0 +1,118 @@
+from requests import Response
+
+
+class AutomizorError(Exception):
+    def __init__(self, message: str, *, status_code=None, url=None):
+        self.status_code = status_code
+        self.url = url
+        super().__init__(message)
+
+    def __str__(self):
+        base = f"{self.args[0]}"
+        if self.status_code:
+            base += f" (status {self.status_code})"
+        if self.url:
+            base += f" → {self.url}"
+        return base
+
+    @classmethod
+    def from_response(cls, response: Response, message: str):
+        _STATUS_EXCEPTION_MAP = {
+            400: InvalidRequest,
+            401: Unauthorized,
+            403: Forbidden,
+            404: NotFound,
+            429: RateLimitExceeded,
+            500: InternalServerError,
+            502: BadGateway,
+            503: ServiceUnavailable,
+            504: GatewayTimeout,
+            520: OriginError,
+            521: OriginDown,
+            522: ConnectionTimedOut,
+            523: OriginUnreachable,
+            524: TimeoutOccurred,
+            525: SSLHandshakeFailed,
+            526: InvalidSSLCertificate,
+            530: OriginDNSError,
+        }
+
+        exc_class = _STATUS_EXCEPTION_MAP.get(response.status_code, UnexpectedError)
+
+        return exc_class(
+            message,
+            status_code=response.status_code,
+            url=response.url,
+        )
+
+
+class BadGateway(AutomizorError):
+    pass
+
+
+class ConnectionTimedOut(AutomizorError):
+    pass
+
+
+class Forbidden(AutomizorError):
+    pass
+
+
+class GatewayTimeout(AutomizorError):
+    pass
+
+
+class InternalServerError(AutomizorError):
+    pass
+
+
+class InvalidRequest(AutomizorError):
+    pass
+
+
+class InvalidSSLCertificate(AutomizorError):
+    pass
+
+
+class NotFound(AutomizorError):
+    pass
+
+
+class OriginDNSError(AutomizorError):
+    pass
+
+
+class OriginDown(AutomizorError):
+    pass
+
+
+class OriginError(AutomizorError):
+    pass
+
+
+class OriginUnreachable(AutomizorError):
+    pass
+
+
+class RateLimitExceeded(AutomizorError):
+    pass
+
+
+class SSLHandshakeFailed(AutomizorError):
+    pass
+
+
+class ServiceUnavailable(AutomizorError):
+    pass
+
+
+class TimeoutOccurred(AutomizorError):
+    pass
+
+
+class Unauthorized(AutomizorError):
+    pass
+
+
+class UnexpectedError(AutomizorError):
+    pass

{automizor-0.4.16 → automizor-0.4.18}/automizor/job/_job.py

@@ -2,8 +2,7 @@ import json
 import os
 from typing import Optional
 
-import requests
-
+from automizor import session
 from automizor.exceptions import AutomizorError
 from automizor.utils import JSON, get_api_config, get_headers
 
@@ -128,13 +127,7 @@ class Job:
 
     def _read_job_context(self) -> dict:
         url = f"https://{self.url}/api/v1/rpa/job/{self._job_id}/"
-        try:
-            response = requests.get(url, headers=self.headers, timeout=10)
-            response.raise_for_status()
-            return response.json().get("context", {})
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to get job context"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to get job context: {exc}") from exc
+        response = session.get(url, headers=self.headers, timeout=60)
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to get job context")
+        return response.json().get("context", {})

{automizor-0.4.16 → automizor-0.4.18}/automizor/storage/_storage.py

@@ -1,7 +1,6 @@
 from typing import List, Optional
 
-import requests
-
+from automizor import session
 from automizor.exceptions import AutomizorError, NotFound
 from automizor.utils import JSON, get_api_config, get_headers
 
@@ -77,21 +76,15 @@ class Storage:
         url = f"https://{self.url}/api/v1/storage/asset/"
         asset_names = []
 
-        try:
-            while url:
-                response = requests.get(url, headers=self.headers, timeout=10)
-                response.raise_for_status()
-                data = response.json()
-
-                for asset in data["results"]:
-                    asset_names.append(asset["name"])
-                url = data["next"]
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to list assets"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to list assets: {exc}") from exc
+        while url:
+            response = session.get(url, headers=self.headers, timeout=60)
+            if response.status_code >= 400:
+                raise AutomizorError.from_response(response, "Failed to list assets")
+            data = response.json()
+
+            for asset in data["results"]:
+                asset_names.append(asset["name"])
+            url = data["next"]
         return asset_names
 
     def delete_asset(self, name: str):
@@ -107,15 +100,9 @@ class Storage:
         """
 
         url = f"https://{self.url}/api/v1/storage/asset/{name}/"
-        try:
-            response = requests.delete(url, headers=self.headers, timeout=10)
-            response.raise_for_status()
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to delete asset"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to delete asset: {exc}") from exc
+        response = session.delete(url, headers=self.headers, timeout=60)
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to delete asset")
 
     def get_bytes(self, name: str) -> bytes:
         """
@@ -224,61 +211,39 @@ class Storage:
         """
 
         url = f"https://{self.url}/api/v1/storage/asset/"
-        try:
-            data = {
-                "content_type": content_type,
-                "name": name,
-            }
-            files = {"file": ("text.txt", content, content_type)}
-            response = requests.post(
-                url, headers=self.headers, files=files, data=data, timeout=10
-            )
-            response.raise_for_status()
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to create asset"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to create asset: {exc}") from exc
+        data = {"content_type": content_type, "name": name}
+        files = {"file": ("text.txt", content, content_type)}
+        response = session.post(
+            url, headers=self.headers, files=files, data=data, timeout=60
+        )
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to create asset")
 
     def _download_file(self, name: str, mode: str = "content"):
         url = self._get_asset_url(name)
-
-        try:
-            response = requests.get(url=url, timeout=10)
-            response.raise_for_status()
-
-            match mode:
-                case "content":
-                    return response.content
-                case "json":
-                    return response.json()
-                case "text":
-                    return response.text
-            raise RuntimeError(f"Invalid mode {mode}")
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to download asset"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to download asset: {exc}") from exc
+        response = session.get(url=url, timeout=60)
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to download asset")
+
+        match mode:
+            case "content":
+                return response.content
+            case "json":
+                return response.json()
+            case "text":
+                return response.text
+        raise RuntimeError(f"Invalid mode {mode}")
 
     def _get_asset_url(self, name: str) -> str:
         url = f"https://{self.url}/api/v1/storage/asset/{name}/"
-        try:
-            response = requests.get(url, headers=self.headers, timeout=10)
-            response.raise_for_status()
-
-            url = response.json().get("file")
-            if url:
-                return url
-            raise RuntimeError("Url not found")
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to get asset URL"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to get asset URL: {exc}") from exc
+        response = session.get(url, headers=self.headers, timeout=60)
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to get asset URL")
+
+        url = response.json().get("file")
+        if url:
+            return url
+        raise RuntimeError("Url not found")
 
     def _update_asset(self, name: str, content: bytes, content_type: str):
         """
@@ -295,19 +260,10 @@ class Storage:
         """
 
         url = f"https://{self.url}/api/v1/storage/asset/{name}/"
-        try:
-            data = {
-                "content_type": content_type,
-                "name": name,
-            }
-            files = {"file": ("text.txt", content, content_type)}
-            response = requests.put(
-                url, headers=self.headers, files=files, data=data, timeout=10
-            )
-            response.raise_for_status()
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to update asset"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to update asset: {exc}") from exc
+        data = {"content_type": content_type, "name": name}
+        files = {"file": ("text.txt", content, content_type)}
+        response = session.put(
+            url, headers=self.headers, files=files, data=data, timeout=60
+        )
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to update asset")

{automizor-0.4.16 → automizor-0.4.18}/automizor/vault/_vault.py

@@ -1,8 +1,7 @@
 from dataclasses import asdict
 from typing import Optional
 
-import requests
-
+from automizor import session
 from automizor.exceptions import AutomizorError, NotFound
 from automizor.utils import get_api_config, get_headers
 
@@ -113,43 +112,25 @@ class Vault:
 
     def _create_secret(self, secret: SecretContainer) -> SecretContainer:
         url = f"https://{self.url}/api/v1/vault/secret/"
-        try:
-            response = requests.post(
-                url, headers=self.headers, timeout=10, json=asdict(secret)
-            )
-            response.raise_for_status()
-            return SecretContainer(**response.json())
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to create secret"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to create secret: {exc}") from exc
+        response = session.post(
+            url, headers=self.headers, timeout=60, json=asdict(secret)
+        )
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to create secret")
+        return SecretContainer(**response.json())
 
     def _get_secret(self, name: str) -> SecretContainer:
         url = f"https://{self.url}/api/v1/vault/secret/{name}/"
-        try:
-            response = requests.get(url, headers=self.headers, timeout=10)
-            response.raise_for_status()
-            return SecretContainer(**response.json())
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to get secret"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to get secret: {exc}") from exc
+        response = session.get(url, headers=self.headers, timeout=60)
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to get secret")
+        return SecretContainer(**response.json())
 
     def _update_secret(self, secret: SecretContainer) -> SecretContainer:
         url = f"https://{self.url}/api/v1/vault/secret/{secret.name}/"
-        try:
-            response = requests.put(
-                url, headers=self.headers, timeout=10, json=asdict(secret)
-            )
-            response.raise_for_status()
-            return SecretContainer(**response.json())
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to update secret"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to update secret: {exc}") from exc
+        response = session.put(
+            url, headers=self.headers, timeout=60, json=asdict(secret)
+        )
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to update secret")
+        return SecretContainer(**response.json())

{automizor-0.4.16 → automizor-0.4.18}/automizor/workflow/_workflow.py

@@ -1,7 +1,6 @@
 from typing import Optional
 
-import requests
-
+from automizor import session
 from automizor.exceptions import AutomizorError
 from automizor.utils import get_api_config, get_headers
 
@@ -85,18 +84,13 @@ class Workflow:
             AutomizorError: If there is an error in creating the instance.
         """
         url = f"https://{self.url}/api/v1/workflow/instance/"
-        try:
-            data = {
-                "business_key": business_key,
-                "initial_data": payload,
-                "process_model": process_model,
-                "workspace": workspace,
-            }
-            response = requests.post(url, headers=self.headers, data=data, timeout=10)
-            response.raise_for_status()
-        except requests.HTTPError as exc:
-            raise AutomizorError.from_response(
-                exc.response, "Failed to create instance"
-            ) from exc
-        except Exception as exc:
-            raise AutomizorError(f"Failed to create instance: {exc}") from exc
+
+        data = {
+            "business_key": business_key,
+            "initial_data": payload,
+            "process_model": process_model,
+            "workspace": workspace,
+        }
+        response = session.post(url, headers=self.headers, data=data, timeout=60)
+        if response.status_code >= 400:
+            raise AutomizorError.from_response(response, "Failed to create instance")

{automizor-0.4.16 → automizor-0.4.18/automizor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: automizor
-Version: 0.4.16
+Version: 0.4.18
 Summary: Python Automizor framework
 Home-page: https://github.com/automizor/automizor-python
 Author: Christian Fischer
@@ -16,3 +16,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE
 Requires-Dist: requests
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary

automizor-0.4.16/automizor/__init__.py

@@ -1 +0,0 @@
-version = "0.4.16"

automizor-0.4.16/automizor/exceptions.py

@@ -1,69 +0,0 @@
-from requests import Response
-
-
-class AutomizorError(Exception):
-    def __init__(self, message, error=None):
-        if error:
-            message = f"{message}: {error}"
-        super().__init__(message)
-
-    def __str__(self):
-        return f"{self.args[0]}"
-
-    @classmethod
-    def from_response(cls, response: Response, message: str):
-        _STATUS_EXCEPTION_MAP = {
-            400: InvalidRequest,
-            401: Unauthorized,
-            403: Forbidden,
-            404: NotFound,
-            429: RateLimitExceeded,
-            500: InternalServerError,
-            502: BadGateway,
-            503: ServiceUnavailable,
-        }
-
-        try:
-            error = dict(response.json()).get("detail", "Unknown error.")
-        except Exception:  # pylint: disable=broad-except
-            error = response.text
-
-        return _STATUS_EXCEPTION_MAP.get(response.status_code, UnexpectedError)(
-            message, error
-        )
-
-
-class BadGateway(AutomizorError):
-    pass
-
-
-class Forbidden(AutomizorError):
-    pass
-
-
-class InternalServerError(AutomizorError):
-    pass
-
-
-class InvalidRequest(AutomizorError):
-    pass
-
-
-class NotFound(AutomizorError):
-    pass
-
-
-class RateLimitExceeded(AutomizorError):
-    pass
-
-
-class ServiceUnavailable(AutomizorError):
-    pass
-
-
-class Unauthorized(AutomizorError):
-    pass
-
-
-class UnexpectedError(AutomizorError):
-    pass