fmu-sumo 2.6.2__py3-none-any.whl → 2.8.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.6.2'
-__version_tuple__ = version_tuple = (2, 6, 2)
+__version__ = version = '2.8.0'
+__version_tuple__ = version_tuple = (2, 8, 0)
 
 __commit_id__ = commit_id = None

fmu/sumo/explorer/objects/_child.py

@@ -212,3 +212,8 @@ class Child(Document):
     def operationname(self) -> str:
         """Object aggregation operation name"""
         return self.get_property("fmu.aggregation.operation")
+
+    @property
+    def entity(self) -> str:
+        """Entity uuid for object."""
+        return self.get_property("fmu.entity.uuid")

fmu/sumo/explorer/objects/_search_context.py

@@ -219,6 +219,30 @@ def _build_bucket_query_simple(query, field, size):
     }
 
 
+def _build_composite_query(query, fields, size):
+    return {
+        "size": 0,
+        "query": query,
+        "aggs": {
+            "composite": {
+                "composite": {
+                    "size": size,
+                    "sources": [
+                        {k: {"terms": {"field": v}}} for k, v in fields.items()
+                    ],
+                }
+            }
+        },
+    }
+
+
+def _extract_composite_results(res):
+    aggs = res["aggregations"]["composite"]
+    after_key = aggs.get("after_key")
+    buckets = [bucket["key"] for bucket in aggs["buckets"]]
+    return buckets, after_key
+
+
 def _set_after_key(query, field, after_key):
     if after_key is not None:
         query["aggs"][field]["composite"]["after"] = after_key
@@ -1027,6 +1051,52 @@ class SearchContext:
         }
     }
 
+    def get_composite_agg(self, fields: Dict[str, str]):
+        buckets_per_batch = 1000
+        query = _build_composite_query(self._query, fields, buckets_per_batch)
+        all_buckets = []
+        after_key = None
+        with Pit(self._sumo, "1m") as pit:
+            while True:
+                query = pit.stamp_query(
+                    _set_after_key(query, "composite", after_key)
+                )
+                res = self._sumo.post("/search", json=query)
+                res = res.json()
+                pit.update_from_result(res)
+                buckets, after_key = _extract_composite_results(res)
+                if len(buckets) == 0:
+                    break
+                all_buckets = all_buckets + buckets
+                if len(buckets) < buckets_per_batch:
+                    break
+                pass
+
+        return all_buckets
+
+    async def get_composite_agg_async(self, fields: Dict[str, str]):
+        buckets_per_batch = 1000
+        query = _build_composite_query(self._query, fields, buckets_per_batch)
+        all_buckets = []
+        after_key = None
+        async with Pit(self._sumo, "1m") as pit:
+            while True:
+                query = pit.stamp_query(
+                    _set_after_key(query, "composite", after_key)
+                )
+                res = await self._sumo.post_async("/search", json=query)
+                res = res.json()
+                pit.update_from_result(res)
+                buckets, after_key = _extract_composite_results(res)
+                if len(buckets) == 0:
+                    break
+                all_buckets = all_buckets + buckets
+                if len(buckets) < buckets_per_batch:
+                    break
+                pass
+
+        return all_buckets
+
     def _context_for_class(self, cls):
         return self.filter(cls=cls)
 

fmu/sumo/explorer/objects/cases.py

@@ -19,3 +19,7 @@ class Cases(SearchContext):
         sc = super().filter(**kwargs)
         uuids = sc.get_field_values("fmu.case.uuid.keyword")
         return Cases(sc, uuids)
+
+    @property
+    def names(self):
+        return self.get_field_values("fmu.case.name.keyword")

fmu/sumo/explorer/objects/ensembles.py

@@ -1,7 +1,10 @@
 """Module for searchcontext for collection of ensembles."""
 
+from copy import deepcopy
 from typing import List
 
+from fmu.sumo.explorer.objects.ensemble import Ensemble
+
 from ._search_context import SearchContext
 
 
@@ -9,16 +12,10 @@ class Ensembles(SearchContext):
     def __init__(self, sc, uuids):
         super().__init__(sc._sumo, must=[{"ids": {"values": uuids}}])
         self._hits = uuids
+        self._prototype = None
+        self._map = {}
         return
 
-    @property
-    def classes(self) -> List[str]:
-        return ["ensemble"]
-
-    @property
-    async def classes_async(self) -> List[str]:
-        return ["ensemble"]
-
     def _maybe_prefetch(self, index):
         return
 
@@ -29,3 +26,65 @@ class Ensembles(SearchContext):
         sc = super().filter(**kwargs)
         uuids = sc.get_field_values("fmu.ensemble.uuid.keyword")
         return Ensembles(sc, uuids)
