Add extra=forbid to pydantic basemodels in ert config and cleanup

# Conflicts:
#	src/ert/config/derived_response_config.py

Author: erlenlh

src/ert/config/derived_response_config.py

@@ -13,9 +13,7 @@
 T = TypeVar("T", bound="TransSettingsValidation")
 
 
-class TransSettingsValidation(BaseModel):
-    model_config = {"extra": "forbid"}
-
+class TransSettingsValidation(BaseModel, extra="forbid"):
     @classmethod
     def create(cls, *args: Any, **kwargs: Any) -> Self:
         return cls(*args, **kwargs)

src/ert/config/distribution.py

@@ -21,7 +21,7 @@
 logger = logging.getLogger(__name__)
 
 
-class EnsembleConfig(BaseModel):
+class EnsembleConfig(BaseModel, extra="forbid"):
     response_configs: dict[str, KnownErtResponseTypes] = Field(default_factory=dict)
     derived_response_configs: dict[str, KnownDerivedResponseTypes] = Field(
         default_factory=dict

src/ert/config/ensemble_config.py

@@ -785,7 +785,7 @@ def log_observation_keys(
 USER_CONFIG_SCHEMA = init_user_config_schema()
 
 
-class ErtConfig(BaseModel):
+class ErtConfig(BaseModel, extra="forbid"):
     DEFAULT_ENSPATH: ClassVar[str] = "storage"
     DEFAULT_RUNPATH_FILE: ClassVar[str] = ".ert_runpath_list"
     PREINSTALLED_FORWARD_MODEL_STEPS: ClassVar[

src/ert/config/ert_config.py

@@ -11,7 +11,7 @@
 import numpy as np
 import polars as pl
 import xarray as xr
-from pydantic import BaseModel, ConfigDict, Field, model_validator
+from pydantic import BaseModel, Field, model_validator
 from ropt.workflow import find_sampler_plugin
 
 from .parameter_config import LocalizationType, ParameterCardinality, ParameterConfig
@@ -26,7 +26,7 @@
     MutableDataType = MutableMapping[str, Number | MutableMapping[str, Number]]
 
 
-class SamplerConfig(BaseModel):
+class SamplerConfig(BaseModel, extra="forbid"):
     backend: str | None = Field(
         default=None,
         description=dedent(
@@ -86,7 +86,6 @@ class SamplerConfig(BaseModel):
             """
         ),
     )
-    model_config = ConfigDict(extra="forbid")
 
     @model_validator(mode="after")
     def validate_backend_and_method(self) -> Self:

src/ert/config/everest_control.py

@@ -112,7 +112,7 @@ def _get_source_package() -> str:
     return "not found"
 
 
-class ForwardModelStepDocumentation(BaseModel):
+class ForwardModelStepDocumentation(BaseModel, extra="forbid"):
     config_file: str | None = Field(default=None)
     source_package: str = Field(default_factory=_get_source_package)
     source_function_name: str = Field(default="ert")

src/ert/config/forward_model_step.py

@@ -31,7 +31,7 @@
 # and used space in percentage is greater than FULL_DISK_PERCENTAGE_THRESHOLD
 
 
-class ModelConfig(BaseModel):
+class ModelConfig(BaseModel, extra="forbid"):
     num_realizations: int = 1
     runpath_format_string: str = DEFAULT_RUNPATH
     jobname_format_string: str = DEFAULT_JOBNAME_FORMAT

src/ert/config/model_config.py

@@ -45,7 +45,7 @@ class ParameterCardinality(StrEnum):
     one_config_per_realization_dataset = auto()
 
 
-class ParameterConfig(BaseModel):
+class ParameterConfig(BaseModel, extra="forbid"):
     type: str
     name: str
     forward_init: bool

src/ert/config/parameter_config.py

@@ -301,8 +301,6 @@ def create(
                     keys=_extract_summary_keys(everest_config), input_files=[eclbase]
                 )
             )
-        else:
-            eclbase = None
 
         runpath_config = ErtModelConfig(
             num_realizations=len(everest_config.model.realizations)
@@ -314,9 +312,6 @@ def create(
                 / "realization_<REALIZATION_ID>"
                 / "<SIM_DIR>"
             ),
-            eclbase_format_string=eclbase
-            if eclbase is not None
-            else DEFAULT_ECLBASE_FORMAT,
         )
 
         simulator_config = everest_config.simulator

src/ert/run_models/everest_run_model.py

@@ -102,7 +102,6 @@ def create_dummy_field(nx, ny, nz, mask):
         forward_init_file="no_nees",
         output_file="no_nees",
         grid_file="no_nees",
-        mask_file=Path("grid_mask.npy"),
     )