fmu-sumo 2.4.5__tar.gz → 2.4.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.github/workflows/build_docs.yaml +3 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.github/workflows/check_formatting.yml +3 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/PKG-INFO +1 -1
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/_version.py +2 -2
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/_search_context.py +13 -9
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu_sumo.egg-info/PKG-INFO +1 -1
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.github/pull_request_template.md +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.github/workflows/publish_release.yaml +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.github/workflows/run_tests.yaml +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.gitignore +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.pre-commit-config.yaml +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/.readthedocs.yml +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/CONTRIBUTING.md +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/LICENSE +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/README.md +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/SECURITY.md +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/_static/equinor-logo.png +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/_static/equinor-logo2.jpg +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/_static/equinor_logo.jpg +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/_static/equinor_logo_only.jpg +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/_templates/layout.html +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/conf.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/explorer.rst +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/docs/index.rst +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/examples/explorer.ipynb +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/examples/explorer2.ipynb +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/examples/grids-and-properties.ipynb +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/examples/metrics.ipynb +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/examples/table-aggregation.ipynb +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/examples/tables.ipynb +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/pyproject.toml +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/setup.cfg +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/__init__.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/__init__.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/__init__.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/cache.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/explorer.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/filters.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/__init__.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/_child.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/_document.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/_metrics.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/case.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/cases.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/cpgrid.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/cpgrid_property.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/cube.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/dictionary.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/ensemble.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/ensembles.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/iteration.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/iterations.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/polygons.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/realization.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/realizations.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/surface.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/objects/table.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu/sumo/explorer/timefilter.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu_sumo.egg-info/SOURCES.txt +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu_sumo.egg-info/dependency_links.txt +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu_sumo.egg-info/requires.txt +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/src/fmu_sumo.egg-info/top_level.txt +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/tests/conftest.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/tests/context.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/tests/test_explorer.py +0 -0
- {fmu_sumo-2.4.5 → fmu_sumo-2.4.6}/tests/test_objects_table.py +0 -0
|
@@ -1553,7 +1553,11 @@ class SearchContext:
|
|
|
1553
1553
|
if (
|
|
1554
1554
|
("sum_other_doc_count" in v)
|
|
1555
1555
|
and (v["sum_other_doc_count"] > 0)
|
|
1556
|
-
or
|
|
1556
|
+
or (
|
|
1557
|
+
"buckets" in v
|
|
1558
|
+
and len(v["buckets"]) > 0
|
|
1559
|
+
and v["buckets"][0]["doc_count"] != tot_hits
|
|
1560
|
+
)
|
|
1557
1561
|
)
|
|
1558
1562
|
]
|
|
1559
1563
|
if len(conflicts) > 0:
|
|
@@ -1612,12 +1616,11 @@ class SearchContext:
|
|
|
1612
1616
|
return self._to_sumo(res)
|
|
1613
1617
|
|
|
1614
1618
|
def aggregate(self, columns=None, operation=None) -> objects.Child:
|
|
1615
|
-
|
|
1616
|
-
|
|
1619
|
+
sc = self.filter(realization=True, column=columns)
|
|
1620
|
+
if len(sc.hidden) > 0:
|
|
1621
|
+
return sc.hidden._aggregate(columns=columns, operation=operation)
|
|
1617
1622
|
else:
|
|
1618
|
-
return
|
|
1619
|
-
columns=columns, operation=operation
|
|
1620
|
-
)
|
|
1623
|
+
return sc.visible._aggregate(columns=columns, operation=operation)
|
|
1621
1624
|
|
|
1622
1625
|
async def _verify_aggregation_operation_async(
|
|
1623
1626
|
self, columns, operation
|
|
@@ -1657,13 +1660,14 @@ class SearchContext:
|
|
|
1657
1660
|
async def aggregate_async(
|
|
1658
1661
|
self, columns=None, operation=None
|
|
1659
1662
|
) -> objects.Child:
|
|
1660
|
-
|
|
1663
|
+
sc = self.filter(realization=True, column=columns)
|
|
1664
|
+
length_hidden = await sc.hidden.length_async()
|
|
1661
1665
|
if length_hidden > 0:
|
|
1662
|
-
return await
|
|
1666
|
+
return await sc.hidden._aggregate_async(
|
|
1663
1667
|
columns=columns, operation=operation
|
|
1664
1668
|
)
|
|
1665
1669
|
else:
|
|
1666
|
-
return await
|
|
1670
|
+
return await sc.visible._aggregate_async(
|
|
1667
1671
|
columns=columns, operation=operation
|
|
1668
1672
|
)
|
|
1669
1673
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|