Rename ext_job* to forward_model_*

src/ert/config/forward_model.py

@@ -9,9 +9,9 @@
 from .parse_arg_types_list import parse_arg_types_list
 from .parsing import (
     ConfigValidationError,
-    ExtJobKeys,
+    ForwardModelKeys,
     SchemaItemType,
-    init_ext_job_schema,
+    init_forward_model_schema,
     lark_parse,
 )
 
@@ -54,13 +54,13 @@ def from_config_file(
         if name is None:
             name = os.path.basename(config_file)
 
-        schema = init_ext_job_schema()
+        schema = init_forward_model_schema()
 
         try:
             content_dict = lark_parse(file=config_file, schema=schema, pre_defines=[])
 
             specified_arg_types: List[Tuple[int, str]] = content_dict.get(
-                ExtJobKeys.ARG_TYPE, []
+                ForwardModelKeys.ARG_TYPE, []
             )
 
             specified_max_args: int = content_dict.get("MAX_ARG", 0)

src/ert/config/parsing/__init__.py

@@ -4,8 +4,8 @@
 from .config_schema import init_site_config_schema, init_user_config_schema
 from .context_values import ContextList, ContextString, ContextValue
 from .error_info import ErrorInfo, WarningInfo
-from .ext_job_keywords import ExtJobKeys
-from .ext_job_schema import init_ext_job_schema
+from .forward_model_keywords import ForwardModelKeys
+from .forward_model_schema import init_forward_model_schema
 from .lark_parser import parse as lark_parse
 from .schema_item_type import SchemaItemType
 from .types import MaybeWithContext
@@ -25,10 +25,10 @@
     "init_site_config_schema",
     "init_user_config_schema",
     "ConfigDict",
-    "ExtJobKeys",
+    "ForwardModelKeys",
     "ErrorInfo",
     "WarningInfo",
-    "init_ext_job_schema",
+    "init_forward_model_schema",
     "ContextString",
     "MaybeWithContext",
     "ContextList",

src/ert/config/parsing/ext_job_keywords.py → src/ert/config/parsing/forward_model_keywords.py

@@ -10,7 +10,7 @@ class StrEnum(str, Enum):
     from enum import StrEnum
 
 
-class ExtJobKeys(StrEnum):
+class ForwardModelKeys(StrEnum):
     NAME = "NAME"
     EXECUTABLE = "EXECUTABLE"
 

src/ert/config/parsing/ext_job_schema.py → src/ert/config/parsing/forward_model_schema.py

@@ -3,104 +3,106 @@
 from .config_dict import ConfigDict
 from .config_schema_item import SchemaItem
 from .deprecation_info import DeprecationInfo
-from .ext_job_keywords import ExtJobKeys
+from .forward_model_keywords import ForwardModelKeys
 from .schema_dict import SchemaItemDict
 from .schema_item_type import SchemaItemType
 
 
 def executable_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.EXECUTABLE,
+        kw=ForwardModelKeys.EXECUTABLE,
         required_set=True,
         type_map=[SchemaItemType.EXECUTABLE],
     )
 
 
 def stdin_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.STDIN,
+        kw=ForwardModelKeys.STDIN,
         type_map=[SchemaItemType.STRING],
         required_set=False,
     )
 
 
 def stdout_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.STDOUT,
+        kw=ForwardModelKeys.STDOUT,
         type_map=[SchemaItemType.STRING],
         required_set=False,
     )
 
 
 def stderr_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.STDERR,
+        kw=ForwardModelKeys.STDERR,
         type_map=[SchemaItemType.STRING],
         required_set=False,
     )
 
 
 def start_file_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.START_FILE,
+        kw=ForwardModelKeys.START_FILE,
         type_map=[SchemaItemType.STRING],
     )
 
 
 def target_file_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.TARGET_FILE,
+        kw=ForwardModelKeys.TARGET_FILE,
         type_map=[SchemaItemType.STRING],
     )
 
 
 def error_file_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.ERROR_FILE,
+        kw=ForwardModelKeys.ERROR_FILE,
         type_map=[SchemaItemType.STRING],
     )
 
 
 def max_running_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.MAX_RUNNING, type_map=[SchemaItemType.INT], required_set=False
+        kw=ForwardModelKeys.MAX_RUNNING,
+        type_map=[SchemaItemType.INT],
+        required_set=False,
     )
 
 
 def max_running_minutes_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.MAX_RUNNING_MINUTES,
