fmu-sumo 2.3.7__py3-none-any.whl → 2.3.8__py3-none-any.whl

fmu/sumo/explorer/objects/cpgrid.py

@@ -4,8 +4,8 @@ from typing import Dict
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._child import Child
-from fmu.sumo.explorer.objects._search_context import SearchContext
+from ._child import Child
+from ._search_context import SearchContext
 
 
 class CPGrid(Child):
@@ -32,7 +32,7 @@ class CPGrid(Child):
                 "Unable to import xtgeo; probably not installed."
             )
         try:
-            return grid_from_file(self.blob)
+            return grid_from_file(self.blob)  # pyright: ignore type
         except TypeError as type_err:
             raise TypeError(f"Unknown format: {self.format}") from type_err
 
@@ -49,7 +49,7 @@ class CPGrid(Child):
             )
 
         try:
-            return grid_from_file(await self.blob_async)
+            return grid_from_file(await self.blob_async)  # pyright: ignore type
         except TypeError as type_err:
             raise TypeError(f"Unknown format: {self.format}") from type_err
 

fmu/sumo/explorer/objects/cpgrid_property.py

@@ -4,8 +4,8 @@ from typing import Dict
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._child import Child
-from fmu.sumo.explorer.objects._search_context import SearchContext
+from ._child import Child
+from ._search_context import SearchContext
 
 
 class CPGridProperty(Child):

fmu/sumo/explorer/objects/cube.py

@@ -1,10 +1,10 @@
 """Module containing class for cube object"""
 
-from typing import Dict
+from typing import Dict, Tuple
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._child import Child
+from ._child import Child
 
 
 class Cube(Child):
@@ -17,64 +17,28 @@ class Cube(Child):
             metadata (dict): cube metadata
         """
         super().__init__(sumo, metadata, blob)
-        self._url = None
-        self._sas = None
 
-    def _populate_url(self):
-        res = self._sumo.get(f"/objects('{self.uuid}')/blob/authuri")
+    def _extract_auth(self, res) -> Tuple[str, str]:
         try:
             res = res.json()
-            self._url = res.get("baseuri") + self.uuid
-            self._sas = res.get("auth")
+            url = res.get("baseuri") + self.uuid
+            sas = res.get("auth")
         except Exception:
-            self._url = res.text
-
-    async def _populate_url_async(self):
-        res = await self._sumo.get_async(
-            f"/objects('{self.uuid}')/blob/authuri"
-        )
-        try:
-            res = res.json()
-            self._url = res.get("baseuri") + self.uuid
-            self._sas = res.get("auth")
-        except Exception:
-            self._url = res.text
-
-    @property
-    def url(self) -> str:
-        if self._url is None:
-            self._populate_url()
-        if self._sas is None:
-            return self._url
-        else:
-            return self._url.split("?")[0] + "/"
-
-    @property
-    async def url_async(self) -> str:
-        if self._url is None:
-            await self._populate_url_async()
-        if self._sas is None:
-            return self._url
-        else:
-            return self._url.split("?")[0] + "/"
+            url, sas = res.text.split("?")
+            pass
+        return url, sas
 
     @property
-    def sas(self) -> str:
-        if self._url is None:
-            self._populate_url()
-        if self._sas is None:
-            return self._url.split("?")[1]
-        else:
-            return self._sas
+    def auth(self) -> Tuple[str, str]:
+        res = self._sumo.get(f"/objects('{self.uuid}')/blob/authuri")
+        return self._extract_auth(res)
 
     @property
-    async def sas_async(self) -> str:
-        if self._url is None:
-            await self._populate_url_async()
-        if self._sas is None:
-            return self._url.split("?")[1]
-        else:
-            return self._sas
+    async def auth_async(self) -> Tuple[str, str]:
+        res = await self._sumo.get_async(
+            f"/objects('{self.uuid}')/blob/authuri"
+        )
+        return self._extract_auth(res)
 
     @property
     def openvds_handle(self):
@@ -85,15 +49,10 @@ class Cube(Child):
                 "Unable to import openvds; probably not installed."
             )
 
-        if self._url is None:
-            self._populate_url()
-
-        if self._sas is None:
-            return openvds.open(self._url)
-        else:
-            url = "azureSAS" + self._url[5:] + "/"
-            sas = "Suffix=?" + self._sas
-            return openvds.open(url, sas)
+        url, sas = self.auth
+        url = url.replace("https://", "azureSAS://") + "/"
+        sas = "Suffix=?" + sas
+        return openvds.open(url, sas)
 
     @property
     async def openvds_handle_async(self):
@@ -104,12 +63,7 @@ class Cube(Child):
                 "Unable to import openvds; probably not installed."
             )
 
-        if self._url is None:
-            await self._populate_url_async()
-
-        if self._sas is None:
-            return openvds.open(self._url)
-        else:
-            url = "azureSAS" + self._url[5:] + "/"
-            sas = "Suffix=?" + self._sas
-            return openvds.open(url, sas)
+        url, sas = await self.auth_async
+        url = url.replace("https://", "azureSAS://") + "/"
+        sas = "Suffix=?" + sas
+        return openvds.open(url, sas)

fmu/sumo/explorer/objects/dictionary.py

@@ -1,7 +1,7 @@
 """Module containing class for dictionary object"""
 
 import json
-from typing import Dict
+from typing import Dict, Optional
 
 from sumo.wrapper import SumoClient
 
@@ -11,7 +11,7 @@ from fmu.sumo.explorer.objects._child import Child
 class Dictionary(Child):
     """Class representing a dictionary object in Sumo"""
 
-    _parsed: dict
+    _parsed: Optional[Dict]
 
     def __init__(self, sumo: SumoClient, metadata: Dict, blob=None) -> None:
         """
