ert 18.0.5__py3-none-any.whl → 18.0.7__py3-none-any.whl

ert/config/ert_config.py

@@ -686,6 +686,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/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '18.0.5'
-__version_tuple__ = version_tuple = (18, 0, 5)
+__version__ = version = '18.0.7'
+__version_tuple__ = version_tuple = (18, 0, 7)
 
-__commit_id__ = commit_id = 'g13b681fbe'
+__commit_id__ = commit_id = 'gbd11a04e9'

{ert-18.0.5.dist-info → ert-18.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ert
-Version: 18.0.5
+Version: 18.0.7
 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.5.dist-info → ert-18.0.7.dist-info}/RECORD

@@ -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=MdLQEnWZqDaAwbKI1maXxlurYousirlZbA8AIk6GITw,12734
 ert/config/ensemble_config.py,sha256=wI2wDWXpblUzFPaRQRpm9ZYgExGIs6DnT4fLmD5vWJ0,7323
-ert/config/ert_config.py,sha256=FSl7XHkK94slKmKrUj-rMmkDRe-C4ehDzc_iLb02I34,54853
+ert/config/ert_config.py,sha256=HRXfKPoecapHtTM5dLe-dDAO_p4-vX0QnulmcOuYB9g,55121
 ert/config/ert_plugin.py,sha256=hENwrc9FfhqUYjVpFYcmy66jDLgU_gagOJFBcYjxe6A,458
 ert/config/ert_script.py,sha256=64FZ-dMI8DZtRLHWReC19KY-ZOsBhdgYkwAe9ZWLc_I,8405
 ert/config/everest_response.py,sha256=NURh-JPQwEm6kQgsw7_PkcXaUYOMSZoUA3x2yQKPTOM,3530
@@ -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=SxCVKe11yQFCplIrFx2YioWUSroggGgknWm6FI-tMh8,714
+ert/shared/version.py,sha256=N_ZtggTFu8IWmMJpnrJLRdvTLMgHvxv3Iqubhwz7-b0,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.5.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-18.0.7.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.5.dist-info/METADATA,sha256=T_gVI7Ry5O9wPk6isM0I_qVDzXT7Bngn8SNBMhva95o,10013
-ert-18.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ert-18.0.5.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-18.0.5.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-18.0.5.dist-info/RECORD,,
+ert-18.0.7.dist-info/METADATA,sha256=Zh2yPHvSF8IQdw5tJju-cgpRUraejGtrVCSSYVKia7M,10012
+ert-18.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ert-18.0.7.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-18.0.7.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-18.0.7.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]
             ```
         """
         ),