+
+    def get_object(self, uuid):
+        if self._prototype is None:
+            obj = super().get_object(uuid)
+            if len(self.get_field_values("fmu.case.uuid.keyword")) > 1:
+                return obj
+            # ELSE
+            self._prototype = obj.metadata
+            buckets = self.get_composite_agg(
+                {
+                    "uuid": "fmu.ensemble.uuid.keyword",
+                    "name": "fmu.ensemble.name.keyword",
+                }
+            )
+            self._map = {b["uuid"]: b for b in buckets}
+            pass
+        metadata = deepcopy(self._prototype)
+        b = self._map[uuid]
+        metadata["fmu"]["ensemble"] = b
+        return Ensemble(self._sumo, {"_id": uuid, "_source": metadata})
+
+    async def get_object_async(self, uuid):
+        if self._prototype is None:
+            obj = await super().get_object_async(uuid)
+            if (
+                len(await self.get_field_values_async("fmu.case.uuid.keyword"))
+                > 1
+            ):
+                return obj
+            # ELSE
+            self._prototype = obj.metadata
+            buckets = await self.get_composite_agg_async(
+                {
+                    "uuid": "fmu.ensemble.uuid.keyword",
+                    "name": "fmu.ensemble.name.keyword",
+                }
+            )
+            self._map = {b["uuid"]: b for b in buckets}
+            pass
+        metadata = deepcopy(self._prototype)
+        b = self._map[uuid]
+        metadata["fmu"]["ensemble"] = b
+        return Ensemble(self._sumo, {"_id": uuid, "_source": metadata})
+
+    @property
+    def classes(self) -> List[str]:
+        return ["ensemble"]
+
+    @property
+    async def classes_async(self) -> List[str]:
+        return ["ensemble"]
+
+    @property
+    def ensemblenames(self) -> List[str]:
+        return [self.get_object(uuid).ensemblename for uuid in self._hits]
+
+    @property
+    async def ensemblenames_async(self) -> List[str]:
+        return [
+            (await self.get_object_async(uuid)).ensemblename
+            for uuid in self._hits
+        ]

fmu/sumo/explorer/objects/realizations.py

@@ -1,7 +1,10 @@
 """Module for searchcontext for collection of realizations."""
 
+from copy import deepcopy
 from typing import List
 
+from fmu.sumo.explorer.objects.realization import Realization
+
 from ._search_context import SearchContext
 
 
@@ -9,6 +12,8 @@ class Realizations(SearchContext):
     def __init__(self, sc, uuids):
         super().__init__(sc._sumo, must=[{"ids": {"values": uuids}}])
         self._hits = uuids
+        self._prototype = None
+        self._map = {}
         return
 
     def _maybe_prefetch(self, index):
@@ -22,6 +27,55 @@ class Realizations(SearchContext):
         uuids = sc.get_field_values("fmu.realization.uuid.keyword")
         return Realizations(self, uuids)
 
+    def get_object(self, uuid):
+        if self._prototype is None:
+            obj = super().get_object(uuid)
+            if len(self.get_field_values("fmu.realization.uuid.keyword")) == 1:
+                return obj
+            # ELSE
+            self._prototype = obj.metadata
+            buckets = self.get_composite_agg(
+                {
+                    "uuid": "fmu.realization.uuid.keyword",
+                    "name": "fmu.realization.name.keyword",
+                    "id": "fmu.realization.id",
+                }
+            )
+            self._map = {b["uuid"]: b for b in buckets}
+            pass
+        metadata = deepcopy(self._prototype)
+        b = self._map[uuid]
+        metadata["fmu"]["realization"] = b
+        return Realization(self._sumo, {"_id": uuid, "_source": metadata})
+
+    async def get_object_async(self, uuid):
+        if self._prototype is None:
+            obj = await super().get_object_async(uuid)
+            if (
+                len(
+                    await self.get_field_values_async(
+                        "fmu.realization.uuid.keyword"
+                    )
+                )
+                == 1
+            ):
+                return obj
+            # ELSE
+            self._prototype = obj.metadata
+            buckets = await self.get_composite_agg_async(
+                {
+                    "uuid": "fmu.realization.uuid.keyword",
+                    "name": "fmu.realization.name.keyword",
+                    "id": "fmu.realization.id",
+                }
+            )
+            self._map = {b["uuid"]: b for b in buckets}
+            pass
+        metadata = deepcopy(self._prototype)
+        b = self._map[uuid]
+        metadata["fmu"]["realization"] = b
+        return Realization(self._sumo, {"_id": uuid, "_source": metadata})
+
     @property
     def classes(self) -> List[str]:
         return ["realization"]

