sumo-wrapper-python 1.3.0__tar.gz → 1.4.0__tar.gz

{sumo_wrapper_python-1.3.0 → sumo_wrapper_python-1.4.0}/.gitignore

@@ -1,6 +1,7 @@
 __pycache__/
 *.py[cod]
 .DS_Store
+.idea*
 *~
 _venv
 venv

{sumo_wrapper_python-1.3.0 → sumo_wrapper_python-1.4.0}/PKG-INFO

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

{sumo_wrapper_python-1.3.0 → sumo_wrapper_python-1.4.0}/src/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.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)
 
-__commit_id__ = commit_id = 'g650a0d132'
+__commit_id__ = commit_id = 'g8c4d4a4f8'

{sumo_wrapper_python-1.3.0 → sumo_wrapper_python-1.4.0}/src/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):

{sumo_wrapper_python-1.3.0 → sumo_wrapper_python-1.4.0}/src/sumo_wrapper_python.egg-info/PKG-INFO

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

{sumo_wrapper_python-1.3.0 → sumo_wrapper_python-1.4.0}/src/sumo_wrapper_python.egg-info/SOURCES.txt

@@ -29,7 +29,6 @@ src/sumo/wrapper/_decorators.py
 src/sumo/wrapper/_logging.py
 src/sumo/wrapper/_retry_strategy.py
 src/sumo/wrapper/_version.py
-src/sumo/wrapper/config.py
 src/sumo/wrapper/login.py
 src/sumo/wrapper/sumo_client.py
 src/sumo_wrapper_python.egg-info/PKG-INFO

sumo_wrapper_python-1.3.0/src/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"