ert 18.0.1__py3-none-any.whl → 18.0.4__py3-none-any.whl

ert/config/parsing/config_schema.py

@@ -4,8 +4,8 @@ from .config_schema_deprecations import deprecated_keywords_list
 from .config_schema_item import (
     SchemaItem,
     Varies,
+    existing_file_keyword,
     existing_path_inline_keyword,
-    existing_path_keyword,
     float_keyword,
     int_keyword,
     path_keyword,
@@ -318,8 +318,8 @@ def init_user_config_schema() -> ConfigSchemaDict:
         surface_keyword(),
         field_keyword(),
         single_arg_keyword(ConfigKeys.ECLBASE),
-        existing_path_keyword(ConfigKeys.DATA_FILE),
-        existing_path_keyword(ConfigKeys.GRID),
+        existing_file_keyword(ConfigKeys.DATA_FILE),
+        existing_file_keyword(ConfigKeys.GRID),
         path_keyword(ConfigKeys.REFCASE),
         int_keyword(ConfigKeys.RANDOM_SEED),
         num_realizations_keyword(),

ert/config/parsing/config_schema_deprecations.py

@@ -217,15 +217,4 @@ deprecated_keywords_list = [
         ),
         check=lambda line: line[0] == "DESIGN2PARAMS",
     ),
-    DeprecationInfo(
-        keyword="FORWARD_MODEL",
-        message=(
-            "FORWARD_MODEL DESIGN_KW will be replaced with RUN_TEMPLATE. "
-            "DESIGN2PARAMS has been replaced by DESIGN_MATRIX, so the "
-            "parameters are already available for magic string replacement "
-            "with the RUN_TEMPLATE keyword. Please use this format: "
-            "'RUN_TEMPLATE my_text_file_template.txt my_text_output_file.txt'"
-        ),
-        check=lambda line: line[0] == "DESIGN_KW",
-    ),
 ]

ert/config/parsing/config_schema_item.py

@@ -155,9 +155,9 @@ class SchemaItem:
                         f"value as argument {index + 1!r}",
                         token,
                     )
-
             case (
                 SchemaItemType.PATH
+                | SchemaItemType.EXISTING_FILE
                 | SchemaItemType.EXISTING_PATH
                 | SchemaItemType.EXISTING_PATH_INLINE
             ):
@@ -166,10 +166,14 @@ class SchemaItem:
                     path = os.path.normpath(
                         os.path.join(os.path.dirname(token.filename), token)
                     )
-                if val_type in {
-                    SchemaItemType.EXISTING_PATH,
-                    SchemaItemType.EXISTING_PATH_INLINE,
-                }:
+                if val_type != SchemaItemType.PATH:
+                    if val_type == SchemaItemType.EXISTING_FILE and not os.path.isfile(
+                        str(path)
+                    ):
+                        raise ConfigValidationError.with_context(
+                            f"{self.kw} {token} is not a file.",
+                            token,
+                        )
                     if not os.path.exists(str(path)):
                         err = f'Cannot find file or directory "{token.value}". '
                         if path != token:
@@ -343,8 +347,8 @@ def path_keyword(keyword: str) -> SchemaItem:
     return SchemaItem(kw=keyword, type_map=[SchemaItemType.PATH])
 
 
