fmu-sumo 2.3.9__tar.gz → 2.4.1__tar.gz

{fmu_sumo-2.3.9 → fmu_sumo-2.4.1}/PKG-INFO

@@ -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 → fmu_sumo-2.4.1}/src/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-2.3.9 → fmu_sumo-2.4.1}/src/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-2.3.9 → fmu_sumo-2.4.1}/src/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-2.3.9 → fmu_sumo-2.4.1}/src/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-2.3.9 → fmu_sumo-2.4.1}/src/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-2.3.9 → fmu_sumo-2.4.1}/src/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 → fmu_sumo-2.4.1}/src/fmu_sumo.egg-info/PKG-INFO

@@ -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