sumo-wrapper-python 1.0.9__py3-none-any.whl → 1.0.10__py3-none-any.whl

sumo/wrapper/_auth_provider.py

@@ -1,5 +1,3 @@
-import platform
-from pathlib import Path
 import msal
 import os
 from datetime import datetime, timedelta
@@ -71,6 +69,18 @@ class AuthProvider:
     pass
 
 
+class AuthProviderSilent(AuthProvider):
+    def __init__(self, client_id, authority, resource_id):
+        super().__init__(resource_id)
+        cache = get_token_cache(resource_id, ".token")
+        self._app = msal.PublicClientApplication(
+            client_id=client_id, authority=authority, token_cache=cache
+        )
+        self._resource_id = resource_id
+
+        self._scope = scope_for_resource(resource_id)
+
+
 class AuthProviderAccessToken(AuthProvider):
     def __init__(self, access_token):
         self._access_token = access_token
@@ -396,6 +406,11 @@ def get_auth_provider(
     if os.path.exists(get_token_path(resource_id, ".sharedkey")):
         return AuthProviderSumoToken(resource_id)
     # ELSE
+    auth_silent = AuthProviderSilent(client_id, authority, resource_id)
+    token = auth_silent.get_token()
+    if token is not None:
+        return auth_silent
+    # ELSE
     if interactive:
         return AuthProviderInteractive(client_id, authority, resource_id)
     # ELSE
@@ -416,12 +431,3 @@ def get_auth_provider(
         ]
     ):
         return AuthProviderManaged(resource_id)
-    # ELSE
-    lockfile_path = Path.home() / ".config/chromium/SingletonLock"
-    if Path(lockfile_path).is_symlink() and not str(
-        Path(lockfile_path).resolve()
-    ).__contains__(platform.node()):
-        # https://github.com/equinor/sumo-wrapper-python/issues/193
-        return AuthProviderDeviceCode(client_id, authority, resource_id)
-    # ELSE
-    return AuthProviderInteractive(client_id, authority, resource_id)

sumo/wrapper/_blob_client.py

@@ -1,17 +1,16 @@
-import httpx
-
 from ._decorators import (
     raise_for_status,
     raise_for_status_async,
 )
 
-from ._retry_strategy import RetryStrategy
-
 
 class BlobClient:
     """Upload blobs to blob store using pre-authorized URLs"""
 
-    def __init__(self, retry_strategy=RetryStrategy()):
+    def __init__(self, client, async_client, timeout, retry_strategy):
+        self._client = client
+        self._async_client = async_client
+        self._timeout = timeout
         self._retry_strategy = retry_strategy
         return
 
@@ -30,7 +29,9 @@ class BlobClient:
         }
 
         def _put():
-            return httpx.put(url, content=blob, headers=headers)
+            return self._client.put(
+                url, content=blob, headers=headers, timeout=self._timeout
+            )
 
         retryer = self._retry_strategy.make_retryer()
 
@@ -51,8 +52,9 @@ class BlobClient:
         }
 
         async def _put():
-            async with httpx.AsyncClient() as client:
-                return await client.put(url=url, content=blob, headers=headers)
+            return await self._async_client.put(
+                url=url, content=blob, headers=headers, timeout=self._timeout
+            )
 
         retryer = self._retry_strategy.make_retryer_async()
 

sumo/wrapper/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.9'
-__version_tuple__ = version_tuple = (1, 0, 9)
+__version__ = version = '1.0.10'
+__version_tuple__ = version_tuple = (1, 0, 10)

sumo/wrapper/login.py

@@ -1,5 +1,6 @@
 import logging
-
+import platform
+from pathlib import Path
 from argparse import ArgumentParser
 from sumo.wrapper import SumoClient
 
@@ -7,6 +8,8 @@ from sumo.wrapper import SumoClient
 logger = logging.getLogger("sumo.wrapper")
 logger.setLevel(level="CRITICAL")
 