@@ -19,18 +19,26 @@ class Dictionary(Child):
             sumo (SumoClient): connection to Sumo
             metadata (dict): dictionary metadata
         """
-        self._parsed = None
+        self._parsed: Optional[Dict] = None
 
         super().__init__(sumo, metadata, blob)
 
     def parse(self) -> Dict:
+        parsed = (
+            json.loads(self.blob.read().decode("utf-8"))
+            if self._parsed is None
+            else self._parsed
+        )
         if self._parsed is None:
-            self._parsed = json.loads(self.blob.read().decode("utf-8"))
-
-        return self._parsed
+            self._parsed = parsed
+        return parsed
 
     async def parse_async(self) -> Dict:
+        parsed = self._parsed = (
+            json.loads((await self.blob_async).read().decode("utf-8"))
+            if self._parsed is None
+            else self._parsed
+        )
         if self._parsed is None:
-            self._parsed = json.loads(self.blob_async.read().decode("utf-8"))
-
-        return self._parsed
+            self._parsed = parsed
+        return parsed

fmu/sumo/explorer/objects/iteration.py

@@ -1,17 +1,20 @@
 """Module for (pseudo) iteration class."""
 
-from typing import Dict
+from typing import Dict, Optional
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._document import Document
-from fmu.sumo.explorer.objects._search_context import SearchContext
+from ._document import Document
+from ._search_context import SearchContext
 
 
 class Iteration(Document, SearchContext):
     """Class for representing an iteration in Sumo."""
 
-    def __init__(self, sumo: SumoClient, metadata: Dict):
+    def __init__(
+        self, sumo: SumoClient, metadata: Dict, blob: Optional[bytes] = None
+    ):
+        assert blob is None
         Document.__init__(self, metadata)
         SearchContext.__init__(
             self,
@@ -45,6 +48,16 @@ class Iteration(Document, SearchContext):
         """FMU case name"""
         return self.get_property("fmu.case.name")
 
+    @property
+    def iterationuuid(self) -> str:
+        """FMU iteration uuid"""
+        return self.get_property("fmu.iteration.uuid")
+
+    @property
+    def iterationname(self) -> str:
+        """FMU iteration name"""
+        return self.get_property("fmu.iteration.name")
+
     @property
     def name(self) -> str:
         """FMU iteration name"""

fmu/sumo/explorer/objects/iterations.py

@@ -1,8 +1,8 @@
 """Module for searchcontext for collection of iterations."""
 
-from typing import Dict, List
+from typing import Dict
 
-from fmu.sumo.explorer.objects._search_context import SearchContext
+from ._search_context import SearchContext
 
 
 class Iterations(SearchContext):
@@ -17,7 +17,7 @@ class Iterations(SearchContext):
     async def _maybe_prefetch_async(self, index):
         return
 
-    def get_object(self, uuid: str, select: List[str] = None) -> Dict:
+    def get_object(self, uuid: str) -> Dict:
         """Get metadata object by uuid
 
         Args:
@@ -35,9 +35,7 @@ class Iterations(SearchContext):
 
         return obj
 
