sumo-wrapper-python 1.0.26__tar.gz → 1.0.28__tar.gz

{sumo_wrapper_python-1.0.26 → sumo_wrapper_python-1.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sumo-wrapper-python
-Version: 1.0.26
+Version: 1.0.28
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License
@@ -229,6 +229,7 @@ Requires-Dist: sphinxcontrib-apidoc; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Dynamic: license-file
 
 # sumo-wrapper-python
 

{sumo_wrapper_python-1.0.26 → sumo_wrapper_python-1.0.28}/src/sumo/wrapper/_auth_provider.py

@@ -7,6 +7,7 @@ import sys
 import time
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
+from typing import Dict
 from urllib.parse import parse_qs
 
 import jwt
@@ -76,10 +77,10 @@ class AuthProvider:
         # ELSE
         return result["access_token"]
 
-    def get_authorization(self):
+    def get_authorization(self) -> Dict:
         token = self.get_token()
         if token is None:
-            return ""
+            return {}
 
         return {"Authorization": "Bearer " + token}
 
@@ -101,6 +102,13 @@ class AuthProvider:
     pass
 
 
+class AuthProviderNone(AuthProvider):
+    def get_token(self):
+        raise Exception("No valid authorization provider found.")
+
+    pass
+
+
 class AuthProviderSilent(AuthProvider):
     def __init__(self, client_id, authority, resource_id):
         super().__init__(resource_id)
@@ -423,7 +431,7 @@ def get_auth_provider(
     refresh_token=None,
     devicecode=False,
     case_uuid=None,
-):
+) -> AuthProvider:
     if refresh_token:
         return AuthProviderRefreshToken(
             refresh_token, client_id, authority, resource_id
@@ -435,6 +443,9 @@ def get_auth_provider(
     if os.path.exists(get_token_path(resource_id, ".sharedkey", case_uuid)):
         return AuthProviderSumoToken(resource_id, case_uuid)
     # ELSE
+    if os.path.exists(get_token_path(resource_id, ".sharedkey")):
+        return AuthProviderSumoToken(resource_id)
+    # ELSE
     if os.path.exists(get_token_path(resource_id, ".token")):
         auth_silent = AuthProviderSilent(client_id, authority, resource_id)
         token = auth_silent.get_token()
@@ -472,6 +483,8 @@ def get_auth_provider(
         ]
     ):
         return AuthProviderManaged(resource_id)
+    # ELSE
+    return AuthProviderNone(resource_id)
 
 
 def cleanup_shared_keys():
@@ -481,7 +494,7 @@ def cleanup_shared_keys():
     for f in os.listdir(tokendir):
         ff = os.path.join(tokendir, f)
         if os.path.isfile(ff):
-            (name, ext) = os.path.splitext(ff)
+            (_, ext) = os.path.splitext(ff)
             if ext.lower() == ".sharedkey":
                 try:
                     with open(ff, "r") as file:

{sumo_wrapper_python-1.0.26 → sumo_wrapper_python-1.0.28}/src/sumo/wrapper/_logging.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 
 class LogHandlerSumo(logging.Handler):
@@ -11,8 +11,8 @@ class LogHandlerSumo(logging.Handler):
     def emit(self, record):
         try:
             dt = (
-                datetime.now(datetime.timezone.utc)
-                .replace(microsecond=0)
+                datetime.now(timezone.utc)
+                .replace(microsecond=0, tzinfo=None)
                 .isoformat()
                 + "Z"
             )

{sumo_wrapper_python-1.0.26 → sumo_wrapper_python-1.0.28}/src/sumo/wrapper/_retry_strategy.py

@@ -44,7 +44,7 @@ class RetryStrategy:
         self._exp_base = exp_base
         return
 
-    def make_retryer(self):
+    def make_retryer(self) -> tn.Retrying:
         return tn.Retrying(
             stop=tn.stop_after_attempt(self._stop_after),
             retry=(
@@ -63,7 +63,7 @@ class RetryStrategy:
             before_sleep=_log_retry_info,
         )
 
-    def make_retryer_async(self):
+    def make_retryer_async(self) -> tn.AsyncRetrying:
         return tn.AsyncRetrying(
             stop=tn.stop_after_attempt(self._stop_after),
             retry=(

{sumo_wrapper_python-1.0.26 → sumo_wrapper_python-1.0.28}/src/sumo/wrapper/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.26'
-__version_tuple__ = version_tuple = (1, 0, 26)
+__version__ = version = '1.0.28'
+__version_tuple__ = version_tuple = (1, 0, 28)

{sumo_wrapper_python-1.0.26 → sumo_wrapper_python-1.0.28}/src/sumo/wrapper/sumo_client.py

@@ -3,6 +3,7 @@ import contextlib
 import logging
 import re
 import time
+from typing import Dict, Optional, Tuple
 
 import httpx
 import jwt
@@ -25,11 +26,14 @@ DEFAULT_TIMEOUT = httpx.Timeout(30.0)
 class SumoClient:
     """Authenticate and perform requests to the Sumo API."""
 
+    _client: httpx.Client
+    _async_client: httpx.AsyncClient
+
     def __init__(
         self,
         env: str,
-        token: str = None,
-        interactive: bool = False,
+        token: Optional[str] = None,
+        interactive: bool = True,
         devicecode: bool = False,
         verbosity: str = "CRITICAL",
         retry_strategy=RetryStrategy(),
@@ -119,26 +123,23 @@ class SumoClient:
     def __enter__(self):
         return self
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def __exit__(self, *_):
         if not self._borrowed_client:
             self._client.close()
-        self._client = None
         return False
 
     async def __aenter__(self):
         return self
 
-    async def __aexit__(self, exc_type, exc_value, traceback):
+    async def __aexit__(self, *_):
         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 and not self._borrowed_client:
             self._client.close()
             pass
-        self._client = None
         if self._async_client is not None and not self._borrowed_async_client:
 
             async def closeit(client):
@@ -151,7 +152,6 @@ class SumoClient:
             except RuntimeError:
                 pass
             pass
-        self._async_client = None
 
     def authenticate(self):
         if self.auth is None:
@@ -186,7 +186,7 @@ class SumoClient:
         )
 
     @raise_for_status
-    def get(self, path: str, params: dict = None) -> dict:
+    def get(self, path: str, params: Optional[Dict] = None) -> httpx.Response:
         """Performs a GET-request to the Sumo API.
 
         Args:
@@ -247,9 +247,9 @@ class SumoClient:
     def post(
         self,
         path: str,
-        blob: bytes = None,
-        json: dict = None,
-        params: dict = None,
+        blob: Optional[bytes] = None,
+        json: Optional[dict] = None,
+        params: Optional[dict] = None,
     ) -> httpx.Response:
         """Performs a POST-request to the Sumo API.
 
@@ -320,7 +320,10 @@ class SumoClient:
 
     @raise_for_status
     def put(
-        self, path: str, blob: bytes = None, json: dict = None
+        self,
+        path: str,
+        blob: Optional[bytes] = None,
+        json: Optional[dict] = None,
     ) -> httpx.Response:
         """Performs a PUT-request to the Sumo API.
 
@@ -365,7 +368,9 @@ class SumoClient:
         return retryer(_put)
 
     @raise_for_status
-    def delete(self, path: str, params: dict = None) -> dict:
+    def delete(
+        self, path: str, params: Optional[dict] = None
+    ) -> httpx.Response:
         """Performs a DELETE-request to the Sumo API.
 
         Args:
@@ -402,12 +407,12 @@ class SumoClient:
 
         return retryer(_delete)
 
-    def _get_retry_details(self, response_in):
+    def _get_retry_details(self, response_in) -> Tuple[str, int]:
         assert response_in.status_code == 202, (
             "Incorrect status code; expcted 202"
         )
         headers = response_in.headers
-        location = headers.get("location")
+        location: str = headers.get("location")
         assert location is not None, "Missing header: Location"
         assert location.startswith(self.base_url)
         retry_after = headers.get("retry-after")
@@ -440,7 +445,6 @@ class SumoClient:
                 )
             location, retry_after = self._get_retry_details(response)
             pass
-        return None  # should never get here.
 
     def getLogger(self, name):
         """Gets a logger object that sends log objects into the message_log
@@ -495,7 +499,9 @@ class SumoClient:
             return self
 
     @raise_for_status_async
-    async def get_async(self, path: str, params: dict = None):
+    async def get_async(
+        self, path: str, params: Optional[dict] = None
+    ) -> httpx.Response:
         """Performs an async GET-request to the Sumo API.
 
         Args:
@@ -556,9 +562,9 @@ class SumoClient:
     async def post_async(
         self,
         path: str,
-        blob: bytes = None,
-        json: dict = None,
-        params: dict = None,
+        blob: Optional[bytes] = None,
+        json: Optional[dict] = None,
+        params: Optional[dict] = None,
     ) -> httpx.Response:
         """Performs an async POST-request to the Sumo API.
 
@@ -630,7 +636,10 @@ class SumoClient:
 
     @raise_for_status_async
     async def put_async(
-        self, path: str, blob: bytes = None, json: dict = None
+        self,
+        path: str,
+        blob: Optional[bytes] = None,
+        json: Optional[dict] = None,
     ) -> httpx.Response:
         """Performs an async PUT-request to the Sumo API.
 
@@ -675,7 +684,9 @@ class SumoClient:
         return await retryer(_put)
 
     @raise_for_status_async
-    async def delete_async(self, path: str, params: dict = None) -> dict:
+    async def delete_async(
+        self, path: str, params: Optional[dict] = None
+    ) -> httpx.Response:
         """Performs an async DELETE-request to the Sumo API.
 
         Args:
@@ -736,4 +747,3 @@ class SumoClient:
                 )
             location, retry_after = self._get_retry_details(response)
             pass
-        return None  # should never get here.

{sumo_wrapper_python-1.0.26 → sumo_wrapper_python-1.0.28}/src/sumo_wrapper_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sumo-wrapper-python
-Version: 1.0.26
+Version: 1.0.28
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License
@@ -229,6 +229,7 @@ Requires-Dist: sphinxcontrib-apidoc; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Dynamic: license-file
 
 # sumo-wrapper-python