sumo-wrapper-python 1.4.0__py3-none-any.whl → 1.6.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
 
 
@@ -322,8 +325,8 @@ class AuthProviderDeviceCode(AuthProvider):
             if "error" in flow:
                 print(
                     "\n\n \033[31m"
-                    + "Failed to initiate device-code login. Err: %s"
-                    + "\033[0m" % json.dumps(flow, indent=4)
+                    + "Failed to initiate device-code login. Err: %s\033[0m"
+                    % json.dumps(flow, indent=4)
                 )
                 return
             flow["expires_at"] = (
@@ -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

@@ -1,5 +1,6 @@
-# file generated by setuptools-scm
+# file generated by vcs-versioning
 # don't change, don't track in version control
+from __future__ import annotations
 
 __all__ = [
     "__version__",
@@ -10,25 +11,14 @@ __all__ = [
     "commit_id",
 ]
 
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
 version: str
 __version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
 
-__version__ = version = '1.4.0'
-__version_tuple__ = version_tuple = (1, 4, 0)
+__version__ = version = '1.6.0'
+__version_tuple__ = version_tuple = (1, 6, 0)
 
 __commit_id__ = commit_id = None

sumo/wrapper/login.py

@@ -8,6 +8,8 @@ logger.setLevel(level="CRITICAL")
 
 modes = ["interactive", "devicecode", "silent"]
 
+fmu_sumo_uploader_client_id = "a65dc4cc-3dec-43df-9599-e66d3abc4dca"
+
 
 def get_parser() -> ArgumentParser:
     parser = ArgumentParser(description="Login to Sumo on azure")
@@ -47,6 +49,16 @@ def get_parser() -> ArgumentParser:
         help="Print access token",
     )
 
+    parser.add_argument(
+        "-u",
+        "--uploader",
+        dest="client_id",
+        action="store_const",
+        const=fmu_sumo_uploader_client_id,
+        default=None,
+        help="Use fmu-sumo-uploader client registration",
+    )
+
     return parser
 
 
@@ -54,6 +66,7 @@ def main():
     args = get_parser().parse_args()
     logger.setLevel(level=args.verbosity)
     env = args.env
+    client_id = args.client_id
     mode = args.mode
     is_interactive = mode == "interactive"
     is_devicecode = mode == "devicecode"
@@ -71,6 +84,7 @@ def main():
         env,
         interactive=is_interactive,
         devicecode=is_devicecode,
+        client_id=client_id,
     )
     token = sumo.authenticate()
 

sumo/wrapper/sumo_client.py

@@ -208,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.4.0.dist-info → sumo_wrapper_python-1.6.0.dist-info}/METADATA

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

sumo_wrapper_python-1.6.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=XO2WcEJjQuXsDhFZ3wplOL_plxNdAqk2yw2jzv3iLSQ,16660
+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=1J23hr68olyCiSnbHNYm6VGnkzB4hDCEmJzkxBTNSWo,520
+sumo/wrapper/login.py,sha256=PtpQ5Qi8Gm1N0hMnE79Je4QvQ8JMuKqa46TwZgjHRnM,2328
+sumo/wrapper/sumo_client.py,sha256=W1s-ENTRXHgP7GPocuJu1KSpdAzA7bGecS9lQt5T-W0,23028
+sumo_wrapper_python-1.6.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sumo_wrapper_python-1.6.0.dist-info/METADATA,sha256=EUIXN978Z2yuKBTQcOO2dTK1ogVFpnfYozboqDxFww0,14615
+sumo_wrapper_python-1.6.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sumo_wrapper_python-1.6.0.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
+sumo_wrapper_python-1.6.0.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
+sumo_wrapper_python-1.6.0.dist-info/RECORD,,

{sumo_wrapper_python-1.4.0.dist-info → sumo_wrapper_python-1.6.0.dist-info}/WHEEL

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

sumo_wrapper_python-1.4.0.dist-info/RECORD

@@ -1,16 +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=qX8_mGjWClM0QeMyVAByaVXEA4Pk87fxkFSMEQx9-KM,704
-sumo/wrapper/login.py,sha256=Bp5IgSrsgjWcgOQIQIQ5aJrCBWdK3khS-CnTmB63Rjk,1951
-sumo/wrapper/sumo_client.py,sha256=oGck7xvDwebdcwiygck91_oIiX6VVLjyrDK46sxGEYY,22763
-sumo_wrapper_python-1.4.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sumo_wrapper_python-1.4.0.dist-info/METADATA,sha256=ENzPCU_6Mr488nu2rXQzUM0eyPJjyrJ5s8RZlyZGvpU,14615
-sumo_wrapper_python-1.4.0.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-sumo_wrapper_python-1.4.0.dist-info/entry_points.txt,sha256=V_vGky2C3He5vohJAxnBdvpt_fqfUDFj5irUm9HtoFc,55
-sumo_wrapper_python-1.4.0.dist-info/top_level.txt,sha256=rLbKyH9rWgCj3PoLeR7fvC5X8vCaUc5LF8-Y_GBWZL0,5
-sumo_wrapper_python-1.4.0.dist-info/RECORD,,