sumo-wrapper-python 1.3.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

sumo/wrapper/_auth_provider.py

@@ -99,6 +99,9 @@ class AuthProvider:
             get_token_path(self._resource_id, ".sharedkey", case_uuid)
         )
 
+    def delete_token(self):
+        return False
+
     pass
 
 
@@ -400,9 +403,10 @@ class AuthProviderSumoToken(AuthProvider):
     def __init__(self, resource_id, case_uuid=None):
         super().__init__(resource_id)
         protect_token_cache(resource_id, ".sharedkey", case_uuid)
-        token_path = get_token_path(resource_id, ".sharedkey", case_uuid)
-        with open(token_path, "r") as f:
+        self.token_path = get_token_path(resource_id, ".sharedkey", case_uuid)
+        with open(self.token_path, "r") as f:
             self._token = f.readline().strip()
+
         return
 
     def get_token(self):
@@ -411,6 +415,11 @@ class AuthProviderSumoToken(AuthProvider):
     def get_authorization(self):
         return {"X-SUMO-Token": self._token}
 
+    def delete_token(self):
+        if os.path.exists(self.token_path):
+            os.unlink(self.token_path)
+        return True
+
 
 @tn.retry(
     retry=tn.retry_if_exception(_maybe_nfs_exception),

sumo/wrapper/_decorators.py

@@ -4,11 +4,13 @@ from functools import wraps
 
 def raise_for_status(func):
     @wraps(func)
-    def wrapper(*args, **kwargs):
+    def wrapper(self, *args, **kwargs):
         # FIXME: in newer versions of httpx, raise_for_status() is chainable,
         # so we could simply write
         # return func(*args, **kwargs).raise_for_status()
-        response = func(*args, **kwargs)
+        response = func(self, *args, **kwargs)
+        if response.status_code == 401:
+            self._handle_invalid_shared_key()
         response.raise_for_status()
         return response
 
@@ -17,11 +19,13 @@ def raise_for_status(func):
 
 def raise_for_status_async(func):
     @wraps(func)
-    async def wrapper(*args, **kwargs):
+    async def wrapper(self, *args, **kwargs):
         # FIXME: in newer versions of httpx, raise_for_status() is chainable,
         # so we could simply write
         # return func(*args, **kwargs).raise_for_status()
-        response = await func(*args, **kwargs)
+        response = await func(self, *args, **kwargs)
+        if response.status_code == 401:
+            self._handle_invalid_shared_key()
         response.raise_for_status()
         return response
 

sumo/wrapper/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.0'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.5.0'
+__version_tuple__ = version_tuple = (1, 5, 0)
 
 __commit_id__ = commit_id = None

sumo/wrapper/sumo_client.py

@@ -1,6 +1,7 @@
 import asyncio
 import contextlib
 import logging
+import os
 import re
 import time
 from typing import Dict, Optional, Tuple
@@ -16,12 +17,15 @@ from ._decorators import (
 )
 from ._logging import LogHandlerSumo
 from ._retry_strategy import RetryStrategy
-from .config import APP_REGISTRATION, AUTHORITY_HOST_URI, TENANT_ID
 
 logger = logging.getLogger("sumo.wrapper")
 
 DEFAULT_TIMEOUT = httpx.Timeout(30.0)
 
+WELL_KNOWN = os.environ.get(
+    "SUMOCONNECTIONINFO", "https://api.sumo.equinor.com/well-known"
+)
+
 
 class SumoClient:
     """Authenticate and perform requests to the Sumo API."""
@@ -31,7 +35,7 @@ class SumoClient:
 
     def __init__(
         self,
-        env: str,
+        env: str = "prod",
         token: Optional[str] = None,
         interactive: bool = True,
         devicecode: bool = False,
@@ -41,22 +45,46 @@ class SumoClient:
         case_uuid=None,
         http_client=None,
         async_http_client=None,
+        client_id: Optional[str] = None,
     ):
         """Initialize a new Sumo object
 
         Args:
-            env: Sumo environment
-            token: Access token or refresh token.
-            interactive: Enable interactive authentication (in browser).
-                If not enabled, code grant flow will be used.
-            verbosity: Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
+            env (str): Sumo environment. Defaults to "prod".
+            token (Optional[str]): Access token or refresh token. Defaults to None.
+            interactive (bool): Enable interactive authentication (in browser).
+                If not enabled, code grant flow will be used. Defaults to True.
+            devicecode (bool): Enable device code flow. Defaults to False.
+            verbosity (str): Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL).
+                Defaults to "CRITICAL".
+            retry_strategy (RetryStrategy): Retry strategy for HTTP requests.
+                Defaults to RetryStrategy().
+            timeout (int): Timeout for HTTP requests. Defaults to DEFAULT_TIMEOUT.
+            case_uuid (Optional[str]): Case UUID for authentication. Defaults to None.
+            http_client (Optional[httpx.Client]): HTTP client for synchronous requests.
+                Defaults to None.
+            async_http_client (Optional[httpx.AsyncClient]): HTTP client for asynchronous requests.
+                Defaults to None.
+            client_id (Optional[str]): Client ID for authentication. If None, will use
+                AZURE_CLIENT_ID from environment variables or the config. Defaults to None.
         """
 
         logger.setLevel(verbosity)
 
-        if env not in APP_REGISTRATION:
+        well_known = httpx.get(WELL_KNOWN).json()
+        if env not in well_known["envs"]:
             raise ValueError(f"Invalid environment: {env}")
 
+        tenant_id = well_known["tenant_id"]
+        authority_host = well_known["authority"]
+        config = well_known["envs"][env]
+        resource_id = config["resource_id"]
+        base_url = config["base_url"]
+        self.client_id = (
+            client_id
+            or os.environ.get("AZURE_CLIENT_ID")
+            or config["client_id"]
+        )
         self.env = env
         self._verbosity = verbosity
 
@@ -101,11 +129,10 @@ class SumoClient:
             pass
 
         cleanup_shared_keys()
-
         self.auth = get_auth_provider(
-            client_id=APP_REGISTRATION[env]["CLIENT_ID"],
-            authority=f"{AUTHORITY_HOST_URI}/{TENANT_ID}",
-            resource_id=APP_REGISTRATION[env]["RESOURCE_ID"],
+            client_id=self.client_id,
+            authority=f"{authority_host}{tenant_id}",
+            resource_id=resource_id,
             interactive=interactive,
             refresh_token=refresh_token,
             access_token=access_token,
@@ -113,14 +140,7 @@ class SumoClient:
             case_uuid=case_uuid,
         )
 
-        if env == "prod":
-            self.base_url = "https://api.sumo.equinor.com/api/v1"
-        elif env == "localhost":
-            self.base_url = "http://localhost:8084/api/v1"
-        else:
-            self.base_url = (
-                f"https://main-sumo-core-{env}.c3.radix.equinor.com/api/v1"
-            )
+        self.base_url = base_url
         return
 
     def __enter__(self):
@@ -188,6 +208,13 @@ class SumoClient:
             self._retry_strategy,
         )
 