+modes = ["interactive", "devicecode", "silent"]
+
 
 def get_parser() -> ArgumentParser:
     parser = ArgumentParser(description="Login to Sumo on azure")
@@ -29,21 +32,12 @@ def get_parser() -> ArgumentParser:
     )
 
     parser.add_argument(
-        "-i",
-        "--interactive",
-        dest="interactive",
-        action="store_true",
-        default=False,
-        help="Login interactively",
-    )
-
-    parser.add_argument(
-        "-d",
-        "--devicecode",
-        dest="devicecode",
-        action="store_true",
-        default=False,
-        help="Login with device-code",
+        "-m",
+        "--mode",
+        dest="mode",
+        action="store",
+        default="interactive",
+        help=f"Valid modes: {', '.join(modes)}",
     )
 
     parser.add_argument(
@@ -62,22 +56,48 @@ def main():
     args = get_parser().parse_args()
     logger.setLevel(level=args.verbosity)
     env = args.env
+    mode = args.mode
+    is_interactive = mode == "interactive"
+    is_devicecode = mode == "devicecode"
+
     logger.debug("env is %s", env)
 
-    print("Login to Sumo environment: " + env)
+    if mode not in modes:
+        print(f"Invalid mode: {mode}")
+        return 1
+
+    if mode != "silent":
+        print("Login to Sumo environment: " + env)
+
+    if mode == "interactive":
+        lockfile_path = Path.home() / ".config/chromium/SingletonLock"
+
+        if Path(lockfile_path).is_symlink() and not str(
+            Path(lockfile_path).resolve()
+        ).__contains__(platform.node()):
+            # https://github.com/equinor/sumo-wrapper-python/issues/193
+            is_interactive = False
+            is_devicecode = True
 
     sumo = SumoClient(
-        args.env, interactive=args.interactive, devicecode=args.devicecode
+        env,
+        interactive=is_interactive,
+        devicecode=is_devicecode,
     )
     token = sumo.authenticate()
 
-    if args.print_token:
-        print(f"TOKEN: {token}")
+    if mode != "silent":
+        if args.print_token:
+            print(token)
+
+        if token is not None:
+            print("Successfully logged in to Sumo environment: " + env)
+        else:
+            print("Failed login to Sumo environment: " + env)
 
-    if token is not None:
-        print("Successfully logged in to Sumo environment: " + env)
-    else:
-        print("Failed login to Sumo environment: " + env)
+    if token is None:
+        return 1
+    return 0
 
 
 if __name__ == "__main__":

sumo/wrapper/sumo_client.py

@@ -1,7 +1,6 @@
 import logging
-
+import asyncio
 import httpx
-
 import jwt
 
 from ._blob_client import BlobClient
@@ -18,7 +17,7 @@ from ._retry_strategy import RetryStrategy
 
 logger = logging.getLogger("sumo.wrapper")
 
-DEFAULT_TIMEOUT = httpx.Timeout(20.0)
+DEFAULT_TIMEOUT = httpx.Timeout(30.0)
 
 
 class SumoClient:
@@ -32,6 +31,7 @@ class SumoClient:
         devicecode: bool = False,
         verbosity: str = "CRITICAL",
         retry_strategy=RetryStrategy(),
+        timeout=DEFAULT_TIMEOUT,
     ):
         """Initialize a new Sumo object
 
@@ -49,7 +49,10 @@ class SumoClient:
             raise ValueError(f"Invalid environment: {env}")
 
         self._retry_strategy = retry_strategy
-        self._blob_client = BlobClient(retry_strategy)
+        self._client = httpx.Client(follow_redirects=True)
+        self._async_client = httpx.AsyncClient(follow_redirects=True)
+
+        self._timeout = timeout
 
         access_token = None
         refresh_token = None
@@ -84,27 +87,6 @@ class SumoClient:
             access_token=access_token,
             devicecode=devicecode,
         )
-        if (
-            self.auth.get_token() is None
-            and refresh_token is None
-            and access_token is None
-        ):
-            print("\n \033[31m !!! Falling back to device-code login:\033[0m")
-            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"],
-                interactive=False,
-                refresh_token=None,
-                access_token=None,
-                devicecode=True,
-            )
-        if self.auth.get_token() is None:
-            print(
-                "\n\n \033[31m "
-                + "NOTE! Login failed/timed out. Giving up."
-                + "\033[0m"
-            )
 
         if env == "localhost":
             self.base_url = "http://localhost:8084/api/v1"
@@ -113,7 +95,44 @@ class SumoClient:
             pass
         return
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self._client.close()
+        self._client = None
+        return False
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc_value, traceback):
+        await self._async_client.aclose()
+        self._async_client = None
+        return False
+
+    def __del__(self):
+        if self._client is not None:
+            self._client.close()
+            self._client = None
+            pass
+        if self._async_client is not None:
+
+            async def closeit(client):
+                await client.aclose()
+                return
+
+            try:
+                loop = asyncio.get_running_loop()
+                loop.create_task(closeit(self._async_client))
+            except RuntimeError:
+                pass
+            self._async_client = None
+            pass
+
     def authenticate(self):
+        if self.auth is None:
+            return None
         return self.auth.get_token()
 
     @property
@@ -136,7 +155,12 @@ class SumoClient:
                 await sumo.blob_client.upload_blob_async(blob, blob_url)
         """
 
