ert 16.0.10__py3-none-any.whl → 16.0.13__py3-none-any.whl

ert/dark_storage/endpoints/parameters.py

@@ -125,8 +125,16 @@ def _extract_parameter_group_and_key(key: str) -> tuple[str, str] | tuple[None,
 
 def data_for_parameter(ensemble: Ensemble, key: str) -> pd.DataFrame:
     group, _ = _extract_parameter_group_and_key(key)
+    if group is None:
+        logger.warning(
+            f"Parameter with key '{key}' does not have a group, "
+            "fetching data for all parameters"
+        )
     try:
         df = ensemble.load_scalars(group)
+        if df.is_empty():
+            logger.warning(f"No data found for parameter '{group}:{key}'")
+            return pd.DataFrame()
     except KeyError as e:
         logger.error(e)
         return pd.DataFrame()

ert/gui/tools/plot/plot_window.py

@@ -269,7 +269,10 @@ class PlotWindow(QMainWindow):
                             response_key=key_def.response_metadata.response_key,
                             filter_on=key_def.filter_on,
                         )
-                    elif key_def.parameter_metadata is not None:
+                    elif (
+                        key_def.parameter_metadata is not None
+                        and "GEN_KW" in key_def.metadata["data_origin"]
+                    ):
                         ensemble_to_data_map[ensemble] = self._api.data_for_parameter(
                             ensemble_id=ensemble.id,
                             parameter_key=key_def.parameter_metadata.key,

ert/run_models/_create_run_path.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import json
 import logging
 import os
+import time
 from collections.abc import Iterable, Mapping
 from datetime import UTC, datetime
 from pathlib import Path
@@ -116,6 +117,7 @@ def _generate_parameter_files(
         # model has completed.
         if param.forward_init and iteration == 0:
             continue
+
         export_values = param.write_to_runpath(Path(run_path), iens, fs)
         if export_values:
             for group, vals in export_values.items():
@@ -168,12 +170,18 @@ def create_run_path(
     if context_env is None:
         context_env = {}
     runpaths.set_ert_ensemble(ensemble.name)
-
+    timings = {
+        "generate_parameter_files": 0.0,
+        "substitute_parameters": 0.0,
+        "substitute_real_iter": 0.0,
+        "result_file_to_target": 0.0,
+    }
     substituter = Substitutions(substitutions)
     for run_arg in run_args:
         run_path = Path(run_arg.runpath)
         if run_arg.active:
             run_path.mkdir(parents=True, exist_ok=True)
+            start_time = time.perf_counter()
             param_data = _generate_parameter_files(
                 ensemble.experiment.parameter_configuration.values(),
                 parameters_file,
@@ -182,10 +190,12 @@ def create_run_path(
                 ensemble,
                 ensemble.iteration,
             )
+            timings["generate_parameter_files"] += time.perf_counter() - start_time
             for (
                 source_file_content,
                 target_file,
             ) in ensemble.experiment.templates_configuration:
+                start_time = time.perf_counter()
                 target_file = substituter.substitute_real_iter(
                     target_file, run_arg.iens, ensemble.iteration
                 )
@@ -194,10 +204,14 @@ def create_run_path(
                     run_arg.iens,
                     ensemble.iteration,
                 )
+                timings["substitute_real_iter"] += time.perf_counter() - start_time
+                start_time = time.perf_counter()
                 result = substituter.substitute_parameters(
                     result,
                     param_data,
                 )
+                timings["substitute_parameters"] += time.perf_counter() - start_time
+                start_time = time.perf_counter()
                 target = run_path / target_file
                 if not target.parent.exists():
                     os.makedirs(
@@ -205,10 +219,13 @@ def create_run_path(
                         exist_ok=True,
                     )
                 target.write_text(result)
+                timings["result_file_to_target"] += time.perf_counter() - start_time
 
             path = run_path / "jobs.json"
+            start_time = time.perf_counter()
             _backup_if_existing(path)
-
+            timings["backup_if_existing"] = time.perf_counter() - start_time
+            start_time = time.perf_counter()
             forward_model_output = create_forward_model_json(
                 context=substitutions,
                 forward_model_steps=forward_model_steps,
@@ -225,12 +242,15 @@ def create_run_path(
                     option=orjson.OPT_NON_STR_KEYS | orjson.OPT_INDENT_2,
                 )
             )
+            timings["jobs_to_json"] = time.perf_counter() - start_time
             # Write MANIFEST file to runpath use to avoid NFS sync issues
+            start_time = time.perf_counter()
             data = _manifest_to_json(ensemble, run_arg.iens, run_arg.itr)
             Path(run_path / "manifest.json").write_bytes(
                 orjson.dumps(data, option=orjson.OPT_NON_STR_KEYS | orjson.OPT_INDENT_2)
             )
-
+            timings["manifest_to_json"] = time.perf_counter() - start_time
+    logger.info(f"_create_run_path durations: {timings}")
     runpaths.write_runpath_list(
         [ensemble.iteration], [real.iens for real in run_args if real.active]
     )

ert/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '16.0.10'
-__version_tuple__ = version_tuple = (16, 0, 10)
+__version__ = version = '16.0.13'
+__version_tuple__ = version_tuple = (16, 0, 13)
 
-__commit_id__ = commit_id = 'gf27dd47f6'
+__commit_id__ = commit_id = 'g2ae29e14d'

{ert-16.0.10.dist-info → ert-16.0.13.dist-info}/METADATA

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

{ert-16.0.10.dist-info → ert-16.0.13.dist-info}/RECORD

@@ -122,7 +122,7 @@ ert/dark_storage/endpoints/ensembles.py,sha256=7dbikqPyNi0MhNeVCfhAhXAldxPxl81TY
 ert/dark_storage/endpoints/experiment_server.py,sha256=fekQwzpaIQzukMoCyLXXVV_iBXZOlrQRaHXf5RxT4uo,13739
 ert/dark_storage/endpoints/experiments.py,sha256=7z4-V2SqxFXrCzt73GWblvaE5oCSvuJmIalFJgYZGCQ,3457
 ert/dark_storage/endpoints/observations.py,sha256=v7LMm5ANu9wlCE5qnH4ArgKp_rnb4-_4CQKvzdWE8hk,4542
-ert/dark_storage/endpoints/parameters.py,sha256=cP3P-zQhxZ-MpjjbIEWu4g1T7J3AUp_mF5h1F5qZmfg,4643
+ert/dark_storage/endpoints/parameters.py,sha256=KNoS0_XdasrhLe7jH-VtaUfUlWWE8VrJcxKB4JGM9xs,4947
 ert/dark_storage/endpoints/responses.py,sha256=Rg0_KhPPOMrzsykwQfAY8VVPFcztaAJ7hH_l2lM1xYI,5586
 ert/dark_storage/endpoints/updates.py,sha256=BWEh2XUTqdsPPEtiSE8bJtXcFVzw-GlbKIK3vvc_Cu8,142
 ert/dark_storage/endpoints/version.py,sha256=sEgwRIgPGJHztacjhbQKT3btiEQCe9PPQghZAtlZhh0,364
@@ -275,7 +275,7 @@ ert/gui/tools/plot/data_type_proxy_model.py,sha256=epTpTsdprL23jDBDFk2B1uEbKIYnb
 ert/gui/tools/plot/plot_api.py,sha256=PhS-6osCq_ErzwoSPWpcAbwU_2QcJd2wCHM3KWULK0s,15249
 ert/gui/tools/plot/plot_ensemble_selection_widget.py,sha256=VgB-PRC2iADdydSOWTG39r-AqgmY76QsZ8a6rWwkj2E,7457
 ert/gui/tools/plot/plot_widget.py,sha256=o_ZQg8nKu_AhAH9nW8YnpMBzKK_P0Wdhva2WAQ7WltE,7165
-ert/gui/tools/plot/plot_window.py,sha256=GK0F7MU7zCTl3BVf_YV0CF4bkL5q-k2mdH_Jt_hSHrk,16461
+ert/gui/tools/plot/plot_window.py,sha256=nGJT9Q4xF0R0UG-SY-aQUnH17aQIg4X0UchXNw9JQZY,16581
 ert/gui/tools/plot/customize/__init__.py,sha256=spAW99ubzOmWuScii_idW0frGDttKCcT4XQegF3vOSU,151
 ert/gui/tools/plot/customize/color_chooser.py,sha256=GS1RSzT9Z_GqJdicvMho_BWjeTBZEWce6IvyfgytFLk,2509
 ert/gui/tools/plot/customize/customization_view.py,sha256=er1PQnhePTs43dsB9gDV7nkMDV0tDmqFneHG7R5UDkM,5093
@@ -368,7 +368,7 @@ ert/resources/workflows/jobs/shell/MOVE_DIRECTORY,sha256=Lh_u0-eCr5Usa8Xien44d6q
 ert/resources/workflows/jobs/shell/MOVE_FILE,sha256=MET6aPtDTVaoEDiTZqKqx_hRayJP3Gn-yubdwrJqpjw,48
 ert/resources/workflows/jobs/shell/SYMLINK,sha256=P6wYoLM6y7IqzJQE5ZWkKEj7ERfK9VTRJa6N1pKigeg,46
 ert/run_models/__init__.py,sha256=ALREGbLZrrJpK3veepVK4Qsb9Aw7sQoc_qssMspILuw,915
-ert/run_models/_create_run_path.py,sha256=wFtqY-K8M_kq4jPhP3yBEEmsoBKBN9ANmP6_3N3Ekxs,8016
+ert/run_models/_create_run_path.py,sha256=5MKl5ktBP_g6Nb1bMz6XzigUNZiFZ7I9NLr8O-F2K2U,9148
 ert/run_models/ensemble_experiment.py,sha256=dUOSNh8a8jKNoBesirvQU0qUUvZ1jcaCTCS1T4s0KCY,2833
 ert/run_models/ensemble_information_filter.py,sha256=CN-yX3DJlRI7qMaLcEdTgpJMptVjU8d4c7o9HX61PQ0,1039
 ert/run_models/ensemble_smoother.py,sha256=CEdcGSAo_yW3Sfvh3OjQjnhGcwwErDkq7aFZBkKsNOo,3623
@@ -398,7 +398,7 @@ ert/services/storage_service.py,sha256=3hiQ5MVDD1ozFgndcy6HadK0qPVS1FAmL4P5p2LFf
 ert/services/webviz_ert_service.py,sha256=J5vznqb_-DjlDMOze7tdvuBE4GWEPgJ5dIIXvRLKd0Y,650
 ert/shared/__init__.py,sha256=OwgL-31MxA0fabETJ5Svw0tqJpHi569CZDRFHdHiqA0,644
 ert/shared/net_utils.py,sha256=DDHIZLHdBnh7ZZ--1s-FUlsoNTSJJsfHmLQE44E2JqU,5324
-ert/shared/version.py,sha256=bkgnc7CHLotqYQpxGCuh4jHuI0RtlDVbZ-cCk_xcxDY,716
+ert/shared/version.py,sha256=W1llhgDUNvoh6bijmPXxSj7zpCWNWOrOHHB5hYkf3I4,716
 ert/shared/_doc_utils/__init__.py,sha256=zSl-NUpWLF167PVTvfjn0T50gExjvyWPw5OGq5Bt2Dc,983
 ert/shared/_doc_utils/ert_jobs.py,sha256=425Ol3pk-rIjyQxoopAijKV-YiAESJy3yyoukBQle4s,8116
 ert/shared/_doc_utils/everest_jobs.py,sha256=uBDN7tIwlBJIZVZ6ZFL1tkewEJJGDLoeVrFIIrJznvM,2081
@@ -447,7 +447,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-16.0.10.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-16.0.13.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
 everest/__init__.py,sha256=8_f50f6H3-onqaiuNCwC0Eiotdl9JuTxhwyF_54MVvU,306
 everest/config_file_loader.py,sha256=hnwsdrj-HWZb8h5gaCaZEt0uEy4_5n9j9_pC17USbCQ,5359
 everest/everest_storage.py,sha256=-AcCQrBYZWvo0ZtNTgMcgH4lSrHY_bQoxe5In2extBk,42477
@@ -514,8 +514,8 @@ everest/templates/well_drill.tmpl,sha256=9iLexmBHMsMQNXyyRK4GlmVuVpVIxRcCHpy1av5
 everest/templates/well_order.tmpl,sha256=XJ1eVRkeyTdLu5sLsltJSSK6BDLN7rFOAqLdM3ZZy3w,75
 everest/util/__init__.py,sha256=RNXpUtHIuDVrIKzi71E6Ui90amJ7o5DmTTFTeJlrXOs,1269
 everest/util/forward_models.py,sha256=JPxHhLI6TrmQJwW50wwGBmw57TfRd8SG2svYhXFHrc8,1617
-ert-16.0.10.dist-info/METADATA,sha256=BFvwzJFzf3TPA-iF-P-DeB8cvV4o1PZkEwXSWm7ziBA,9758
-ert-16.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ert-16.0.10.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-16.0.10.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-16.0.10.dist-info/RECORD,,
+ert-16.0.13.dist-info/METADATA,sha256=gPNBC8hZbnr6dT5XhEsOUNutti3dD26a8tEc2BGjFL0,9758
+ert-16.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ert-16.0.13.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-16.0.13.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-16.0.13.dist-info/RECORD,,