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

sumo_wrapper_python-1.6.0/.github/pull_request_template.md

@@ -0,0 +1,15 @@
+ ## Issue
+_Link to the issue resolved by this PR._
+
+## Description
+_Description of the approach taken to solve the issue._
+
+## How to test
+_How to verify the changes._
+
+## Checklist
+- [ ] No redundant \`print()\` statements, commented-out code, or other remnants from the development 👀
+- [ ] New/refactored code is following same conventions as the rest of the code base 🧬
+- [ ] New/refactored code is tested ⚙
+- [ ] Documentation has been updated 🧾
+- [ ] Commits are semantic ✅

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

@@ -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.4.0 → sumo_wrapper_python-1.6.0}/src/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_python-1.4.0 → sumo_wrapper_python-1.6.0}/src/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_python-1.6.0/src/sumo/wrapper/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '1.6.0'
+__version_tuple__ = version_tuple = (1, 6, 0)
+
+__commit_id__ = commit_id = 'gcfd9c4112'

{sumo_wrapper_python-1.4.0 → sumo_wrapper_python-1.6.0}/src/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_python-1.4.0 → sumo_wrapper_python-1.6.0}/src/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 → sumo_wrapper_python-1.6.0}/src/sumo_wrapper_python.egg-info/PKG-INFO

@@ -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.4.0 → sumo_wrapper_python-1.6.0}/src/sumo_wrapper_python.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ LICENSE
 README.md
 SECURITY.md
 pyproject.toml
+.github/pull_request_template.md
 .github/workflows/build_docs.yaml
 .github/workflows/linting.yml
 .github/workflows/publish_release.yml

{sumo_wrapper_python-1.4.0 → sumo_wrapper_python-1.6.0}/tests/test_sumo_thin_client.py

@@ -50,8 +50,7 @@ def _upload_child_level_json(conn, parent_id, json):
 
 
 def _delete_object(conn, object_id):
-    response = conn.delete(f"/objects('{object_id}')").json()
-
+    response = conn.delete(f"/objects('{object_id}')")
     return response
 
 
@@ -144,7 +143,7 @@ def test_upload_search_delete_ensemble_child(token):
 
     # Delete Ensemble
     result = _delete_object(conn=sumo_client, object_id=case_id)
-    assert result == "Accepted"
+    assert result.text == "Accepted."
 
     sleep(40)
 
@@ -210,7 +209,7 @@ def test_upload_duplicate_ensemble(token):
     # Delete Ensemble
     sleep(5)
     result = _delete_object(conn=conn, object_id=case_id1)
-    assert result == "Accepted"
+    assert result.text == "Accepted."
 
     # Ugly: sumo-core has a cache for case objects, which has a
     # time-to-live of 60 seconds. If there are multiple replicas

sumo_wrapper_python-1.4.0/src/sumo/wrapper/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "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__ = version = '1.4.0'
-__version_tuple__ = version_tuple = (1, 4, 0)
-
-__commit_id__ = commit_id = 'g8c4d4a4f8'