sumo-wrapper-python 1.0.22__py3-none-any.whl → 1.0.23__py3-none-any.whl

sumo/wrapper/_auth_provider.py

@@ -5,6 +5,7 @@ import stat
 import sys
 import time
 from datetime import datetime, timedelta
+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,36 @@ class AuthProvider:
         ) as f:
             f.write(token)
         protect_token_cache(self._resource_id, ".sharedkey", case_uuid)
+        return
+
+    def cleanup_shared_keys(self):
+        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.utcnow()
+                            if now > end:
+                                os.unlink(ff)
+                                pass
+                            pass
+                        pass
+                    except Exception:
+                        pass
+                pass
+            pass
+        return
 
     def has_case_token(self, case_uuid):
         return os.path.exists(

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/_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.23'
+__version_tuple__ = version_tuple = (1, 0, 23)

sumo/wrapper/sumo_client.py

@@ -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
 
@@ -92,6 +105,8 @@ class SumoClient:
             case_uuid=case_uuid,
         )
 
+        self.auth.cleanup_shared_keys()
+
         if env == "localhost":
             self.base_url = "http://localhost:8084/api/v1"
         else:
@@ -103,7 +118,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 +127,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 +148,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.dist-info → sumo_wrapper_python-1.0.23.dist-info}/METADATA

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

sumo_wrapper_python-1.0.23.dist-info/RECORD

@@ -0,0 +1,17 @@
+sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
+sumo/wrapper/__init__.py,sha256=JK6iMAy2Fdrc7iaIHTn60fHPdRvsgNjZwWD6DJtGUYQ,235
+sumo/wrapper/_auth_provider.py,sha256=Fcg62itYF8MfQit9wa191ZA5kFL4tGFobp7ESVi4qy0,15697
+sumo/wrapper/_blob_client.py,sha256=SyfyFZ1hHVWKU4lmgUqSjl5TaK_OJNQ__0wDETrp-ag,1623
+sumo/wrapper/_decorators.py,sha256=3IEi6GXVkkDACHoo8dOeDoBtZh5TlJ6Tw0qlpOVHqLQ,806
+sumo/wrapper/_logging.py,sha256=jOtMpiVJcF38QBM4ER1VDdHom777L5MkfomtOVHXgu8,1060
+sumo/wrapper/_retry_strategy.py,sha256=m4mK-ZQDr0CSOZGN9ZleZyRSR07PjUjAis3WXXR4jwk,2490
+sumo/wrapper/_version.py,sha256=f2afgyfNj59Aqh0DnuaBrzxyqz1K0o3bJu1DsISS4g4,413
+sumo/wrapper/config.py,sha256=6t7qqjrrmd11m4VMlRryiMYw2JDU_R51305woAP1TAs,865
+sumo/wrapper/login.py,sha256=PGYhKnrwV4NorNbwnWj-5LDvCCIKgn-pnvCTeCDvqXA,2375
+sumo/wrapper/sumo_client.py,sha256=pDJNWSxsTolZWo-xON45bjtVuq3TdiJFTq3R2U_kzhU,18330
+sumo_wrapper_python-1.0.23.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sumo_wrapper_python-1.0.23.dist-info/METADATA,sha256=__ZBI1la4s9lygtBzmlPEC2U8NlYJCiZBPV9RLaCXiA,14593
+sumo_wrapper_python-1.0.23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+sumo_wrapper_python-1.0.23.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
+sumo_wrapper_python-1.0.23.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
+sumo_wrapper_python-1.0.23.dist-info/RECORD,,

sumo_wrapper_python-1.0.22.dist-info/RECORD

@@ -1,17 +0,0 @@
-sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
-sumo/wrapper/__init__.py,sha256=JK6iMAy2Fdrc7iaIHTn60fHPdRvsgNjZwWD6DJtGUYQ,235
-sumo/wrapper/_auth_provider.py,sha256=rmnqRm_o5D9DLt4XBtiJ_CIWV3PJ-BVbq6lFGaPNtUg,14665
-sumo/wrapper/_blob_client.py,sha256=SyfyFZ1hHVWKU4lmgUqSjl5TaK_OJNQ__0wDETrp-ag,1623
-sumo/wrapper/_decorators.py,sha256=3IEi6GXVkkDACHoo8dOeDoBtZh5TlJ6Tw0qlpOVHqLQ,806
-sumo/wrapper/_logging.py,sha256=jOtMpiVJcF38QBM4ER1VDdHom777L5MkfomtOVHXgu8,1060
-sumo/wrapper/_retry_strategy.py,sha256=qDgl_FLec94fzZaCG__BT8tO4O-D5cZ2_JRYw1zjVTI,2495
-sumo/wrapper/_version.py,sha256=i5YNpOqJi5ga7622RoO_H7qsCctndrnXe5nHT2I-0OA,413
-sumo/wrapper/config.py,sha256=6t7qqjrrmd11m4VMlRryiMYw2JDU_R51305woAP1TAs,865
-sumo/wrapper/login.py,sha256=PGYhKnrwV4NorNbwnWj-5LDvCCIKgn-pnvCTeCDvqXA,2375
-sumo/wrapper/sumo_client.py,sha256=vWmiQgUJG9hE4YCORujSs4HbsPIEasFXBKk3DiL48fY,17708
-sumo_wrapper_python-1.0.22.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sumo_wrapper_python-1.0.22.dist-info/METADATA,sha256=l63vM35g9ecsxfF6RhCt_oEIMApzBlZHC7HEJ0enrA8,14593
-sumo_wrapper_python-1.0.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-sumo_wrapper_python-1.0.22.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
-sumo_wrapper_python-1.0.22.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
-sumo_wrapper_python-1.0.22.dist-info/RECORD,,