Clean up UpdateSettings import

equinor · Jan 29, 2025 · 6466dd8 · 6466dd8
1 parent 7da209f
commit 6466dd8
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 35 deletions.
diff --git a/src/ert/analysis/_es_update.py b/src/ert/analysis/_es_update.py
@@ -19,10 +19,8 @@
 import scipy
 from iterative_ensemble_smoother.experimental import AdaptiveESMDA
 
-from ert.config import GenKwConfig
+from ert.config import ESSettings, GenKwConfig, ObservationGroups, UpdateSettings
 
-from ..config.analysis_config import ObservationGroups, UpdateSettings
-from ..config.analysis_module import ESSettings
 from . import misfit_preprocessor
 from .event import (
     AnalysisCompleteEvent,

diff --git a/src/ert/config/__init__.py b/src/ert/config/__init__.py
@@ -1,4 +1,4 @@
-from .analysis_config import AnalysisConfig
+from .analysis_config import AnalysisConfig, ObservationGroups, UpdateSettings
 from .analysis_module import AnalysisModule, ESSettings
 from .capture_validation import capture_validation
 from .design_matrix import DesignMatrix
@@ -69,6 +69,7 @@
     "HookRuntime",
     "InvalidResponseFile",
     "ModelConfig",
+    "ObservationGroups",
     "ObservationType",
     "ParameterConfig",
     "PriorDict",
@@ -79,6 +80,7 @@
     "SummaryObservation",
     "SurfaceConfig",
     "TransformFunction",
+    "UpdateSettings",
     "WarningInfo",
     "Workflow",
     "WorkflowJob",

diff --git a/src/ert/run_models/base_run_model.py b/src/ert/run_models/base_run_model.py
@@ -29,7 +29,7 @@
     AnalysisErrorEvent,
     AnalysisEvent,
 )
-from ert.config import HookRuntime, QueueSystem
+from ert.config import HookRuntime, QueueSystem, UpdateSettings
 from ert.config.analysis_module import ESSettings
 from ert.config.forward_model_step import ForwardModelStep
 from ert.config.model_config import ModelConfig
@@ -58,7 +58,6 @@
 from ert.trace import tracer
 from ert.workflow_runner import WorkflowRunner
 
