Remove everest auto-scaled control values warning

* Remove everest auto-scaled control values warning
* Remove show_scaling_warning setting from settings file

If the file contains other keys, it will be updated, otherwise the whole settings
file will be removed.

* Have ert clean settings file if present

Author: andreas-el

.github/workflows/test_ert_with_flow.yml

@@ -87,5 +87,5 @@ jobs:
         yq eval '.model.realizations = [0, 1]' -i config.yml
         yq eval '.simulator.queue_system.max_running = 4' -i config.yml
         uv run everest lint config.yml
-        uv run everest run config.yml --skip-prompt --disable-monitoring
+        uv run everest run config.yml --disable-monitoring
         popd

ci/testkomodo.sh

@@ -75,7 +75,7 @@ run_everest_eightcells_test() {
     # shellcheck source=/dev/null
     source "${_KOMODO_ROOT}/${_FULL_RELEASE_NAME}/enable"
 
-    everest run "$CONFIG" --skip-prompt --debug --disable-monitoring
+    everest run "$CONFIG" --debug --disable-monitoring
     STATUS=$?
     if [ $STATUS -ne 0 ]; then
         echo "EVEREST eightcells test failed. Running everest kill"

src/ert/__main__.py

@@ -49,6 +49,7 @@
     RangeStringArgument,
     ValidationStatus,
 )
+from everest.bin.utils import remove_show_scaling_warning_setting
 
 logger = logging.getLogger(__name__)
 
@@ -630,6 +631,7 @@ def main() -> None:
         sys.exit(exit_msg)
 
     logger = logging.getLogger(__name__)
+    remove_show_scaling_warning_setting()
     if args.verbose:
         root_logger = logging.getLogger()
         handler = logging.StreamHandler(sys.stdout)

src/everest/bin/everest_script.py

@@ -36,10 +36,10 @@
     ArgParseFormatter,
     get_experiment_status,
     handle_keyboard_interrupt,
+    remove_show_scaling_warning_setting,
     run_detached_monitor,
     run_empty_detached_monitor,
     setup_logging,
-    show_scaled_controls_warning,
 )
 
 logger = logging.getLogger(__name__)
@@ -54,6 +54,7 @@ def everest_entry(args: list[str] | None = None) -> None:
     makedirs_if_needed(Path(options.config.output_dir), roll_if_exists=True)
     with setup_logging(options):
         logger.info(version_info())
+        remove_show_scaling_warning_setting()
 
         client_machine_hostname = socket.gethostname()
         server_queue_system = options.config.server.queue_system.name
@@ -150,11 +151,6 @@ def _build_args_parser() -> argparse.ArgumentParser:
             "and will be removed in a future version."
         ),
     )
-    arg_parser.add_argument(
-        "--skip-prompt",
-        action="store_true",
-        help="Flag used to disable user prompts that will stop execution.",
-    )
     arg_parser.add_argument(
         "--disable-monitoring",
         action="store_true",
@@ -210,8 +206,6 @@ async def directory_is_nonempty(path: Path) -> bool:
         options.config.simulation_dir
     ).exists() and await directory_is_nonempty(options.config.simulation_dir):
         warn_user_that_runpath_is_nonempty()
-    if not options.skip_prompt:
-        show_scaled_controls_warning()
 
     try:
         output_dir = Path(options.config.output_dir)

src/everest/bin/utils.py

@@ -10,7 +10,6 @@
 from contextlib import contextmanager
 from dataclasses import dataclass, field
 from pathlib import Path
-from textwrap import dedent
 from typing import Any, ClassVar
 
 import yaml
