sumo-wrapper-python 1.0.22__tar.gz → 1.0.24__tar.gz

{sumo_wrapper_python-1.0.22 → sumo_wrapper_python-1.0.24}/.gitignore

@@ -4,6 +4,7 @@ __pycache__/
 *~
 _venv
 venv
+.venv
 dist
 build
 *.egg-info/

{sumo_wrapper_python-1.0.22 → sumo_wrapper_python-1.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sumo-wrapper-python
-Version: 1.0.22
+Version: 1.0.24
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License

{sumo_wrapper_python-1.0.22 → sumo_wrapper_python-1.0.24}/src/sumo/wrapper/_auth_provider.py

@@ -4,7 +4,8 @@ import os
 import stat
 import sys
 import time
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
+from urllib.parse import parse_qs
 
 import jwt
 import msal
@@ -30,20 +31,17 @@ def _maybe_nfs_exception(exception):
 
 
 def get_token_dir():
-    return os.path.join(os.path.expanduser("~"), ".sumo")
+    return os.path.expanduser("~/.sumo")
 
 
 def get_token_path(resource_id, suffix, case_uuid=None):
     if case_uuid is not None:
         return os.path.join(
-            os.path.expanduser("~"),
-            ".sumo",
+            get_token_dir(),
             str(resource_id) + "+" + str(case_uuid) + suffix,
         )
     else:
-        return os.path.join(
-            os.path.expanduser("~"), ".sumo", str(resource_id) + suffix
-        )
+        return os.path.join(get_token_dir(), str(resource_id) + suffix)
 
 
 class AuthProvider:
@@ -91,6 +89,7 @@ class AuthProvider:
         ) as f:
             f.write(token)
         protect_token_cache(self._resource_id, ".sharedkey", case_uuid)
+        return
 
     def has_case_token(self, case_uuid):
         return os.path.exists(
@@ -459,3 +458,31 @@ def get_auth_provider(
         ]
     ):
         return AuthProviderManaged(resource_id)
+
+
+def cleanup_shared_keys():
+    tokendir = get_token_dir()
+    if not os.path.exists(tokendir):
+        return
+    for f in os.listdir(tokendir):
+        ff = os.path.join(tokendir, f)
+        if os.path.isfile(ff):
+            (name, ext) = os.path.splitext(ff)
+            if ext.lower() == ".sharedkey":
+                try:
+                    with open(ff, "r") as file:
+                        token = file.read()
+                        pq = parse_qs(token)
+                        se = pq["se"][0]
+                        end = datetime.strptime(se, "%Y-%m-%dT%H:%M:%S.%fZ")
+                        now = datetime.now(timezone.utc)
+                        if now.timestamp() > end.timestamp():
+                            os.unlink(ff)
+                            pass
+                        pass
+                    pass
+                except Exception:
+                    pass
+            pass
+        pass
+    return

{sumo_wrapper_python-1.0.22 → sumo_wrapper_python-1.0.24}/src/sumo/wrapper/_retry_strategy.py

@@ -30,7 +30,7 @@ def _is_retryable_exception(exception):
 
 # Define the conditions for retrying based on HTTP status codes
 def _is_retryable_status_code(response):
-    return response.status_code in [502, 503, 504]
+    return response.status_code in [502, 503]
 
 
 def _return_last_value(retry_state):

{sumo_wrapper_python-1.0.22 → sumo_wrapper_python-1.0.24}/src/sumo/wrapper/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.22'
-__version_tuple__ = version_tuple = (1, 0, 22)
+__version__ = version = '1.0.24'
+__version_tuple__ = version_tuple = (1, 0, 24)

{sumo_wrapper_python-1.0.22 → sumo_wrapper_python-1.0.24}/src/sumo/wrapper/sumo_client.py

@@ -6,7 +6,7 @@ import re
 import httpx
 import jwt
 
-from ._auth_provider import get_auth_provider
+from ._auth_provider import cleanup_shared_keys, get_auth_provider
 from ._blob_client import BlobClient
 from ._decorators import (
     raise_for_status,
@@ -34,6 +34,8 @@ class SumoClient:
         retry_strategy=RetryStrategy(),
         timeout=DEFAULT_TIMEOUT,
         case_uuid=None,
+        http_client=None,
+        async_http_client=None,
     ):
         """Initialize a new Sumo object
 
@@ -54,8 +56,19 @@ class SumoClient:
         self._verbosity = verbosity
 
         self._retry_strategy = retry_strategy
-        self._client = httpx.Client()
-        self._async_client = httpx.AsyncClient()
+        if http_client is None:
+            self._client = httpx.Client()
+            self._borrowed_client = False
+        else:
+            self._client = http_client
+            self._borrowed_client = True
+
+        if async_http_client is None:
+            self._async_client = httpx.AsyncClient()
+            self._borrowed_async_client = False
+        else:
+            self._async_client = async_http_client
+            self._borrowed_async_client = True
 
         self._timeout = timeout
 
@@ -81,6 +94,9 @@ class SumoClient:
                 refresh_token = token
                 pass
             pass
+
+        cleanup_shared_keys()
+
         self.auth = get_auth_provider(
             client_id=APP_REGISTRATION[env]["CLIENT_ID"],
             authority=f"{AUTHORITY_HOST_URI}/{TENANT_ID}",
@@ -103,7 +119,8 @@ class SumoClient:
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
-        self._client.close()
+        if not self._borrowed_client:
+            self._client.close()
         self._client = None
         return False
 
@@ -111,16 +128,17 @@ class SumoClient:
         return self
 
     async def __aexit__(self, exc_type, exc_value, traceback):
-        await self._async_client.aclose()
+        if not self._borrowed_async_client:
+            await self._async_client.aclose()
         self._async_client = None
         return False
 
     def __del__(self):
-        if self._client is not None:
+        if self._client is not None and not self._borrowed_client:
             self._client.close()
-            self._client = None
             pass
-        if self._async_client is not None:
+        self._client = None
+        if self._async_client is not None and not self._borrowed_async_client:
 
             async def closeit(client):
                 await client.aclose()
@@ -131,8 +149,8 @@ class SumoClient:
                 loop.create_task(closeit(self._async_client))
             except RuntimeError:
                 pass
-            self._async_client = None
             pass
+        self._async_client = None
 
     def authenticate(self):
         if self.auth is None:

{sumo_wrapper_python-1.0.22 → sumo_wrapper_python-1.0.24}/src/sumo_wrapper_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sumo-wrapper-python
-Version: 1.0.22
+Version: 1.0.24
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License