-from ..config.analysis_config import UpdateSettings
 from ..run_arg import RunArg
 from .event import (
     AnalysisStatusEvent,

diff --git a/src/ert/run_models/ensemble_smoother.py b/src/ert/run_models/ensemble_smoother.py
@@ -7,14 +7,12 @@
 
 import numpy as np
 
-from ert.config import ErtConfig, HookRuntime
+from ert.config import ErtConfig, ESSettings, HookRuntime, UpdateSettings
 from ert.enkf_main import sample_prior
 from ert.ensemble_evaluator import EvaluatorServerConfig
 from ert.storage import Storage
 from ert.trace import tracer
 
-from ..config.analysis_config import UpdateSettings
-from ..config.analysis_module import ESSettings
 from ..run_arg import create_run_arguments
 from .base_run_model import StatusEvents, UpdateRunModel
 

diff --git a/src/ert/run_models/manual_update.py b/src/ert/run_models/manual_update.py
@@ -6,12 +6,10 @@
 from typing import TYPE_CHECKING
 from uuid import UUID
 
-from ert.config import ErtConfig
+from ert.config import ErtConfig, ESSettings, UpdateSettings
 from ert.ensemble_evaluator import EvaluatorServerConfig
 from ert.storage import Storage
 
-from ..config.analysis_config import UpdateSettings
-from ..config.analysis_module import ESSettings
 from .base_run_model import ErtRunError, StatusEvents, UpdateRunModel
 
 if TYPE_CHECKING:

diff --git a/src/ert/run_models/model_factory.py b/src/ert/run_models/model_factory.py
@@ -6,8 +6,7 @@
 
 import numpy as np
 
-from ert.config import ConfigValidationError, ConfigWarning, ErtConfig
-from ert.config.analysis_config import UpdateSettings
+from ert.config import ConfigValidationError, ConfigWarning, ErtConfig, UpdateSettings
 from ert.mode_definitions import (
     ENSEMBLE_EXPERIMENT_MODE,
     ENSEMBLE_SMOOTHER_MODE,

diff --git a/src/ert/run_models/multiple_data_assimilation.py b/src/ert/run_models/multiple_data_assimilation.py
@@ -8,14 +8,12 @@
 
 import numpy as np
 
-from ert.config import ErtConfig, HookRuntime
+from ert.config import ErtConfig, ESSettings, HookRuntime, UpdateSettings
 from ert.enkf_main import sample_prior
 from ert.ensemble_evaluator import EvaluatorServerConfig
 from ert.storage import Ensemble, Storage
 from ert.trace import tracer
 
-from ..config.analysis_config import UpdateSettings
-from ..config.analysis_module import ESSettings
 from ..run_arg import create_run_arguments
 from .base_run_model import ErtRunError, StatusEvents, UpdateRunModel
 

diff --git a/tests/ert/performance_tests/test_analysis.py b/tests/ert/performance_tests/test_analysis.py
@@ -8,9 +8,7 @@
 from scipy.ndimage import gaussian_filter
 
 from ert.analysis import smoother_update
-from ert.config import Field, GenDataConfig
-from ert.config.analysis_config import UpdateSettings
-from ert.config.analysis_module import ESSettings
+from ert.config import ESSettings, Field, GenDataConfig, UpdateSettings
 from ert.field_utils import Shape
 
 

diff --git a/tests/ert/performance_tests/test_memory_usage.py b/tests/ert/performance_tests/test_memory_usage.py
@@ -13,8 +13,7 @@
 import xtgeo
 
 from ert.analysis import smoother_update
-from ert.config import ErtConfig, ESSettings
-from ert.config.analysis_config import UpdateSettings
+from ert.config import ErtConfig, ESSettings, UpdateSettings
 from ert.enkf_main import sample_prior
 from ert.mode_definitions import ENSEMBLE_SMOOTHER_MODE
 from ert.storage import open_storage

diff --git a/tests/ert/performance_tests/test_obs_and_responses_performance.py b/tests/ert/performance_tests/test_obs_and_responses_performance.py
@@ -8,8 +8,13 @@
 import pytest
 
 from ert.analysis import smoother_update
-from ert.config import ESSettings, GenDataConfig, GenKwConfig, SummaryConfig
-from ert.config.analysis_config import UpdateSettings
+from ert.config import (
+    ESSettings,
+    GenDataConfig,
+    GenKwConfig,
+    SummaryConfig,
+    UpdateSettings,
+)
 from ert.config.gen_kw_config import TransformFunctionDefinition
 from ert.enkf_main import sample_prior
 from ert.storage import open_storage

diff --git a/tests/ert/ui_tests/cli/test_field_parameter.py b/tests/ert/ui_tests/cli/test_field_parameter.py
@@ -14,9 +14,7 @@
 from ert.analysis import (
     smoother_update,
 )
-from ert.config import ErtConfig
-from ert.config.analysis_config import UpdateSettings
-from ert.config.analysis_module import ESSettings
+from ert.config import ErtConfig, ESSettings, UpdateSettings
 from ert.mode_definitions import ENSEMBLE_SMOOTHER_MODE
 from ert.storage import open_storage
 

diff --git a/tests/ert/unit_tests/analysis/test_es_update.py b/tests/ert/unit_tests/analysis/test_es_update.py
@@ -19,9 +19,7 @@
     _save_param_ensemble_array_to_disk,
 )
 from ert.analysis.event import AnalysisCompleteEvent, AnalysisErrorEvent
-from ert.config import Field, GenDataConfig, GenKwConfig
-from ert.config.analysis_config import UpdateSettings
-from ert.config.analysis_module import ESSettings
+from ert.config import ESSettings, Field, GenDataConfig, GenKwConfig, UpdateSettings
 from ert.config.gen_kw_config import TransformFunctionDefinition
 from ert.field_utils import Shape
 from ert.storage import open_storage

diff --git a/tests/ert/unit_tests/run_models/test_model_factory.py b/tests/ert/unit_tests/run_models/test_model_factory.py
@@ -11,8 +11,8 @@
     ConfigWarning,
     ErtConfig,
     ModelConfig,
+    UpdateSettings,
 )
-from ert.config.analysis_config import UpdateSettings
 from ert.mode_definitions import (
     ENSEMBLE_SMOOTHER_MODE,
     ES_MDA_MODE,

diff --git a/tests/ert/unit_tests/scenarios/test_summary_response.py b/tests/ert/unit_tests/scenarios/test_summary_response.py
@@ -11,8 +11,7 @@
 
 from ert import LibresFacade
 from ert.analysis import ErtAnalysisError, smoother_update
-from ert.config import ErtConfig, ESSettings
-from ert.config.analysis_config import UpdateSettings
+from ert.config import ErtConfig, ESSettings, UpdateSettings
 from ert.data import MeasuredData
 from ert.enkf_main import sample_prior
 

diff --git a/tests/ert/unit_tests/storage/test_storage_migration.py b/tests/ert/unit_tests/storage/test_storage_migration.py
@@ -10,8 +10,7 @@
 from packaging import version
 
 from ert.analysis import ErtAnalysisError, smoother_update
-from ert.config import ErtConfig, ESSettings
-from ert.config.analysis_config import UpdateSettings
+from ert.config import ErtConfig, ESSettings, UpdateSettings
 from ert.storage import open_storage
 from ert.storage.local_storage import (
     _LOCAL_STORAGE_VERSION,