ert 19.0.0rc2__py3-none-any.whl → 19.0.0rc3__py3-none-any.whl

ert/config/_observations.py

@@ -1,5 +1,4 @@
 import os
-from collections import Counter
 from collections.abc import Sequence
 from dataclasses import dataclass
 from enum import StrEnum
@@ -324,25 +323,9 @@ def make_observations(
     if error_list:
         raise ObservationConfigError.from_collected(error_list)
 
-    _validate_unique_names(result)
     return result
 
 
-def _validate_unique_names(
-    observations: Sequence[Observation],
-) -> None:
-    names_counter = Counter(d.name for d in observations)
-    duplicate_names = [n for n, c in names_counter.items() if c > 1]
-    errors = [
-        ErrorInfo(
-            f"Duplicate observation name {n}",
-        ).set_context(n)
-        for n in duplicate_names
-    ]
-    if errors:
-        raise ObservationConfigError.from_collected(errors)
-
-
 def _validate_segment_dict(name_token: str, inp: dict[str, Any]) -> Segment:
     start = None
     stop = None

ert/config/ert_config.py

@@ -688,6 +688,14 @@ def log_observation_keys(
         if key not in {"name", "type"}
     )
 
+    if "HISTORY_OBSERVATION" in observation_type_counts:
+        msg = (
+            "HISTORY_OBSERVATION is deprecated and will be removed. "
+            "Please use SUMMARY_OBSERVATION instead."
+        )
+        ConfigWarning.warn(msg)
+        logger.warning(msg)
+
     logger.info(
         f"Count of observation types:\n\t{dict(observation_type_counts)}\n"
         f"Count of observation keywords:\n\t{dict(observation_keyword_counts)}"

ert/dark_storage/endpoints/observations.py

@@ -84,6 +84,7 @@ async def get_observations_for_response(
         ensemble.experiment,
         obs_keys,
         json.loads(filter_on) if filter_on is not None else None,
+        requested_response_type=response_type,
     )
     if not obss:
         return []
@@ -107,10 +108,17 @@ def _get_observations(
     experiment: Experiment,
     observation_keys: list[str] | None = None,
     filter_on: dict[str, Any] | None = None,
+    requested_response_type: str | None = None,
 ) -> list[dict[str, Any]]:
     observations = []
 
-    for response_type, df in experiment.observations.items():
+    for stored_response_type, df in experiment.observations.items():
+        if (
+            requested_response_type is not None
+            and stored_response_type != requested_response_type
+        ):
+            continue
+
         if observation_keys is not None:
             df = df.filter(pl.col("observation_key").is_in(observation_keys))
 
@@ -127,7 +135,7 @@ def _get_observations(
         if df.is_empty():
             continue
 
-        x_axis_fn = response_to_pandas_x_axis_fns[response_type]
+        x_axis_fn = response_to_pandas_x_axis_fns[stored_response_type]
         df = df.rename(
             {
                 "observation_key": "name",

ert/gui/tools/manage_experiments/storage_info_widget.py

@@ -223,9 +223,12 @@ class _EnsembleWidget(QWidget):
             return
 
         observation_key = selected.data(1, Qt.ItemDataRole.DisplayRole)
-        if not observation_key:
+        parent = selected.parent()
+
+        if not observation_key or not parent:
             return
 
+        response_type = parent.data(0, Qt.ItemDataRole.UserRole)
         observation_label = selected.data(0, Qt.ItemDataRole.DisplayRole)
         assert self._ensemble is not None
         observations_dict = self._ensemble.experiment.observations
@@ -235,17 +238,7 @@ class _EnsembleWidget(QWidget):
         ax.set_title(observation_key)
         ax.grid(True)
 
-        response_type, obs_for_type = next(
-            (
-                (response_type, df)
-                for response_type, df in observations_dict.items()
-                if observation_key in df["observation_key"]
-            ),
-            (None, None),
-        )
-
-        assert response_type is not None
-        assert obs_for_type is not None
+        obs_for_type = observations_dict[response_type]
 
         response_config = self._ensemble.experiment.response_configuration[
             response_type
@@ -377,14 +370,23 @@ class _EnsembleWidget(QWidget):
                     .to_numpy()
                 ):
                     match_list = self._observations_tree_widget.findItems(
-                        response_key, Qt.MatchFlag.MatchExactly
+                        response_key, Qt.MatchFlag.MatchExactly, 0
                     )
-                    if len(match_list) == 0:
+
+                    root = next(
+                        (
+                            item
+                            for item in match_list
+                            if item.data(0, Qt.ItemDataRole.UserRole) == response_type
+                        ),
+                        None,
+                    )
+
+                    if root is None:
                         root = QTreeWidgetItem(
                             self._observations_tree_widget, [response_key]
                         )
-                    else:
-                        root = match_list[0]
+                        root.setData(0, Qt.ItemDataRole.UserRole, response_type)
 
                     obs_ds = obs_ds_for_type.filter(
                         pl.col("observation_key").eq(obs_key)
@@ -400,9 +402,7 @@ class _EnsembleWidget(QWidget):
                             ],
                         )
 
-                    self._observations_tree_widget.sortItems(
-                        0, Qt.SortOrder.AscendingOrder
-                    )
+            self._observations_tree_widget.sortItems(0, Qt.SortOrder.AscendingOrder)
 
             for i in range(self._observations_tree_widget.topLevelItemCount()):
                 item = self._observations_tree_widget.topLevelItem(i)

ert/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '19.0.0rc2'
-__version_tuple__ = version_tuple = (19, 0, 0, 'rc2')
+__version__ = version = '19.0.0rc3'
+__version_tuple__ = version_tuple = (19, 0, 0, 'rc3')
 
-__commit_id__ = commit_id = 'g0135983dc'
+__commit_id__ = commit_id = 'g40bbd3ce0'

{ert-19.0.0rc2.dist-info → ert-19.0.0rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ert
-Version: 19.0.0rc2
+Version: 19.0.0rc3
 Summary: Ensemble based Reservoir Tool (ERT)
 Author-email: Equinor ASA <fg_sib-scout@equinor.com>
 License-Expression: GPL-3.0-only

{ert-19.0.0rc2.dist-info → ert-19.0.0rc3.dist-info}/RECORD

@@ -45,7 +45,7 @@ ert/config/__init__.py,sha256=RVLt_v8nF9xjG51smLK9OXZT6yAH5KEmSgnFYYvVogU,4310
 ert/config/_create_observation_dataframes.py,sha256=P-cyJlushUR4Em58rRAsmK3jw3PoYhbqsT5qsHrpL7c,19717
 ert/config/_design_matrix_validator.py,sha256=_eEk07L4c7sv8WwTYYGHc_rT1HEOZDqLrgla0r9rpj0,1308
 ert/config/_get_num_cpu.py,sha256=IXOEHkGJEz7kEOysc29q-jpaXqbWeu-Y4FlQvGp0ryM,7684
-ert/config/_observations.py,sha256=EUWQCEMqEpJgmQYvGrvyOIF25nu6w566XV-vw7QPqjU,14814
+ert/config/_observations.py,sha256=wByDMhvJau9iqimyVPcfY10ALlVJFP7nKoaMyON2r1A,14318
 ert/config/_read_summary.py,sha256=_1f6iZV2tBDRtPn5C_29cyjN7suA5hh1HnLKyF9L4jY,7500
 ert/config/_str_to_bool.py,sha256=AxNCJAuTtKF-562CRh7HgjQIyM7N-jjSlRJKvpCNk9I,852
 ert/config/analysis_config.py,sha256=v-ZppIlP_NkmhtuYuxm31m2V3eA7YjvC3rDsMXm5qPk,8646
@@ -54,7 +54,7 @@ ert/config/capture_validation.py,sha256=8HGEbJ2z9FXeEaxSewejP7NtEh4LLomPwcdpC0CJ
 ert/config/design_matrix.py,sha256=yyAFBppTwZXt4OeN6kxRmLk16jF8bntQWLHU_-rDQn4,17236
 ert/config/distribution.py,sha256=rzpO-U8c2ptsj1KlfUw6n_CRaj-e1cvzVvasR0t5sZI,12728
 ert/config/ensemble_config.py,sha256=b0KuQ_y85kr4AOPPX_qieYKgnDGZ4_87bSjYpVZuOlM,7322
-ert/config/ert_config.py,sha256=_UXsCXU_aV_IBqfQEuDGOT9ylopjpWrThDaYVwIWweA,57147
+ert/config/ert_config.py,sha256=jLiqGYLA-lBlnHoh6tmWa1kZE6LT11gwoSZD-eLEYCs,57415
 ert/config/ert_plugin.py,sha256=hENwrc9FfhqUYjVpFYcmy66jDLgU_gagOJFBcYjxe6A,458
 ert/config/ert_script.py,sha256=64FZ-dMI8DZtRLHWReC19KY-ZOsBhdgYkwAe9ZWLc_I,8405
 ert/config/everest_control.py,sha256=-bwFEb_GpdodQ3N_BscQdcKatMlWBs8UVSCDURV8Q3s,8072
@@ -122,7 +122,7 @@ ert/dark_storage/endpoints/__init__.py,sha256=o093-GLgw8br7PDKhHna0LviXeJQdC5P1R
 ert/dark_storage/endpoints/ensembles.py,sha256=22M358HTAjiNuKaRYp9FZ3SZvkWL3v9wMDD0DGwLF8M,1363
 ert/dark_storage/endpoints/experiment_server.py,sha256=snaCwRXayGn6_SIqH49Qmi4u1ZILiH2ynFZL6L4YsxQ,14118
 ert/dark_storage/endpoints/experiments.py,sha256=_tY95HzW6ibJy7N9C-1XICFHSOrKdz4vM3bv7ePRvY8,3413
-ert/dark_storage/endpoints/observations.py,sha256=EpetZi7cjlrexfU9VPdiTJV1PT6k0ZNx366WGlfKZM4,4574
+ert/dark_storage/endpoints/observations.py,sha256=gnww5S1B9G8vAw7AwcR1fgW_vFgyf5WlU1gOSUXW1i4,4841
 ert/dark_storage/endpoints/parameters.py,sha256=LERil7H-L3ZsPGGFm97kvy3XeIqpceyBe5aSFLkSVEY,4406
 ert/dark_storage/endpoints/responses.py,sha256=tFEdgqP1vcOuRPmr4YpE9okEpxowXMoYjYdUq2wljZ8,6195
 ert/dark_storage/endpoints/updates.py,sha256=BWEh2XUTqdsPPEtiSE8bJtXcFVzw-GlbKIK3vvc_Cu8,142
@@ -263,7 +263,7 @@ ert/gui/tools/load_results/load_results_tool.py,sha256=deP__dGX8z5iycPMYv3cYyOta
 ert/gui/tools/manage_experiments/__init__.py,sha256=MAB41GPqlpALPYRvFFpKCcr2Sz3cya7Grd88jLxUj2A,99
 ert/gui/tools/manage_experiments/export_dialog.py,sha256=tWtttCLqr4T0HK9uEtM8JUubBLvytn_A2cZRZBvJ1AI,4485
 ert/gui/tools/manage_experiments/manage_experiments_panel.py,sha256=EUGOo68g8E9f4oG3K4MFRCu8a7rm7ojOF6jUvz_dqic,5680
-ert/gui/tools/manage_experiments/storage_info_widget.py,sha256=UBlnF8sqCTliV-FeNILBBKtwXJGY3PjPIaaM8xAptFM,19861
+ert/gui/tools/manage_experiments/storage_info_widget.py,sha256=J3Xm59mQ6VIYTrwCkhKzZqojrBtncxgEI_f_nLfbFF4,19940
 ert/gui/tools/manage_experiments/storage_model.py,sha256=wf5JPqvbFWLI9ZcVTc4gpZh3hUPDNwOxRdbdcRtjKCc,6802
 ert/gui/tools/manage_experiments/storage_widget.py,sha256=pe5mWOgw-uNGXaZYhl1JsF5--Krz1W4n3Ut4sRcx6uc,6692
 ert/gui/tools/plot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -397,7 +397,7 @@ ert/services/ert_server.py,sha256=qIzqugIHcxwKuzjkItiMt3jah3hNI7x3NQ3p_WBBf_o,10
 ert/services/webviz_ert_service.py,sha256=J5vznqb_-DjlDMOze7tdvuBE4GWEPgJ5dIIXvRLKd0Y,650
 ert/shared/__init__.py,sha256=OwgL-31MxA0fabETJ5Svw0tqJpHi569CZDRFHdHiqA0,644
 ert/shared/net_utils.py,sha256=Wp9Qyd5wWNHPU0Myh1GCbUONu0a-akYEdJ07MjQJt4I,6130
-ert/shared/version.py,sha256=a08nnfTcfo2JoiO9C_qp7fS-7EAD96k6QDqcATgTKd4,724
+ert/shared/version.py,sha256=l535qCMHPX_OouidXmZZfWhYSl0-tdcRVCWcfczt7-0,724
 ert/shared/_doc_utils/__init__.py,sha256=09KMJxjza26BXouUy6yJmMiSuYFGSI6c8nZ-1_qXh90,995
 ert/shared/_doc_utils/ert_jobs.py,sha256=uHP8ozhKwCHG6BkyhAgCGoy59JEFb102pHKot-5ZEys,8054
 ert/shared/_doc_utils/everest_jobs.py,sha256=uBDN7tIwlBJIZVZ6ZFL1tkewEJJGDLoeVrFIIrJznvM,2081
@@ -453,7 +453,7 @@ ert/validation/validation_status.py,sha256=f47_B7aS-9DEh6uaVzKxD97pXienkyTVVCqTy
 ert/warnings/__init__.py,sha256=IBwQVkdD7Njaad9PAB-9K-kr15wnA4EBKboxyqgu9NA,214
 ert/warnings/_warnings.py,sha256=7qhNZ0W4nnljzoOx6AXX7VlMv5pa34Ek5M5n1Ep0Kak,189
 ert/warnings/specific_warning_handler.py,sha256=5dVXtOhzcMmtPBGx4AOddXNPfzTFOPA7RVtdH8hLv68,932
-ert-19.0.0rc2.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-19.0.0rc3.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
 everest/__init__.py,sha256=8_f50f6H3-onqaiuNCwC0Eiotdl9JuTxhwyF_54MVvU,306
 everest/config_file_loader.py,sha256=rOHYvB4ayB2MaKdaAynvJVtbCOqi_z25EdwEqJ02-DQ,5675
 everest/everest_storage.py,sha256=c3sgU7-3BDSRXxJfCR_4F58rWEaoII1wygz6VvM-GGI,42025
@@ -517,8 +517,8 @@ everest/templates/well_drill.tmpl,sha256=9iLexmBHMsMQNXyyRK4GlmVuVpVIxRcCHpy1av5
 everest/templates/well_order.tmpl,sha256=XJ1eVRkeyTdLu5sLsltJSSK6BDLN7rFOAqLdM3ZZy3w,75
 everest/util/__init__.py,sha256=xEYLz6pUtgkH8VHer1RfoCwKiO70dBnuhHonsOPaOx0,1359
 everest/util/forward_models.py,sha256=JPxHhLI6TrmQJwW50wwGBmw57TfRd8SG2svYhXFHrc8,1617
-ert-19.0.0rc2.dist-info/METADATA,sha256=QR91Z6CbWwTQrNCHBDThQE71MzA8wXXFkUS9Fct4eJ0,10015
-ert-19.0.0rc2.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-ert-19.0.0rc2.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-19.0.0rc2.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-19.0.0rc2.dist-info/RECORD,,
+ert-19.0.0rc3.dist-info/METADATA,sha256=SRYfiXI2kEriVA505ALyGhUxZSM7zaUzkO4BnCdBwoY,10015
+ert-19.0.0rc3.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+ert-19.0.0rc3.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-19.0.0rc3.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-19.0.0rc3.dist-info/RECORD,,