{fmu_sumo-2.6.2.dist-info → fmu_sumo-2.8.0.dist-info}/METADATA

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

{fmu_sumo-2.6.2.dist-info → fmu_sumo-2.8.0.dist-info}/RECORD

@@ -1,33 +1,33 @@
 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=K_PdMoDM3cnCth9l5Wj8Zgz4tHrD_dXoBfsMuI4VHeQ,704
+fmu/sumo/explorer/_version.py,sha256=9o_P9mg_lm8dZdRjWfkpikVSLuPB26JLjcQeqWLe_GI,704
 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/timefilter.py,sha256=AQHa18vkCz2BzH7X9GR1ypmNxfvI4gExh_jxAVYrDjc,6260
 fmu/sumo/explorer/objects/__init__.py,sha256=72G0yfWWMTXA-oZw5GMRkrWvQqAYfadjerEwsyndCzc,637
-fmu/sumo/explorer/objects/_child.py,sha256=I-TVxC5JhmcuCAkj1A_dK-cUzvbQarbonX1zq59d0ZU,6088
+fmu/sumo/explorer/objects/_child.py,sha256=7CJiBGfmtK7zNDUv6NLWphHMMtC8M386VyrGhuHq4dk,6222
 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=xZq04B0op2Rko-qcsvEqs8SHRFZh_uJYTV6ZXZcNRXY,66564
+fmu/sumo/explorer/objects/_search_context.py,sha256=qV4UIQsddoF1liKiQ9ZlBx8FbMRpll7F6jXvQ-T7gQc,68933
 fmu/sumo/explorer/objects/case.py,sha256=fKp7X43ETLE1RaH3rMYxZiIuduRmf0JSnJ5gRoUgNPE,3813
-fmu/sumo/explorer/objects/cases.py,sha256=i2bnvk7NWIkzbdWMs3BXU7TCqD5tH2r7pg1m1QXUj3o,561
+fmu/sumo/explorer/objects/cases.py,sha256=_6q8rXWUeJgHGF1b3X9rt3VQmH_HE7uPU0Id4Fmtq_E,659
 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/ensemble.py,sha256=MoGiXrtyVL8_cQt5vjh0rIA5bMMGRahPb284teQEqfs,2767
-fmu/sumo/explorer/objects/ensembles.py,sha256=uFtnWDgk316NRM_JvD1C7PK20gDOPQVQjCygPFhe3ZE,772
+fmu/sumo/explorer/objects/ensembles.py,sha256=GnE0wJ8fKjJeSWnY4P0X46gKSxlgb9ihVcgWG7BeI5M,2811
 fmu/sumo/explorer/objects/iteration.py,sha256=vXaH6G93pNPvufgliqRSs4fpqgNvgxa7QI0G0ucgr_U,2784
 fmu/sumo/explorer/objects/iterations.py,sha256=ZRQOxPl6MpX7JV7lfvtXp8mGLHl37pl3-F9YAXYfRgc,778
 fmu/sumo/explorer/objects/polygons.py,sha256=0N6sKTOGkYO6augIbBObzdovCAIF5VtA_XDzbWvd3YY,1523
 fmu/sumo/explorer/objects/realization.py,sha256=HK47WyX6kwe6ZoHaGHeTWEno86Wkh9THLOtEzOt1FGE,2483
-fmu/sumo/explorer/objects/realizations.py,sha256=ojyQDZNEGubRE97z7c5WHK1ZnO267jsIureNeIzouAw,1120
+fmu/sumo/explorer/objects/realizations.py,sha256=GmvaDm4y2HB9VGAl3d7FNX5ePVc3jJVht3UHQMQstTg,3061
 fmu/sumo/explorer/objects/surface.py,sha256=zHBtjLCIfkRHBv39OeJjA9lq3puLTfTII6TndZTtxVI,1627
 fmu/sumo/explorer/objects/table.py,sha256=vLor3YTddHkDWZSMyWPQsddFNQ2_VXE_O-stmPIWIaQ,4900
-fmu_sumo-2.6.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fmu_sumo-2.6.2.dist-info/METADATA,sha256=3SA9YL-w9t4cFxKw7gDO-uRvgYhdYi3ugLt4Rj6qbQ8,14781
-fmu_sumo-2.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmu_sumo-2.6.2.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
-fmu_sumo-2.6.2.dist-info/RECORD,,
+fmu_sumo-2.8.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fmu_sumo-2.8.0.dist-info/METADATA,sha256=cBIyAnCj97Tx2toZhE_GSiMx684TebA1M1OJkmjUWMA,14781
+fmu_sumo-2.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmu_sumo-2.8.0.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
+fmu_sumo-2.8.0.dist-info/RECORD,,