various review changes

Author: dwsutherland

cylc/flow/data_store_mgr.py

@@ -215,7 +215,7 @@
 }
 
 # internal runtime to protobuf field name mapping
-RUNTIME_MAPPING = {
+RUNTIME_CFG_MAP_TO_FIELD = {
     'completion': 'completion',
     'directives': 'directives',
     'environment': 'environment',
@@ -244,7 +244,6 @@
 }
 RUNTIME_JSON_DUMPS = {'directives', 'environment', 'outputs'}
 RUNTIME_STRINGIFYS = {'execution time limit'}
-RUNTIME_TRY_ITEMS = {'platform': 'name'}
 
 
 def setbuff(obj, key, value):
@@ -353,41 +352,35 @@ def runtime_from_config(rtconfig):
 def runtime_from_partial(rtconfig, runtimeold=None):
     """Populate runtime object from partial/full config.
 
-    Potentially slower with all the setattr calls, but no expected fields.
+    Potentially slower than the non-partial one, due to tha the setattr calls,
+    but does not have expected fields.
     """
     runtime = PbRuntime()
     if runtimeold is not None:
         runtime.CopyFrom(runtimeold)
     for key, val in rtconfig.items():
-        if val is None or key not in RUNTIME_MAPPING:
+        if val is None or key not in RUNTIME_CFG_MAP_TO_FIELD:
             continue
         elif key in RUNTIME_LIST_JOINS:
-            setattr(runtime, RUNTIME_MAPPING[key], listjoin(val))
+            setattr(runtime, RUNTIME_CFG_MAP_TO_FIELD[key], listjoin(val))
         elif key in RUNTIME_JSON_DUMPS:
             setattr(
                 runtime,
-                RUNTIME_MAPPING[key],
+                RUNTIME_CFG_MAP_TO_FIELD[key],
                 json.dumps(
                     [
                         {'key': k, 'value': v}
                         for k, v in val.items()
                     ]
                 )
             )
-        elif key in RUNTIME_TRY_ITEMS:
-            try:
-                setattr(
-                    runtime,
-                    RUNTIME_MAPPING[key],
-                    val[RUNTIME_TRY_ITEMS[key]]
-                )
-            except (KeyError, TypeError):
-                with suppress(KeyError, TypeError):
-                    setattr(runtime, RUNTIME_MAPPING[key], val)
+        elif key == 'platform' and isinstance(val, dict):
+            with suppress(KeyError, TypeError):
+                setattr(runtime, RUNTIME_CFG_MAP_TO_FIELD[key], val['name'])
         elif key in RUNTIME_STRINGIFYS:
-            setattr(runtime, RUNTIME_MAPPING[key], str(val or ''))
+            setattr(runtime, RUNTIME_CFG_MAP_TO_FIELD[key], str(val or ''))
         else:
-            setattr(runtime, RUNTIME_MAPPING[key], val)
+            setattr(runtime, RUNTIME_CFG_MAP_TO_FIELD[key], val)
     return runtime
 
 

cylc/flow/network/schema.py

@@ -62,6 +62,7 @@
     FAMILIES,
     FAMILY_PROXIES,
     JOBS,
+    RUNTIME_CFG_MAP_TO_FIELD,
     TASK_PROXIES,
     TASKS,
 )
@@ -874,19 +875,10 @@ class Meta:
 
 
 RUNTIME_FIELD_TO_CFG_MAP = {
-    **{
-        k: k.replace('_', ' ') for k in Runtime.__dict__
-        if not k.startswith('_')
-    },
-    'init_script': 'init-script',
-    'env_script': 'env-script',
-    'err_script': 'err-script',
-    'exit_script': 'exit-script',
-    'pre_script': 'pre-script',
-    'post_script': 'post-script',
-    'work_sub_dir': 'work sub-directory',
+    v: k
+    for k, v in RUNTIME_CFG_MAP_TO_FIELD.items()
 }
-"""Map GQL Runtime fields' names to workflow config setting names."""
+"""Map Pb/GQL Runtime fields' names to workflow config setting names."""
 
 
 def runtime_schema_to_cfg(runtime: dict) -> dict:

tests/integration/test_reload.py

@@ -314,9 +314,9 @@ async def test_orphan_reload(
     start,
     log_filter,
 ):
-    """Reload should not fail about orphaned tasks.
+    """Reload should not fail because of orphaned tasks.
 
-    The following aspects of reload about orphans are tested:
+    The following aspects of reload-with-orphans are tested:
         - Broadcast deltas generated after reload.
           https://github.com/cylc/cylc-flow/issues/6814
         - Removal of both xtrigger and associated active/incomplete task.