-    async def get_object_async(
-        self, uuid: str, select: List[str] = None
-    ) -> Dict:
+    async def get_object_async(self, uuid: str) -> Dict:
         """Get metadata object by uuid
 
         Args:

fmu/sumo/explorer/objects/polygons.py

@@ -4,7 +4,7 @@ from typing import Dict
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._child import Child
+from ._child import Child
 
 
 class Polygons(Child):

fmu/sumo/explorer/objects/realization.py

@@ -1,17 +1,20 @@
 """Module for (pseudo) realization class."""
 
-from typing import Dict
+from typing import Dict, Optional
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._document import Document
-from fmu.sumo.explorer.objects._search_context import SearchContext
+from ._document import Document
+from ._search_context import SearchContext
 
 
 class Realization(Document, SearchContext):
     """Class for representing a realization in Sumo."""
 
-    def __init__(self, sumo: SumoClient, metadata: Dict):
+    def __init__(
+        self, sumo: SumoClient, metadata: Dict, blob: Optional[bytes] = None
+    ):
+        assert blob is None
         Document.__init__(self, metadata)
         SearchContext.__init__(
             self,
@@ -54,3 +57,23 @@ class Realization(Document, SearchContext):
     def iterationname(self) -> str:
         """FMU iteration name"""
         return self.get_property("fmu.iteration.name")
+
+    @property
+    def realizationuuid(self) -> str:
+        """FMU realization uuid"""
+        return self.get_property("fmu.realization.uuid")
+
+    @property
+    def realizationname(self) -> str:
+        """FMU realization name"""
+        return self.get_property("fmu.realization.name")
+
+    @property
+    def realizationid(self) -> int:
+        """FMU realization id"""
+        return self.get_property("fmu.realization.id")
+
+    @property
+    def name(self) -> str:
+        """FMU realization name"""
+        return self.get_property("fmu.realization.name")

fmu/sumo/explorer/objects/realizations.py

@@ -1,8 +1,8 @@
 """Module for searchcontext for collection of realizations."""
 
-from typing import Dict, List
+from typing import Dict
 
-from fmu.sumo.explorer.objects._search_context import SearchContext
+from ._search_context import SearchContext
 
 
 class Realizations(SearchContext):
@@ -17,7 +17,7 @@ class Realizations(SearchContext):
     async def _maybe_prefetch_async(self, index):
         return
 
-    def get_object(self, uuid: str, select: List[str] = None) -> Dict:
+    def get_object(self, uuid: str) -> Dict:
         """Get metadata object by uuid
 
         Args:
@@ -35,9 +35,7 @@ class Realizations(SearchContext):
 
         return obj
 
