fmu-sumo 2.9.0__py3-none-any.whl → 2.11.0__py3-none-any.whl

fmu/sumo/explorer/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.9.0'
-__version_tuple__ = version_tuple = (2, 9, 0)
+__version__ = version = '2.11.0'
+__version_tuple__ = version_tuple = (2, 11, 0)
 
 __commit_id__ = commit_id = None

fmu/sumo/explorer/filters.py

@@ -22,7 +22,7 @@ class Filters:
     observations = {
         "bool": {
             "must_not": [
-                {"exists": {"field": "fmu.iteration.name.keyword"}},
+                {"exists": {"field": "fmu.ensemble.name.keyword"}},
                 {"exists": {"field": "fmu.realization.id"}},
             ]
         }

fmu/sumo/explorer/objects/_child.py

@@ -33,7 +33,7 @@ class Child(Document):
                 return (
                     f"<{self.__class__.__name__}: {self.name} {self.uuid}(uuid) "
                     f"in realization {self.realization} "
-                    f"in iteration {self.iteration} "
+                    f"in ensemble {self.ensemble} "
                     f"in case {self.casename} "
                     f"in asset {self.asset}>"
                 )
@@ -41,7 +41,7 @@ class Child(Document):
                 return (
                     f"<{self.__class__.__name__}: {self.name} {self.uuid}(uuid) "
                     f"in operation {self.operationname} "
-                    f"in iteration {self.iteration} "
+                    f"in ensemble {self.ensemble} "
                     f"in case {self.casename} "
                     f"in asset {self.asset}>"
                 )
@@ -94,8 +94,7 @@ class Child(Document):
     @property
     def template_path(self) -> str:
         return "/".join(
-            ["{realization}", "{iteration}"]
-            + self.relative_path.split("/")[2:]
+            ["{realization}", "{ensemble}"] + self.relative_path.split("/")[2:]
         )
 
     @property
@@ -138,11 +137,6 @@ class Child(Document):
         """Object realization"""
         return self.get_property("fmu.realization.id")
 
-    @property
-    def iteration(self) -> str:
-        """Object iteration"""
-        return self.get_property("fmu.iteration.name")
-
     @property
     def ensemble(self) -> str:
         """Object ensemble"""

fmu/sumo/explorer/objects/_search_context.py

@@ -64,19 +64,16 @@ def _gen_filter_gen(attr):
 def _gen_filter_stage(attr):
     """Match property against either single value or list of values.
     If the value given is a boolean, tests for existence or not of the property.
-    In addition, if the value is or includes either "iteration" or "ensemble",
-    expand to include both values.
+    In addition, if the value is or includes "ensemble" expand to include it.
     """
 
     _inner = _gen_filter_gen(attr)
 
     def _fn(value):
-        if value == "iteration" or value == "ensemble":
-            return _inner(["iteration", "ensemble"])
-        elif isinstance(value, list) and set(value).intersection(
-            {"iteration", "ensemble"}
-        ):
-            return _inner(list(set(value).union({"iteration", "ensemble"})))
+        if value == "ensemble":
+            return _inner(["ensemble"])
+        elif isinstance(value, list) and set(value).intersection({"ensemble"}):
+            return _inner(list(set(value).union({"ensemble"})))
         else:
             return _inner(value)
 
@@ -156,10 +153,6 @@ _filterspec = {
     "relative_path": [_gen_filter_gen, "file.relative_path.keyword"],
     "tagname": [_gen_filter_gen, "data.tagname.keyword"],
     "dataformat": [_gen_filter_gen, "data.format.keyword"],
-    "iteration": [
-        _gen_filter_gen,
-        "fmu.iteration.name.keyword",
-    ],  # FIXME: to be removed
     "ensemble": [_gen_filter_gen, "fmu.ensemble.name.keyword"],
     "realization": [_gen_filter_gen, "fmu.realization.id"],
     "aggregation": [_gen_filter_gen, "fmu.aggregation.operation.keyword"],
@@ -1285,8 +1278,8 @@ class SearchContext:
                                 "must": [
                                     {"term": {"class.keyword": "dictionary"}},
                                     {
-                                        "exists": {
-                                            "field": "fmu.realization.id"
+                                        "term": {
+                                            "fmu.context.stage.keyword": "realization"
                                         }
                                     },
                                 ]
@@ -1297,8 +1290,11 @@ class SearchContext:
                                 "must": [
                                     {"term": {"class.keyword": "table"}},
                                     {
-                                        "exists": {
-                                            "field": "fmu.aggregation.operation"
+                                        "terms": {
+                                            "fmu.context.stage.keyword": [
+                                                "ensemble",
+                                                "iteration",
+                                            ]
                                         }
                                     },
                                 ]
@@ -1550,7 +1546,6 @@ class SearchContext:
             "class": classname,
             "entity_uuid": entityuuid,
             "ensemble_name": ensemblename,
-            "iteration_name": ensemblename,
             "operations": [operation],
         }
         if columns is not None:

fmu/sumo/explorer/objects/case.py

@@ -12,19 +12,19 @@ def _make_overview_query(id) -> Dict:
     return {
         "query": {"term": {"fmu.case.uuid.keyword": id}},
         "aggs": {
-            "iteration_uuids": {
-                "terms": {"field": "fmu.iteration.uuid.keyword", "size": 100}
+            "ensemble_uuids": {
+                "terms": {"field": "fmu.ensemble.uuid.keyword", "size": 100}
             },
-            "iteration_names": {
-                "terms": {"field": "fmu.iteration.name.keyword", "size": 100}
+            "ensemble_names": {
+                "terms": {"field": "fmu.ensemble.name.keyword", "size": 100}
             },
             "data_types": {"terms": {"field": "class.keyword", "size": 100}},
-            "iterations": {
-                "terms": {"field": "fmu.iteration.uuid.keyword", "size": 100},
+            "ensembles": {
+                "terms": {"field": "fmu.ensemble.uuid.keyword", "size": 100},
                 "aggs": {
-                    "iteration_name": {
+                    "ensemble_name": {
                         "terms": {
-                            "field": "fmu.iteration.name.keyword",
+                            "field": "fmu.ensemble.name.keyword",
                             "size": 100,
                         }
                     },
@@ -49,7 +49,7 @@ class Case(Document, SearchContext):
             self, sumo, must=[{"term": {"fmu.case.uuid.keyword": self.uuid}}]
         )
         self._overview = None
-        self._iterations = None
+        self._ensembles = None
 
     @property
     def overview(self) -> Dict:
@@ -63,27 +63,27 @@ class Case(Document, SearchContext):
             res = self._sumo.post("/search", json=query)
             data = res.json()
             aggs = data["aggregations"]
-            iteration_names = extract_bucket_keys(aggs, "iteration_names")
-            iteration_uuids = extract_bucket_keys(aggs, "iteration_uuids")
+            ensemble_names = extract_bucket_keys(aggs, "ensemble_names")
+            ensemble_uuids = extract_bucket_keys(aggs, "ensemble_uuids")
             data_types = extract_bucket_keys(aggs, "data_types")
-            iterations = {}
-            for bucket in aggs["iterations"]["buckets"]:
+            ensembles = {}
+            for bucket in aggs["ensembles"]["buckets"]:
                 iterid = bucket["key"]
-                itername = extract_bucket_keys(bucket, "iteration_name")
+                itername = extract_bucket_keys(bucket, "ensemble_name")
                 minreal = bucket["minreal"]["value"]
                 maxreal = bucket["maxreal"]["value"]
                 numreal = bucket["numreal"]["value"]
-                iterations[iterid] = {
+                ensembles[iterid] = {
                     "name": itername,
                     "minreal": minreal,
                     "maxreal": maxreal,
                     "numreal": numreal,
                 }
             self._overview = {
-                "iteration_names": iteration_names,
-                "iteration_uuids": iteration_uuids,
+                "ensemble_names": ensemble_names,
+                "ensemble_uuids": ensemble_uuids,
                 "data_types": data_types,
-                "iterations": iterations,
+                "ensembles": ensembles,
             }
 
         return self._overview

fmu/sumo/explorer/objects/cpgrid.py

@@ -61,7 +61,7 @@ class CPGrid(Child):
         """
         sc = SearchContext(self._sumo).grid_properties.filter(
             uuid=self.caseuuid,
-            iteration=self.iteration,
+            ensemble=self.ensemble,
             realization=self.realization,
         )
         return sc.filter(

fmu/sumo/explorer/objects/cpgrid_property.py

@@ -61,7 +61,7 @@ class CPGridProperty(Child):
         """
         sc = SearchContext(self._sumo).grids.filter(
             uuid=self.caseuuid,
-            iteration=self.iteration,
+            ensemble=self.ensemble,
             realization=self.realization,
         )
         should = [

fmu/sumo/explorer/objects/realization.py

@@ -26,7 +26,7 @@ class Realization(Document, SearchContext):
     def __str__(self):
         return (
             f"<{self.__class__.__name__}: {self.realizationid} {self.uuid}(uuid) "
-            f"in iteration {self.iterationname} "
+            f"in ensemble {self.ensemblename} "
             f"in case {self.casename} "
             f"in asset {self.asset}>"
         )
@@ -46,7 +46,7 @@ class Realization(Document, SearchContext):
 
     @property
     def user(self) -> str:
-        """Name of user who uploaded iteration."""
+        """Name of user who uploaded ensemble."""
         return self.get_property("fmu.case.user.id")
 
     @property
@@ -60,14 +60,14 @@ class Realization(Document, SearchContext):
         return self.get_property("fmu.case.name")
 
     @property
-    def iterationuuid(self) -> str:
-        """FMU iteration uuid"""
-        return self.get_property("fmu.iteration.uuid")
+    def ensembleuuid(self) -> str:
+        """FMU ensemble uuid"""
+        return self.get_property("fmu.ensemble.uuid")
 
     @property
-    def iterationname(self) -> str:
-        """FMU iteration name"""
-        return self.get_property("fmu.iteration.name")
+    def ensemblename(self) -> str:
+        """FMU ensemble name"""
+        return self.get_property("fmu.ensemble.name")
 
     @property
     def realizationuuid(self) -> str:

{fmu_sumo-2.9.0.dist-info → fmu_sumo-2.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-sumo
-Version: 2.9.0
+Version: 2.11.0
 Summary: Python package for interacting with Sumo in an FMU setting
 Author: Equinor
 License:                                  Apache License

{fmu_sumo-2.9.0.dist-info → fmu_sumo-2.11.0.dist-info}/RECORD

@@ -1,31 +1,31 @@
 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=24D27WSWcO2HaMUGCrVCG6Zbd76BrLDh2qQ1KbGX6Hc,704
+fmu/sumo/explorer/_version.py,sha256=eqKbWb9LnxuZWE9-pafopBz45ugg0beSlKLIOIjeSzc,706
 fmu/sumo/explorer/cache.py,sha256=uvz8TciwBnDEwJIHa9wneC0WVWuzhUqyF3dzk4kvGNk,1037
 fmu/sumo/explorer/explorer.py,sha256=_3nUTO1E_nf6jqpivjgjKcX6rX1fx_mIG76YOM8xb-8,2931
-fmu/sumo/explorer/filters.py,sha256=_t2PmHeTY9XiBvQeEGM-BpudWUaxIfyUSdNyG70xfRU,875
+fmu/sumo/explorer/filters.py,sha256=Es4JiSvHfCNiN5GXxfaBIBp-1BeFRgNzUeGOTXknK7s,874
 fmu/sumo/explorer/timefilter.py,sha256=AQHa18vkCz2BzH7X9GR1ypmNxfvI4gExh_jxAVYrDjc,6260
 fmu/sumo/explorer/objects/__init__.py,sha256=KoZ-Wo1YUIkWN1aGKu-xbQDkQlZQTP5oUwTRUyVoV9U,569
-fmu/sumo/explorer/objects/_child.py,sha256=7CJiBGfmtK7zNDUv6NLWphHMMtC8M386VyrGhuHq4dk,6222
+fmu/sumo/explorer/objects/_child.py,sha256=gV4dtXSGqGSg5R1Xkh7el0SAsRzD-cdLvu8PtNYqi90,6072
 fmu/sumo/explorer/objects/_document.py,sha256=UR607n9N33vYaTSsYQoMmJUgnmS3To_uVyRSf7Vxulo,1797
 fmu/sumo/explorer/objects/_metrics.py,sha256=Z7iJ8qmvH3iY5dsSf6At_AFIzITyM0rDfum_oGmUFG8,9989
-fmu/sumo/explorer/objects/_search_context.py,sha256=CzypJ2cVcxiwN0yCrXLm2bEPNVbquc0dXxkYY4TQK54,65189
-fmu/sumo/explorer/objects/case.py,sha256=fKp7X43ETLE1RaH3rMYxZiIuduRmf0JSnJ5gRoUgNPE,3813
+fmu/sumo/explorer/objects/_search_context.py,sha256=nqg41EnQpfyeIs6r66_gNwiUxEvCcgYAkYGUTJ7JFv4,65082
+fmu/sumo/explorer/objects/case.py,sha256=9ptXE1XTkAGbw_R4Nh9KgCktoq2Ahu-YoLhc2wJAKOE,3790
 fmu/sumo/explorer/objects/cases.py,sha256=6Hj9ORj4Zta-C8Q9wpFYNsOqR8q-KCXrX-mlsc1hg0o,695
-fmu/sumo/explorer/objects/cpgrid.py,sha256=nuRgZ6FVEOPZT1ibd-rJhlbYYZ6BuUxXZPzovcH0kVc,2548
-fmu/sumo/explorer/objects/cpgrid_property.py,sha256=PqqR05oKKKiTTG0iDO9V6TADdHY7VUsLHjai6SqahVo,2694
+fmu/sumo/explorer/objects/cpgrid.py,sha256=3dQBiKJCbjrwIc9-Fm3dcg_kCLPXst37NI5Sl_Hk1uQ,2546
+fmu/sumo/explorer/objects/cpgrid_property.py,sha256=-URqq6I0UX4fvqi8LO2gQUF6zUoFCTvQBp_ukJR2Bdo,2692
 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/ensemble.py,sha256=MoGiXrtyVL8_cQt5vjh0rIA5bMMGRahPb284teQEqfs,2767
 fmu/sumo/explorer/objects/ensembles.py,sha256=ZTM74xMY8EjQjaSOgIcEMXhnJB7LDoqqdjIXXkmGZvQ,883
 fmu/sumo/explorer/objects/polygons.py,sha256=0N6sKTOGkYO6augIbBObzdovCAIF5VtA_XDzbWvd3YY,1523
-fmu/sumo/explorer/objects/realization.py,sha256=HK47WyX6kwe6ZoHaGHeTWEno86Wkh9THLOtEzOt1FGE,2483
+fmu/sumo/explorer/objects/realization.py,sha256=1ZvPGjoCZ_xNEHJ5Lp6-TYLuq0UHG2IymHBo9BV6koI,2474
 fmu/sumo/explorer/objects/realizations.py,sha256=KIvr6gA-rDAUfcPmsLZQ7jN83-u3SQD0Jk2j9usH-So,883
 fmu/sumo/explorer/objects/surface.py,sha256=zHBtjLCIfkRHBv39OeJjA9lq3puLTfTII6TndZTtxVI,1627
 fmu/sumo/explorer/objects/table.py,sha256=vLor3YTddHkDWZSMyWPQsddFNQ2_VXE_O-stmPIWIaQ,4900
-fmu_sumo-2.9.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fmu_sumo-2.9.0.dist-info/METADATA,sha256=9A8Bav8cZU-sv8f2d_2Igh4V_PTtS8KNnRDkQjqb1oA,14781
-fmu_sumo-2.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmu_sumo-2.9.0.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
-fmu_sumo-2.9.0.dist-info/RECORD,,
+fmu_sumo-2.11.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fmu_sumo-2.11.0.dist-info/METADATA,sha256=X5xaqLFVtM5E_Wrt6hb6yovG1Ip-7evkSDJZDm5oZWI,14782
+fmu_sumo-2.11.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+fmu_sumo-2.11.0.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
+fmu_sumo-2.11.0.dist-info/RECORD,,

{fmu_sumo-2.9.0.dist-info → fmu_sumo-2.11.0.dist-info}/WHEEL

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