fix after rebase

Author: erlenlh

src/ert/config/gen_data_config.py

@@ -129,7 +129,6 @@ def from_config_dict(cls, config_dict: ConfigDict) -> Self:
             input_files.append(res_file)
 
         return cls(
-            name="gen_data",
             keys=keys,
             input_files=input_files,
             report_steps_list=report_steps,

src/ert/config/response_config.py

@@ -14,7 +14,7 @@ class InvalidResponseFile(Exception):
     """
 
 
-class BaseResponseConfig(BaseModel):
+class BaseResponseConfig(BaseModel, extra="forbid"):
     type: str
 
     @property

src/ert/config/summary_config.py

@@ -82,7 +82,6 @@ def from_config_dict(cls, config_dict: ConfigDict) -> SummaryConfig | None:
                     "steps known to generate summary files"
                 )
             return cls(
-                name="summary",
                 input_files=[eclbase.replace("%d", "<IENS>")],
                 keys=[key for keys in summary_keys for key in keys],
             )

tests/ert/performance_tests/test_obs_and_responses_performance.py

@@ -74,14 +74,13 @@ def create_experiment_args(
     random.seed(seed)
 
     gen_data_config = GenDataConfig(
-        name="gen_data",
         report_steps_list=[list(range(num_gen_data_report_steps))] * num_gen_data_keys,
         keys=[f"gen_data_{i}" for i in range(num_gen_data_keys)],
     ).model_dump(mode="json")
 
     # Remember to do one explicit .save_parameters to an ensemble
     # to get the finalized summary keys stored in the experiment
-    summary_config = SummaryConfig(name="summary", keys=["*"]).model_dump(mode="json")
+    summary_config = SummaryConfig(keys=["*"]).model_dump(mode="json")
 
     genkw_data = (
         pl.DataFrame(

tests/ert/unit_tests/analysis/test_es_update.py

@@ -234,7 +234,6 @@ def test_update_handles_precision_loss_in_std_dev(tmp_path):
                 "parameter_configuration": [gen_kw.model_dump(mode="json")],
                 "response_configuration": [
                     GenDataConfig(
-                        name="gen_data",
                         input_files=["poly.out"],
                         keys=["RES"],
                         has_finalized_keys=True,

tests/ert/unit_tests/config/test_gen_data_config.py

@@ -120,7 +120,6 @@ def test_that_invalid_gendata_outfile_error_propagates(tmp_path):
     """)
 
     config = GenDataConfig(
-        name="gen_data",
         keys=["something"],
         report_steps_list=[None],
         input_files=["poly.out"],
@@ -142,7 +141,6 @@ def test_that_read_file_does_not_raise_unexpected_exceptions_on_invalid_file(con
     Path("./output").write_bytes(contents)
     with suppress(InvalidResponseFile):
         GenDataConfig(
-            name="gen_data",
             keys=["something"],
             report_steps_list=[None],
             input_files=["output"],
@@ -152,7 +150,6 @@ def test_that_read_file_does_not_raise_unexpected_exceptions_on_invalid_file(con
 def test_that_read_file_does_not_raise_unexpected_exceptions_on_missing_file(tmpdir):
     with pytest.raises(FileNotFoundError, match="DOES_NOT_EXIST not found"):
         GenDataConfig(
-            name="gen_data",
             keys=["something"],
             report_steps_list=[None],
             input_files=["DOES_NOT_EXIST"],
@@ -164,7 +161,6 @@ def test_that_read_file_does_not_raise_unexpected_exceptions_on_missing_director
 ):
     with pytest.raises(FileNotFoundError, match="DOES_NOT_EXIST not found"):
         GenDataConfig(
-            name="gen_data",
             keys=["something"],
             report_steps_list=[None],
             input_files=["DOES_NOT_EXIST"],

tests/ert/unit_tests/config/test_summary_config.py

@@ -34,9 +34,7 @@ def test_reading_empty_summaries_raises(wopr_summary):
 
 
 def test_summary_config_normalizes_list_of_keys():
-    assert SummaryConfig(
-        name="summary", input_files=["CASE"], keys=["FOPR", "WOPR", "WOPR"]
-    ).keys == [
+    assert SummaryConfig(input_files=["CASE"], keys=["FOPR", "WOPR", "WOPR"]).keys == [
         "FOPR",
         "WOPR",
     ]
@@ -50,26 +48,26 @@ def test_that_read_file_does_not_raise_unexpected_exceptions_on_invalid_file(
     Path("CASE.UNSMRY").write_bytes(unsmry)
     Path("CASE.SMSPEC").write_bytes(smspec)
     with suppress(InvalidResponseFile):
-        SummaryConfig(
-            name="summary", input_files=["CASE"], keys=["FOPR"]
-        ).read_from_file(Path.cwd(), 1, 0)
+        SummaryConfig(input_files=["CASE"], keys=["FOPR"]).read_from_file(
+            Path.cwd(), 1, 0
+        )
 
 
 def test_that_read_file_does_not_raise_unexpected_exceptions_on_missing_file(tmpdir):
     with pytest.raises(FileNotFoundError):
-        SummaryConfig(
-            name="summary", input_files=["NOT_CASE"], keys=["FOPR"]
-        ).read_from_file(tmpdir, 1, 0)
+        SummaryConfig(input_files=["NOT_CASE"], keys=["FOPR"]).read_from_file(
+            tmpdir, 1, 0
+        )
 
 
 @pytest.mark.usefixtures("use_tmpdir")
 def test_that_read_file_does_not_raise_unexpected_exceptions_on_missing_directory(
     tmp_path,
 ):
     with pytest.raises(FileNotFoundError):
-        SummaryConfig(
-            name="summary", input_files=["CASE"], keys=["FOPR"]
-        ).read_from_file(str(tmp_path / "DOES_NOT_EXIST"), 1, 0)
+        SummaryConfig(input_files=["CASE"], keys=["FOPR"]).read_from_file(
+            str(tmp_path / "DOES_NOT_EXIST"), 1, 0
+        )
 
 
 def create_observations(config, obs_config):

tests/ert/unit_tests/dark_storage/test_common.py

@@ -27,7 +27,7 @@ def test_data_for_response_gives_mean_for_duplicate_values(tmp_path):
     value1 = 1.1
     value2 = 1.0e19
     with open_storage(tmp_path / "storage", mode="w") as storage:
-        summary_config = SummaryConfig(name="summary", input_files=["CASE"], keys=["*"])
+        summary_config = SummaryConfig(input_files=["CASE"], keys=["*"])
         experiment = storage.create_experiment(
             experiment_config={
                 "response_configuration": [summary_config.model_dump(mode="json")]
@@ -81,9 +81,7 @@ def test_data_for_response_gives_mean_for_duplicate_values(tmp_path):
 
 def test_data_for_response_doesnt_mistake_history_for_response(tmp_path):
     with open_storage(tmp_path / "storage", mode="w") as storage:
-        summary_config = SummaryConfig(
-            name="summary", input_files=["CASE"], keys=["FGPR"]
-        )
+        summary_config = SummaryConfig(input_files=["CASE"], keys=["FGPR"])
         experiment = storage.create_experiment(
             experiment_config={
                 "response_configuration": [summary_config.model_dump(mode="json")]

tests/ert/unit_tests/gui/tools/plot/conftest.py

@@ -192,7 +192,6 @@ def mocked_requests_get(*args, **kwargs):
                     "type": "gen_kw",
                     "name": "BPR_138_PERSISTENCE",
                     "forward_init": False,
-                    "update": True,
                     "dimensionality": 1,
                     "distribution": {"name": "uniform", "min": 0.2, "max": 0.7},
                     "group": "SNAKE_OIL_PARAM",
@@ -202,7 +201,6 @@ def mocked_requests_get(*args, **kwargs):
                     "type": "gen_kw",
                     "name": "OP1_DIVERGENCE_SCALE",
                     "forward_init": False,
-                    "update": True,
                     "dimensionality": 1,
                     "distribution": {"name": "uniform", "min": 0.5, "max": 1.5},
                     "group": "SNAKE_OIL_PARAM",
@@ -212,7 +210,6 @@ def mocked_requests_get(*args, **kwargs):
                     "type": "gen_kw",
                     "name": "I_AM_A_PARAM",
                     "forward_init": False,
-                    "update": True,
                     "dimensionality": 1,
                     "distribution": {"name": "normal", "mean": 0.0, "std": 1.0},
                     "group": "SNAKE_OIL_PARAM",

tests/ert/unit_tests/gui/tools/plot/test_plot_api.py

@@ -91,7 +91,6 @@ def test_key_def_structure(api: PlotApi):
             {
                 "name": "BPR_138_PERSISTENCE",
                 "forward_init": False,
-                "update": True,
                 "dimensionality": 1,
                 "distribution": {"name": "uniform", "min": 0.2, "max": 0.7},
                 "group": "SNAKE_OIL_PARAM",
@@ -225,7 +224,6 @@ def test_plot_api_handles_urlescape(api_and_storage):
             "parameter_configuration": [],
             "response_configuration": [
                 SummaryConfig(
-                    name="summary",
                     input_files=["CASE.UNSMRY", "CASE.SMSPEC"],
                     keys=[key],
                 ).model_dump(mode="json")
@@ -371,7 +369,6 @@ def test_that_multiple_observations_are_parsed_correctly(api_and_storage):
             "parameter_configuration": [],
             "response_configuration": [
                 SummaryConfig(
-                    name="summary",
                     input_files=[""],
                     keys=["WOPR:OP1"],
                     has_finalized_keys=True,
@@ -419,9 +416,9 @@ def test_that_observations_for_empty_ensemble_returns_empty_data(api_and_storage
         experiment_config={
             "parameter_configuration": [],
             "response_configuration": [
-                SummaryConfig(
-                    name="summary", input_files=[""], keys=["NAIMFRAC"]
-                ).model_dump(mode="json")
+                SummaryConfig(input_files=[""], keys=["NAIMFRAC"]).model_dump(
+                    mode="json"
+                )
             ],
             "ert_templates": [],
             "observations": [],
@@ -443,7 +440,6 @@ def test_that_data_for_response_is_empty_for_ensembles_without_responses(
             "parameter_configuration": [],
             "response_configuration": [
                 SummaryConfig(
-                    name="summary",
                     input_files=[],
                     keys=["FOPT"],
                     has_finalized_keys=True,
@@ -474,7 +470,6 @@ def test_that_response_key_has_observation_when_only_one_experiment_has_observat
             "parameter_configuration": [],
             "response_configuration": [
                 SummaryConfig(
-                    name="summary",
                     input_files=["CASE.UNSMRY", "CASE.SMSPEC"],
                     keys=["FOPR"],
                 ).model_dump(mode="json")
@@ -499,7 +494,6 @@ def test_that_response_key_has_observation_when_only_one_experiment_has_observat
             "parameter_configuration": [],
             "response_configuration": [
                 SummaryConfig(
-                    name="summary",
                     input_files=["CASE.UNSMRY", "CASE.SMSPEC"],
                     keys=["FOPR"],
                 ).model_dump(mode="json")
@@ -563,7 +557,6 @@ def test_that_response_keys_do_not_match_keys_that_are_substrings(
             "parameter_configuration": [],
             "response_configuration": [
                 SummaryConfig(
-                    name="summary",
                     input_files=["CASE.UNSMRY", "CASE.SMSPEC"],
                     keys=[key, history_key(key), "FOPR"],
                 ).model_dump(mode="json")
@@ -621,7 +614,6 @@ def _create_gradient_only_ensemble(storage):
             "parameter_configuration": [],
             "response_configuration": [
                 EverestObjectivesConfig(
-                    name="everest_objectives",
                     input_files=[f"{objective_key}.json"],
                     keys=[objective_key],
                     scales=[1.0],