@@ -411,51 +410,55 @@ def run_empty_detached_monitor(
     start_monitor(server_context, callback=lambda _: None, experiment_id=experiment_id)
 
 
-def _read_user_preferences(user_info_path: Path) -> dict[str, dict[str, Any]]:
-    try:
-        if user_info_path.exists():
-            return json.loads(user_info_path.read_text(encoding="utf-8"))
-
-        user_info = {EVEREST: {"show_scaling_warning": True}}
-        user_info_path.write_text(
-            json.dumps(user_info, ensure_ascii=False, indent=4), encoding="utf-8"
-        )
-    except json.decoder.JSONDecodeError:
-        return {EVEREST: {}}
-    else:
-        return user_info
+def remove_show_scaling_warning_setting() -> None:
+    """Remove the now unused "show_scaling_warning" everest preference from
+    the legacy ~/.ert preferences file, if present. The whole file is
+    deleted if removing it leaves the file empty; otherwise the file is
+    rewritten without that key, preserving any other content.
+    """
+    user_info_path = Path(os.getenv("HOME", "")) / ".ert"
+    if not user_info_path.exists():
+        return
 
+    logger = logging.getLogger(EVEREST)
+    content = user_info_path.read_text(encoding="utf-8")
 
-def show_scaled_controls_warning() -> None:
-    user_info_path = Path(os.getenv("HOME", "")) / ".ert"
-    user_info = _read_user_preferences(user_info_path)
-    everest_pref = user_info.get(EVEREST, {})
+    try:
+        user_info = json.loads(content)
+    except json.decoder.JSONDecodeError as e:
+        logger.info(
+            "Preserving preferences file %s, could not be parsed: %s",
+            user_info_path,
+            e,
+        )
+        return
 
-    if not everest_pref.get("show_scaling_warning", True):
+    everest_pref = user_info.get(EVEREST)
+    if not isinstance(everest_pref, dict) or "show_scaling_warning" not in everest_pref:
         return
 
-    user_input = input(
-        dedent("""
-        From EVEREST version: 14.0.3, EVEREST will output auto-scaled control values.
-        Control values should now be specified in real-world units instead of the
-        optimizer's internal scale. The 'scaled_range' property can still be used
-        to configure the optimizer's range for each control.
-
-        [Enter] to continue.
-        [  Y  ] to stop showing this message again.
-        [  N  ] to abort.
-        """)
-    ).lower()
-    match user_input:
-        case "y":
-            everest_pref["show_scaling_warning"] = False
-            try:
-                with Path(user_info_path).open(mode="w", encoding="utf-8") as f:
-                    json.dump(user_info, f, ensure_ascii=False, indent=4)
-            except Exception as e:
-                logging.getLogger(EVEREST).error(str(e))
-        case "n":
-            raise SystemExit(0)
+    everest_pref.pop("show_scaling_warning")
+    if not everest_pref:
+        user_info.pop(EVEREST)
+
+    if not user_info:
+        user_info_path.unlink()
+        logger.info(
+            "Deleted preferences file %s, previously containing: %s",
+            user_info_path,
+            content,
+        )
+    else:
+        user_info_path.write_text(
+            json.dumps(user_info, ensure_ascii=False, indent=4), encoding="utf-8"
+        )
+        logger.info(
+            "Removed legacy show_scaling_warning preference from %s, "
+            "previous content: %s, remaining content: %s",
+            user_info_path,
+            content,
+            user_info,
+        )
 
 
 def get_experiment_status(storage_dir: str) -> ExperimentStatus | None:

tests/everest/entry_points/test_everest_entry.py

@@ -54,7 +54,7 @@ def test_everest_entry_debug(
         patch("everest.bin.utils.LOGGING_CONFIG", logger_conf),
         caplog.at_level(logging.DEBUG),
     ):
-        everest_entry(["config.yml", "--debug", "--skip"])
+        everest_entry(["config.yml", "--debug"])
     logstream = "\n".join(caplog.messages)
     start_server_mock.assert_called_once()
     wait_for_server_mock.assert_called_once()
@@ -93,7 +93,7 @@ def test_everest_entry(
     Path("config.yml").touch()
     config = everest_config_with_defaults(config_path="./config.yml")
     config.write_to_file("config.yml")
-    everest_entry(["config.yml", "--skip"])
+    everest_entry(["config.yml"])
     start_server_mock.assert_called_once()
     wait_for_server_mock.assert_called_once()
     start_monitor_mock.assert_called_once()
@@ -136,7 +136,7 @@ def test_everest_entry_detached_already_run(
     config.write_to_file("config.yml")
 
     # start a new run
-    everest_entry(["config.yml", "--skip-prompt"])
+    everest_entry(["config.yml"])
     start_server_mock.assert_called_once()
     start_monitor_mock.assert_called_once()
     start_experiment_mock.assert_called_once()
@@ -152,7 +152,7 @@ def test_everest_entry_detached_already_run(
     assert kill_script_client_mock.call_count == 1
 
     # run again, should start a new run like above
-    everest_entry(["config.yml", "--skip-prompt"])
+    everest_entry(["config.yml"])
     start_server_mock.assert_called_once()
     start_monitor_mock.assert_called_once()
     start_experiment_mock.assert_called_once()
@@ -214,7 +214,7 @@ def test_everest_entry_detached_running(
 
     # can't start a new run if one is already running
     with capture_streams() as (out, _):
-        everest_entry(["config.yml", "--skip-prompt"])
+        everest_entry(["config.yml"])
     assert "everest kill" in out.getvalue()
     assert "everest monitor" in out.getvalue()
     start_server_mock.assert_not_called()
@@ -236,7 +236,7 @@ def test_everest_entry_detached_running(
     # if already running, nothing happens
     assert "everest kill" in out.getvalue()
     assert "everest monitor" in out.getvalue()
-    everest_entry(["config.yml", "--skip-prompt"])
+    everest_entry(["config.yml"])
     kill_script_client_mock.assert_called_once()
     start_server_mock.assert_not_called()
 
@@ -327,7 +327,7 @@ def test_exception_raised_when_server_run_fails(
     config.write_to_file("config.yml")
 
     with pytest.raises(SystemError, match="Reality was ripped to shreds!"):
-        everest_entry(["config.yml", "--skip-prompt"])
+        everest_entry(["config.yml"])
 
 
 @patch(
@@ -420,7 +420,7 @@ def test_that_run_everest_prints_where_it_runs(
         patch("everest.bin.everest_script.wait_for_server"),
         patch("everest.bin.everest_script.start_experiment"),
     ):
-        everest_entry(["config.yml", "--skip-prompt"])
+        everest_entry(["config.yml"])
 
         captured = capsys.readouterr().out
 

tests/everest/functional/test_main_everest_entry.py

@@ -67,7 +67,7 @@ def test_everest_entry_run(cached_example):
 
     # Setup command line arguments
     with capture_streams() as (out, _):
-        start_everest(["everest", "run", config_file, "--skip-prompt"])
+        start_everest(["everest", "run", config_file])
 
     assert (
         "EVEREST run finished with: Maximum number of batches reached" in out.getvalue()
@@ -166,7 +166,7 @@ def wait_and_kill():
         thread.start()
 
         with pytest.raises(SystemExit):
-            start_everest(["everest", "run", "config.yml", "--skip-prompt"])
+            start_everest(["everest", "run", "config.yml"])
 
         out = capsys.readouterr().out
 

tests/everest/test_everest_client.py

@@ -187,7 +187,7 @@ def test_that_multiple_everest_clients_can_connect_to_server(
 
     # Run the case through everserver
     everest_main_thread = threading.Thread(
-        target=everest_entry, args=[[str(config_path), "--skip-prompt"]]
+        target=everest_entry, args=[[str(config_path)]]
     )
 
     everest_main_thread.start()

tests/everest/test_everest_output.py

@@ -52,7 +52,7 @@ def test_save_running_config(
     )
     config.write_to_file("config.yml")
 
-    everest_entry(["config.yml", "--skip-prompt"])
+    everest_entry(["config.yml"])
     saved_config_path = Path(config.output_dir) / "config.yml"
 
     assert saved_config_path.exists()

tests/everest/test_logging.py

@@ -43,7 +43,7 @@ def test_logging_setup(copy_math_func_test_data_to_tmp):
     # start_server() loads config based on config_path, so we need to actually
     # overwrite it
     everest_config.write_to_file("config_minimal.yml")
-    start_everest(["everest", "run", "config_minimal.yml", "--skip-prompt"])
+    start_everest(["everest", "run", "config_minimal.yml"])
 
     everest_output_path = Path.cwd() / "everest_output"
     everest_logs_dir_path = Path(everest_config.log_dir)