-def existing_path_keyword(keyword: str) -> SchemaItem:
-    return SchemaItem(kw=keyword, type_map=[SchemaItemType.EXISTING_PATH])
+def existing_file_keyword(keyword: str) -> SchemaItem:
+    return SchemaItem(kw=keyword, type_map=[SchemaItemType.EXISTING_FILE])
 
 
 def existing_path_inline_keyword(

ert/config/parsing/schema_item_type.py

@@ -9,6 +9,7 @@ class SchemaItemType(StrEnum):
     POSITIVE_FLOAT = "POSITIVE_FLOAT"
     PATH = "PATH"
     EXISTING_PATH = "EXISTING_PATH"
+    EXISTING_FILE = "EXISTING_FILE"
     # EXISTING_PATH_INLINE is a directive to the
     # schema validation to inline the contents of
     # the file.

ert/run_models/_create_run_path.py

@@ -5,6 +5,7 @@ import logging
 import math
 import os
 import time
+from collections import defaultdict
 from collections.abc import Iterable, Mapping
 from copy import deepcopy
 from datetime import UTC, datetime
@@ -102,7 +103,7 @@ def _generate_parameter_files(
     iens: int,
     fs: Ensemble,
     iteration: int,
-) -> Mapping[str, Mapping[str, float | str]]:
+) -> tuple[Mapping[str, Mapping[str, float | str]], Mapping[str, float]]:
     """
     Generate parameter files that are placed in each runtime directory for
     forward-model jobs to consume.
@@ -117,8 +118,9 @@ def _generate_parameter_files(
         fs: Ensemble from which to load parameter data
 
     Returns:
-        Returns the union of parameters returned by write_to_runpath for each
-        parameter_config.
+        Returns a tuple containing: the union of parameters returned by
+        write_to_runpath for each parameter_config, and a dict with
+        timings/durations for each parameter type.
     """
     # preload scalar parameters for this realization
     keys = [
@@ -126,18 +128,23 @@ def _generate_parameter_files(
         for p in parameter_configs
         if p.cardinality == ParameterCardinality.multiple_configs_per_ensemble_dataset
     ]
+    export_timings: defaultdict[str, float] = defaultdict(float)
     scalar_data: dict[str, float | str] = {}
     if keys:
+        start_time = time.perf_counter()
         df = fs._load_scalar_keys(keys=keys, realizations=iens, transformed=True)
         scalar_data = df.to_dicts()[0]
+        export_timings["load_scalar_keys"] = time.perf_counter() - start_time
     exports: dict[str, dict[str, float | str]] = {}
     log_exports: dict[str, dict[str, float | str]] = {}
+
     for param in parameter_configs:
         # For the first iteration we do not write the parameter
         # to run path, as we expect to read if after the forward
         # model has completed.
         if param.forward_init and iteration == 0:
             continue
+        start_time = time.perf_counter()
         export_values: dict[str, dict[str, float | str]] | None = None
         log_export_values: dict[str, dict[str, float | str]] | None = {}
         if param.name in scalar_data:
@@ -164,11 +171,15 @@ def _generate_parameter_files(
         if log_export_values:
             for group, vals in log_export_values.items():
                 log_exports.setdefault(group, {}).update(vals)
+        export_timings[param.type] += time.perf_counter() - start_time
         continue
-
+    start_time = time.perf_counter()
     _value_export_txt(run_path, export_base_name, exports | log_exports)
+    export_timings["value_export_txt"] = time.perf_counter() - start_time
+    start_time = time.perf_counter()
     _value_export_json(run_path, export_base_name, exports)
-    return exports
+    export_timings["value_export_json"] = time.perf_counter() - start_time
+    return (exports, dict(export_timings))
 
 
 def _manifest_to_json(ensemble: Ensemble, iens: int, iter_: int) -> dict[str, Any]:
@@ -239,7 +250,7 @@ def create_run_path(
         if run_arg.active:
             run_path.mkdir(parents=True, exist_ok=True)
             start_time = time.perf_counter()
-            param_data = _generate_parameter_files(
+            (param_data, detailed_parameter_timings) = _generate_parameter_files(
                 ensemble.experiment.parameter_configuration.values(),
                 parameters_file,
                 run_path,
@@ -247,6 +258,11 @@ def create_run_path(
                 ensemble,
                 ensemble.iteration,
             )
+            for parameter_type, duration in detailed_parameter_timings.items():
+                if parameter_type not in timings:
+                    timings[parameter_type] = 0.0
+                timings[parameter_type] += duration
+
             timings["generate_parameter_files"] += time.perf_counter() - start_time
             real_iter_substituter = substituter.real_iter_substituter(
                 run_arg.iens, ensemble.iteration

ert/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '18.0.1'
-__version_tuple__ = version_tuple = (18, 0, 1)
+__version__ = version = '18.0.4'
+__version_tuple__ = version_tuple = (18, 0, 4)
 
-__commit_id__ = commit_id = 'g969b012de'
+__commit_id__ = commit_id = 'gbe2423cee'

{ert-18.0.1.dist-info → ert-18.0.4.dist-info}/METADATA

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

{ert-18.0.1.dist-info → ert-18.0.4.dist-info}/RECORD

@@ -88,9 +88,9 @@ ert/config/parsing/_read_file.py,sha256=QKMQSNG5J05AdTzy_VQiK5AQ26g0bDHyxlSSPqIh
 ert/config/parsing/config_dict.py,sha256=yyBb-NeaFnIjENrcziVA11Bq43uGguUiPECcKWLDg8w,52
 ert/config/parsing/config_errors.py,sha256=p3lAcRPXTm4okupdVyLwRCVWJ_86a7rgCohkDaLRM10,4806
 ert/config/parsing/config_keywords.py,sha256=J8kgzDVhuM8jvCwzO1kfOxvOH_DnDASOZPaJZujcIgQ,1860
-ert/config/parsing/config_schema.py,sha256=sUkjjhso6xNChfyFWE1srhD3DMLNvg3eHyALzZ5s6FQ,9614
-ert/config/parsing/config_schema_deprecations.py,sha256=fmzyxUBxR9GtDNIkP0ozHWU2SH1TvyhBFFyFhG8vZjA,9125
-ert/config/parsing/config_schema_item.py,sha256=G5TQNuywQu55yglR3Ef_DnkYBRm5YzqAfyL1XwMt-m0,14172
+ert/config/parsing/config_schema.py,sha256=9ws2C3Oc-eT5uB_Xy2IEvPWON7b9rZnIc2FpID7hhWc,9614
+ert/config/parsing/config_schema_deprecations.py,sha256=xUkbe-_UA8UawNcUF58YwHHpHTAfC6XO2ZBN97jchKc,8611
+ert/config/parsing/config_schema_item.py,sha256=jjHT1KqobQvpLxh9gZ0rR8x_YylV29pvvP7oUASFwtA,14448
 ert/config/parsing/context_values.py,sha256=S_j_BKuwqSm8RZNnw6Ki2ZQ4jz0VFXXmh0MZA2OstmQ,2288
 ert/config/parsing/deprecation_info.py,sha256=E31LBTiG1qNeqACU8lTxp54bESIeuuVHgFim8j8uVjg,663
 ert/config/parsing/error_info.py,sha256=AMOS0v-_ECHESj4aoy0m2fUPPlw9SE1DN_8MsaHeilY,2906
@@ -103,7 +103,7 @@ ert/config/parsing/lark_parser.py,sha256=SS0yXTI5w_qmpFvePMO-r0g9NPqOOrlCFF3amPe
 ert/config/parsing/observations_parser.py,sha256=3hmDjQYjSgrumrb8592X2AbJFp-J72Sq_VLQpOwMaWw,6707
 ert/config/parsing/queue_system.py,sha256=P4-oHftl7piNwCNjnelJAA3WePlBmgXGPhnbHhSb4Eo,570
 ert/config/parsing/schema_dict.py,sha256=MWKhtLhdRvqfWm8oZatWFnAhiIU03DdQCOaX6A71068,4313
-ert/config/parsing/schema_item_type.py,sha256=mruMC2Gb7XzK6blg-tDuAJLy0aHct6xkg7p8xLkYrko,617
+ert/config/parsing/schema_item_type.py,sha256=LP6lXE7YihnAEVP3kCJ80kdpgH6Veu--xcPfgaqJhdc,653
 ert/config/parsing/types.py,sha256=NXV5odfbVL_opQgPTaSlpgkilY4qaB3pal4TaV6pL80,315
 ert/config/parsing/workflow_job_keywords.py,sha256=4SSy2dwLS3G2B1-HPw3b6dMEpIc5-2218ERL_PT_R1k,269
 ert/config/parsing/workflow_job_schema.py,sha256=lkL7CAOFeNcWNRGfBuu1FdbcSqwPXM__8dCC8b3hkTg,2905
@@ -369,7 +369,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=PzLAD_gFRm_oUq_zDByAlQ05zShrBRoCR8oCn2qg43I,1348
-ert/run_models/_create_run_path.py,sha256=kcjx-Q1RqswzI-lx0Y-3dApZMCNSEZHq7y2xs9BxjrE,11734
+ert/run_models/_create_run_path.py,sha256=fnHCRQaGtTYpQy2garIGF7qrTQsfXMZmcOCoFZoFVu4,12691
 ert/run_models/ensemble_experiment.py,sha256=bbwZtuQQy-3V5VKK8WpGnGe4rDd9A8A4B0skt70ds3Q,2968
 ert/run_models/ensemble_information_filter.py,sha256=WecqKB9XlN0Ktxu43jTftjSkw0Kp_GfxSUh-tPrT0_E,1297
 ert/run_models/ensemble_smoother.py,sha256=zGEG6DvASDaz_XsXrUT8Vbv7bxWIWw-wR4b1DGx6H3I,3802
@@ -400,7 +400,7 @@ ert/services/ert_server.py,sha256=geh5mkdAKqNKgG56DcwSnEpvf0wcUc7vuw4feG1ykEI,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=DDHIZLHdBnh7ZZ--1s-FUlsoNTSJJsfHmLQE44E2JqU,5324
-ert/shared/version.py,sha256=LdklmOEwlOIIdS7lWti2mZbLoh16FqAetVPZiWAM6Ug,714
+ert/shared/version.py,sha256=sHyQpOJPAhRw_LFevtB2d0hrVnwOgd9JQmCvacV5LwI,714
 ert/shared/_doc_utils/__init__.py,sha256=zSl-NUpWLF167PVTvfjn0T50gExjvyWPw5OGq5Bt2Dc,983
 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-18.0.1.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-18.0.4.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
 everest/__init__.py,sha256=8_f50f6H3-onqaiuNCwC0Eiotdl9JuTxhwyF_54MVvU,306
 everest/config_file_loader.py,sha256=q_rmxk778uDrNxdQQW0tBs9R3hU4az6yGCJwuY_5xww,5698
 everest/everest_storage.py,sha256=Xg2CuRdhZOqljm0i6H5o-pejcMeCwncSGw7Q6beZRgY,42173
@@ -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-18.0.1.dist-info/METADATA,sha256=Ral9g5M8fieMBwg1eytzO6DkwFGV6T83V-0iypq_VcA,10013
-ert-18.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ert-18.0.1.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-18.0.1.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-18.0.1.dist-info/RECORD,,
+ert-18.0.4.dist-info/METADATA,sha256=eSyzD9hbt1j8gVmplb7QiqFVxBXbx9k_tivxwopG2E8,10013
+ert-18.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ert-18.0.4.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-18.0.4.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-18.0.4.dist-info/RECORD,,