Move remaining modules out of _c_wrappers

ci/jenkins/testkomodo-libres-ctest.sh

@@ -7,7 +7,6 @@ build() {
 
 copy_test_files () {
     mkdir -p ${CI_TEST_ROOT}/src/clib/res/fm/rms
-    ln -s ${CI_SOURCE_ROOT}/src/clib/_c_wrappers/fm/rms/rms_config.yml ${CI_TEST_ROOT}/src/clib/res/fm/rms/rms_config.yml
 }
 
 install_test_dependencies () {

script/pylint

@@ -6,7 +6,6 @@ from typing import Union
 SOURCE_ROOT = Path(__file__).parent.parent
 
 IGNORE_PATHS = [
-    "src/ert/_c_wrappers",
     "src/ert/gui",
     "src/ert/logging",
     "src/ert/analysis/_es_update.py",

setup.py

@@ -93,9 +93,6 @@ def package_files(directory):
         + package_files("src/ert/shared/share/")
         + ["logging/logger.conf", "logging/storage_log.conf"]
         + [
-            "_c_wrappers/fm/rms/rms_config.yml",
-            "_c_wrappers/fm/ecl/ecl300_config.yml",
-            "_c_wrappers/fm/ecl/ecl100_config.yml",
             "job_queue/qstat_proxy.sh",
         ],
     },

src/ert/analysis/_es_update.py

@@ -25,17 +25,17 @@
     ensemble_smoother_update_step_row_scaling,
 )
 
-from ert._c_wrappers.enkf.row_scaling import RowScaling
 from ert.config import Field, GenKwConfig, SurfaceConfig
 from ert.realization_state import RealizationState
 
+from .row_scaling import RowScaling
 from .update import Parameter, RowScalingParameter
 
 if TYPE_CHECKING:
     import numpy.typing as npt
 
-    from ert._c_wrappers.enkf import EnKFMain
     from ert.config import AnalysisConfig, AnalysisModule, EnkfObs, EnsembleConfig
+    from ert.enkf_main import EnKFMain
     from ert.storage import EnsembleAccessor, EnsembleReader
 
     from .configuration import UpdateConfiguration

src/ert/_c_wrappers/enkf/row_scaling.py → src/ert/analysis/row_scaling.py

@@ -1,6 +1,6 @@
 from typing import no_type_check
 
-from ert._clib.local.row_scaling import RowScaling
+from ert._clib.local.row_scaling import RowScaling  # pylint: disable=import-error
 
 
 @no_type_check

src/ert/analysis/update.py

@@ -3,7 +3,7 @@
 from pydantic import ConfigDict
 from pydantic.dataclasses import dataclass
 
-from ert._c_wrappers.enkf.row_scaling import RowScaling
+from .row_scaling import RowScaling
 
 
 @dataclass

src/ert/callbacks.py

@@ -4,8 +4,8 @@
 from pathlib import Path
 from typing import Callable, Iterable, Tuple
 
-from ert._c_wrappers.enkf import RunArg
 from ert.config import EnsembleConfig, ParameterConfig, SummaryConfig
+from ert.run_arg import RunArg
 
 from .load_status import LoadResult, LoadStatus
 from .realization_state import RealizationState

src/ert/cli/main.py

@@ -8,7 +8,6 @@
 import uuid
 from typing import Any
 
-from ert._c_wrappers.enkf import EnKFMain
 from ert.cli import (
     ENSEMBLE_EXPERIMENT_MODE,
     ENSEMBLE_SMOOTHER_MODE,
@@ -21,6 +20,7 @@
 from ert.cli.monitor import Monitor
 from ert.cli.workflow import execute_workflow
 from ert.config import ErtConfig
+from ert.enkf_main import EnKFMain
 from ert.ensemble_evaluator import EvaluatorServerConfig, EvaluatorTracker
 from ert.libres_facade import LibresFacade
 from ert.shared.feature_toggling import FeatureToggling

src/ert/cli/model_factory.py

@@ -5,7 +5,6 @@
 from typing import TYPE_CHECKING, List
 from uuid import UUID
 
-from ert._c_wrappers.enkf.enkf_main import EnKFMain
 from ert.cli import (
     ENSEMBLE_EXPERIMENT_MODE,
     ENSEMBLE_SMOOTHER_MODE,
@@ -14,6 +13,7 @@
     TEST_RUN_MODE,
 )
 from ert.config import ConfigWarning
+from ert.enkf_main import EnKFMain
 from ert.run_models import (
     EnsembleExperiment,
     EnsembleSmoother,

src/ert/config/ert_config.py

@@ -10,7 +10,7 @@
 
 import pkg_resources
 
-from ert._c_wrappers.util import SubstitutionList
+from ert.substitution_list import SubstitutionList
 
 from .analysis_config import AnalysisConfig
 from .ensemble_config import EnsembleConfig

src/ert/config/ert_script.py

@@ -10,7 +10,7 @@
 from typing import TYPE_CHECKING, Any, Callable, List, Optional, Type
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import EnKFMain
+    from ert.enkf_main import EnKFMain
     from ert.storage import EnsembleAccessor, StorageAccessor
 
 logger = logging.getLogger(__name__)

src/ert/config/ext_job.py

@@ -4,7 +4,7 @@
 from dataclasses import dataclass, field
 from typing import Dict, List, Optional, Tuple, no_type_check
 
-from ert._c_wrappers.util import SubstitutionList
+from ert.substitution_list import SubstitutionList
 
 from .parse_arg_types_list import parse_arg_types_list
 from .parsing import (

src/ert/config/external_ert_script.py

@@ -8,7 +8,7 @@
 from .ert_script import ErtScript
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import EnKFMain
+    from ert.enkf_main import EnKFMain
     from ert.storage import StorageAccessor
 
 

src/ert/config/workflow.py

@@ -6,7 +6,7 @@
 from .parsing import ConfigValidationError, ErrorInfo, init_workflow_schema, lark_parse
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.util import SubstitutionList
+    from ert.substitution_list import SubstitutionList
 
     from .workflow_job import WorkflowJob
 

src/ert/dark_storage/enkf.py

@@ -6,8 +6,8 @@
 from ert_storage.security import security
 from fastapi import Depends
 
-from ert._c_wrappers.enkf import EnKFMain
 from ert.config import ErtConfig
+from ert.enkf_main import EnKFMain
 from ert.libres_facade import LibresFacade
 from ert.storage import StorageReader, open_storage
 

src/ert/_c_wrappers/enkf/enkf_main.py → src/ert/enkf_main.py

@@ -21,23 +21,23 @@
 import numpy as np
 from numpy.random import SeedSequence
 
-from ert._c_wrappers.enkf.ert_run_context import RunContext
-from ert._c_wrappers.util.substitution_list import SubstitutionList
-from ert.analysis.configuration import UpdateConfiguration
-from ert.config import (
+from .analysis.configuration import UpdateConfiguration
+from .config import (
     AnalysisConfig,
     EnkfObs,
     EnsembleConfig,
     ModelConfig,
     ParameterConfig,
 )
-from ert.job_queue import WorkflowRunner
-from ert.realization_state import RealizationState
-from ert.runpaths import Runpaths
+from .job_queue import WorkflowRunner
+from .realization_state import RealizationState
+from .run_context import RunContext
+from .runpaths import Runpaths
+from .substitution_list import SubstitutionList
 
 if TYPE_CHECKING:
-    from ert.config import ErtConfig, HookRuntime, QueueConfig
-    from ert.storage import EnsembleAccessor, EnsembleReader, StorageAccessor
+    from .config import ErtConfig, HookRuntime, QueueConfig
+    from .storage import EnsembleAccessor, EnsembleReader, StorageAccessor
 
 logger = logging.getLogger(__name__)
 
@@ -97,7 +97,7 @@ def _value_export_json(
     )
 
 
-def _generate_parameter_files(
+def _generate_parameter_files(  # pylint: disable=too-many-arguments
     parameter_configs: Iterable[ParameterConfig],
     export_base_name: str,
     run_path: Path,
@@ -154,7 +154,7 @@ def _seed_sequence(seed: Optional[str]) -> SeedSequence:
     return SeedSequence(int_seed)
 
 
-class EnKFMain:
+class EnKFMain:  # pylint: disable=too-many-public-methods
     def __init__(self, config: "ErtConfig", read_only: bool = False) -> None:
         self.ert_config = config
         self._update_configuration: Optional[UpdateConfiguration] = None

src/ert/ensemble_evaluator/_builder/_ensemble_builder.py

@@ -10,8 +10,7 @@
 from ._realization import RealizationBuilder
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import AnalysisConfig
-    from ert.config import QueueConfig
+    from ert.config import AnalysisConfig, QueueConfig
 
     from ._ensemble import Ensemble
 

src/ert/ensemble_evaluator/_builder/_legacy.py

@@ -29,9 +29,9 @@
 from ._ensemble import Ensemble
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import AnalysisConfig, EnsembleConfig, RunArg
     from ert.callbacks import Callback
-    from ert.config import QueueConfig
+    from ert.config import AnalysisConfig, EnsembleConfig, QueueConfig
+    from ert.run_arg import RunArg
 
     from ..config import EvaluatorServerConfig
     from ._realization import Realization

src/ert/ensemble_evaluator/_builder/_step.py

@@ -9,8 +9,8 @@
 
 SOURCE_TEMPLATE_STEP = "/step/{step_id}"
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import RunArg
     from ert.callbacks import Callback, CallbackArgs
+    from ert.run_arg import RunArg
 
 
 class Step(Stage):

src/ert/gui/ertwidgets/models/ertsummary.py

@@ -1,7 +1,7 @@
 from typing import List
 
-from ert._c_wrappers.enkf import EnKFMain
 from ert.config import EnkfObservationImplementationType
+from ert.enkf_main import EnKFMain
 
 
 class ErtSummary:

src/ert/gui/ertwidgets/summarypanel.py

@@ -14,7 +14,7 @@
 from ert.gui.ertwidgets.models.ertsummary import ErtSummary
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import EnKFMain
+    from ert.enkf_main import EnKFMain
 
 
 class SummaryTemplate:

src/ert/gui/main.py

@@ -18,8 +18,8 @@
 from qtpy.QtCore import QLocale, QSize, Qt
 from qtpy.QtWidgets import QApplication
 
-from ert._c_wrappers.enkf import EnKFMain
 from ert.config import ConfigValidationError, ConfigWarning, ErtConfig, ParameterConfig
+from ert.enkf_main import EnKFMain
 from ert.gui.about_dialog import AboutDialog
 from ert.gui.ertwidgets import SuggestorMessage, SummaryPanel, resourceIcon
 from ert.gui.main_window import ErtMainWindow

src/ert/gui/simulation/ensemble_experiment_panel.py

@@ -2,7 +2,7 @@
 
 from qtpy.QtWidgets import QFormLayout, QLabel
 
-from ert._c_wrappers.enkf import EnKFMain
+from ert.enkf_main import EnKFMain
 from ert.gui.ertnotifier import ErtNotifier
 from ert.gui.ertwidgets import addHelpToWidget
 from ert.gui.ertwidgets.caseselector import CaseSelector

src/ert/gui/simulation/ensemble_smoother_panel.py

@@ -2,7 +2,7 @@
 
 from qtpy.QtWidgets import QFormLayout, QLabel
 
-from ert._c_wrappers.enkf import EnKFMain
+from ert.enkf_main import EnKFMain
 from ert.gui.ertnotifier import ErtNotifier
 from ert.gui.ertwidgets import AnalysisModuleEdit, addHelpToWidget
 from ert.gui.ertwidgets.caseselector import CaseSelector

src/ert/gui/simulation/simulation_panel.py

@@ -15,8 +15,8 @@
     QWidget,
 )
 
-from ert._c_wrappers.enkf import EnKFMain
 from ert.cli.model_factory import create_model
+from ert.enkf_main import EnKFMain
 from ert.gui.ertnotifier import ErtNotifier
 from ert.gui.ertwidgets import addHelpToWidget, resourceIcon
 from ert.libres_facade import LibresFacade

src/ert/gui/tools/export/export_tool.py

@@ -3,7 +3,7 @@
 
 from qtpy.QtWidgets import QMessageBox
 
-from ert._c_wrappers.enkf.enkf_main import EnKFMain
+from ert.enkf_main import EnKFMain
 from ert.gui.ertnotifier import ErtNotifier
 from ert.gui.ertwidgets import resourceIcon
 from ert.gui.ertwidgets.closabledialog import ClosableDialog

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

@@ -5,9 +5,9 @@
 if TYPE_CHECKING:
     from qtpy.QtWidgets import QWidget
 
-    from ert._c_wrappers.enkf import EnKFMain
+    from ert.config import ErtPlugin, WorkflowJob
+    from ert.enkf_main import EnKFMain
     from ert.gui.ertnotifier import ErtNotifier
-    from ert.job_queue import ErtPlugin, WorkflowJob
 
 
 class Plugin:

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

@@ -3,9 +3,9 @@
 from .plugin import Plugin
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import EnKFMain
+    from ert.config import WorkflowJob
+    from ert.enkf_main import EnKFMain
     from ert.gui.ertnotifier import ErtNotifier
-    from ert.job_queue import WorkflowJob
 
 
 class PluginHandler:

src/ert/gui/tools/run_analysis/run_analysis_tool.py

@@ -5,8 +5,8 @@
 from qtpy.QtCore import QObject, Qt, QThread, Signal, Slot
 from qtpy.QtWidgets import QApplication, QMessageBox
 
-from ert._c_wrappers.enkf import EnKFMain
 from ert.analysis import ErtAnalysisError, ESUpdate, Progress
+from ert.enkf_main import EnKFMain
 from ert.gui.ertnotifier import ErtNotifier
 from ert.gui.ertwidgets import resourceIcon
 from ert.gui.ertwidgets.statusdialog import StatusDialog

src/ert/job_queue/queue.py

@@ -31,10 +31,10 @@
 from . import ResPrototype
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf.run_arg import RunArg
     from ert.callbacks import Callback
     from ert.config import ErtConfig
     from ert.ensemble_evaluator import LegacyStep
+    from ert.run_arg import RunArg
 
     from .driver import Driver
 

src/ert/job_queue/workflow_runner.py

@@ -10,7 +10,7 @@
 from ert.config import ErtScript, ExternalErtScript, Workflow, WorkflowJob
 
 if TYPE_CHECKING:
-    from ert._c_wrappers.enkf import EnKFMain
+    from ert.enkf_main import EnKFMain
     from ert.storage import EnsembleAccessor, StorageAccessor
 
 

src/ert/libres_facade.py

@@ -10,9 +10,7 @@
 from ecl.grid import EclGrid
 from pandas import DataFrame, Series
 
-from ert._c_wrappers.enkf import EnKFMain
-from ert.analysis import ESUpdate, SmootherSnapshot
-from ert.analysis._es_update import ProgressCallback
+from ert.analysis import ESUpdate, ProgressCallback, SmootherSnapshot
 from ert.config import (
     EnkfObservationImplementationType,
     EnsembleConfig,
@@ -27,6 +25,8 @@
 from ert.shared.version import __version__
 from ert.storage import EnsembleReader
 
+from .enkf_main import EnKFMain
+
 _logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING: