fmu-sumo 2.3.9__py3-none-any.whl → 2.4.1__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.3.9'
-__version_tuple__ = version_tuple = (2, 3, 9)
+__version__ = version = '2.4.1'
+__version_tuple__ = version_tuple = (2, 4, 1)

fmu/sumo/explorer/objects/_search_context.py

@@ -1690,7 +1690,7 @@ class SearchContext:
             ).realizationids
             if set(reals) == set(
                 agg.metadata["fmu"]["aggregation"]["realization_ids"]
-            ):
+            ) and len(reals) == len(self.filter(realization=True)):
                 return agg
         # ELSE
         return self.filter(realization=True).aggregate(
@@ -1714,8 +1714,11 @@ class SearchContext:
                 realization=True,
                 complex={"range": {"_sumo.timestamp": {"lt": ts}}},
             ).realizationids_async
-            if set(reals) == set(
-                agg.metadata["fmu"]["aggregation"]["realization_ids"]
+            if (
+                set(reals)
+                == set(agg.metadata["fmu"]["aggregation"]["realization_ids"])
+                and len(reals)
+                == await self.filter(realization=True).length_async()
             ):
                 return agg
         # ELSE

fmu/sumo/explorer/objects/cases.py

@@ -16,8 +16,6 @@ class Cases(SearchContext):
         return
 
     def filter(self, **kwargs):
-        sc = SearchContext(
-            self._sumo, must=[{"terms": {"fmu.case.uuid.keyword": self._hits}}]
-        ).filter(**kwargs)
+        sc = super().filter(**kwargs)
         uuids = sc.get_field_values("fmu.case.uuid.keyword")
         return Cases(sc, uuids)

fmu/sumo/explorer/objects/ensembles.py

@@ -11,17 +11,6 @@ class Ensembles(SearchContext):
         self._hits = uuids
         return
 
-    # def __str__(self) -> str:
-    #     length = len(self)
-    #     if length == 0:
-    #         return "None"
-    #     else:
-    #         preview = [self[i].metadata for i in range(min(5, length))]
-    #         return f"Data Preview:\n{json.dumps(preview, indent=4)}"
-
-    # def __repr__(self) -> str:
-    #     return(f"<{self.__class__.__name__} {len(self)} objects of type ensemble>")
-
     @property
     def classes(self) -> List[str]:
         return ["ensemble"]
@@ -73,9 +62,6 @@ class Ensembles(SearchContext):
         return obj
 
     def filter(self, **kwargs):
-        sc = SearchContext(
-            self._sumo,
-            must=[{"terms": {"fmu.ensemble.uuid.keyword": self._hits}}],
-        ).filter(**kwargs)
-        uuids = sc.get_field_values("fmu.iteration.uuid.keyword")
+        sc = super().filter(**kwargs)
+        uuids = sc.get_field_values("fmu.ensemble.uuid.keyword")
         return Ensembles(sc, uuids)

fmu/sumo/explorer/objects/iterations.py

@@ -62,9 +62,6 @@ class Iterations(SearchContext):
         return obj
 
     def filter(self, **kwargs):
-        sc = SearchContext(
-            self._sumo,
-            must=[{"terms": {"fmu.iteration.uuid.keyword": self._hits}}],
-        ).filter(**kwargs)
+        sc = super().filter(**kwargs)
         uuids = sc.get_field_values("fmu.iteration.uuid.keyword")
         return Iterations(sc, uuids)

fmu/sumo/explorer/objects/realizations.py

@@ -54,9 +54,6 @@ class Realizations(SearchContext):
         return obj
 
     def filter(self, **kwargs):
-        sc = SearchContext(
-            self._sumo,
-            must=[{"terms": {"fmu.realization.uuid.keyword": self._hits}}],
-        ).filter(**kwargs)
+        sc = super().filter(**kwargs)
         uuids = sc.get_field_values("fmu.realization.uuid.keyword")
         return Realizations(self, uuids)

{fmu_sumo-2.3.9.dist-info → fmu_sumo-2.4.1.dist-info}/METADATA

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

{fmu_sumo-2.3.9.dist-info → fmu_sumo-2.4.1.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=xD7sq7tXCC-QKVs2SPi2bsTgQhH6dVLkP6dvZaxMKcA,511
+fmu/sumo/explorer/_version.py,sha256=H3hbvip-BJTNbNG0ITRXctaII3Vc2949yckZEGuAGg8,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,24 +10,24 @@ fmu/sumo/explorer/objects/__init__.py,sha256=72G0yfWWMTXA-oZw5GMRkrWvQqAYfadjerE
 fmu/sumo/explorer/objects/_child.py,sha256=Cq2jmjRjJDjh0hwy_lKWhPdvkuoMqx6UoHFIcmAJ7OA,5905
 fmu/sumo/explorer/objects/_document.py,sha256=uPAkNzcOk8U4LCtXthWkm7kfU9W4HYHrrqV9HERDhe8,1835
 fmu/sumo/explorer/objects/_metrics.py,sha256=q6CSeCjiN1SjNx4G32Lod7Slnflsu3aoJIpwm_VMIhQ,3954
-fmu/sumo/explorer/objects/_search_context.py,sha256=qCejfIAnLNgGHhqvkhKK8T1JlK9GhV3rMqHpZXGz5z4,62554
+fmu/sumo/explorer/objects/_search_context.py,sha256=V5O3q3sM9QnFjRuwzWaJrvdGtDwUh3xGYlswYKzc6A4,62726
 fmu/sumo/explorer/objects/case.py,sha256=fKp7X43ETLE1RaH3rMYxZiIuduRmf0JSnJ5gRoUgNPE,3813
-fmu/sumo/explorer/objects/cases.py,sha256=dxf3mEfx7mkgUyJaStbF2mWEwqEicfGvoi1MjD_t0As,658
+fmu/sumo/explorer/objects/cases.py,sha256=i2bnvk7NWIkzbdWMs3BXU7TCqD5tH2r7pg1m1QXUj3o,561
 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=PqHUKMxIyT8pMVtPjvgUNS5P3gTeDYI52CqFGB56HUA,2009
-fmu/sumo/explorer/objects/ensembles.py,sha256=CKQ7i9LugXRC8nmmvj9WbbfwlNeixbsphi1oDGTtyPk,2230
+fmu/sumo/explorer/objects/ensembles.py,sha256=Z20a9Vlx-P9Z484ikL_0X_xm5pudVjghmB0tq-_smwE,1718
 fmu/sumo/explorer/objects/iteration.py,sha256=ASZXjsxASEoVgbS-ZNpBNm3qKr1pPG0v7CAlFyiYOk4,2024
-fmu/sumo/explorer/objects/iterations.py,sha256=AdqNaJztbDiSYm4aL6Jrp0K8Pnmg_-tEz8Kw0RocRVY,1841
+fmu/sumo/explorer/objects/iterations.py,sha256=VzoOQSnqVRXJDCPe9nJCWNtPyVtJEraZPTJsPwXF_j4,1726
 fmu/sumo/explorer/objects/polygons.py,sha256=k5BKuXHsLxzhMR5KId6Fly4FNygTOcShFCCMXvhjWg4,1187
 fmu/sumo/explorer/objects/realization.py,sha256=Th3zr_nT2I1HYHkBojOAKnf_RSIPc-TiDtW0X39eMRw,2259
-fmu/sumo/explorer/objects/realizations.py,sha256=t_4ACL-whAhaglIfh0m8vOsbluWSYO5I9bg0rt9erb0,1679
+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.3.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fmu_sumo-2.3.9.dist-info/METADATA,sha256=4jJRAWxT1gJVIwUvZ60Cu633KU98N-I56Axtn6_zZdU,14780
-fmu_sumo-2.3.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-fmu_sumo-2.3.9.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
-fmu_sumo-2.3.9.dist-info/RECORD,,
+fmu_sumo-2.4.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fmu_sumo-2.4.1.dist-info/METADATA,sha256=M8zKipDl1zfpmcJYulUNpQAGssQzKxtsURnpwxYFFkg,14780
+fmu_sumo-2.4.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+fmu_sumo-2.4.1.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
+fmu_sumo-2.4.1.dist-info/RECORD,,

{fmu_sumo-2.3.9.dist-info → fmu_sumo-2.4.1.dist-info}/WHEEL

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