sumo-wrapper-python 1.0.13__py3-none-any.whl → 1.0.15__py3-none-any.whl

sumo/wrapper/__init__.py

@@ -1,5 +1,5 @@
-from .sumo_client import SumoClient
 from ._retry_strategy import RetryStrategy
+from .sumo_client import SumoClient
 
 try:
     from ._version import version

sumo/wrapper/_auth_provider.py

@@ -1,19 +1,19 @@
-import msal
+import errno
+import json
 import os
-from datetime import datetime, timedelta
 import stat
 import sys
-import json
-import jwt
 import time
-from azure.identity import ManagedIdentityCredential
-import tenacity as tn
-from ._retry_strategy import _log_retry_info, _return_last_value
+from datetime import datetime, timedelta
 
+import jwt
+import msal
+import tenacity as tn
+from azure.identity import ManagedIdentityCredential
 from msal_extensions.persistence import FilePersistence
 from msal_extensions.token_cache import PersistedTokenCache
-import errno
 
+from ._retry_strategy import _log_retry_info, _return_last_value
 
 if not sys.platform.startswith("linux"):
     from msal_extensions import build_encrypted_persistence
@@ -422,14 +422,12 @@ def get_auth_provider(
         return AuthProviderDeviceCode(client_id, authority, resource_id)
     # ELSE
     if all(
-        [
-            os.getenv(x)
-            for x in [
-                "AZURE_FEDERATED_TOKEN_FILE",
-                "AZURE_TENANT_ID",
-                "AZURE_CLIENT_ID",
-                "AZURE_AUTHORITY_HOST",
-            ]
+        os.getenv(x)
+        for x in [
+            "AZURE_FEDERATED_TOKEN_FILE",
+            "AZURE_TENANT_ID",
+            "AZURE_CLIENT_ID",
+            "AZURE_AUTHORITY_HOST",
         ]
     ):
         return AuthProviderManaged(resource_id)

sumo/wrapper/_logging.py

@@ -3,14 +3,19 @@ from datetime import datetime
 
 
 class LogHandlerSumo(logging.Handler):
-    def __init__(self, sumoClient):
+    def __init__(self, sumo_client):
         logging.Handler.__init__(self)
-        self._sumoClient = sumoClient
+        self._sumoClient = sumo_client
         return
 
     def emit(self, record):
         try:
-            dt = datetime.utcnow().replace(microsecond=0).isoformat() + "Z"
+            dt = (
+                datetime.now(datetime.timezone.utc)
+                .replace(microsecond=0)
+                .isoformat()
+                + "Z"
+            )
             json = {
                 "severity": record.levelname,
                 "message": record.getMessage(),
@@ -20,7 +25,7 @@ class LogHandlerSumo(logging.Handler):
                 "funcname": record.funcName,
                 "linenumber": record.lineno,
             }
-            if "objectUuid" in record.__dict__.keys():
+            if "objectUuid" in record.__dict__:
                 json["objectUuid"] = record.__dict__.get("objectUuid")
 
             self._sumoClient.post("/message-log/new", json=json)

sumo/wrapper/_retry_strategy.py

@@ -1,5 +1,5 @@
-import tenacity as tn
 import httpx
+import tenacity as tn
 
 
 def _log_retry_info(retry_state):

sumo/wrapper/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.13'
-__version_tuple__ = version_tuple = (1, 0, 13)
+__version__ = version = '1.0.15'
+__version_tuple__ = version_tuple = (1, 0, 15)

sumo/wrapper/login.py

@@ -1,9 +1,9 @@
 import logging
 import platform
-from pathlib import Path
 from argparse import ArgumentParser
-from sumo.wrapper import SumoClient
+from pathlib import Path
 
+from sumo.wrapper import SumoClient
 
 logger = logging.getLogger("sumo.wrapper")
 logger.setLevel(level="CRITICAL")

sumo/wrapper/sumo_client.py

@@ -1,19 +1,20 @@
-import logging
 import asyncio
+import contextlib
+import logging
+import re
+
 import httpx
 import jwt
 
-from ._blob_client import BlobClient
-from ._logging import LogHandlerSumo
 from ._auth_provider import get_auth_provider
-from .config import APP_REGISTRATION, TENANT_ID, AUTHORITY_HOST_URI
-
+from ._blob_client import BlobClient
 from ._decorators import (
     raise_for_status,
     raise_for_status_async,
 )
-
+from ._logging import LogHandlerSumo
 from ._retry_strategy import RetryStrategy
+from .config import APP_REGISTRATION, AUTHORITY_HOST_URI, TENANT_ID
 
 logger = logging.getLogger("sumo.wrapper")
 
@@ -49,8 +50,8 @@ class SumoClient:
             raise ValueError(f"Invalid environment: {env}")
 
         self._retry_strategy = retry_strategy
-        self._client = httpx.Client(follow_redirects=True)
-        self._async_client = httpx.AsyncClient(follow_redirects=True)
+        self._client = httpx.Client()
+        self._async_client = httpx.AsyncClient()
 
         self._timeout = timeout
 
@@ -60,12 +61,10 @@ class SumoClient:
             logger.debug("Token provided")
 
             payload = None
-            try:
+            with contextlib.suppress(jwt.InvalidTokenError):
                 payload = jwt.decode(
                     token, options={"verify_signature": False}
                 )
-            except jwt.InvalidTokenError:
-                pass
 
             if payload:
                 logger.debug(f"Token decoded as JWT, payload: {payload}")
@@ -197,12 +196,22 @@ class SumoClient:
 
         headers.update(self.auth.get_authorization())
 
+        follow_redirects = False
+        if (
+            re.match(
+                r"^/objects\('[0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}'\)/blob$",  # noqa: E501
+                path,
+            )
+            is not None
+        ):
+            follow_redirects = True
+
         def _get():
             return self._client.get(
                 f"{self.base_url}{path}",
                 params=params,
                 headers=headers,
-                follow_redirects=True,
+                follow_redirects=follow_redirects,
                 timeout=self._timeout,
             )
 
@@ -369,7 +378,7 @@ class SumoClient:
 
         return retryer(_delete)
 
-    def getLogger(self, name):
+    def get_logger(self, name):
         """Gets a logger object that sends log objects into the message_log
         index for the Sumo instance.
 
@@ -424,11 +433,22 @@ class SumoClient:
 
         headers.update(self.auth.get_authorization())
 
+        follow_redirects = False
+        if (
+            re.match(
+                r"^/objects\('[0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}'\)/blob$",  # noqa: E501
+                path,
+            )
+            is not None
+        ):
+            follow_redirects = True
+
         async def _get():
             return await self._async_client.get(
                 f"{self.base_url}{path}",
                 params=params,
                 headers=headers,
+                follow_redirects=follow_redirects,
                 timeout=self._timeout,
             )
 

{sumo_wrapper_python-1.0.13.dist-info → sumo_wrapper_python-1.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sumo-wrapper-python
-Version: 1.0.13
+Version: 1.0.15
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License: Apache License
@@ -217,6 +217,9 @@ 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: dev
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx==7.1.2; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

sumo_wrapper_python-1.0.15.dist-info/RECORD

@@ -0,0 +1,17 @@
+sumo/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
+sumo/wrapper/__init__.py,sha256=JK6iMAy2Fdrc7iaIHTn60fHPdRvsgNjZwWD6DJtGUYQ,235
+sumo/wrapper/_auth_provider.py,sha256=ZPwqapMRnzSySq9uXT4cavWaIQcff4IPbxb3sHbxhQg,13661
+sumo/wrapper/_blob_client.py,sha256=SyfyFZ1hHVWKU4lmgUqSjl5TaK_OJNQ__0wDETrp-ag,1623
+sumo/wrapper/_decorators.py,sha256=3IEi6GXVkkDACHoo8dOeDoBtZh5TlJ6Tw0qlpOVHqLQ,806
+sumo/wrapper/_logging.py,sha256=jOtMpiVJcF38QBM4ER1VDdHom777L5MkfomtOVHXgu8,1060
+sumo/wrapper/_retry_strategy.py,sha256=qDgl_FLec94fzZaCG__BT8tO4O-D5cZ2_JRYw1zjVTI,2495
+sumo/wrapper/_version.py,sha256=jEnaeEof2ggMD0wz8kIGv1b-OQvXJDcVBOnxoO7WWV0,413
+sumo/wrapper/config.py,sha256=6t7qqjrrmd11m4VMlRryiMYw2JDU_R51305woAP1TAs,865
+sumo/wrapper/login.py,sha256=PGYhKnrwV4NorNbwnWj-5LDvCCIKgn-pnvCTeCDvqXA,2375
+sumo/wrapper/sumo_client.py,sha256=pOx2ahRe1rXonH2PAnQWZ_S3XFv1n3P9qU5Pt-oe1Oc,16424
+sumo_wrapper_python-1.0.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sumo_wrapper_python-1.0.15.dist-info/METADATA,sha256=a2p1BGlGPdahGCkc55MnQ9VzPAsPkNsgdCN0w0Fu6_I,14560
+sumo_wrapper_python-1.0.15.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+sumo_wrapper_python-1.0.15.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
+sumo_wrapper_python-1.0.15.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
+sumo_wrapper_python-1.0.15.dist-info/RECORD,,

sumo_wrapper_python-1.0.13.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=O7Yqw4xfEWCJXF_jAX0zosT4bSPUtbDLYZ46aQWJ4k4,13709
-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=_V-KzAyP1nAeHf1lhc_syxlaKj5CQz-tIsCYs2DONe0,2495
-sumo/wrapper/_version.py,sha256=CZ8Zo1p2pk-2aVQ1p1ONwv-G7Nuh-enuBbQWiK4K-Fs,413
-sumo/wrapper/config.py,sha256=6t7qqjrrmd11m4VMlRryiMYw2JDU_R51305woAP1TAs,865
-sumo/wrapper/login.py,sha256=IlENRNdSc2UPmGdrcxjziovMVYpV40qQSnAuDy5LKh4,2375
-sumo/wrapper/sumo_client.py,sha256=itx4zZBMA7JmgPOEVRI37_QNpJPpBvK7UokeLMRgnvE,15770
-sumo_wrapper_python-1.0.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sumo_wrapper_python-1.0.13.dist-info/METADATA,sha256=1Pa2-GVAakpaspTypl2boMl4BxAfv_uxezUldnEWs68,14462
-sumo_wrapper_python-1.0.13.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-sumo_wrapper_python-1.0.13.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
-sumo_wrapper_python-1.0.13.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
-sumo_wrapper_python-1.0.13.dist-info/RECORD,,