hpcflow-new2 0.2.0a218__py3-none-any.whl → 0.2.0a219__py3-none-any.whl

hpcflow/_version.py

@@ -1 +1 @@
-__version__ = "0.2.0a218"
+__version__ = "0.2.0a219"

hpcflow/data/scripts/import_future_script.py

@@ -0,0 +1,7 @@
+from __future__ import annotations
+
+
+def import_future_script():
+    """Used to test the `__future__` import is moved to the top of the file in the
+    generated script in the case of `resources.combine_scripts == True`"""
+    pass

hpcflow/sdk/app.py

@@ -1794,7 +1794,8 @@ class BaseApp(metaclass=Singleton):
         for comp_type in TEMPLATE_COMP_TYPES:
             with open_text_resource(package, f"{comp_type}.yaml") as fh:
                 SDK_logger.info(f"Parsing file as YAML: {fh.name!r}")
-                components[comp_type] = read_YAML_str(fh.read())
+                source = f"from {Path(fh.name)!r}"
+                components[comp_type] = read_YAML_str(fh.read(), source=source)
 
         return components
 

hpcflow/sdk/core/errors.py

@@ -1020,3 +1020,9 @@ class MissingElementGroup(ValueError):
             f"Adding elements to task {task_name!r}: "
             f"no element group named {group_name!r} found for input {input_path!r}."
         )
+
+
+class YAMLError(ValueError):
+    """
+    A problem with parsing a YAML file.
+    """

hpcflow/sdk/core/parameters.py

@@ -2788,31 +2788,31 @@ class InputSource(JSONLike):
 
         Examples
         --------
-            task.[task_ref].input
-            task.[task_ref].output
-            local
-            default
-            import.[import_ref]
+        For a local task input source, use:
+
+        >>> InputSource.from_string("local")
+
+        For a schema input default source, use:
+
+        >>> InputSource.from_string("default")
+
+        For task input sources, specify either the task insert ID (typically this is just
+        the task index within the workflow), or the task's unique name, which is usually
+        just the associated task schema's objective, but if multiple tasks use the same
+        schema, it will be suffixed by an index, starting from one.
+
+        >>> InputSource.from_string("task.0.input")
+        >>> InputSource.from_string("task.my_task.input")
         """
         return cls(**cls._parse_from_string(str_defn))
 
     @staticmethod
     def _parse_from_string(str_defn: str) -> dict[str, Any]:
-        """Parse a dot-delimited string definition of an InputSource.
-
-        Examples
-        --------
-            task.[task_ref].input
-            task.[task_ref].output
-            local
-            default
-            import.[import_ref]
-        """
+        """Parse a dot-delimited string definition of an InputSource."""
         parts = str_defn.split(".")
         source_type = get_enum_by_name_or_val(InputSourceType, parts[0])
-        task_ref: int | None = None
+        task_ref: int | str | None = None
         task_source_type: TaskSourceType | None = None
-        import_ref: int | None = None
         if (
             (
                 source_type in (InputSourceType.LOCAL, InputSourceType.DEFAULT)
@@ -2826,22 +2826,20 @@ class InputSource(JSONLike):
         if source_type is InputSourceType.TASK:
             # TODO: does this include element_iters?
             try:
+                # assume specified by task insert ID
                 task_ref = int(parts[1])
             except ValueError:
-                pass
+                # assume specified by task unique name
+                task_ref = parts[1]
             try:
                 task_source_type = get_enum_by_name_or_val(TaskSourceType, parts[2])
             except IndexError:
                 task_source_type = TaskSourceType.OUTPUT
         elif source_type is InputSourceType.IMPORT:
-            try:
-                import_ref = int(parts[1])
-            except ValueError:
-                pass
+            raise NotImplementedError("Import input sources are not yet supported.")
 
         return {
             "source_type": source_type,
-            "import_ref": import_ref,
             "task_ref": task_ref,
             "task_source_type": task_source_type,
         }

hpcflow/sdk/core/utils.py

@@ -30,12 +30,14 @@ import fsspec  # type: ignore
 import numpy as np
 
 from ruamel.yaml import YAML
+from ruamel.yaml.error import MarkedYAMLError
 from watchdog.utils.dirsnapshot import DirectorySnapshot
 
 from hpcflow.sdk.core.errors import (
     ContainerKeyError,
     InvalidIdentifier,
     MissingVariableSubstitutionError,
+    YAMLError,
 )
 from hpcflow.sdk.log import TimeIt
 from hpcflow.sdk.utils.deferred_file import DeferredFileWriter
@@ -412,7 +414,10 @@ def substitute_string_vars(string: str, variables: dict[str, str]):
 
 @TimeIt.decorator
 def read_YAML_str(
-    yaml_str: str, typ="safe", variables: dict[str, str] | Literal[False] | None = None
+    yaml_str: str,
+    typ="safe",
+    variables: dict[str, str] | Literal[False] | None = None,
+    source: str | None = None,
 ) -> Any:
     """Load a YAML string. This will produce basic objects.
 
