review: use log path for reports dir

Author: yngve-sk

src/ert/cli/workflow.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from ert.runpaths import Runpaths
@@ -28,9 +27,7 @@ def execute_workflow(
         fixtures={
             "storage": storage,
             "random_seed": ert_config.random_seed,
-            "reports_dir": str(
-                storage.path.parent / "reports" / Path(ert_config.user_config_file).stem
-            ),
+            "reports_dir": str(ert_config.analysis_config.log_path),
             "observation_settings": ert_config.analysis_config.observation_settings,
             "es_settings": ert_config.analysis_config.es_module,
             "run_paths": Runpaths(

src/ert/gui/tools/plugins/plugin_runner.py

@@ -2,7 +2,6 @@
 
 import time
 from collections.abc import Callable
-from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from _ert.threading import ErtThread
@@ -50,9 +49,7 @@ def run(self) -> None:
                     "storage": self.storage,
                     "random_seed": ert_config.random_seed,
                     "reports_dir": str(
-                        self.storage.path.parent
-                        / "reports"
-                        / Path(ert_config.user_config_file).stem
+                        self.ert_config.analysis_config.log_path / "reports"
                     ),
                     "observation_settings": ert_config.analysis_config.observation_settings,
                     "es_settings": ert_config.analysis_config.es_module,

src/ert/gui/tools/workflows/run_workflow_widget.py

@@ -2,7 +2,6 @@
 
 import time
 from collections.abc import Iterable
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from PyQt6.QtCore import QSize, Qt
@@ -126,16 +125,15 @@ def startWorkflow(self) -> None:
         )
 
         workflow = self.config.workflows[self.getCurrentWorkflowName()]
+        ensemble = self.source_ensemble_selector.currentData()
         self._workflow_runner = WorkflowRunner(
             workflow=workflow,
             fixtures={
-                "ensemble": self.source_ensemble_selector.currentData(),
+                "ensemble": ensemble,
                 "storage": self.storage,
                 "random_seed": self.config.random_seed,
                 "reports_dir": str(
-                    self.storage.path.parent
-                    / "reports"
-                    / Path(self.config.user_config_file).stem
+                    self.config.analysis_config.log_path / ensemble.experiment.name
                 ),
                 "observation_settings": self.config.analysis_config.observation_settings,
                 "es_settings": self.config.analysis_config.es_module,

src/ert/libres_facade.py

@@ -221,10 +221,7 @@ def run_ertscript(  # type: ignore
                 "storage": storage,
                 "ensemble": ensemble,
                 "reports_dir": (
-                    storage.path.parent
-                    / "reports"
-                    / Path(str(self.user_config_file)).stem
-                    / ensemble.name
+                    self.config.analysis_config.log_path / ensemble.experiment.name
                 ),
                 "observation_settings": self.config.analysis_config.observation_settings,
                 "es_settings": self.config.analysis_config.es_module,

src/ert/run_models/base_run_model.py

@@ -151,6 +151,7 @@ def __init__(
         templates: list[tuple[str, str]],
         hooked_workflows: defaultdict[HookRuntime, list[Workflow]],
         active_realizations: list[bool],
+        log_path: Path,
         total_iterations: int = 1,
         start_iteration: int = 0,
         random_seed: int | None = None,
@@ -181,6 +182,7 @@ def __init__(
         self._hooked_workflows: defaultdict[HookRuntime, list[Workflow]] = (
             hooked_workflows
         )
+        self._log_path = log_path
 
         self._env_vars: dict[str, str] = env_vars
         self._env_pr_fm_step: dict[str, dict[str, Any]] = env_pr_fm_step
@@ -214,13 +216,8 @@ def api(self) -> BaseRunModelAPI:
             cancel=self.cancel,
         )
 
-    def reports_dir(self, ensemble_name: str) -> str:
-        return str(
-            self._storage.path.parent
-            / "reports"
-            / Path(str(self._user_config_file)).stem
-            / ensemble_name
-        )
+    def reports_dir(self, experiment_name: str) -> str:
+        return str(self._log_path / experiment_name)
 
     def log_at_startup(self) -> None:
         keys_to_drop = [
@@ -747,7 +744,9 @@ def _evaluate_and_postprocess(
             fixtures={
                 "storage": self._storage,
                 "ensemble": ensemble,
-                "reports_dir": self.reports_dir(ensemble_name=ensemble.name),
+                "reports_dir": self.reports_dir(
+                    experiment_name=ensemble.experiment.name
+                ),
                 "random_seed": self.random_seed,
                 "run_paths": self.run_paths,
             },
@@ -782,7 +781,9 @@ def _evaluate_and_postprocess(
             fixtures={
                 "storage": self._storage,
                 "ensemble": ensemble,
-                "reports_dir": self.reports_dir(ensemble_name=ensemble.name),
+                "reports_dir": self.reports_dir(
+                    experiment_name=ensemble.experiment.name
+                ),
                 "random_seed": self.random_seed,
                 "run_paths": self.run_paths,
             },
@@ -813,6 +814,7 @@ def __init__(
         start_iteration: int,
         random_seed: int | None,
         minimum_required_realizations: int,
+        log_path: Path,
     ):
         self._analysis_settings: ESSettings = analysis_settings
         self._update_settings: UpdateSettings = update_settings
@@ -835,6 +837,7 @@ def __init__(
             start_iteration=start_iteration,
             random_seed=random_seed,
             minimum_required_realizations=minimum_required_realizations,
+            log_path=log_path,
         )
 
     def update(
@@ -858,7 +861,7 @@ def update(
             "observation_settings": self._update_settings,
             "es_settings": self._analysis_settings,
             "random_seed": self.random_seed,
-            "reports_dir": self.reports_dir(ensemble_name=prior.name),
+            "reports_dir": self.reports_dir(experiment_name=prior.experiment.name),
             "run_paths": self.run_paths,
         }
 

src/ert/run_models/ensemble_experiment.py

@@ -66,6 +66,7 @@ def __init__(
             config.ert_templates,
             config.hooked_workflows,
             total_iterations=1,
+            log_path=config.analysis_config.log_path,
             active_realizations=active_realizations,
             random_seed=random_seed,
             minimum_required_realizations=minimum_required_realizations,

src/ert/run_models/ensemble_smoother.py

@@ -58,6 +58,7 @@ def __init__(
             total_iterations=2,
             random_seed=random_seed,
             minimum_required_realizations=minimum_required_realizations,
+            log_path=config.analysis_config.log_path,
         )
         self.target_ensemble_format = target_ensemble
         self.experiment_name = experiment_name

src/ert/run_models/evaluate_ensemble.py

@@ -67,6 +67,7 @@ def __init__(
             active_realizations=active_realizations,
             minimum_required_realizations=minimum_required_realizations,
             random_seed=random_seed,
+            log_path=config.analysis_config.log_path,
         )
 
     @tracer.start_as_current_span(f"{__name__}.run_experiment")

src/ert/run_models/everest_run_model.py

@@ -249,6 +249,7 @@ def _get_variables(
             ert_templates,
             hooked_workflows,
             active_realizations=[],  # Set dynamically in run_forward_model()
+            log_path=Path(everest_config.optimization_output_dir),
         )
 
     @classmethod

src/ert/run_models/multiple_data_assimilation.py

@@ -85,6 +85,7 @@ def __init__(
             start_iteration=start_iteration,
             random_seed=random_seed,
             minimum_required_realizations=minimum_required_realizations,
+            log_path=config.analysis_config.log_path,
         )
         self.support_restart = False
         self._observations = config.observations

tests/ert/unit_tests/run_models/test_base_run_model.py

@@ -38,6 +38,7 @@ def test_base_run_model_supports_restart(minimum_case):
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=[True],
+        log_path=Path(""),
     )
     assert brm.support_restart
 
@@ -68,6 +69,7 @@ def test_active_realizations(initials):
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=initials,
+        log_path=Path(""),
     )
     brm._initial_realizations_mask = initials
     assert brm.ensemble_size == len(initials)
@@ -101,6 +103,7 @@ def test_failed_realizations(initials, completed, any_failed, failures):
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=initials,
+        log_path=Path(""),
     )
     brm._initial_realizations_mask = initials
     brm._completed_realizations_mask = completed
@@ -147,6 +150,7 @@ def test_check_if_runpath_exists(
         active_realizations=active_realizations_mask,
         start_iteration=start_iteration,
         total_iterations=number_of_iterations,
+        log_path=Path(""),
     )
     assert brm.check_if_runpath_exists() == expected
 
@@ -181,6 +185,7 @@ def test_get_number_of_existing_runpaths(
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=active_realizations_mask,
+        log_path=Path(""),
     )
 
     assert brm.get_number_of_existing_runpaths() == expected_number
@@ -228,6 +233,7 @@ def test_delete_run_path(run_path_format, active_realizations):
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=active_realizations,
+        log_path=Path(""),
     )
 
     brm.rm_run_path()
@@ -256,6 +262,7 @@ def test_num_cpu_is_propagated_from_config_to_ensemble(run_args):
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=[True],
+        log_path=Path(""),
     )
 
     run_args = run_args(config, MagicMock())
@@ -311,6 +318,7 @@ def test_get_current_status(
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=initial_active_realizations,
+        log_path=Path(""),
     )
 
     snapshot_dict_reals = {}
@@ -398,6 +406,7 @@ def test_get_current_status_when_rerun(
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=initial_active_realizations,
+        log_path=Path(""),
     )
 
     brm.restart = True
@@ -432,6 +441,7 @@ def test_get_current_status_for_new_iteration_when_realization_failed_in_previou
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=initial_active_realizations,
+        log_path=Path(""),
     )
 
     snapshot_dict_reals = {
@@ -485,6 +495,7 @@ def test_get_number_of_active_realizations_varies_when_rerun_or_new_iteration(
         templates=MagicMock(),
         hooked_workflows=MagicMock(),
         active_realizations=initial_active_realizations,
+        log_path=Path(""),
     )
 
     brm.active_realizations = new_active_realizations