Use only one fm shell script list

src/ert/resources/__init__.py

@@ -0,0 +1,10 @@
+import os
+import pathlib
+
+all_shell_script_fm_steps = [
+ x.split(".py")[0]
+ for x in os.listdir(pathlib.Path(__file__).resolve().parent / "shell_scripts")
+ if not x.startswith("__")
+]
+
+__all__ = ["all_shell_script_fm_steps"]

src/everest/bin/utils.py

@@ -9,6 +9,7 @@
 import colorama
 from colorama import Fore
 
+from ert.resources import all_shell_script_fm_steps
 from ert.simulator.batch_simulator_context import Status
 from everest.config import EverestConfig
 from everest.detached import (
@@ -20,7 +21,6 @@
  start_monitor,
 )
 from everest.export import export
-from everest.jobs import shell_commands
 from everest.simulator import JOB_FAILURE, JOB_RUNNING, JOB_SUCCESS
 from everest.strings import EVEREST
 
@@ -269,7 +269,11 @@ def _get_jobs_status(progress):
  def _filter_jobs(self, progress):
  if not self._show_all_jobs:
  progress = [
- [job for job in progress_list if job["name"] not in shell_commands]
+ [
+ job
+ for job in progress_list
+ if job["name"] not in all_shell_script_fm_steps
+ ]
  for progress_list in progress
  ]
  return progress

src/everest/jobs/__init__.py

@@ -50,17 +50,3 @@ def fetch_script(script_name):
 
 
 _inject_scripts()
-
-# Note: Must be kept in sync with shell scripts on ERT-side
-# (which is also not expected to change frequently/drastically)
-shell_commands = (
- "careful_copy_file",
- "copy_directory",
- "copy_file",
- "delete_directory",
- "delete_file",
- "make_directory",
- "make_symlink",
- "move_file",
- "symlink",
-)

src/everest/suite.py

@@ -18,7 +18,7 @@
 from ropt.plan import OptimizationPlanRunner
 from seba_sqlite import SqliteStorage
 
-import everest
+from ert.resources import all_shell_script_fm_steps
 from everest.config import EverestConfig
 from everest.optimizer.everest2ropt import everest2ropt
 from everest.plugins.site_config_env import PluginSiteConfigEnv
@@ -217,7 +217,7 @@ def extract(path_str, key):
  for fms in progress_queue.steps:
  if (
  not self._display_all_jobs
- and fms.name in everest.jobs.shell_commands
+ and fms.name in all_shell_script_fm_steps
  ):
  continue
  realization = extract(fms.std_out_file, "geo_realization")

tests/everest/entry_points/test_everest_entry.py

@@ -5,6 +5,7 @@
 
 import pytest
 
+from ert.resources import all_shell_script_fm_steps
 from everest.bin.everest_script import everest_entry
 from everest.bin.kill_script import kill_entry
 from everest.bin.monitor_script import monitor_entry
@@ -15,7 +16,6 @@
  everserver_status,
  update_everserver_status,
 )
-from everest.jobs import shell_commands
 from everest.simulator import JOB_SUCCESS
 from ieverest.bin.ieverest_script import ieverest_entry
 from tests.everest.utils import capture_streams
@@ -43,7 +43,7 @@ def build_job(
  "simulation": 0,
  }
 
- shell_cmd_jobs = [build_job(name=command) for command in shell_commands]
+ shell_cmd_jobs = [build_job(name=command) for command in all_shell_script_fm_steps]
  all_jobs = [
  *shell_cmd_jobs,
  build_job(name="make_pancakes"),
@@ -315,7 +315,7 @@ def test_everest_entry_show_all_jobs(
  # of forward model jobs
  with capture_streams() as (out, _):
  everest_entry([CONFIG_FILE_MINIMAL, "--show-all-jobs"])
- for cmd in shell_commands:
+ for cmd in all_shell_script_fm_steps:
  assert cmd in out.getvalue()
 
 
@@ -350,7 +350,7 @@ def test_everest_entry_no_show_all_jobs(
  # in the list of forward model jobs
  with capture_streams() as (out, _):
  everest_entry([CONFIG_FILE_MINIMAL])
- for cmd in shell_commands:
+ for cmd in all_shell_script_fm_steps:
  assert cmd not in out.getvalue()
 
  # Check the other jobs are still there
@@ -386,7 +386,7 @@ def test_monitor_entry_show_all_jobs(
 
  with capture_streams() as (out, _):
  monitor_entry([CONFIG_FILE_MINIMAL, "--show-all-jobs"])
- for cmd in shell_commands:
+ for cmd in all_shell_script_fm_steps:
  assert cmd in out.getvalue()
 
 
@@ -417,7 +417,7 @@ def test_monitor_entry_no_show_all_jobs(
  # in the list of forward model jobs
  with capture_streams() as (out, _):
  monitor_entry([CONFIG_FILE_MINIMAL])
- for cmd in shell_commands:
+ for cmd in all_shell_script_fm_steps:
  assert cmd not in out.getvalue()
 
  # Check the other jobs are still there

tests/everest/test_shell_scripts.py

@@ -1,13 +1,13 @@
+from ert.resources import all_shell_script_fm_steps
 from everest.config.everest_config import EverestConfig, get_system_installed_jobs
-from everest.jobs import shell_commands
 from tests.everest.utils import relpath
 
 
 def test_everest_shell_commands_list():
  # Check list of defined shell commands are part of the list of ert
  # installed system jobs
  system_installed_jobs = get_system_installed_jobs()
- for command_name in shell_commands:
+ for command_name in all_shell_script_fm_steps:
  assert command_name in system_installed_jobs