-    async def get_object_async(
-        self, uuid: str, select: List[str] = None
-    ) -> Dict:
+    async def get_object_async(self, uuid: str) -> Dict:
         """Get metadata object by uuid
 
         Args:

fmu/sumo/explorer/objects/surface.py

@@ -4,7 +4,7 @@ from typing import Dict
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._child import Child
+from ._child import Child
 
 
 class Surface(Child):

fmu/sumo/explorer/objects/table.py

@@ -5,7 +5,7 @@ from typing import Dict
 
 from sumo.wrapper import SumoClient
 
-from fmu.sumo.explorer.objects._child import Child
+from ._child import Child
 
 
 class Table(Child):

fmu/sumo/explorer/timefilter.py

@@ -1,6 +1,7 @@
 """Module with classes handling time filtering"""
 
 from enum import Enum
+from typing import Optional
 
 
 class TimeType(Enum):
@@ -24,8 +25,8 @@ class TimeFilter:
     def __init__(
         self,
         time_type: TimeType,
-        start: str = None,
-        end: str = None,
+        start: Optional[str] = None,
+        end: Optional[str] = None,
         overlap: bool = False,
         exact: bool = False,
     ) -> None:

{fmu_sumo-2.3.7.dist-info → fmu_sumo-2.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fmu-sumo
-Version: 2.3.7
+Version: 2.3.8
 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.8.dist-info/RECORD

@@ -0,0 +1,32 @@
+fmu/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
+fmu/sumo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fmu/sumo/explorer/__init__.py,sha256=Bc1wd1lQO3HP3tsVyPbqaesf2boZwGdtookWp8lmG-k,317
+fmu/sumo/explorer/_version.py,sha256=3Oc3thyKkSSxKGqu1ruTNsjrUTMaCkmwZoi_w-3OL9M,511
+fmu/sumo/explorer/cache.py,sha256=uvz8TciwBnDEwJIHa9wneC0WVWuzhUqyF3dzk4kvGNk,1037
+fmu/sumo/explorer/explorer.py,sha256=pVm6hYWxXH22VslATrnWkmgVSF3OSqLDCoAA3S5FvBo,2857
+fmu/sumo/explorer/filters.py,sha256=_t2PmHeTY9XiBvQeEGM-BpudWUaxIfyUSdNyG70xfRU,875
+fmu/sumo/explorer/timefilter.py,sha256=AQHa18vkCz2BzH7X9GR1ypmNxfvI4gExh_jxAVYrDjc,6260
+fmu/sumo/explorer/objects/__init__.py,sha256=WKBwuUuKX7ymBU1C5GiuBBl1Taq7LJPlDe8SuZmlljk,573
+fmu/sumo/explorer/objects/_child.py,sha256=7w32fdRgFSK1rcpSrWJeX2aE0RniaTv0H57iatSKscc,4516
+fmu/sumo/explorer/objects/_document.py,sha256=ISxLRwWDO6PJRywTfFEua1_D6NgRW2PCbqifHA8ZyPo,1405
+fmu/sumo/explorer/objects/_metrics.py,sha256=q6CSeCjiN1SjNx4G32Lod7Slnflsu3aoJIpwm_VMIhQ,3954
+fmu/sumo/explorer/objects/_search_context.py,sha256=FQr79ZsLm66_1JdPEzuaqS35YWWcVL6qrOvjtgg_weM,56810
+fmu/sumo/explorer/objects/case.py,sha256=fKp7X43ETLE1RaH3rMYxZiIuduRmf0JSnJ5gRoUgNPE,3813
+fmu/sumo/explorer/objects/cases.py,sha256=_deqorrU8KjtkJAgtxOBl9Q-3_FVuxkVydul_wknerE,527
+fmu/sumo/explorer/objects/cpgrid.py,sha256=nuRgZ6FVEOPZT1ibd-rJhlbYYZ6BuUxXZPzovcH0kVc,2548
+fmu/sumo/explorer/objects/cpgrid_property.py,sha256=PqqR05oKKKiTTG0iDO9V6TADdHY7VUsLHjai6SqahVo,2694
+fmu/sumo/explorer/objects/cube.py,sha256=6pJLDajex-mblkt9YRZxtcK1XHcRZ8mlPPqJ-yDGEbA,1948
+fmu/sumo/explorer/objects/dictionary.py,sha256=9Nt8Br7H4TgXO6qc46HtV1vB40LsEQb6WjWYDT-Ve0g,1191
+fmu/sumo/explorer/objects/iteration.py,sha256=CqdXITmClNer_Rq7JPq4TNUwgP3X4PwKQtKDXn8yyqM,1690
+fmu/sumo/explorer/objects/iterations.py,sha256=trMtJiIgbTuWiVGfECtJzzwlV_Bc-ehg5ra5lz8hKtE,1509
+fmu/sumo/explorer/objects/polygons.py,sha256=k5BKuXHsLxzhMR5KId6Fly4FNygTOcShFCCMXvhjWg4,1187
+fmu/sumo/explorer/objects/realization.py,sha256=oikKdV-rCEOVAECJiEMYpfhyYupEIbQ_JcGXJ1Je9LU,2130
+fmu/sumo/explorer/objects/realizations.py,sha256=bez1aVgvehmOZ28IyfBv0lFWroG1ZhQ0qH2nvXnRYbQ,1519
+fmu/sumo/explorer/objects/surface.py,sha256=zHBtjLCIfkRHBv39OeJjA9lq3puLTfTII6TndZTtxVI,1627
+fmu/sumo/explorer/objects/table.py,sha256=vLor3YTddHkDWZSMyWPQsddFNQ2_VXE_O-stmPIWIaQ,4900
+fmu/sumo/explorer/objects/table_aggregated.py,sha256=vq2EcR36JTcQsyCeyiMgigJMDFDQfVrlTZe2LdXrDFo,3794
+fmu_sumo-2.3.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fmu_sumo-2.3.8.dist-info/METADATA,sha256=PK2TO57uD0AWODdK3b8t9revZHVOiY3UfHozF3Ou0nw,14780
+fmu_sumo-2.3.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fmu_sumo-2.3.8.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
+fmu_sumo-2.3.8.dist-info/RECORD,,

{fmu_sumo-2.3.7.dist-info → fmu_sumo-2.3.8.dist-info}/WHEEL

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

fmu_sumo-2.3.7.dist-info/RECORD

@@ -1,32 +0,0 @@
-fmu/__init__.py,sha256=ftS-xRPSH-vU7fIHlnZQaCTWbNvs4owJivNW65kzsIM,85
-fmu/sumo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fmu/sumo/explorer/__init__.py,sha256=Bc1wd1lQO3HP3tsVyPbqaesf2boZwGdtookWp8lmG-k,317
-fmu/sumo/explorer/_version.py,sha256=UANYi9NwDKsEL0-DdBqhuR1fJMtRtyyEntWN_jeSZpo,511
-fmu/sumo/explorer/cache.py,sha256=uvz8TciwBnDEwJIHa9wneC0WVWuzhUqyF3dzk4kvGNk,1037
-fmu/sumo/explorer/explorer.py,sha256=0dSUGG2-4yOYGXRWC5Ubrdjd-hIEEgRxJlMvvIAYom0,2806
-fmu/sumo/explorer/filters.py,sha256=NVTWbjL-dIHQZeWcR3Orgx6f0WHPpThSPxmxZo5tvfM,812
-fmu/sumo/explorer/timefilter.py,sha256=GetbPm0VYVSts_G7F2BA2nvgvvKzWE26ZjhqRc1avIE,6212
-fmu/sumo/explorer/objects/__init__.py,sha256=2XqF0abZI1T7I_Fjlhvs4_vjwid_3HUsqdxmA6nNcLo,941
-fmu/sumo/explorer/objects/_child.py,sha256=ase6ZypK2KB-Zv6skHRFodkLC3vfm9x8EFgJfhsblLE,4477
-fmu/sumo/explorer/objects/_document.py,sha256=JMhlCr1XlXi1lE1-44WhISTNHiDw9gYGOTl0LUboQKo,1249
-fmu/sumo/explorer/objects/_metrics.py,sha256=q6CSeCjiN1SjNx4G32Lod7Slnflsu3aoJIpwm_VMIhQ,3954
-fmu/sumo/explorer/objects/_search_context.py,sha256=crBRcIi8OocalZtLBJVrRXQvPeqlXS-VJlxTP6NftLc,52761
-fmu/sumo/explorer/objects/case.py,sha256=D4MGn5lKNMdmaBvTJRYXu9xlGEOpuiMlZR_tsNs4AJU,3847
-fmu/sumo/explorer/objects/cases.py,sha256=L2LQieRTCJeNXRvXceHz9088nRO9gvKuRpsNpLI7Gnw,552
-fmu/sumo/explorer/objects/cpgrid.py,sha256=Va1M_rgHYdQfPFKFJvfDQhRcSZ_PnniCSI6uweaG3_s,2550
-fmu/sumo/explorer/objects/cpgrid_property.py,sha256=DxiFn6QrQCjXbDrxuxPi95b9pvkGI6nxxd0VoFn3e6k,2744
-fmu/sumo/explorer/objects/cube.py,sha256=UEFFx_qfS7o0cWNwVPxdO3Fee8Pst9J0GN1j6cXRd_o,3189
-fmu/sumo/explorer/objects/dictionary.py,sha256=56ol3ohxVwuesYsrULBE1a4pXXqcUnMWi41EX6_Zn-s,918
-fmu/sumo/explorer/objects/iteration.py,sha256=iSQiQ2Epa98ZrySu47GMtJh2dsPnJVo9JqwSlEMRml4,1380
-fmu/sumo/explorer/objects/iterations.py,sha256=_d6fRmtVziy0qj-MucG_nPNTn6ffsTcIFGF0H2NqbTw,1606
-fmu/sumo/explorer/objects/polygons.py,sha256=z4maL5WI3cdFol3WlTYxhUJzMLkskfb_8Lz7QD4uqIY,1212
-fmu/sumo/explorer/objects/realization.py,sha256=s5uSHCt9yoghhJByYIJp8KuWnoO6LPF2f0AkzRME8XI,1535
-fmu/sumo/explorer/objects/realizations.py,sha256=QnmrswpV34-AM05M6DP4BrD0vS3QKzPYaaCb18eeOEk,1616
-fmu/sumo/explorer/objects/surface.py,sha256=8SVYvCtpKISGd3gY_jIkTgTd_yTWIU8xiW9lcyTiMKU,1652
-fmu/sumo/explorer/objects/table.py,sha256=fRit1cWfCLqwZwLHK26D-qFT64uCYVjlVhDyXHWhO40,4925
-fmu/sumo/explorer/objects/table_aggregated.py,sha256=vq2EcR36JTcQsyCeyiMgigJMDFDQfVrlTZe2LdXrDFo,3794
-fmu_sumo-2.3.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fmu_sumo-2.3.7.dist-info/METADATA,sha256=NxqmqErKTChOD3d94hXftwIfZ1GpFmXrPXQQyzv1nP4,14758
-fmu_sumo-2.3.7.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-fmu_sumo-2.3.7.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
-fmu_sumo-2.3.7.dist-info/RECORD,,