sumo-wrapper-python 1.9.0__py3-none-any.whl → 1.11.0__py3-none-any.whl

sumo/wrapper/_auth_provider.py

@@ -9,6 +9,7 @@ from datetime import UTC, datetime, timedelta
 from pathlib import Path
 from urllib.parse import parse_qs
 
+import httpx
 import jwt
 import msal
 import tenacity as tn
@@ -64,7 +65,10 @@ class AuthProvider:
         retry_error_callback=_return_last_value,
         before_sleep=_log_retry_info,
     )
-    def get_token(self):
+    def get_token(self) -> str | None:
+        if self._app is None:
+            return None
+        assert isinstance(self._app, msal.PublicClientApplication)
         accounts = self._app.get_accounts()
         if len(accounts) == 0:
             return None
@@ -81,6 +85,18 @@ class AuthProvider:
 
         return {"Authorization": "Bearer " + token}
 
+    def invalidate_access_tokens(self):
+        if self._app is not None:
+            assert isinstance(self._app, msal.PublicClientApplication)
+            assert isinstance(self._app.token_cache, PersistedTokenCache)
+            access_tokens = list(
+                self._app.token_cache.search(
+                    self._app.token_cache.CredentialType.ACCESS_TOKEN
+                )
+            )
+            for access_token in access_tokens:
+                self._app.token_cache.remove_at(access_token)
+
     def store_shared_access_key_for_case(self, case_uuid, token):
         os.makedirs(get_token_dir(), mode=0o700, exist_ok=True)
         with open(
@@ -90,6 +106,17 @@ class AuthProvider:
             f.write(token)
         protect_token_cache(self._resource_id, ".sharedkey", case_uuid)
 
+    def _store_fallback_auth(self, sumo_client):
+        sync_client = sumo_client._client
+        if sync_client is None:
+            sumo_client._client = httpx.Client()
+        token = sumo_client.get("/createfallbackauth").text
+        self.store_shared_access_key_for_case("fallback", token)
+        sumo_client._client = sync_client
+
+    def store_fallback_auth(self, sumo_client):
+        return
+
     def has_case_token(self, case_uuid):
         return os.path.exists(
             get_token_path(self._resource_id, ".sharedkey", case_uuid)
@@ -115,6 +142,9 @@ class AuthProviderSilent(AuthProvider):
 
         self._scope = scope_for_resource(resource_id)
 
+    def store_fallback_auth(self, sumo_client):
+        self._store_fallback_auth(sumo_client)
+
 
 class AuthProviderAccessToken(AuthProvider):
     def __init__(self, access_token):
@@ -268,6 +298,9 @@ class AuthProviderInteractive(AuthProvider):
         )
         return
 
+    def store_fallback_auth(self, sumo_client):
+        self._store_fallback_auth(sumo_client)
+
 
 class AuthProviderDeviceCode(AuthProvider):
     def __init__(self, client_id, authority, resource_id):
@@ -451,12 +484,15 @@ def get_auth_provider(
             )
             os.environ["BROWSER"] = "firefox"
 
-        return AuthProviderInteractive(client_id, authority, resource_id)
+        auth_interactive = AuthProviderInteractive(
+            client_id, authority, resource_id
+        )
+        token = auth_interactive.get_token()
+        if token is not None:
+            return auth_interactive
     # ELSE
-    if devicecode:
-        # Potential issues with device-code
-        # under Equinor compliant device policy
-        return AuthProviderDeviceCode(client_id, authority, resource_id)
+    if os.path.exists(get_token_path(resource_id, ".sharedkey", "fallback")):
+        return AuthProviderSumoToken(resource_id, "fallback")
     # ELSE
     return AuthProviderNone(resource_id)
 

sumo/wrapper/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.9.0'
-__version_tuple__ = version_tuple = (1, 9, 0)
+__version__ = version = '1.11.0'
+__version_tuple__ = version_tuple = (1, 11, 0)
 
 __commit_id__ = commit_id = None

sumo/wrapper/sumo_client.py

@@ -149,7 +149,11 @@ class SumoClient:
 
         self.base_url = base_url
 
+        with contextlib.suppress(Exception):
+            self.auth.store_fallback_auth(self)
+
     def __enter__(self):
+
         return self
 
     def __exit__(self, *_):
@@ -184,6 +188,11 @@ class SumoClient:
             return None
         return self.auth.get_token()
 
+    def invalidate_access_tokens(self):
+        if self.auth is None:
+            return None
+        return self.auth.invalidate_access_tokens()
+
     @property
     def blob_client(self) -> BlobClient:
         """Get blob_client

{sumo_wrapper_python-1.9.0.dist-info → sumo_wrapper_python-1.11.0.dist-info}/METADATA

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

sumo_wrapper_python-1.11.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
+sumo/wrapper/__init__.py,sha256=srvnJZqUgtAWhvjsM8ovl4dPcppZNU8MXRZszicrUoA,235
+sumo/wrapper/_auth_provider.py,sha256=lE74AFtwBqWNK9rCje6BdW9NaL8Kip7HQJVQ-eE_rxM,17527
+sumo/wrapper/_blob_client.py,sha256=QLJmgjFZk44jgxhbFed95JbQ1a69xpO6eQJFuTKyU3A,1608
+sumo/wrapper/_decorators.py,sha256=ZwyrWkfAXiGNSgYsQSEXA13D-WIQM2XPf0v2z9N8HyQ,1002
+sumo/wrapper/_logging.py,sha256=Au77-3D9eYTK0FhaNQLQV6Pl4sKJi0PpQjcUfCckLus,1144
+sumo/wrapper/_retry_strategy.py,sha256=D-4aayNv9BrDrEYMRhkhod6szvyw5d9oZvTekAa4BBI,2624
+sumo/wrapper/_version.py,sha256=R0RDH1rwZiqBhqHMW83hcuYNyE-V-M_xo-8QDd6aazQ,522
+sumo/wrapper/login.py,sha256=PtpQ5Qi8Gm1N0hMnE79Je4QvQ8JMuKqa46TwZgjHRnM,2328
+sumo/wrapper/sumo_client.py,sha256=FKGSIDMMQQdWitZc68afc-Jgdw4bi9uK_8GutlvucPw,24537
+sumo_wrapper_python-1.11.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sumo_wrapper_python-1.11.0.dist-info/METADATA,sha256=I68WxWzuRaRq3ACd9zqyH_wL4WY6aUX9rTecjYdfSSQ,14616
+sumo_wrapper_python-1.11.0.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+sumo_wrapper_python-1.11.0.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
+sumo_wrapper_python-1.11.0.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
+sumo_wrapper_python-1.11.0.dist-info/RECORD,,

{sumo_wrapper_python-1.9.0.dist-info → sumo_wrapper_python-1.11.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.0.0)
+Generator: setuptools (84.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sumo_wrapper_python-1.9.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
-sumo/wrapper/__init__.py,sha256=srvnJZqUgtAWhvjsM8ovl4dPcppZNU8MXRZszicrUoA,235
-sumo/wrapper/_auth_provider.py,sha256=CkTdDVjQ9DTkoHiaFSC_f4mSFaAlYYKi0w2XaE3NMTg,16171
-sumo/wrapper/_blob_client.py,sha256=QLJmgjFZk44jgxhbFed95JbQ1a69xpO6eQJFuTKyU3A,1608
-sumo/wrapper/_decorators.py,sha256=ZwyrWkfAXiGNSgYsQSEXA13D-WIQM2XPf0v2z9N8HyQ,1002
-sumo/wrapper/_logging.py,sha256=Au77-3D9eYTK0FhaNQLQV6Pl4sKJi0PpQjcUfCckLus,1144
-sumo/wrapper/_retry_strategy.py,sha256=D-4aayNv9BrDrEYMRhkhod6szvyw5d9oZvTekAa4BBI,2624
-sumo/wrapper/_version.py,sha256=OUQ9Ng15kRCe7xhTtcSldmCpPE9ugON0d9kKGsiC7-c,520
-sumo/wrapper/login.py,sha256=PtpQ5Qi8Gm1N0hMnE79Je4QvQ8JMuKqa46TwZgjHRnM,2328
-sumo/wrapper/sumo_client.py,sha256=zROiw6I-zY9kkVsjXz5xN1D6KC8G_jb0Xd175gyp_3E,24295
-sumo_wrapper_python-1.9.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sumo_wrapper_python-1.9.0.dist-info/METADATA,sha256=BHunLpm0o2wwvndk3okJ4uFRynuu9DD0pqpH6p19oYc,14615
-sumo_wrapper_python-1.9.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-sumo_wrapper_python-1.9.0.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
-sumo_wrapper_python-1.9.0.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
-sumo_wrapper_python-1.9.0.dist-info/RECORD,,