fmu-sumo 2.3.7__tar.gz → 2.3.9__tar.gz

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/.github/workflows/run_tests.yaml

@@ -3,8 +3,6 @@ name: Build and test fmu-sumo
 on:
   pull_request:
     branches: [main]
-  schedule:
-    - cron: "4 4 * * *"
   workflow_dispatch:
 
 jobs:

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/.gitignore

@@ -106,3 +106,6 @@ testing.ipynb
 
 # emacs backup files
 *~
+
+# Ignore macOS system files
+*.DS_Store

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fmu-sumo
-Version: 2.3.7
+Version: 2.3.9
 Summary: Python package for interacting with Sumo in an FMU setting
 Author: Equinor
 License:                                  Apache License
@@ -235,6 +235,7 @@ 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"
+Dynamic: license-file
 
 # fmu-sumo
 

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/src/fmu/sumo/explorer/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.7'
-__version_tuple__ = version_tuple = (2, 3, 7)
+__version__ = version = '2.3.9'
+__version_tuple__ = version_tuple = (2, 3, 9)

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/src/fmu/sumo/explorer/explorer.py

@@ -1,11 +1,13 @@
 """Module containing class for exploring results from sumo"""
 
 import warnings
+from typing import Optional
 
 import httpx
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._search_context import SearchContext
+from .objects._search_context import SearchContext
+from .objects.cases import Cases
 
 
 class Explorer(SearchContext):
@@ -25,9 +27,9 @@ class Explorer(SearchContext):
     def __init__(
         self,
         env: str = "prod",
-        token: str = None,
+        token: Optional[str] = None,
         interactive: bool = True,
-        keep_alive: str = None,
+        keep_alive: Optional[str] = None,
         http_client=None,
         async_http_client=None,
     ):
@@ -56,9 +58,10 @@ class Explorer(SearchContext):
 
     @property
     def cases(self):
-        return self._context_for_class("case")
+        uuids = self._context_for_class("case").uuids
+        return Cases(self, uuids)
 
-    def get_permissions(self, asset: str = None):
+    def get_permissions(self, asset: Optional[str] = None):
         """Get permissions
 
         Args:
@@ -74,7 +77,7 @@ class Explorer(SearchContext):
 
         return res
 
-    async def get_permissions_async(self, asset: str = None):
+    async def get_permissions_async(self, asset: Optional[str] = None):
         """Get permissions
 
         Args:

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/src/fmu/sumo/explorer/filters.py

@@ -1,3 +1,8 @@
+"""
+Complex(ish) filters for use with fmu-sumo Explorer.
+"""
+
+
 class Filters:
     # Filter that matches 4d-seismic objects.
     seismic4d = {

fmu_sumo-2.3.9/src/fmu/sumo/explorer/objects/__init__.py

@@ -0,0 +1,21 @@
+"""Sumo cases and child objects"""
+
+from ._child import Child
+from ._document import Document
+from ._metrics import Metrics
+from ._search_context import SearchContext
+from .case import Case
+from .cases import Cases
+from .cpgrid import CPGrid
+from .cpgrid_property import CPGridProperty
+from .cube import Cube
+from .dictionary import Dictionary
+from .ensemble import Ensemble
+from .ensembles import Ensembles
+from .iteration import Iteration
+from .iterations import Iterations
+from .polygons import Polygons
+from .realization import Realization
+from .realizations import Realizations
+from .surface import Surface
+from .table import Table

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/src/fmu/sumo/explorer/objects/_child.py

@@ -1,11 +1,11 @@
 """module containing class for child object"""
 
 from io import BytesIO
-from typing import Dict, List
+from typing import Dict, List, Tuple, Union
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._document import Document
+from ._document import Document
 
 
 class Child(Document):
@@ -21,6 +21,33 @@ class Child(Document):
         self._sumo = sumo
         self._blob = blob
 
+    def __repr__(self):
+        if self.stage == "case" and self.__class__.__name__ != "Case":
+            return (
+                f"<{self.__class__.__name__}: {self.name} {self.uuid}(uuid) "
+                f"in case {self.casename} "
+                f"in asset {self.asset}>"
+            )
+        else:
+            if self.realization:
+                return (
+                    f"<{self.__class__.__name__}: {self.name} {self.uuid}(uuid) "
+                    f"in realization {self.realization} "
+                    f"in iteration {self.iteration} "
+                    f"in case {self.casename} "
+                    f"in asset {self.asset}>"
+                )
+            if self.operationname:
+                return (
+                    f"<{self.__class__.__name__}: {self.name} {self.uuid}(uuid) "
+                    f"in operation {self.operationname} "
+                    f"in iteration {self.iteration} "
+                    f"in case {self.casename} "
+                    f"in asset {self.asset}>"
+                )
+            else:
+                return super().__repr__()
+
     @property
     def blob(self) -> BytesIO:
         """Object blob"""
@@ -40,7 +67,7 @@ class Child(Document):
         return self._blob
 
     @property
-    def timestamp(self) -> str:
+    def timestamp(self) -> Union[str, None]:
         """Object timestmap data"""
         t0 = self._get_property(["data", "time", "t0", "value"])
         t1 = self._get_property(["data", "time", "t1", "value"])
@@ -51,7 +78,7 @@ class Child(Document):
         return None
 
     @property
-    def interval(self) -> str:
+    def interval(self) -> Union[str, Tuple[str, str], None]:
         """Object interval data"""
         t0 = self._get_property(["data", "time", "t0", "value"])
         t1 = self._get_property(["data", "time", "t1", "value"])
@@ -62,7 +89,7 @@ class Child(Document):
         return None
 
     @property
-    def template_path(self):
+    def template_path(self) -> str:
         return "/".join(
             ["{realization}", "{iteration}"]
             + self.relative_path.split("/")[2:]
@@ -167,3 +194,13 @@ class Child(Document):
     def name(self) -> str:
         """Object data name"""
         return self.get_property("data.name")
+
+    @property
+    def asset(self) -> str:
+        """Object asset name"""
+        return self.get_property("access.asset.name")
+
+    @property
+    def operationname(self) -> str:
+        """Object aggregation operation name"""
+        return self.get_property("fmu.aggregation.operation")

{fmu_sumo-2.3.7 → fmu_sumo-2.3.9}/src/fmu/sumo/explorer/objects/_document.py

@@ -1,5 +1,6 @@
 """Contains class for one document"""
 
+import json
 import re
 from typing import Any, Dict, List, Union
 
@@ -18,6 +19,15 @@ class Document:
         self._uuid = metadata["_id"]
         self._metadata = metadata["_source"]
 
+    def __str__(self):
+        return f"{json.dumps(self.metadata, indent=4)}"
+
+    def __repr__(self):
+        return (
+            f"<{self.__class__.__name__}: {self.name} {self.uuid}(uuid) "
+            f"in asset {self.asset}>"
+        )
+
     @property
     def uuid(self):
         """Return uuid
@@ -40,7 +50,11 @@ class Document:
         curr = self._metadata
 
         for key in path:
-            if (isinstance(curr, list) and key < len(curr)) or key in curr:
+            if (
+                isinstance(curr, list)
+                and isinstance(key, int)
+                and key < len(curr)
+            ) or key in curr:
                 curr = curr[key]
             else:
                 return None
@@ -52,3 +66,15 @@ class Document:
 
     def __getitem__(self, key: str):
         return self._metadata[key]
+
+    @property
+    def template_path(self) -> str:
+        return ""
+
+    @property
+    def name(self) -> str:
+        return "Should not happen"
+
+    @property
+    def asset(self) -> str:
+        return self.get_property("access.asset.name")