@@ -426,11 +431,21 @@ def read_YAML_str(
         String variables to substitute in `yaml_str`. Substitutions will be attempted if
         the file looks to contain variable references (like "<<var:name>>"). If set to
         `False`, no substitutions will occur.
+    source:
+        Used to document the source of the YAML string if raising a parsing error.
+        Typically, this should be a string that starts with "from ...", e.g.
+        "from the file path '/path/to/bad/file'".
     """
     if variables is not False and "<<var:" in yaml_str:
         yaml_str = substitute_string_vars(yaml_str, variables=variables or {})
     yaml = YAML(typ=typ)
-    return yaml.load(yaml_str)
+    try:
+        return yaml.load(yaml_str)
+    except MarkedYAMLError as err:  # includes `ScannerError` and `ParserError`
+        source_str = f"{source} " if source else ""
+        raise YAMLError(
+            f"The YAML string {source_str}is not formatted correctly."
+        ) from err
 
 
 @TimeIt.decorator
@@ -452,7 +467,7 @@ def read_YAML_file(
     """
     with fsspec.open(path, "rt") as f:
         yaml_str: str = f.read()
-    return read_YAML_str(yaml_str, typ=typ, variables=variables)
+    return read_YAML_str(yaml_str, typ=typ, variables=variables, source=f"from {path!r}")
 
 
 def write_YAML_file(obj, path: str | Path, typ: str = "safe") -> None:

hpcflow/sdk/core/workflow.py

@@ -578,7 +578,13 @@ class WorkflowTemplate(JSONLike):
             set to `False`, no substitutions will occur, which may result in an invalid
             workflow template!
         """
-        return cls._from_data(read_YAML_str(string, variables=variables))
+        return cls._from_data(
+            read_YAML_str(
+                string,
+                variables=variables,
+                source="(from the inline workflow template definition)",
+            )
+        )
 
     @classmethod
     def _check_name(cls, data: dict[str, Any], path: PathLike) -> None:
@@ -962,9 +968,12 @@ class Workflow(AppAware):
                             f"({task.name!r})..."
                         )
                     wk._add_task(task)
-                if status:
-                    status.update(f"Preparing to add {len(template.loops)} loops...")
                 if template.loops:
+                    if status:
+                        status.update(
+                            f"Preparing to add {len(template.loops)} loops; building "
+                            f"cache..."
+                        )
                     # TODO: if loop with non-initialisable actions, will fail
                     cache = LoopCache.build(workflow=wk, loops=template.loops)
                     for idx, loop in enumerate(template.loops):
@@ -979,6 +988,8 @@ class Workflow(AppAware):
                             f"Added {len(template.loops)} loops. "
                             f"Committing to store..."
                         )
+                elif status:
+                    status.update("Committing to store...")
         except (Exception, NotImplementedError):
             if status:
                 status.stop()
@@ -4235,8 +4246,7 @@ class Workflow(AppAware):
                     input_source.task_ref = uniq_names_cur[input_source.task_ref]
                 except KeyError:
                     raise InvalidInputSourceTaskReference(
-                        f"Input source {input_source.to_string()!r} refers to a missing "
-                        f"or inaccessible task: {input_source.task_ref!r}."
+                        input_source, task_ref=input_source.task_ref
                     )
 
     @TimeIt.decorator

hpcflow/sdk/persistence/zarr.py

@@ -124,7 +124,7 @@ def _encode_numpy_array(
     new_idx = (
         max((int(i.removeprefix("arr_")) for i in param_arr_group.keys()), default=-1) + 1
     )
-    param_arr_group.create_dataset(name=f"arr_{new_idx}", data=obj)
+    param_arr_group.create_dataset(name=f"arr_{new_idx}", data=obj, chunks=obj.shape)
     type_lookup["arrays"].append([path, new_idx])
 
     return len(type_lookup["arrays"]) - 1

hpcflow/sdk/submission/jobscript.py

@@ -24,6 +24,7 @@ from hpcflow.sdk.core.errors import (
 from hpcflow.sdk.typing import hydrate
 from hpcflow.sdk.core.json_like import ChildObjectSpec, JSONLike
 from hpcflow.sdk.core.utils import nth_value, parse_timestamp, current_timestamp
+from hpcflow.sdk.utils.strings import extract_py_from_future_imports
 from hpcflow.sdk.log import TimeIt
 from hpcflow.sdk.submission.schedulers import QueuedScheduler
 from hpcflow.sdk.submission.schedulers.direct import DirectScheduler
@@ -1942,10 +1943,13 @@ class Jobscript(JSONLike):
         tab_indent = "    "
 
         script_funcs_lst: list[str] = []
+        future_imports: set[str] = set()
         for act_name, (_, snip_path) in script_data.items():
             main_func_name = snip_path.stem
             with snip_path.open("rt") as fp:
                 script_str = fp.read()
+            script_str, future_imports_i = extract_py_from_future_imports(script_str)
+            future_imports.update(future_imports_i)
             script_funcs_lst.append(
                 dedent(
                     """\
@@ -2325,13 +2329,22 @@ class Jobscript(JSONLike):
             func_invoc_lines=indent(func_invoc_lines, tab_indent * 4),
         )
 
+        future_imports_str = (
+            f"from __future__ import {', '.join(future_imports)}\n\n"
+            if future_imports
+            else ""
+        )
         script = dedent(
             """\
-            {script_funcs}
+            {future_imports_str}{script_funcs}
             if __name__ == "__main__":
             {main}
         """
-        ).format(script_funcs=script_funcs, main=indent(main, tab_indent))
+        ).format(
+            future_imports_str=future_imports_str,
+            script_funcs=script_funcs,
+            main=indent(main, tab_indent),
+        )
 
         num_elems = [i.num_elements for i in self.blocks]
         num_acts = [len(i) for i in action_scripts]

hpcflow/sdk/utils/strings.py

@@ -1,4 +1,5 @@
 from typing import Iterable