-        return self._blob_client
+        return BlobClient(
+            self._client,
+            self._async_client,
+            self._timeout,
+            self._retry_strategy,
+        )
 
     @raise_for_status
     def get(self, path: str, params: dict = None) -> dict:
@@ -174,12 +198,12 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         def _get():
-            return httpx.get(
+            return self._client.get(
                 f"{self.base_url}{path}",
                 params=params,
                 headers=headers,
                 follow_redirects=True,
-                timeout=DEFAULT_TIMEOUT,
+                timeout=self._timeout,
             )
 
         retryer = self._retry_strategy.make_retryer()
@@ -248,13 +272,13 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         def _post():
-            return httpx.post(
+            return self._client.post(
                 f"{self.base_url}{path}",
                 content=blob,
                 json=json,
                 headers=headers,
                 params=params,
-                timeout=DEFAULT_TIMEOUT,
+                timeout=self._timeout,
             )
 
         retryer = self._retry_strategy.make_retryer()
@@ -295,12 +319,12 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         def _put():
-            return httpx.put(
+            return self._client.put(
                 f"{self.base_url}{path}",
                 content=blob,
                 json=json,
                 headers=headers,
-                timeout=DEFAULT_TIMEOUT,
+                timeout=self._timeout,
             )
 
         retryer = self._retry_strategy.make_retryer()
@@ -334,11 +358,11 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         def _delete():
-            return httpx.delete(
+            return self._client.delete(
                 f"{self.base_url}{path}",
                 headers=headers,
                 params=params,
-                timeout=DEFAULT_TIMEOUT,
+                timeout=self._timeout,
             )
 
         retryer = self._retry_strategy.make_retryer()
@@ -399,13 +423,12 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         async def _get():
-            async with httpx.AsyncClient(follow_redirects=True) as client:
-                return await client.get(
-                    f"{self.base_url}{path}",
-                    params=params,
-                    headers=headers,
-                    timeout=DEFAULT_TIMEOUT,
-                )
+            return await self._async_client.get(
+                f"{self.base_url}{path}",
+                params=params,
+                headers=headers,
+                timeout=self._timeout,
+            )
 
         retryer = self._retry_strategy.make_retryer_async()
 
@@ -474,15 +497,14 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         async def _post():
-            async with httpx.AsyncClient() as client:
-                return await client.post(
-                    url=f"{self.base_url}{path}",
-                    content=blob,
-                    json=json,
-                    headers=headers,
-                    params=params,
-                    timeout=DEFAULT_TIMEOUT,
-                )
+            return await self._async_client.post(
+                url=f"{self.base_url}{path}",
+                content=blob,
+                json=json,
+                headers=headers,
+                params=params,
+                timeout=self._timeout,
+            )
 
         retryer = self._retry_strategy.make_retryer_async()
 
@@ -522,14 +544,13 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         async def _put():
-            async with httpx.AsyncClient() as client:
-                return await client.put(
-                    url=f"{self.base_url}{path}",
-                    content=blob,
-                    json=json,
-                    headers=headers,
-                    timeout=DEFAULT_TIMEOUT,
-                )
+            return await self._async_client.put(
+                url=f"{self.base_url}{path}",
+                content=blob,
+                json=json,
+                headers=headers,
+                timeout=self._timeout,
+            )
 
         retryer = self._retry_strategy.make_retryer_async()
 
@@ -562,13 +583,12 @@ class SumoClient:
         headers.update(self.auth.get_authorization())
 
         async def _delete():
-            async with httpx.AsyncClient() as client:
-                return await client.delete(
-                    url=f"{self.base_url}{path}",
-                    headers=headers,
-                    params=params,
-                    timeout=DEFAULT_TIMEOUT,
-                )
+            return await self._async_client.delete(
+                url=f"{self.base_url}{path}",
+                headers=headers,
+                params=params,
+                timeout=self._timeout,
+            )
 
         retryer = self._retry_strategy.make_retryer_async()
 

{sumo_wrapper_python-1.0.9.dist-info → sumo_wrapper_python-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sumo-wrapper-python
-Version: 1.0.9
+Version: 1.0.10
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License: Apache License
@@ -211,25 +211,26 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: msal >=1.20.0
-Requires-Dist: msal-extensions >=1.0.0
-Requires-Dist: pyjwt >=2.4.0
-Requires-Dist: httpx >=0.24.1
-Requires-Dist: tenacity >=8.2.2
-Requires-Dist: azure-identity >=1.13.0
+Requires-Dist: msal>=1.20.0
+Requires-Dist: msal-extensions>=1.0.0
+Requires-Dist: pyjwt>=2.4.0
+Requires-Dist: httpx>=0.24.1
+Requires-Dist: tenacity!=8.4.0,>=8.2.2
+Requires-Dist: azure-identity>=1.13.0
 Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
-Requires-Dist: autoapi ; extra == 'docs'
-Requires-Dist: sphinx-autodoc-typehints ; extra == 'docs'
-Requires-Dist: sphinxcontrib-apidoc ; extra == 'docs'
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Requires-Dist: autoapi; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
+Requires-Dist: sphinxcontrib-apidoc; extra == "docs"
 Provides-Extra: test
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: PyYAML ; extra == 'test'
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: PyYAML; extra == "test"
 
 # sumo-wrapper-python
 
 [![Documentation Status](https://readthedocs.org/projects/sumo-wrapper-python/badge/?version=latest)](https://sumo-wrapper-python.readthedocs.io/en/latest/?badge=latest)
+[![SCM Compliance](https://scm-compliance-api.radix.equinor.com/repos/equinor/sumo-wrapper-python/badge)](https://scm-compliance-api.radix.equinor.com/repos/equinor/sumo-wrapper-python/badge)
 
 ## Documentation and guidelines
 [sumo-wrapper-python documentation](https://sumo-wrapper-python.readthedocs.io/en/latest/)

sumo_wrapper_python-1.0.10.dist-info/RECORD

@@ -0,0 +1,17 @@
+sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
+sumo/wrapper/__init__.py,sha256=wW7Bjl0btCgK9_exGVrfJsnFmTOybIdyeCudz0LueQM,235
+sumo/wrapper/_auth_provider.py,sha256=PGLOnQmOC77caKfEZaSNLmETrN48PNBZtatiJnzrzOI,13618
+sumo/wrapper/_blob_client.py,sha256=SyfyFZ1hHVWKU4lmgUqSjl5TaK_OJNQ__0wDETrp-ag,1623
+sumo/wrapper/_decorators.py,sha256=3IEi6GXVkkDACHoo8dOeDoBtZh5TlJ6Tw0qlpOVHqLQ,806
+sumo/wrapper/_logging.py,sha256=lnhjn6oQna33jZpzeZ7IeBya2uKNfrzXr_C3nw7txo0,965
+sumo/wrapper/_retry_strategy.py,sha256=9PjOT0hOhLbCHrJu02thUkGdY39NpB2rqa_XUODoguw,2415
+sumo/wrapper/_version.py,sha256=6mwHFYvRmuR_NDSMZ-tZ0hVgwAgYaLihPiAGrb850ks,413
+sumo/wrapper/config.py,sha256=6t7qqjrrmd11m4VMlRryiMYw2JDU_R51305woAP1TAs,865
+sumo/wrapper/login.py,sha256=IlENRNdSc2UPmGdrcxjziovMVYpV40qQSnAuDy5LKh4,2375
+sumo/wrapper/sumo_client.py,sha256=Td2K1MkSP_ZDD2AIWcMmvFrwugtBWdDdme8h3VWSGJk,15707
+sumo_wrapper_python-1.0.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sumo_wrapper_python-1.0.10.dist-info/METADATA,sha256=PR41RcBbNUOYGFvT1KuhgTCqqRpdHVi2hJlOxxsINDI,14455
+sumo_wrapper_python-1.0.10.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+sumo_wrapper_python-1.0.10.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
+sumo_wrapper_python-1.0.10.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
+sumo_wrapper_python-1.0.10.dist-info/RECORD,,

{sumo_wrapper_python-1.0.9.dist-info → sumo_wrapper_python-1.0.10.dist-info}/WHEEL

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

sumo_wrapper_python-1.0.9.dist-info/RECORD

@@ -1,17 +0,0 @@
-sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
-sumo/wrapper/__init__.py,sha256=wW7Bjl0btCgK9_exGVrfJsnFmTOybIdyeCudz0LueQM,235
-sumo/wrapper/_auth_provider.py,sha256=HieseMcqT9lMBqgyzwL5Pr6CCyk-eFjKyYhJQx8UKRw,13494
-sumo/wrapper/_blob_client.py,sha256=y15_TThJ4ENFtEAF37mgju6Htc8D3ZyzcYCqsYQZo7Y,1495
-sumo/wrapper/_decorators.py,sha256=3IEi6GXVkkDACHoo8dOeDoBtZh5TlJ6Tw0qlpOVHqLQ,806
-sumo/wrapper/_logging.py,sha256=lnhjn6oQna33jZpzeZ7IeBya2uKNfrzXr_C3nw7txo0,965
-sumo/wrapper/_retry_strategy.py,sha256=9PjOT0hOhLbCHrJu02thUkGdY39NpB2rqa_XUODoguw,2415
-sumo/wrapper/_version.py,sha256=29gfaFnVGHlO4YwJu6vgvQjCQwPqDmuCvkEOYMZyflo,411
-sumo/wrapper/config.py,sha256=6t7qqjrrmd11m4VMlRryiMYw2JDU_R51305woAP1TAs,865
-sumo/wrapper/login.py,sha256=HY3CLu3u0RZtgSbitpdyk2T0P-M9ttZ6LRDsGO4BwRM,1773
-sumo/wrapper/sumo_client.py,sha256=Mjco-nFF28GgmjXgDmGmXmFXr7LJI50M54zL0zt3CJs,15545
-sumo_wrapper_python-1.0.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sumo_wrapper_python-1.0.9.dist-info/METADATA,sha256=pmewZzDIe8sALypH6d9EVNxBr5qiuoCFlW5MfBjytSg,14267
-sumo_wrapper_python-1.0.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sumo_wrapper_python-1.0.9.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
-sumo_wrapper_python-1.0.9.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
-sumo_wrapper_python-1.0.9.dist-info/RECORD,,