sumo-wrapper-python 1.7.0__tar.gz → 1.8.0__tar.gz

{sumo_wrapper_python-1.7.0 → sumo_wrapper_python-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sumo-wrapper-python
-Version: 1.7.0
+Version: 1.8.0
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License

{sumo_wrapper_python-1.7.0 → sumo_wrapper_python-1.8.0}/src/sumo/wrapper/_logging.py

@@ -28,6 +28,9 @@ class LogHandlerSumo(logging.Handler):
             if "objectUuid" in record.__dict__:
                 json["objectUuid"] = record.__dict__.get("objectUuid")
 
+            if "details" in record.__dict__:
+                json["details"] = record.__dict__.get("details")
+
             self._sumoClient.post("/message-log/new", json=json)
         except Exception:
             # Never fail on logging

{sumo_wrapper_python-1.7.0 → sumo_wrapper_python-1.8.0}/src/sumo/wrapper/_retry_strategy.py

@@ -38,10 +38,17 @@ def _return_last_value(retry_state):
 
 
 class RetryStrategy:
-    def __init__(self, stop_after=6, multiplier=0.5, exp_base=2):
+    def __init__(
+        self,
+        stop_after=6,
+        multiplier=0.5,
+        exp_base=2,
+        before_sleep=_log_retry_info,
+    ):
         self._stop_after = stop_after
         self._multiplier = multiplier
         self._exp_base = exp_base
+        self._before_sleep = before_sleep
         return
 
     def make_retryer(self) -> tn.Retrying:
@@ -60,7 +67,7 @@ class RetryStrategy:
                 )
             ),
             retry_error_callback=_return_last_value,
-            before_sleep=_log_retry_info,
+            before_sleep=self._before_sleep,
         )
 
     def make_retryer_async(self) -> tn.AsyncRetrying:
@@ -79,5 +86,5 @@ class RetryStrategy:
                 )
             ),
             retry_error_callback=_return_last_value,
-            before_sleep=_log_retry_info,
+            before_sleep=self._before_sleep,
         )

{sumo_wrapper_python-1.7.0 → sumo_wrapper_python-1.8.0}/src/sumo/wrapper/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.7.0'
-__version_tuple__ = version_tuple = (1, 7, 0)
+__version__ = version = '1.8.0'
+__version_tuple__ = version_tuple = (1, 8, 0)
 
-__commit_id__ = commit_id = 'g6b39d36f8'
+__commit_id__ = commit_id = 'gd3b39bc3e'

{sumo_wrapper_python-1.7.0 → sumo_wrapper_python-1.8.0}/src/sumo/wrapper/sumo_client.py

@@ -219,7 +219,12 @@ class SumoClient:
             )
 
     @raise_for_status
-    def get(self, path: str, params: Optional[Dict] = None) -> httpx.Response:
+    def get(
+        self,
+        path: str,
+        params: Optional[Dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
+    ) -> httpx.Response:
         """Performs a GET-request to the Sumo API.
 
         Args:
@@ -277,8 +282,9 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer()
-
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer()
         return retryer(_get)
 
     @raise_for_status
@@ -288,6 +294,7 @@ class SumoClient:
         blob: Optional[bytes] = None,
         json: Optional[dict] = None,
         params: Optional[dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Performs a POST-request to the Sumo API.
 
@@ -352,7 +359,9 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer()
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer()
 
         return retryer(_post)
 
@@ -362,6 +371,7 @@ class SumoClient:
         path: str,
         blob: Optional[bytes] = None,
         json: Optional[dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Performs a PUT-request to the Sumo API.
 
@@ -401,13 +411,18 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer()
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer()
 
         return retryer(_put)
 
     @raise_for_status
     def delete(
-        self, path: str, params: Optional[dict] = None
+        self,
+        path: str,
+        params: Optional[dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Performs a DELETE-request to the Sumo API.
 
@@ -441,7 +456,9 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer()
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer()
 
         return retryer(_delete)
 
@@ -460,7 +477,10 @@ class SumoClient:
         return location, retry_after
 
     def poll(
-        self, response_in: httpx.Response, timeout=None
+        self,
+        response_in: httpx.Response,
+        timeout=None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Poll a specific endpoint until a result is obtained.
 
@@ -474,7 +494,7 @@ class SumoClient:
         expiry = time.time() + timeout if timeout is not None else None
         while True:
             time.sleep(retry_after)
-            response = self.get(location)
+            response = self.get(location, retry_strategy=retry_strategy)
             if response.status_code != 202:
                 return response
             if expiry is not None and time.time() > expiry:
@@ -539,7 +559,10 @@ class SumoClient:
 
     @raise_for_status_async
     async def get_async(
-        self, path: str, params: Optional[dict] = None
+        self,
+        path: str,
+        params: Optional[dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Performs an async GET-request to the Sumo API.
 
@@ -598,7 +621,9 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer_async()
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer_async()
 
         return await retryer(_get)
 
@@ -609,6 +634,7 @@ class SumoClient:
         blob: Optional[bytes] = None,
         json: Optional[dict] = None,
         params: Optional[dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Performs an async POST-request to the Sumo API.
 
@@ -674,7 +700,9 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer_async()
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer_async()
 
         return await retryer(_post)
 
@@ -684,6 +712,7 @@ class SumoClient:
         path: str,
         blob: Optional[bytes] = None,
         json: Optional[dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Performs an async PUT-request to the Sumo API.
 
@@ -723,13 +752,18 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer_async()
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer_async()
 
         return await retryer(_put)
 
     @raise_for_status_async
     async def delete_async(
-        self, path: str, params: Optional[dict] = None
+        self,
+        path: str,
+        params: Optional[dict] = None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Performs an async DELETE-request to the Sumo API.
 
@@ -763,12 +797,17 @@ class SumoClient:
                 timeout=self._timeout,
             )
 
-        retryer = self._retry_strategy.make_retryer_async()
+        retryer = (
+            retry_strategy if retry_strategy else self._retry_strategy
+        ).make_retryer_async()
 
         return await retryer(_delete)
 
     async def poll_async(
-        self, response_in: httpx.Response, timeout=None
+        self,
+        response_in: httpx.Response,
+        timeout=None,
+        retry_strategy: Optional[RetryStrategy] = None,
     ) -> httpx.Response:
         """Poll a specific endpoint until a result is obtained.
 
@@ -782,7 +821,9 @@ class SumoClient:
         expiry = time.time() + timeout if timeout is not None else None
         while True:
             await asyncio.sleep(retry_after)
-            response = await self.get_async(location)
+            response = await self.get_async(
+                location, retry_strategy=retry_strategy
+            )
             if response.status_code != 202:
                 return response
             if expiry is not None and time.time() > expiry:

{sumo_wrapper_python-1.7.0 → sumo_wrapper_python-1.8.0}/src/sumo_wrapper_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sumo-wrapper-python
-Version: 1.7.0
+Version: 1.8.0
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License