ert 16.0.9__py3-none-any.whl → 19.0.0rc2__py3-none-any.whl

ert/run_models/ensemble_experiment.py

@@ -13,14 +13,22 @@ from ert.config import (
     ResponseConfig,
 )
 from ert.ensemble_evaluator import EvaluatorServerConfig
-from ert.run_models.initial_ensemble_run_model import InitialEnsembleRunModel
+from ert.run_models.initial_ensemble_run_model import (
+    InitialEnsembleRunModel,
+    InitialEnsembleRunModelConfig,
+)
 from ert.storage import Ensemble
 from ert.trace import tracer
 
 logger = logging.getLogger(__name__)
 
 
-class EnsembleExperiment(InitialEnsembleRunModel):
+class EnsembleExperimentConfig(InitialEnsembleRunModelConfig):
+    target_ensemble: str
+    supports_rerunning_failed_realizations: ClassVar[bool] = True
+
+
+class EnsembleExperiment(InitialEnsembleRunModel, EnsembleExperimentConfig):
     """
     This workflow will create a new experiment and a new ensemble from
     the user configuration.<br>It will never overwrite existing ensembles, and
@@ -28,8 +36,6 @@ class EnsembleExperiment(InitialEnsembleRunModel):
     """
 
     _ensemble_id: UUID | None = PrivateAttr(None)
-    supports_rerunning_failed_realizations: ClassVar[bool] = True
-    target_ensemble: str
 
     @property
     def _ensemble(self) -> Ensemble:

ert/run_models/ensemble_information_filter.py

@@ -7,11 +7,18 @@ from ert.run_models.ensemble_smoother import EnsembleSmoother
 from ert.storage import Ensemble
 
 from ..analysis import enif_update
+from .initial_ensemble_run_model import InitialEnsembleRunModelConfig
+from .update_run_model import UpdateRunModelConfig
 
 logger = logging.getLogger(__name__)
 
 
-class EnsembleInformationFilter(EnsembleSmoother):
+class EnsembleInformationFilterConfig(
+    InitialEnsembleRunModelConfig, UpdateRunModelConfig
+): ...
+
+
+class EnsembleInformationFilter(EnsembleSmoother, EnsembleInformationFilterConfig):
     def update_ensemble_parameters(
         self, prior: Ensemble, posterior: Ensemble, weight: float
     ) -> None:

ert/run_models/ensemble_smoother.py

@@ -14,8 +14,11 @@ from ert.config import (
     ResponseConfig,
 )
 from ert.ensemble_evaluator import EvaluatorServerConfig
-from ert.run_models.initial_ensemble_run_model import InitialEnsembleRunModel
-from ert.run_models.update_run_model import UpdateRunModel
+from ert.run_models.initial_ensemble_run_model import (
+    InitialEnsembleRunModel,
+    InitialEnsembleRunModelConfig,
+)
+from ert.run_models.update_run_model import UpdateRunModel, UpdateRunModelConfig
 from ert.storage import Ensemble
 from ert.trace import tracer
 
@@ -26,7 +29,10 @@ from .run_model import ErtRunError
 logger = logging.getLogger(__name__)
 
 
-class EnsembleSmoother(UpdateRunModel, InitialEnsembleRunModel):
+class EnsembleSmootherConfig(InitialEnsembleRunModelConfig, UpdateRunModelConfig): ...
+
+
+class EnsembleSmoother(InitialEnsembleRunModel, UpdateRunModel, EnsembleSmootherConfig):
     _total_iterations: int = PrivateAttr(default=2)
 
     @tracer.start_as_current_span(f"{__name__}.run_experiment")

ert/run_models/evaluate_ensemble.py

@@ -10,12 +10,17 @@ from ert.ensemble_evaluator import EvaluatorServerConfig
 from ert.trace import tracer
 
 from ..run_arg import create_run_arguments
-from .run_model import RunModel
+from .run_model import RunModel, RunModelConfig
 
 logger = logging.getLogger(__name__)
 
 
-class EvaluateEnsemble(RunModel):
+class EvaluateEnsembleConfig(RunModelConfig):
+    ensemble_id: str
+    supports_rerunning_failed_realizations: ClassVar[bool] = True
+
+
+class EvaluateEnsemble(RunModel, EvaluateEnsembleConfig):
     """
     This workflow will evaluate ensembles which have parameters, but no simulation
     has been performed, so there are no responses. This can be used in instances
@@ -24,14 +29,11 @@ class EvaluateEnsemble(RunModel):
     ensemble, and will not reflect any changes to the user configuration on disk.
     """
 
-    ensemble_id: str
-    supports_rerunning_failed_realizations: ClassVar[bool] = True
-
     def model_post_init(self, ctx: Any) -> None:
         super().model_post_init(ctx)
         try:
             ensemble = self._storage.get_ensemble(UUID(self.ensemble_id))
-            self.start_iteration = ensemble.iteration
+            self._start_iteration = ensemble.iteration
         except KeyError as err:
             raise ValueError(f"No ensemble: {self.ensemble_id}") from err
 

ert/run_models/event.py

@@ -6,6 +6,7 @@ from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
 
+from _ert.events import EnsembleEvaluationWarning
 from ert.analysis import (
     AnalysisStatusEvent,
     AnalysisTimeEvent,
@@ -15,6 +16,7 @@ from ert.ensemble_evaluator.event import (
     EndEvent,
     FullSnapshotEvent,
     SnapshotUpdateEvent,
+    StartEvent,
     WarningEvent,
 )
 
@@ -90,17 +92,19 @@ StatusEvents = (
     AnalysisStatusEvent
     | AnalysisTimeEvent
     | EndEvent
-    | EverestStatusEvent
     | EverestBatchResultEvent
+    | EverestStatusEvent
     | FullSnapshotEvent
-    | SnapshotUpdateEvent
+    | RunModelDataEvent
     | RunModelErrorEvent
     | RunModelStatusEvent
     | RunModelTimeEvent
     | RunModelUpdateBeginEvent
-    | RunModelDataEvent
     | RunModelUpdateEndEvent
+    | SnapshotUpdateEvent
+    | StartEvent
     | WarningEvent
+    | EnsembleEvaluationWarning
 )