fmu-sumo 2.4.4__py3-none-any.whl → 2.4.6__py3-none-any.whl

fmu/sumo/explorer/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.4.4'
-__version_tuple__ = version_tuple = (2, 4, 4)
+__version__ = version = '2.4.6'
+__version_tuple__ = version_tuple = (2, 4, 6)

fmu/sumo/explorer/objects/_search_context.py

@@ -1162,6 +1162,46 @@ class SearchContext:
     def grid_properties(self) -> SearchContext:
         return self._context_for_class("cpgrid_property")
 
+    @property
+    def parameters(self) -> SearchContext:
+        return self.filter(
+            complex={
+                "bool": {
+                    "must": [
+                        {"term": {"data.name.keyword": "parameters"}},
+                        {"term": {"data.content.keyword": "parameters"}},
+                    ],
+                    "should": [
+                        {
+                            "bool": {
+                                "must": [
+                                    {"term": {"class.keyword": "dictionary"}},
+                                    {
+                                        "exists": {
+                                            "field": "fmu.realization.id"
+                                        }
+                                    },
+                                ]
+                            }
+                        },
+                        {
+                            "bool": {
+                                "must": [
+                                    {"term": {"class.keyword": "table"}},
+                                    {
+                                        "exists": {
+                                            "field": "fmu.aggregation.operation"
+                                        }
+                                    },
+                                ]
+                            }
+                        },
+                    ],
+                    "minimum_should_match": 1,
+                }
+            }
+        )
+
     def _get_object_by_class_and_uuid(self, cls, uuid) -> Any:
         obj = self.get_object(uuid)
         if obj.metadata["class"] != cls:
@@ -1513,7 +1553,11 @@ class SearchContext:
             if (
                 ("sum_other_doc_count" in v)
                 and (v["sum_other_doc_count"] > 0)
-                or v["buckets"][0]["doc_count"] != tot_hits
+                or (
+                    "buckets" in v
+                    and len(v["buckets"]) > 0
+                    and v["buckets"][0]["doc_count"] != tot_hits
+                )
             )
         ]
         if len(conflicts) > 0:
@@ -1531,11 +1575,9 @@ class SearchContext:
     def _verify_aggregation_operation(
         self, columns, operation
     ) -> Tuple[str, str, str, str]:
-        assert (
-            operation != "collection"
-            or columns is not None
-            and len(columns) == 1
-        ), "Exactly one column required for collection aggregation."
+        assert columns is None or len(columns) == 1, (
+            "Exactly one column required for collection aggregation."
+        )
         sc = self if columns is None else self.filter(column=columns)
         query = sc.__prepare_verify_aggregation_query()
         sres = sc._sumo.post("/search", json=query).json()
@@ -1574,12 +1616,11 @@ class SearchContext:
         return self._to_sumo(res)
 
     def aggregate(self, columns=None, operation=None) -> objects.Child:
-        if len(self.hidden) > 0:
-            return self.hidden._aggregate(columns=columns, operation=operation)
+        sc = self.filter(realization=True, column=columns)
+        if len(sc.hidden) > 0:
+            return sc.hidden._aggregate(columns=columns, operation=operation)
         else:
-            return self.visible._aggregate(
-                columns=columns, operation=operation
-            )
+            return sc.visible._aggregate(columns=columns, operation=operation)
 
     async def _verify_aggregation_operation_async(
         self, columns, operation
@@ -1619,13 +1660,14 @@ class SearchContext:
     async def aggregate_async(
         self, columns=None, operation=None
     ) -> objects.Child:
-        length_hidden = await self.hidden.length_async()
+        sc = self.filter(realization=True, column=columns)
+        length_hidden = await sc.hidden.length_async()
         if length_hidden > 0:
-            return await self.hidden._aggregate_async(
+            return await sc.hidden._aggregate_async(
                 columns=columns, operation=operation
             )
         else:
-            return await self.visible._aggregate_async(
+            return await sc.visible._aggregate_async(
                 columns=columns, operation=operation
             )
 

{fmu_sumo-2.4.4.dist-info → fmu_sumo-2.4.6.dist-info}/METADATA

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

{fmu_sumo-2.4.4.dist-info → fmu_sumo-2.4.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=MR9avcqaQooUbRHXdvzgSvIO8lnZznuyDaeYiPpkwyo,511
+fmu/sumo/explorer/_version.py,sha256=A7m3JGqv6GgWxdlAhxGqiDnKOY6QWqyUQuVpQYGKv-s,511
 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
@@ -10,7 +10,7 @@ fmu/sumo/explorer/objects/__init__.py,sha256=72G0yfWWMTXA-oZw5GMRkrWvQqAYfadjerE
 fmu/sumo/explorer/objects/_child.py,sha256=RrH3W3GF5Nhje7VnhmlEwG_jhX0z6CloJgdGJJzk3po,6035
 fmu/sumo/explorer/objects/_document.py,sha256=uPAkNzcOk8U4LCtXthWkm7kfU9W4HYHrrqV9HERDhe8,1835
 fmu/sumo/explorer/objects/_metrics.py,sha256=WITAFAV-3VRd-AqTg0tUwWpOChW4YFfF8ffT2fvOrAo,8144
-fmu/sumo/explorer/objects/_search_context.py,sha256=Bu4f4ksilUYs1BVaaeBmSC0It5lC0uX_CwELVpKkPAE,61700
+fmu/sumo/explorer/objects/_search_context.py,sha256=tHOxcOK6Mj1pJRKT6JwIKfZ_ogVugAHs8SP4-hIRKNk,63363
 fmu/sumo/explorer/objects/case.py,sha256=fKp7X43ETLE1RaH3rMYxZiIuduRmf0JSnJ5gRoUgNPE,3813
 fmu/sumo/explorer/objects/cases.py,sha256=i2bnvk7NWIkzbdWMs3BXU7TCqD5tH2r7pg1m1QXUj3o,561
 fmu/sumo/explorer/objects/cpgrid.py,sha256=nuRgZ6FVEOPZT1ibd-rJhlbYYZ6BuUxXZPzovcH0kVc,2548
@@ -26,8 +26,8 @@ fmu/sumo/explorer/objects/realization.py,sha256=Th3zr_nT2I1HYHkBojOAKnf_RSIPc-Ti
 fmu/sumo/explorer/objects/realizations.py,sha256=4agtQFJ5pxLyWMeIzdJbkBMc8__Md-tZOj8Un4ol22c,1562
 fmu/sumo/explorer/objects/surface.py,sha256=zHBtjLCIfkRHBv39OeJjA9lq3puLTfTII6TndZTtxVI,1627
 fmu/sumo/explorer/objects/table.py,sha256=vLor3YTddHkDWZSMyWPQsddFNQ2_VXE_O-stmPIWIaQ,4900
-fmu_sumo-2.4.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fmu_sumo-2.4.4.dist-info/METADATA,sha256=xzfcvUiRnEc_TZEHrsXUi41dPYH7vm8zCPdkxAR2qvc,14781
-fmu_sumo-2.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmu_sumo-2.4.4.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
-fmu_sumo-2.4.4.dist-info/RECORD,,
+fmu_sumo-2.4.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fmu_sumo-2.4.6.dist-info/METADATA,sha256=YHRaMJwrrPD0zJij7bAC-4voTDVaz4lFxs4a24HEULk,14781
+fmu_sumo-2.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmu_sumo-2.4.6.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
+fmu_sumo-2.4.6.dist-info/RECORD,,