+        kw=ForwardModelKeys.MAX_RUNNING_MINUTES,
         type_map=[SchemaItemType.INT],
         required_set=False,
     )
 
 
 def min_arg_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.MIN_ARG,
+        kw=ForwardModelKeys.MIN_ARG,
         type_map=[SchemaItemType.INT],
         required_set=False,
     )
 
 
 def max_arg_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.MAX_ARG,
+        kw=ForwardModelKeys.MAX_ARG,
         type_map=[SchemaItemType.INT],
         required_set=False,
     )
 
 
 def arglist_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.ARGLIST,
+        kw=ForwardModelKeys.ARGLIST,
         argc_max=None,
     )
 
 
 def arg_type_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.ARG_TYPE,
+        kw=ForwardModelKeys.ARG_TYPE,
         argc_min=2,
         argc_max=2,
         type_map=[SchemaItemType.INT, SchemaItemType.STRING],
@@ -110,7 +112,7 @@ def arg_type_keyword() -> SchemaItem:
 
 def env_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.ENV,
+        kw=ForwardModelKeys.ENV,
         argc_min=2,
         argc_max=2,
         multi_occurrence=True,
@@ -120,7 +122,7 @@ def env_keyword() -> SchemaItem:
 
 def exec_env_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.EXEC_ENV,
+        kw=ForwardModelKeys.EXEC_ENV,
         argc_min=2,
         argc_max=2,
         multi_occurrence=True,
@@ -130,15 +132,15 @@ def exec_env_keyword() -> SchemaItem:
 
 def default_keyword() -> SchemaItem:
     return SchemaItem(
-        kw=ExtJobKeys.DEFAULT,
+        kw=ForwardModelKeys.DEFAULT,
         argc_min=2,
         argc_max=2,
         multi_occurrence=True,
         type_map=[SchemaItemType.STRING, SchemaItemType.STRING],
     )
 
 
-ext_job_schema_items: List[SchemaItem] = [
+forward_model_schema_items: List[SchemaItem] = [
     executable_keyword(),
     stdin_keyword(),
     stdout_keyword(),
@@ -157,15 +159,15 @@ def default_keyword() -> SchemaItem:
     exec_env_keyword(),
 ]
 
-ext_job_deprecations: List[DeprecationInfo] = [
+forward_model_deprecations: List[DeprecationInfo] = [
     DeprecationInfo(
         keyword="PORTABLE_EXE",
         message='"PORTABLE_EXE" key is deprecated, please replace with "EXECUTABLE"',
     )
 ]
 
 
-class ExtJobSchemaItemDict(SchemaItemDict):
+class ForwardModelSchemaItemDict(SchemaItemDict):
     def check_required(
         self,
         config_dict: ConfigDict,
@@ -180,11 +182,11 @@ def check_required(
         )
 
 
-def init_ext_job_schema() -> ExtJobSchemaItemDict:
-    schema = ExtJobSchemaItemDict()
+def init_forward_model_schema() -> ForwardModelSchemaItemDict:
+    schema = ForwardModelSchemaItemDict()
 
-    for item in ext_job_schema_items:
+    for item in forward_model_schema_items:
         schema[item.kw] = item
 
-    schema.add_deprecations(ext_job_deprecations)
+    schema.add_deprecations(forward_model_deprecations)
     return schema

tests/unit_tests/config/config_dict_generator.py

@@ -167,7 +167,7 @@ def queue_options(draw, systems):
         return [queue_system, name]
 
 
-def default_ext_job_names():
+def default_forward_model_names():
     return (
         st.sampled_from(
             [
@@ -207,7 +207,7 @@ def default_ext_job_names():
 
 
 @st.composite
-def random_ext_job_names(draw, some_words, some_file_names):
+def random_forward_model_names(draw, some_words, some_file_names):
     return draw(
         st.tuples(
             some_words,
@@ -387,7 +387,7 @@ def composite_keys(smspec: Smspec) -> st.SearchStrategy[str]:
 def ert_config_values(draw, use_eclbase=booleans):
     use_eclbase = draw(use_eclbase)
     queue_system = draw(queue_systems)
-    install_jobs = draw(small_list(random_ext_job_names(words, file_names)))
+    install_jobs = draw(small_list(random_forward_model_names(words, file_names)))
     forward_model = draw(small_list(job(install_jobs))) if install_jobs else []
     simulation_job = draw(small_list(sim_job(install_jobs))) if install_jobs else []
     gen_data = draw(