ert 19.0.1__py3-none-any.whl → 20.0.0b1__py3-none-any.whl

ert/__main__.py

@@ -8,10 +8,12 @@ import multiprocessing
 import os
 import re
 import resource
+import shutil
 import sys
 import warnings
 from argparse import ArgumentParser, ArgumentTypeError
 from collections.abc import Sequence
+from datetime import datetime
 from pathlib import Path
 from typing import Any
 from uuid import UUID
@@ -24,6 +26,9 @@ from _ert.threading import set_signal_handler
 from ert.base_model_context import use_runtime_plugins
 from ert.cli.main import ErtCliError, run_cli
 from ert.config import ConfigValidationError, ErtConfig, lint_file
+from ert.config.observation_config_migrations import (
+    remove_refcase_and_time_map_dependence_from_obs_config,
+)
 from ert.logging import LOGGING_CONFIG
 from ert.mode_definitions import (
     ENIF_MODE,
@@ -36,9 +41,9 @@ from ert.mode_definitions import (
 from ert.namespace import Namespace
 from ert.plugins import ErtRuntimePlugins, get_site_plugins, setup_site_logging
 from ert.run_models.multiple_data_assimilation import MultipleDataAssimilationConfig
-from ert.services import ErtServer, WebvizErt
+from ert.services import ErtServer
+from ert.services._storage_main import add_parser_options as ert_api_add_parser_options
 from ert.shared.status.utils import get_ert_memory_usage
-from ert.shared.storage.command import add_parser_options as ert_api_add_parser_options
 from ert.storage import ErtStorageException, ErtStoragePermissionError
 from ert.trace import trace, tracer
 from ert.validation import (
@@ -53,6 +58,66 @@ from ert.validation import (
 logger = logging.getLogger(__name__)
 
 
+def run_convert_observations(
+    args: Namespace, _: ErtRuntimePlugins | None = None
+) -> None:
+    changes = remove_refcase_and_time_map_dependence_from_obs_config(args.config)
+
+    if changes is None or changes.is_empty():
+        logger.info("convert_observations did not make any changes")
+        print(
+            "No observations dependent on TIME_MAP / REFCASE found, you can "
+            "safely remove TIME_MAP / REFCASE and the "
+            "corresponding files from ERT config."
+        )
+        return
+
+    obs_config_to_edit_path = changes.obs_config_path + ".updated"
+    print(
+        f"Making copy of obs config "
+        f"@ {changes.obs_config_path} -> {obs_config_to_edit_path}"
+    )
+
+    shutil.copy(changes.obs_config_path, obs_config_to_edit_path)
+    print(f"Applying change to obs config @ {obs_config_to_edit_path}...")
+    changes.apply_to_file(Path(obs_config_to_edit_path))
+    convert_observations_trace = ""
+    for history_change in changes.history_changes:
+        convert_observations_trace += (
+            f"History obs {history_change.source_observation.name} "
+            f"-> {len(history_change.summary_obs_declarations)} summary observations\n"
+        )
+
+    for gen_obs_change in changes.general_obs_changes:
+        convert_observations_trace += (
+            f"General obs {gen_obs_change.source_observation.name}, changing "
+            f"DATE {gen_obs_change.source_observation.date} "
+            f"to RESTART={gen_obs_change.restart}\n"
+        )
+    for summary_change in changes.summary_obs_changes:
+        convert_observations_trace += (
+            f"Summary obs {summary_change.source_observation.name}, changing "
+            f"RESTART {summary_change.source_observation.restart} "
+            f"to DATE={summary_change.date}\n"
+        )
+
+    logger.info(f"convert_observations trace: \n {convert_observations_trace}")
+    print(convert_observations_trace)
+
+    os.rename(
+        changes.obs_config_path,
+        f"{changes.obs_config_path}-{datetime.now().strftime('%Y-%m-%d-%H-%M-%S')}.old",
+    )
+    os.rename(obs_config_to_edit_path, changes.obs_config_path)
+    msg = (
+        f"Observation changes applied to {changes.obs_config_path}. The old "
+        f"observations file is now at {changes.obs_config_path}.old and can be "
+        f"safely deleted if the new one works."
+    )
+    print(msg)
+    logger.info(msg)
+
+
 def run_ert_storage(args: Namespace, _: ErtRuntimePlugins | None = None) -> None:
     with ErtServer.start_server(
         verbose=True,
@@ -63,67 +128,24 @@ def run_ert_storage(args: Namespace, _: ErtRuntimePlugins | None = None) -> None
 
 
 def run_webviz_ert(args: Namespace, _: ErtRuntimePlugins | None = None) -> None:
-    try:
-        import webviz_ert  # type: ignore  # noqa
-    except ImportError as err:
-        raise ValueError(
-            "Running `ert vis` requires that webviz_ert is installed"
-        ) from err
-
-    kwargs: dict[str, Any] = {"verbose": args.verbose}
-    ert_config = ErtConfig.with_plugins(get_site_plugins()).from_file(args.config)
-
-    os.chdir(ert_config.config_path)
-    ens_path = ert_config.ens_path
-
-    # Changing current working directory means we need to
-    # only use the base name of the config file path
-    kwargs["ert_config"] = os.path.basename(args.config)
-    kwargs["project"] = os.path.abspath(ens_path)
-
     yellow = "\x1b[33m"
     green = "\x1b[32m"
     bold = "\x1b[1m"
     reset = "\x1b[0m"
 
-    try:
-        with ErtServer.init_service(project=Path(ens_path).absolute()) as storage:
-            storage.wait_until_ready()
-            print(
-                f"""
+    print(
+        f"""
     ---------------------------------------------------------------
 
-    {yellow}{bold}Webviz-ERT is deprecated and will be removed in the near future{reset}
+    {yellow}{bold}Webviz-ERT is removed.
 
     {green}{bold}Plotting capabilities provided by Webviz-ERT are now available
     using the ERT plotter{reset}
 
-    ---------------------------------------------------------------
-
-    Starting up Webviz-ERT. This might take more than a minute.
-
     ---------------------------------------------------------------
     """
-            )
-            logger.info("Show Webviz-ert deprecation warning")
-            webviz_kwargs = {
-                "experimental_mode": args.experimental_mode,
-                "verbose": args.verbose,
-                "title": kwargs.get("ert_config", "ERT - Visualization tool"),
-                "project": kwargs.get("project", os.getcwd()),
-            }
-            with WebvizErt.start_server(**webviz_kwargs) as webviz_ert_server:
-                webviz_ert_server.wait()
-    except PermissionError as pe:
-        print(f"Error: {pe}", file=sys.stderr)
-        print(
-            "Cannot start or connect to storage service due to permission issues.",
-            file=sys.stderr,
-        )
-        print(
-            "This is most likely due to another user starting ERT using this storage",
-            file=sys.stderr,
-        )
+    )
+    logger.info("Show Webviz-ert removal warning")
 
 
 def strip_error_message_and_raise_exception(validated: ValidationStatus) -> None:
@@ -317,19 +339,6 @@ def get_ert_parser(parser: ArgumentParser | None = None) -> ArgumentParser:
     ert_api_parser.set_defaults(func=run_ert_storage)
     ert_api_add_parser_options(ert_api_parser)
 
-    ert_vis_parser = subparsers.add_parser(
-        "vis",
-        description="Launch webviz-driven visualization tool.",
-    )
-    ert_vis_parser.set_defaults(func=run_webviz_ert)
-    ert_vis_parser.add_argument("--name", "-n", type=str, default="Webviz-ERT")
-    ert_vis_parser.add_argument(
-        "--experimental-mode",
-        action="store_true",
-        help="Feature flag for enabling experimental plugins",
-    )
-    ert_api_add_parser_options(ert_vis_parser)  # ert vis shares args with ert api
-
     # test_run_parser
     test_run_description = f"Run '{TEST_RUN_MODE}' in cli"
     test_run_parser = subparsers.add_parser(
@@ -564,6 +573,28 @@ def get_ert_parser(parser: ArgumentParser | None = None) -> ArgumentParser:
         "--ensemble", help="Which ensemble to use", default=None
     )
 
+    # convert_observations_parser
+    convert_obs_parser = subparsers.add_parser(
+        "convert_observations",
+        help=(
+            "Convert HISTORY_OBSERVATION to SUMMARY_OBSERVATION and "
+            "remove REFCASE and TIME_MAP from ERT config."
+        ),
+        description=(
+            "Convert HISTORY_OBSERVATION to SUMMARY_OBSERVATION, "
+            "and embed REFCASE and TIME_MAP into observations"
+        ),
+    )
+    convert_obs_parser.set_defaults(func=run_convert_observations)
+    convert_obs_parser.add_argument(
+        "config",
+        type=valid_file,
+        help="Path to ERT config file",
+    )
+    convert_obs_parser.add_argument(
+        "--verbose", action="store_true", help="Show verbose output.", default=False
+    )
+
     # Common arguments/defaults for all non-gui modes
     for cli_parser in [
         test_run_parser,

ert/analysis/_es_update.py

@@ -323,16 +323,13 @@ def analysis_ES(
         logger.info(log_msg)
         progress_callback(AnalysisStatusEvent(msg=log_msg))
 
-        log_msg = f"There are {num_obs} responses and {ensemble_size} realizations."
-        logger.info(log_msg)
-        progress_callback(AnalysisStatusEvent(msg=log_msg))
-
-        log_msg = (
-            f"There are {(~non_zero_variance_mask).sum()} parameters with 0 variance "
-            f"that will not be updated."
-        )
-        logger.info(log_msg)
-        progress_callback(AnalysisStatusEvent(msg=log_msg))
+        if (param_count := (~non_zero_variance_mask).sum()) > 0:
+            log_msg = (
+                f"There are {param_count} parameters with 0 variance "
+                f"that will not be updated."
+            )
+            logger.info(log_msg)
+            progress_callback(AnalysisStatusEvent(msg=log_msg))
 
         if module.localization:
             config_node = source_ensemble.experiment.parameter_configuration[
@@ -382,16 +379,16 @@ def analysis_ES(
             )
 
         else:
+            log_msg = f"There are {num_obs} responses and {ensemble_size} realizations."
+            logger.info(log_msg)
+            progress_callback(AnalysisStatusEvent(msg=log_msg))
+
             # In-place multiplication is not yet supported, therefore avoiding @=
             param_ensemble_array[non_zero_variance_mask] = param_ensemble_array[  # noqa: PLR6104
                 non_zero_variance_mask
             ] @ T.astype(param_ensemble_array.dtype)
 
-        log_msg = f"Storing data for {param_group}.."
-        logger.info(log_msg)
-        progress_callback(AnalysisStatusEvent(msg=log_msg))
         start = time.time()
-
         target_ensemble.save_parameters_numpy(
             param_ensemble_array, param_group, iens_active_index
         )

ert/cli/main.py

@@ -59,7 +59,7 @@ def run_cli(args: Namespace, runtime_plugins: ErtRuntimePlugins | None = None) -
             f"Config contains forward model step {fm_step_name} {count} time(s)",
         )
 
-    if not ert_config.observations and args.mode not in {
+    if not ert_config.observation_declarations and args.mode not in {
         ENSEMBLE_EXPERIMENT_MODE,
         TEST_RUN_MODE,
         WORKFLOW_MODE,

ert/config/__init__.py

@@ -1,3 +1,4 @@
+from ._observations import Observation
 from .analysis_config import (
     AnalysisConfig,
     ObservationGroups,
@@ -47,7 +48,7 @@ from .queue_config import (
     LocalQueueOptions,
     QueueConfig,
 )
-from .response_config import InvalidResponseFile, ResponseConfig, ResponseMetadata
+from .response_config import InvalidResponseFile, ResponseConfig
 from .rft_config import RFTConfig
 from .summary_config import SummaryConfig
 from .surface_config import SurfaceConfig
@@ -113,6 +114,7 @@ __all__ = [
     "LegacyWorkflowConfigs",
     "LocalQueueOptions",
     "ModelConfig",
+    "Observation",
     "ObservationGroups",
     "ObservationSettings",
     "ObservationType",
@@ -131,7 +133,6 @@ __all__ = [
     "QueueSystem",
     "RFTConfig",
     "ResponseConfig",
-    "ResponseMetadata",
     "SamplerConfig",
     "SiteInstalledForwardModelStep",
     "SiteOrUserForwardModelStep",