+    def _handle_invalid_shared_key(self):
+        """Handle the invalid shared key by deleting it."""
+        if self.auth.delete_token():
+            print(
+                "Invalid shared key detected and deleted, run again to reset automatically"
+            )
+
     @raise_for_status
     def get(self, path: str, params: Optional[Dict] = None) -> httpx.Response:
         """Performs a GET-request to the Sumo API.

{sumo_wrapper_python-1.3.0.dist-info → sumo_wrapper_python-1.5.0.dist-info}/METADATA

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

sumo_wrapper_python-1.5.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
+sumo/wrapper/__init__.py,sha256=JK6iMAy2Fdrc7iaIHTn60fHPdRvsgNjZwWD6DJtGUYQ,235
+sumo/wrapper/_auth_provider.py,sha256=SJRu8lRkSryFPI6Nevveny_QMFfGfhQwzk9ef5TmMNE,16665
+sumo/wrapper/_blob_client.py,sha256=SyfyFZ1hHVWKU4lmgUqSjl5TaK_OJNQ__0wDETrp-ag,1623
+sumo/wrapper/_decorators.py,sha256=ZwyrWkfAXiGNSgYsQSEXA13D-WIQM2XPf0v2z9N8HyQ,1002
+sumo/wrapper/_logging.py,sha256=WAGrjPmK2_JC9w1IxT5onq1iEAreEsyzmm95pXBe0dA,1074
+sumo/wrapper/_retry_strategy.py,sha256=JSXy-ki5vWI_N4D52LpK9EoAmPrnT3H6OG0aBLsJRMk,2525
+sumo/wrapper/_version.py,sha256=sfeo6QRBwy3wEFaKhAEbFPpF98FLjoe4Car1c6NnghQ,704
+sumo/wrapper/login.py,sha256=Bp5IgSrsgjWcgOQIQIQ5aJrCBWdK3khS-CnTmB63Rjk,1951
+sumo/wrapper/sumo_client.py,sha256=W1s-ENTRXHgP7GPocuJu1KSpdAzA7bGecS9lQt5T-W0,23028
+sumo_wrapper_python-1.5.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sumo_wrapper_python-1.5.0.dist-info/METADATA,sha256=LFC9vB8mBHjF6LBTUl_v582ScotGLsJzmJfTKEk609w,14615
+sumo_wrapper_python-1.5.0.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+sumo_wrapper_python-1.5.0.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
+sumo_wrapper_python-1.5.0.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
+sumo_wrapper_python-1.5.0.dist-info/RECORD,,

{sumo_wrapper_python-1.3.0.dist-info → sumo_wrapper_python-1.5.0.dist-info}/WHEEL

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

sumo/wrapper/config.py

@@ -1,26 +0,0 @@
-APP_REGISTRATION = {
-    "prod": {
-        "CLIENT_ID": "d57a8f87-4e28-4391-84d6-34356d5876a2",
-        "RESOURCE_ID": "9e5443dd-3431-4690-9617-31eed61cb55a",
-    },
-    "test": {
-        "CLIENT_ID": "d57a8f87-4e28-4391-84d6-34356d5876a2",
-        "RESOURCE_ID": "9e5443dd-3431-4690-9617-31eed61cb55a",
-    },
-    "dev": {
-        "CLIENT_ID": "1826bd7c-582f-4838-880d-5b4da5c3eea2",
-        "RESOURCE_ID": "88d2b022-3539-4dda-9e66-853801334a86",
-    },
-    "preview": {
-        "CLIENT_ID": "1826bd7c-582f-4838-880d-5b4da5c3eea2",
-        "RESOURCE_ID": "88d2b022-3539-4dda-9e66-853801334a86",
-    },
-    "localhost": {
-        "CLIENT_ID": "1826bd7c-582f-4838-880d-5b4da5c3eea2",
-        "RESOURCE_ID": "88d2b022-3539-4dda-9e66-853801334a86",
-    },
-}
-
-TENANT_ID = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0"
-
-AUTHORITY_HOST_URI = "https://login.microsoftonline.com"

sumo_wrapper_python-1.3.0.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=du15SjkJ7eDEITbAJXdx6y1L4RALpSpsDrw9zE9E3fI,16472
-sumo/wrapper/_blob_client.py,sha256=SyfyFZ1hHVWKU4lmgUqSjl5TaK_OJNQ__0wDETrp-ag,1623
-sumo/wrapper/_decorators.py,sha256=3IEi6GXVkkDACHoo8dOeDoBtZh5TlJ6Tw0qlpOVHqLQ,806
-sumo/wrapper/_logging.py,sha256=WAGrjPmK2_JC9w1IxT5onq1iEAreEsyzmm95pXBe0dA,1074
-sumo/wrapper/_retry_strategy.py,sha256=JSXy-ki5vWI_N4D52LpK9EoAmPrnT3H6OG0aBLsJRMk,2525
-sumo/wrapper/_version.py,sha256=0Oc4EBzGTJOvXX0Vym4evglW1NQPpe8RLn8TdxsKzfs,704
-sumo/wrapper/config.py,sha256=6t7qqjrrmd11m4VMlRryiMYw2JDU_R51305woAP1TAs,865
-sumo/wrapper/login.py,sha256=Bp5IgSrsgjWcgOQIQIQ5aJrCBWdK3khS-CnTmB63Rjk,1951
-sumo/wrapper/sumo_client.py,sha256=toWsk_5yrVYWfVF1SgmF-lKN-NQ3YNszikZk1xeS8wE,21660
-sumo_wrapper_python-1.3.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sumo_wrapper_python-1.3.0.dist-info/METADATA,sha256=S6VEoUsqpP3Z1VFL-mnKmZ1Dqw6i0Ft3oPuXcgU1Ujk,14615
-sumo_wrapper_python-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sumo_wrapper_python-1.3.0.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
-sumo_wrapper_python-1.3.0.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
-sumo_wrapper_python-1.3.0.dist-info/RECORD,,