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

ert/config/parsing/config_schema_item.py

@@ -315,6 +315,8 @@ class SchemaItem:
         self, line: Sequence[FileContextToken]
     ) -> Sequence[FileContextToken | dict[FileContextToken, FileContextToken]]:
         n = self.options_after
+        if not line:
+            return []
         if isinstance(n, Varies):
             args, kwargs = parse_variable_options(list(line), n.max_positionals)
             return [*args, kwargs]  # type: ignore

ert/run_models/_create_run_path.py

@@ -60,15 +60,17 @@ def _value_export_txt(
     with path.open("w") as f:
         for key, param_map in values.items():
             for param, value in param_map.items():
-                if isinstance(value, (int | float)):
-                    if key == DESIGN_MATRIX_GROUP:
-                        print(f"{param} {value:g}", file=f)
-                    else:
-                        print(f"{key}:{param} {value:g}", file=f)
-                elif key == DESIGN_MATRIX_GROUP:
-                    print(f"{param} {value}", file=f)
+                if isinstance(value, int):
+                    value_str = str(value)
+                elif isinstance(value, float):
+                    value_str = f"{value:g}"
                 else:
-                    print(f"{key}:{param} {value}", file=f)
+                    value_str = str(value)
+
+                if key == DESIGN_MATRIX_GROUP:
+                    print(f"{param} {value_str}", file=f)
+                else:
+                    print(f"{key}:{param} {value_str}", file=f)
 
 
 def _value_export_json(
@@ -214,11 +216,15 @@ def _make_param_substituter(
     param_substituter = deepcopy(substituter)
     for values in param_data.values():
         for param_name, value in values.items():
-            if isinstance(value, (int, float)):
-                formatted_value = f"{value:.6g}"
+            if isinstance(value, int):
+                formatted_value = str(value)
+            elif isinstance(value, float):
+                formatted_value = f"{value:g}"
             else:
                 formatted_value = str(value)
+
             param_substituter[f"<{param_name}>"] = formatted_value
+
     return param_substituter
 
 

ert/shared/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ert
-Version: 18.0.4
+Version: 18.0.6
 Summary: Ensemble based Reservoir Tool (ERT)
 Author-email: Equinor ASA <fg_sib-scout@equinor.com>
 License-Expression: GPL-3.0-only
@@ -52,7 +52,7 @@ Requires-Dist: progressbar2
 Requires-Dist: psutil
 Requires-Dist: pyarrow
 Requires-Dist: pydantic>2
-Requires-Dist: pyqt6!=6.10.0
+Requires-Dist: pyqt6<6.10.0
 Requires-Dist: python-dateutil
 Requires-Dist: python-multipart
 Requires-Dist: pyyaml

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

@@ -90,7 +90,7 @@ ert/config/parsing/config_errors.py,sha256=p3lAcRPXTm4okupdVyLwRCVWJ_86a7rgCohkD
 ert/config/parsing/config_keywords.py,sha256=J8kgzDVhuM8jvCwzO1kfOxvOH_DnDASOZPaJZujcIgQ,1860
 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/config_schema_item.py,sha256=3BsemNNXoFisT67iSxhGKTtRtflwnBw79_83l3X-uuU,14491
 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
@@ -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=fnHCRQaGtTYpQy2garIGF7qrTQsfXMZmcOCoFZoFVu4,12691
+ert/run_models/_create_run_path.py,sha256=Cev5Cwprca3CbIIAqIHElcieOuBamX91gRdstkKR-As,12764
 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=sHyQpOJPAhRw_LFevtB2d0hrVnwOgd9JQmCvacV5LwI,714
+ert/shared/version.py,sha256=UbS5A3ggo0qvlCwZwDIDBHmSiajgVMJK6jCVrBMWqzc,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.4.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-18.0.6.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
@@ -472,11 +472,11 @@ everest/bin/monitor_script.py,sha256=4FOkLvGJXaBf84Pl97JxE_fGQXU5AiRVgLWEXmFrLHs
 everest/bin/utils.py,sha256=LKnwJIALpRj2H3tSHHONPQKFY3Si8wJZCew6529ou5I,18814
 everest/bin/visualization_script.py,sha256=QUzTKRt1JeCRF4U5jGataLd3GZwCkJOFi0mwnWOpQMk,2729
 everest/config/__init__.py,sha256=nYC7D8A0Lh8jFIbtCiLjRxSjufPCsQsdQ6HW5dZfHfc,1535
-everest/config/control_config.py,sha256=nCflBBkPxqvQiTqzpjAVFY9I2y-568g1WVXpnluWqe0,12983
+everest/config/control_config.py,sha256=ERD4VBFGq6nkHMOrjtLS8rnXxoF-VHk9kP1_uZKtY7o,13581
 everest/config/control_variable_config.py,sha256=9MMRFtNgt_gRKOlwV7jE6QD6jiHFzcx-z6U6yq9jrww,7677
 everest/config/cvar_config.py,sha256=vIZZ3DUZpestNsC3ljY2I4PbANeDeh10fEy8KyB_58A,1593
 everest/config/environment_config.py,sha256=r5avqQFyaEpTIVXM9IqPVImvlsVK1qy1WxoPNgGDWLo,2645
-everest/config/everest_config.py,sha256=kbzgXvH_Ssef18obpE-21-SpfYqnsjZ5S4OrLZ4tcyw,39800
+everest/config/everest_config.py,sha256=0X1vvuOpVz3OajFnx-xdoewNg_UWxcEru4zBiNP2lP8,39822
 everest/config/export_config.py,sha256=Uut70fMB7Zd_vOEebTCz9GvFv5DjS_f2CW0qT9GcBQ0,982
 everest/config/forward_model_config.py,sha256=kjQ6ASh9PaDU-rP0IX8u5JxQ6KjWiyv_pUN68yrori0,2784
 everest/config/input_constraint_config.py,sha256=czgkiPBiOd0VpIWZgRkgCpm0TkioNoDP13ao6VUDGW0,3011
@@ -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.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,,
+ert-18.0.6.dist-info/METADATA,sha256=a7oF4txAllq9AXi-4ulfjq1Fzr5j5gEQqMi0wNqQYbw,10012
+ert-18.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ert-18.0.6.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-18.0.6.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-18.0.6.dist-info/RECORD,,

everest/config/control_config.py

@@ -166,7 +166,8 @@ class ControlConfig(BaseModel):
             """
         ),
     )
-    perturbation_magnitude: float = Field(
+    perturbation_magnitude: float | None = Field(
+        default=None,
         description=dedent(
             """
             The magnitude of the perturbation of all control variables in the
@@ -185,6 +186,8 @@ class ControlConfig(BaseModel):
               and `min` fields.
 
             This default value can be overridden at the variable level.
+
+            This field is required unless it is explicitly set for all variables.
             """
         ),
     )
@@ -247,6 +250,19 @@ class ControlConfig(BaseModel):
             )
         return values
 
+    @model_validator(mode="after")
+    def validate_perturbation_magnitude(self) -> Self:
+        if self.perturbation_magnitude is None and any(
+            variable
+            for variable in self.variables
+            if variable.perturbation_magnitude is None
+        ):
+            raise ValueError(
+                "A default perturbation_magnitude for all variables must be set "
+                "when not all variables define it explicitly."
+            )
+        return self
+
     @model_validator(mode="after")
     def validate_variables(self) -> Self:
         if self.variables is None:

everest/config/everest_config.py

@@ -188,18 +188,18 @@ class EverestConfig(BaseModelWithContextSupport):
             ```yaml
             controls:
               - name: point
-                  type: generic_control
-                  min: -1.0
+                type: generic_control
+                min: -1.0
+                max: 1.0
+                initial_guess: 0.1
+                perturbation_magnitude: 0.001
+                variables:
+                - name: x
+                  initial_guess: 0.5
+                - name: y
+                  min: 0.0
                   max: 1.0
-                  initial_guess: 0.1
-                  perturbation_magnitude: 0.001
-                  variables:
-                    - name: x
-                      initial_guess: 0.5
-                    - name: y
-                      min: 0.0
-                      max: 1.0
-                    - name: z
+                - name: z
             ```
 
             This defines a group of controls names `point`, with variables `x`,
@@ -221,17 +221,18 @@ class EverestConfig(BaseModelWithContextSupport):
             ```yaml
             controls:
               - name: point
-                  max: 1.0
-                  min: -1.0
-                  initial_guess: 0.25
-                  type: generic_control
-                  variables:
-                    - name: x
-                      index: 1
-                    - name: x
-                      index: 2
-                    - name: x
-                      index: 3
+                max: 1.0
+                min: -1.0
+                initial_guess: 0.25
+                perturbation_magnitude: 0.001
+                type: generic_control
+                variables:
+                  - name: x
+                    index: 1
+                  - name: x
+                    index: 2
+                  - name: x
+                    index: 3
             ```
 
             This defines three variables `point.x.1`, `point.x.2` and
@@ -247,12 +248,13 @@ class EverestConfig(BaseModelWithContextSupport):
             ```yaml
             controls:
               - name: point
-                  max: 1.0
-                  min: -1.0
-                  type: generic_control
-                  variables:
-                    - name: x
-                      initial_guess: [0.25, 0.25, 0.25]
+                max: 1.0
+                min: -1.0
+                perturbation_magnitude: 0.001
+                type: generic_control
+                variables:
+                  - name: x
+                    initial_guess: [0.25, 0.25, 0.25]
             ```
         """
         ),