+import re
 
 
 def shorten_list_str(
@@ -31,3 +32,30 @@ def shorten_list_str(
         lst_short = lst[:start_num] + ["..."] + lst[-end_num:]
 
     return "[" + ", ".join(f"{i}" for i in lst_short) + "]"
+
+
+def extract_py_from_future_imports(py_str: str) -> tuple[str, set[str]]:
+    """
+    Remove any `from __future__ import <feature>` lines from a string of Python code, and
+    return the modified string, and a list of `<feature>`s that were imported.
+
+    Notes
+    -----
+    This is required when generated a combined-scripts jobscript that concatenates
+    multiple Python scripts into one script. If `__future__` statements are included in
+    these individual scripts, they must be moved to the top of the file [1].
+
+    References
+    ----------
+    [1] https://docs.python.org/3/reference/simple_stmts.html#future-statements
+
+    """
+
+    pattern = r"^from __future__ import (.*)\n"
+    if future_imports := (set(re.findall(pattern, py_str, flags=re.MULTILINE) or ())):
+        future_imports = {
+            j.strip() for i in future_imports for j in i.split(",") if j.strip()
+        }
+        py_str = re.sub(pattern, "", py_str, flags=re.MULTILINE)
+
+    return (py_str, future_imports)

hpcflow/tests/scripts/test_main_scripts.py

@@ -6,6 +6,7 @@ import time
 import pytest
 
 from hpcflow.app import app as hf
+from hpcflow.sdk.core.enums import EARStatus
 from hpcflow.sdk.core.test_utils import P1_parameter_cls as P1
 
 # note: when testing the frozen app, we might not have MatFlow installed in the built in
@@ -1332,3 +1333,29 @@ def test_combine_scripts_script_data_multiple_input_file_formats(
     assert isinstance(t1_p3, hf.ElementParameter)
     assert t0_p2.value == p1_val + 100
     assert t1_p3.value == p1_val + 100
+
+
+@pytest.mark.integration
+@pytest.mark.skipif("hf.run_time_info.is_frozen")
+def test_combine_scripts_from_future_import(null_config, tmp_path: Path):
+    s1 = hf.TaskSchema(
+        objective="t1",
+        actions=[
+            hf.Action(
+                script="<<script:import_future_script.py>>",
+                script_exe="python_script",
+                environments=[hf.ActionEnvironment(environment="python_env")],
+            ),
+        ],
+    )
+
+    wk = hf.Workflow.from_template_data(
+        template_name="test_future_import",
+        tasks=[hf.Task(schema=s1)],
+        resources={"any": {"combine_scripts": True}},
+        path=tmp_path,
+    )
+    wk.submit(status=False, add_to_known=False, wait=True)
+
+    run = wk.get_EARs_from_IDs([0])[0]
+    assert run.status is EARStatus.success

hpcflow/tests/unit/test_element_set.py

@@ -121,3 +121,28 @@ def test_nesting_order_paths_raise(null_config) -> None:
 
 def test_nesting_order_paths_no_raise(null_config) -> None:
     hf.ElementSet(nesting_order={"inputs.p1": 1, "resources.any": 2, "repeats": 3})
+
+
+def test_input_source_str_dict_list_str_list_dict_equivalence(null_config) -> None:
+    inp_source_dict: dict[str, str | int] = {
+        "source_type": "task",
+        "task_source_type": "output",
+        "task_ref": 0,
+    }
+    inp_source_str = "task.0.output"
+    inp_source_list_dict = [inp_source_dict]
+    inp_source_list_str = [inp_source_str]
+    assert (
+        hf.ElementSet.from_json_like(
+            {"input_sources": {"p1": inp_source_dict}}
+        ).input_sources
+        == hf.ElementSet.from_json_like(
+            {"input_sources": {"p1": inp_source_list_dict}}
+        ).input_sources
+        == hf.ElementSet.from_json_like(
+            {"input_sources": {"p1": inp_source_str}}
+        ).input_sources
+        == hf.ElementSet.from_json_like(
+            {"input_sources": {"p1": inp_source_list_str}}
+        ).input_sources
+    )

hpcflow/tests/unit/test_input_source.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from textwrap import dedent
 from typing import TYPE_CHECKING
 import numpy as np
 import pytest
@@ -183,6 +184,7 @@ def test_input_source_from_string_task_same_default_task_source() -> None:
     )
 
 
+@pytest.mark.skip(reason="Import not yet implemented.")
 def test_input_source_from_string_import() -> None:
     import_ref = 0
     assert hf.InputSource.from_string(f"import.{import_ref}") == hf.InputSource(
@@ -1283,3 +1285,72 @@ def test_input_source_inputs_from_multiple_element_sets_with_sub_parameter_seque
         {"a": 5, "b": 22},
         {"a": 5, "b": 22},
     ]
+
+
+def test_input_source_task_ref_equivalence(null_config, tmp_path):
+    yml = dedent(
+        """\
+    name: test
+    template_components:
+      task_schemas:
+        - objective: t1
+          inputs:
+            - parameter: p1
+    tasks:
+      - schema: t1
+        inputs:
+          p1: 100 # all subsequent tasks will source from this input
+    
+      - schema: t1 # t1_2
+        input_sources: # single source dict; by task insert ID
+          p1: 
+            source_type: task
+            task_source_type: input
+            task_ref: 0
+
+      - schema: t1 # t1_3
+        input_sources: # as a list of dicts; by task insert ID
+          p1: 
+            - source_type: task
+              task_source_type: input
+              task_ref: 0
+    
+      - schema: t1 # t1_4
+        input_sources: # as a single source dict; by task unique name
+          p1: 
+            source_type: task
+            task_source_type: input
+            task_ref: t1_1
+
+      - schema: t1 # t1_5
+        input_sources: # as a list of dicts; by task unique name
+          p1: 
+            - source_type: task
+              task_source_type: input
+              task_ref: t1_1
+    
+      - schema: t1 # t1_6
+        input_sources: # single source string; by task insert ID
+          p1: task.0.input
+
+      - schema: t1 # t1_7
+        input_sources: # as a list of strings; by task insert ID
+          p1: 
+            - task.0.input
+
+      - schema: t1 # t1_8
+        input_sources: # single source string; by task unique name
+          p1: task.t1_1.input
+
+      - schema: t1 # t1_9
+        input_sources: # as a list of strings; by task unique name
+          p1: 
+            - task.t1_1.input
+        
+    """
+    )
+    wk = hf.Workflow.from_YAML_string(YAML_str=yml, path=tmp_path)
+
+    all_sources = (task.elements[0].input_sources["inputs.p1"] for task in wk.tasks[1:])
+    all_task_refs = (src.task_ref for src in all_sources)
+    assert all(task_ref == 0 for task_ref in all_task_refs)

hpcflow/tests/unit/test_utils.py

@@ -1,9 +1,14 @@
 from pathlib import Path
+from textwrap import dedent
 import pytest
 import zarr  # type: ignore
 import numpy as np
 from numpy.typing import NDArray
-from hpcflow.sdk.core.errors import InvalidIdentifier, MissingVariableSubstitutionError
+from hpcflow.sdk.core.errors import (
+    InvalidIdentifier,
+    MissingVariableSubstitutionError,
+    YAMLError,
+)
 
 from hpcflow.sdk.core.utils import (
     JSONLikeDirSnapShot,
@@ -16,6 +21,7 @@ from hpcflow.sdk.core.utils import (
     nth_key,
     nth_value,
     process_string_nodes,
+    read_YAML_str,
     replace_items,
     check_valid_py_identifier,
     reshape,
@@ -575,3 +581,36 @@ def test_nth_key_raises():
 
     with pytest.raises(Exception):
         nth_key(dct, -1)
+
+
+def test_read_YAML_str():
+    good_yaml = dedent(
+        """\
+        a: 1
+        b: 2
+        """
+    )
+    assert read_YAML_str(good_yaml) == {"a": 1, "b": 2}
+
+
+def test_read_YAML_str_raise_on_bad_indent():
+    bad_yaml = dedent(
+        """\
+        a: 1
+          b: 2
+        """
+    )
+    with pytest.raises(YAMLError):
+        read_YAML_str(bad_yaml)
+
+
+def test_read_YAML_str_raise_on_mixed_tabs_spaces():
+    bad_yaml = dedent(
+        """\
+        a:
+          a1: 2 # this has a space indent
+        	a2: 3 # this has a tab indent
+        """
+    )
+    with pytest.raises(YAMLError):
+        read_YAML_str(bad_yaml)

hpcflow/tests/unit/utils/test_strings.py

@@ -0,0 +1,97 @@
+from textwrap import dedent
+
+from hpcflow.sdk.utils.strings import extract_py_from_future_imports
+
+
+def test_extract_py_from_future_imports_none():
+    py_str = dedent(
+        """\
+
+    def my_function():
+        print("blah!")
+    """
+    )
+    new_str, imports = extract_py_from_future_imports(py_str)
+    assert imports == set()
+    assert new_str == py_str
+
+
+def test_extract_py_from_future_imports_single():
+    py_str = dedent(
+        """\
+    from __future__ import annotations
+
+    def my_function():
+        print("blah!")
+    """
+    )
+    new_str, imports = extract_py_from_future_imports(py_str)
+    assert imports == {"annotations"}
+    assert new_str == dedent(
+        """\
+
+    def my_function():
+        print("blah!")
+    """
+    )
+
+
+def test_extract_py_from_future_imports_multi():
+    py_str = dedent(
+        """\
+    from __future__ import annotations, feature_2
+
+    def my_function():
+        print("blah!")
+    """
+    )
+    new_str, imports = extract_py_from_future_imports(py_str)
+    assert imports == {"annotations", "feature_2"}
+    assert new_str == dedent(
+        """\
+
+    def my_function():
+        print("blah!")
+    """
+    )
+
+
+def test_extract_py_from_future_imports_trailing_comma():
+    py_str = dedent(
+        """\
+    from __future__ import annotations,
+
+    def my_function():
+        print("blah!")
+    """
+    )
+    new_str, imports = extract_py_from_future_imports(py_str)
+    assert imports == {"annotations"}
+    assert new_str == dedent(
+        """\
+
+    def my_function():
+        print("blah!")
+    """
+    )
+
+
+def test_extract_py_from_future_imports_multi_lines():
+    py_str = dedent(
+        """\
+    from __future__ import annotations, feature_2
+    from __future__ import feature_2, feature_3,
+
+    def my_function():
+        print("blah!")
+    """
+    )
+    new_str, imports = extract_py_from_future_imports(py_str)
+    assert imports == {"annotations", "feature_2", "feature_3"}
+    assert new_str == dedent(
+        """\
+
+    def my_function():
+        print("blah!")
+    """
+    )

{hpcflow_new2-0.2.0a218.dist-info → hpcflow_new2-0.2.0a219.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpcflow-new2
-Version: 0.2.0a218
+Version: 0.2.0a219
 Summary: Computational workflow management
 License: MPL-2.0
 Author: aplowman

{hpcflow_new2-0.2.0a218.dist-info → hpcflow_new2-0.2.0a219.dist-info}/RECORD

@@ -1,7 +1,7 @@
 hpcflow/__init__.py,sha256=WIETuRHeOp2SqUqHUzpjQ-lk9acbYv-6aWOhZPRdlhs,64
 hpcflow/__pyinstaller/__init__.py,sha256=YOzBlPSck6slucv6lJM9K80JtsJWxXRL00cv6tRj3oc,98
 hpcflow/__pyinstaller/hook-hpcflow.py,sha256=P2b-8QdQqkSS7cJB6CB3CudUuJ9iZzTh2fQF4hNdCa4,1118
-hpcflow/_version.py,sha256=Mke3CFbH1LlDjsfIqc62QRCiwiI5qesSPGG_hYGm1WA,26
+hpcflow/_version.py,sha256=UPqegR29afxElZxjtVwzLBfjeBP_T5TFhl_3XnX3PkM,26
 hpcflow/app.py,sha256=gl2viVS65PbpDhUp2DARaYHFDqDWQjuoyB3ikrCNRW4,1367
 hpcflow/cli.py,sha256=G2J3D9v6MnMWOWMMWK6UEKLn_6wnV9lT_qygEBBxg-I,66
 hpcflow/data/demo_data_manifest/__init__.py,sha256=Hsq0jT8EXM13wu1MpGy5FQgyuz56ygep4VWOnulFn50,41
@@ -20,6 +20,7 @@ hpcflow/data/scripts/env_specifier_test/v1/main_script_test_direct_in_direct_out
 hpcflow/data/scripts/env_specifier_test/v1/output_file_parser_basic.py,sha256=l50Pvl5bZSeD-BImdaQ4dZ6lTaNKjrxnLFbz-YvtJok,139
 hpcflow/data/scripts/env_specifier_test/v2/main_script_test_direct_in_direct_out.py,sha256=CJe8th-rNseGhzYarIDGfIK2eJoLBU2tKRXqzPIPfDI,137
 hpcflow/data/scripts/generate_t1_file_01.py,sha256=QtrtIC-lDZynzhIUxjJPTSAjLffSug-HMWEpnmNpHlI,168
+hpcflow/data/scripts/import_future_script.py,sha256=LRkxJla-Q42JFMzq52AfKIEnJZVnEpJ-QjuvBPGnnPY,232
 hpcflow/data/scripts/input_file_generator_basic.py,sha256=wekw1-XIyg1zPxgrvBUlVJRlSqMUC0JrfbK8xDQRdTE,101
 hpcflow/data/scripts/input_file_generator_basic_FAIL.py,sha256=uNho_hqvGlqeRFhReDZTvLUUL4qef3QB_3Q5luvHeqI,104
 hpcflow/data/scripts/input_file_generator_test_stdout_stderr.py,sha256=yqOgBJlhRvXxBhRtT1VD_DEAzEjRrkwxLGen9TAFyVs,172
@@ -63,7 +64,7 @@ hpcflow/data/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 hpcflow/data/workflows/workflow_1.yaml,sha256=lF7Re2SVc_5gQk5AwB0gXaq-n-T5ia4su3zNQ9oMRV0,220
 hpcflow/examples.ipynb,sha256=cLKp4QsxwwMXRanDnfWY9kqsV23q6G4raOpu6IZXnMw,28553
 hpcflow/sdk/__init__.py,sha256=BEbIz8adCAX06ZmvEcquEu29PmQDvVP1I1qn_q78dYc,6289
-hpcflow/sdk/app.py,sha256=Gn-b-tVcfWZJWtS6aANDj0RFXkoEcngr0pmpUV4suUk,146660
+hpcflow/sdk/app.py,sha256=ZFMnEV43dlZlnTpJNzBsfRZ1ndiMGyeJ3hKxlhrm39I,146726
 hpcflow/sdk/cli.py,sha256=C_7Ts6TbspTZtUXlPwF37Vt-t71NABJ_2zNpZLYFPUE,45563
 hpcflow/sdk/cli_common.py,sha256=MO0TbC280JdZTLnxSV15wE7PDNx83sotpJsyAN1E2F4,10458
 hpcflow/sdk/config/__init__.py,sha256=pkufl_CXm_Kswk1x7LTavuplWjUbUCitK0AJ2E60gwM,137
@@ -82,13 +83,13 @@ hpcflow/sdk/core/commands.py,sha256=vFyZ9Cv_tvGqSGtVEnAHAeXA-HAxWoF0nmf1e0bFCvs,
 hpcflow/sdk/core/element.py,sha256=pPRezx0HATKH55qEstXp1xOG4S8oGLVnJ3sQcEmLsXo,68152
 hpcflow/sdk/core/enums.py,sha256=BV_cFqTWkME3zVLswmb21QXeIiCBb9_9avr6VIhL3HM,4387
 hpcflow/sdk/core/environment.py,sha256=m0Qp4Y1XcPJ1yPrdHp6RJv9_H61nA9Qo2ZJV_-wGne8,7959
-hpcflow/sdk/core/errors.py,sha256=5Bjk1w8FdVP4X7oFCNtzxJ_q4uaSZfQausZkWvYMkS4,28782
+hpcflow/sdk/core/errors.py,sha256=8PxlFewrRZU2MSPoNUiQ2jAX9iQTr9-Qr-O5hDywU_A,28869
 hpcflow/sdk/core/execute.py,sha256=Gc2SauA4QNA1W4Gi2FYoKoqkoJtGg57cgn1p87WNCIs,7221
 hpcflow/sdk/core/json_like.py,sha256=tzCpaarGCHr_NXA-vLcX1jrDYlWbZuAbUPjR6jREhX8,29414
 hpcflow/sdk/core/loop.py,sha256=vs7pNVe3Io5zNO6Xl_Tqmra9mCJUw8IESLZC4p2QFvo,50084
 hpcflow/sdk/core/loop_cache.py,sha256=C0t9UpvHFdTmw3bViZ2wccjZWtkbSbN9APvcwzBSREg,10801
 hpcflow/sdk/core/object_list.py,sha256=WvUBb-2DA7-7_7oNoPykSsTihVbGB-1cgHh8W78IzKI,29882
-hpcflow/sdk/core/parameters.py,sha256=EHl6v_2yQdxlFnN2Vv2slEsSxJuLFJR7CV5IDL8tWJA,98259
+hpcflow/sdk/core/parameters.py,sha256=5iuqTCz9ZxQnhgDElDIRBB32PDSHnqMJ1701v-M5GVI,98597
 hpcflow/sdk/core/rule.py,sha256=LiNyKp09a6TRGJvtiB1CcNqgyAIuPhuSW2RVfDWf5FE,6274
 hpcflow/sdk/core/run_dir_files.py,sha256=yh49BSlswqqyr97x5nDT87qu2MlOLMu7Arzl_B-fxy0,2061
 hpcflow/sdk/core/skip_reason.py,sha256=xPm8bd8sbPpiZ3sx9ZeW0jxgRQ0TBokSv0XIJKrEW2Y,113
@@ -96,9 +97,9 @@ hpcflow/sdk/core/task.py,sha256=7jXQUDU0mVS33b3tVimkHAnC6k1QMofwu45qt7xvuKc,1424
 hpcflow/sdk/core/task_schema.py,sha256=LjHnpS8ccEWGDQFzGhhAzpMvWGeoUlPDY2XTY2_gqMQ,38844
 hpcflow/sdk/core/test_utils.py,sha256=UXe8P-1b_6Pn6vdgJfMVsTGJdVI65TZ2mSUgWHlVnnc,13766
 hpcflow/sdk/core/types.py,sha256=kqVXpiH8qwOVVBAw6GFvUQVdNYLEv7qIbgEkgfK0DO8,13021
-hpcflow/sdk/core/utils.py,sha256=NTbXX2tkfb2Wp0hpGuisnfpBNAo9j-4EXh-KVqJygqA,36342
+hpcflow/sdk/core/utils.py,sha256=EFflyTr6Ju8v0AfZYQuFnJm-hNjtx0XbnFuccM7cV-k,36950
 hpcflow/sdk/core/validation.py,sha256=4-0g5z3CgjFLQ2FCM0p0mjvNqHYuLhIqvQR_kpM0tsU,1838
-hpcflow/sdk/core/workflow.py,sha256=Id5CSPvjP_dJUCTWuCGU4bNFmRA-ESW05miVoB44yT4,183535
+hpcflow/sdk/core/workflow.py,sha256=aM4JTfaIhtDA3dOeNC4ThTA1L7_EGOyBOPMcvf6KjC8,183779
 hpcflow/sdk/core/zarr_io.py,sha256=i6WqkFXe-q1sJGTCYAbsNRXRrdkxZy6NRahTcuZPuX4,5906
 hpcflow/sdk/data/__init__.py,sha256=-YzROirohSKU2UGYj5vkCe_J2KejbzhIjUXNaJwKHLk,568
 hpcflow/sdk/data/config_file_schema.yaml,sha256=7i3z_m3GBRtLyB4c7qPngnlQWqcIq1CyCcOysDyq4es,791
@@ -124,11 +125,11 @@ hpcflow/sdk/persistence/pending.py,sha256=JB42Emk2cN639bPlNtQtoFhe5WXGWDJeFm7aFU
 hpcflow/sdk/persistence/store_resource.py,sha256=P-VZF7gMIsVvgOsHJEplK1Se4jHsaAqbdoKoQo-7_LU,5903
 hpcflow/sdk/persistence/types.py,sha256=c4vd8RW8bg8Meoz1HNXjGT8Za9Hpfl1Sxp4pLAgdV0g,9125
 hpcflow/sdk/persistence/utils.py,sha256=TuQp0BKwiy1-5WTgiMaYXn00bZb6HWHAjs4BBFE9khw,1804
-hpcflow/sdk/persistence/zarr.py,sha256=--H7uWNJ-SlcElFPHvbFZLMqwKsz1qh8oUAogXb8HX0,88249
+hpcflow/sdk/persistence/zarr.py,sha256=yCsiNteaok-eM9x5jogeDoCPdnIpx1Yv7LgYm8qoVeA,88267
 hpcflow/sdk/runtime.py,sha256=vPNu4_DXYMnRyJenkVLq8yt6_XG4tCuwX69Oew4OWmo,11269
 hpcflow/sdk/submission/__init__.py,sha256=79xJXVkddsuj3uJz3BV9iOnAV7vCeJvLrhKccOA_dnU,67
 hpcflow/sdk/submission/enums.py,sha256=DykNHISQDmfa0oDggj6iIKugeFXJd8iF9NwqV3MN2oA,2049
-hpcflow/sdk/submission/jobscript.py,sha256=Td4z2OKqnqAsXgjZOVciioJph7Gj3nghpHB4396_XHM,90331
+hpcflow/sdk/submission/jobscript.py,sha256=QvvJAwOAYQ6gkNkRAU1Ke4zJnQd6OneMUkAJapmPMGw,90846
 hpcflow/sdk/submission/schedulers/__init__.py,sha256=E-XBhSMflInTrQ5ZBUy8Hhq-JtAuIcCx6IM_7fI1Axw,9291
 hpcflow/sdk/submission/schedulers/direct.py,sha256=b_LS_xB0vu2tRHs-Xd08-16PC-nojRB6aNXwT9qtv0A,7493
 hpcflow/sdk/submission/schedulers/sge.py,sha256=WRohm-1eBEcadcKGg5QPd1DHvGEUV759IVtLbbDx2qU,13927
@@ -146,7 +147,7 @@ hpcflow/sdk/utils/arrays.py,sha256=7znIaqfl_bGElZ6U_da0vumWPez6ITyNrSDu_AlACDI,2
 hpcflow/sdk/utils/deferred_file.py,sha256=LYIjTPjAmbOflwUaq_-o-O6DZJCQzRHX8dl_rIWTO5c,1381
 hpcflow/sdk/utils/hashing.py,sha256=40H7yO-oYgrt6RCdlTDDzJV9YIGiQeDx6zGpMJrRKZo,484
 hpcflow/sdk/utils/patches.py,sha256=jpbodcOjhE5ccrHPz5-L-r9yC7s2ymQccIdJi6Zd2Jo,398
-hpcflow/sdk/utils/strings.py,sha256=8zaZYCeaL5ShYFtlKhYIcmGfKsgWm4BFNBp0yD9wK0k,959
+hpcflow/sdk/utils/strings.py,sha256=MGdVeQpEZjo_9_VSMNI2ArAesQpgAx4-RkHL7IAQInQ,1966
 hpcflow/tests/api/test_api.py,sha256=h0HT9W0Jd1pChrXYaBOVwGThaI3slGkloS0sbq2YX88,962
 hpcflow/tests/conftest.py,sha256=xtSqhOxjZYioiAPvrKwf7NFicZoA4BR9Si4J1A8mWHw,4083
 hpcflow/tests/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -162,7 +163,7 @@ hpcflow/tests/schedulers/direct_linux/test_direct_linux_submission.py,sha256=pgH
 hpcflow/tests/schedulers/sge/test_sge_submission.py,sha256=NKO2wBR9AOW8chEBW2nZ9OyDMa_8xZWDw16gtg5g-C8,1107
 hpcflow/tests/schedulers/slurm/test_slurm_submission.py,sha256=Hcok40_hWb68T0hFzODcmzXr10M6WavLD3qiyzjcNOI,493
 hpcflow/tests/scripts/test_input_file_generators.py,sha256=zyM_0AXFDCHMO75GC3we__z4KeqcF5s7MFw2MJfeDec,9960
-hpcflow/tests/scripts/test_main_scripts.py,sha256=qj4tg5s9Ii-n9b0bbWHAAGeXIoCPBZDhEMYH9LoAmbk,47911
+hpcflow/tests/scripts/test_main_scripts.py,sha256=pM_aA_XZ1py78yVJ-Fu-UQ7zJciIq8Ywv4CwiUuJEo4,48759
 hpcflow/tests/scripts/test_non_snippet_script.py,sha256=XFn34lLxd8iL03a4OIY9pbT5NWbjswDcjp2jaQF2ICU,1304
 hpcflow/tests/scripts/test_ouput_file_parsers.py,sha256=gB6W1stp5TdoRjupbvt6_Ufs1TsOQwTUS5oHif4P3c8,12092
 hpcflow/tests/shells/wsl/test_wsl_submission.py,sha256=L9TChOSwLKGIcHrfNno843SNpNWopgHY7Ptc_HzMEtA,1069
@@ -176,9 +177,9 @@ hpcflow/tests/unit/test_config.py,sha256=__rJADdEIia1lA2eSoT40IVw-7ArZSA86PDCQiW
 hpcflow/tests/unit/test_config_file.py,sha256=H0jXqPDEz4KKJ-VcnhpY9Xf_iVxFZr9eOvKvGRzmHCU,4599
 hpcflow/tests/unit/test_element.py,sha256=UMSNbNDZa2Ok-GQ9JWtqAWXYnOwkJdbjAeR3hHrXntU,20918
 hpcflow/tests/unit/test_element_iteration.py,sha256=ykn0eyhAhiL1NJlRp5B6PxE68GoqFGpIllHNoEriV3c,3101
-hpcflow/tests/unit/test_element_set.py,sha256=acKKnShu-DUlSvKqzbukQ_09nFEf-SBtGF8S3Vh3fDI,4223
+hpcflow/tests/unit/test_element_set.py,sha256=R1kqKkvYhSZeXfL_yzDhQgLc9TXXkewZaayM7cbWLPw,5082
 hpcflow/tests/unit/test_group.py,sha256=izOxElHzBtj7YafdTOZv4z_AyHXLhcfRvdNA4Bll9Ww,2660
-hpcflow/tests/unit/test_input_source.py,sha256=2xFXCjO3rcPxcRyYW2Mfg-qL5XfMX3QWxYfNQIopE44,40065
+hpcflow/tests/unit/test_input_source.py,sha256=0qRuKMDP8GkIN30PiLOUoGAkd9kfCFOFJ9LNEnw1mjc,42127
 hpcflow/tests/unit/test_input_value.py,sha256=UwW8bdSLkMXOEmhRw-n7fyMeVPEBHTxf5-WUNnVQVFg,6031
 hpcflow/tests/unit/test_jobscript_unit.py,sha256=E_uszw3-3Lf2nBcIUZUngMMIgd0S1X6nK40KYEBjGrg,26077
 hpcflow/tests/unit/test_json_like.py,sha256=b0_BHW0zfBmc_J848s0ZcYIl4NJkTxNciiAMMRvUCtA,30434
@@ -198,7 +199,7 @@ hpcflow/tests/unit/test_slurm.py,sha256=TGYLsEWtzmZg5hNa0LzWPQTWIQ4ZfINX3_XuxbTV
 hpcflow/tests/unit/test_submission.py,sha256=N5g5lR5_g4vtGZ7501q74UtB7QP6uEdPY-FAH2HAQJM,15411
 hpcflow/tests/unit/test_task.py,sha256=vI38Wx-EOCUkEipYoB1LL21Cxr5t073-F8eUluBsP28,83958
 hpcflow/tests/unit/test_task_schema.py,sha256=8qLioZQxdthDRU_-wFRFqfnuC8ygjyXt9iQGSw-0GGE,5065
-hpcflow/tests/unit/test_utils.py,sha256=Owr-7BP0_ryAhgnf14CMYFlDkY8_fqfnSwHMJTv8BAc,14645
+hpcflow/tests/unit/test_utils.py,sha256=m4wshifm6g19xnEXG8-sj-gldTKZ-NPx-xPE9BwcQiM,15350
 hpcflow/tests/unit/test_value_sequence.py,sha256=wQl-PVB72159OSVrpLPrHd2DyVjc2jNi79nDKhFbWMU,15858
 hpcflow/tests/unit/test_workflow.py,sha256=SKH1GwFufZTEkgKCyOiJhvajxJwQdX2dpVoFGLrQD2s,24409
 hpcflow/tests/unit/test_workflow_template.py,sha256=M99VxA7hHRsrN7IjrcwHzA_yShH3O6BhoPU0rrl5jJc,6709
@@ -207,6 +208,7 @@ hpcflow/tests/unit/utils/test_deferred_file_writer.py,sha256=1UvMGRT2pes1iDZdgL1
 hpcflow/tests/unit/utils/test_hashing.py,sha256=Q1BZRdrbF5BKb5jkmOZE0QoaoOg-zHwymmamekxO5Mo,2334
 hpcflow/tests/unit/utils/test_patches.py,sha256=31P3OZ5cMHo7FL3svOWNiiGqVxdlTpgKAqWgI2lQL1s,133
 hpcflow/tests/unit/utils/test_redirect_std.py,sha256=Aw56qOWL42HUL2kmhmgsjBdjutErhyOt0SHajl5CdxU,1463
+hpcflow/tests/unit/utils/test_strings.py,sha256=TUB87sSjSPLsq9GPu8ebXVbL74MpuLbsgySCN5gASQU,2045
 hpcflow/tests/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hpcflow/tests/workflows/test_directory_structure.py,sha256=Fp2kHMi6iydCJjRmVXPWj5gnZ-QzGj9lL-T_jb4kG2Y,1143
 hpcflow/tests/workflows/test_jobscript.py,sha256=jbInUDTxvN3qRVzLrF81OXrlP1RdgSfQZ5Zy3wUN9GI,11539
@@ -216,8 +218,8 @@ hpcflow/tests/workflows/test_submission.py,sha256=SUbBUbD8C8LSulrI7aETkzP9RqED48
 hpcflow/tests/workflows/test_workflows.py,sha256=9z3rtXjA5iMOp4C0q4TkD_9kLzwourCY-obpeOtnNt0,18927
 hpcflow/tests/workflows/test_zip.py,sha256=MzEwsIAYV_1A3bD0XRo23zUwUKVzkkmNd8_cil6YdWQ,578
 hpcflow/viz_demo.ipynb,sha256=6D9uBbWK3oMfbaf93Tnv5riFPtW-2miUTWNr9kGcnd4,228913
-hpcflow_new2-0.2.0a218.dist-info/LICENSE,sha256=Xhxf_KsrJNJFGMogumZhXSTPhUOVHCWf7nU-TDzqg0E,16763
-hpcflow_new2-0.2.0a218.dist-info/METADATA,sha256=v8HY5I7xM675Mu7q95T0DSHk2SEd_xpgyZWDVLBRnTo,2663
-hpcflow_new2-0.2.0a218.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-hpcflow_new2-0.2.0a218.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
-hpcflow_new2-0.2.0a218.dist-info/RECORD,,
+hpcflow_new2-0.2.0a219.dist-info/LICENSE,sha256=Xhxf_KsrJNJFGMogumZhXSTPhUOVHCWf7nU-TDzqg0E,16763
+hpcflow_new2-0.2.0a219.dist-info/METADATA,sha256=5YbT79dL7KTRczewYTZSD5cOxYJm7cKlbGdzFfaGcOw,2663
+hpcflow_new2-0.2.0a219.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+hpcflow_new2-0.2.0a219.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
+hpcflow_new2-0.2.0a219.dist-info/RECORD,,