hpcflow-new2 0.2.0a108__tar.gz → 0.2.0a109__tar.gz

{hpcflow_new2-0.2.0a108 → hpcflow_new2-0.2.0a109}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpcflow-new2
-Version: 0.2.0a108
+Version: 0.2.0a109
 Summary: Computational workflow management
 License: MIT
 Author: aplowman

hpcflow_new2-0.2.0a109/hpcflow/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.0a109"

{hpcflow_new2-0.2.0a108 → hpcflow_new2-0.2.0a109}/hpcflow/sdk/core/actions.py

@@ -513,16 +513,14 @@ class ElementActionRun:
             outputs[out_typ] = self.get(f"outputs.{out_typ}")
         return outputs
 
-    def compose_source(self) -> str:
+    def compose_source(self, snip_path: Path) -> str:
         """Generate the file contents of this source."""
 
-        script_name = self.action.get_script_name(self.action.script)
-        script_key = self.action.get_app_data_script_path(self.action.script)
-        script_path = self.app.scripts.get(script_key)
-        with script_path.open("rt") as fp:
+        script_name = snip_path.name
+        with snip_path.open("rt") as fp:
             script_str = fp.read()
 
-        is_python = script_path.suffix == ".py"
+        is_python = snip_path.suffix == ".py"
         if is_python:
             py_imports = dedent(
                 """\
@@ -639,10 +637,12 @@ class ElementActionRun:
 
         # write the script if it is specified as a app data script, otherwise we assume
         # the script already exists in the working directory:
-        if self.action.script and self.action.is_app_data_script(self.action.script):
-            script_name = self.action.get_script_name(self.action.script)
+        snip_path = self.action.get_snippet_script_path(self.action.script)
+        if snip_path:
+            script_name = snip_path.name
+            source_str = self.compose_source(snip_path)
             with Path(script_name).open("wt", newline="\n") as fp:
-                fp.write(self.compose_source())
+                fp.write(source_str)
 
     def _param_dump_JSON(self, dump_path: Path):
         with dump_path.open("wt") as fp:
@@ -1358,15 +1358,16 @@ class Action(JSONLike):
         )
 
     @staticmethod
-    def is_app_data_script(script: str) -> bool:
+    def is_snippet_script(script: str) -> bool:
+        """Returns True if the provided script string represents a script snippets that is
+        to be modified before execution (e.g. to receive and provide parameter data)."""
         return script.startswith("<<script:")
 
     @classmethod
     def get_script_name(cls, script: str) -> str:
         """Return the script name."""
-        if cls.is_app_data_script(script):
-            # an app data script:
-            pattern = r"\<\<script:(?:.*\/)*(.*:?)\>\>"
+        if cls.is_snippet_script(script):
+            pattern = r"\<\<script:(?:.*(?:\/|\\))*(.*)\>\>"
             match_obj = re.match(pattern, script)
             return match_obj.group(1)
         else:
@@ -1374,8 +1375,8 @@ class Action(JSONLike):
             return script
 
     @classmethod
-    def get_app_data_script_path(cls, script) -> str:
-        if not cls.is_app_data_script(script):
+    def get_snippet_script_str(cls, script) -> str:
+        if not cls.is_snippet_script(script):
             raise ValueError(
                 f"Must be an app-data script name (e.g. "
                 f"<<script:path/to/app/data/script.py>>), but received {script}"
@@ -1384,6 +1385,17 @@ class Action(JSONLike):
         match_obj = re.match(pattern, script)
         return match_obj.group(1)
 
+    @classmethod
+    def get_snippet_script_path(cls, script_path) -> Path:
+        if not cls.is_snippet_script(script_path):
+            return False
+
+        path = cls.get_snippet_script_str(script_path)
+        if path in cls.app.scripts:
+            path = cls.app.scripts.get(path)
+
+        return Path(path)
+
     @staticmethod
     def get_param_dump_file_stem(js_idx: int, js_act_idx: int):
         return f"js_{js_idx}_act_{js_act_idx}_inputs"

{hpcflow_new2-0.2.0a108 → hpcflow_new2-0.2.0a109}/hpcflow/sdk/core/command_files.py

@@ -134,12 +134,9 @@ class InputFileGenerator(JSONLike):
     def compose_source(self, action) -> str:
         """Generate the file contents of this input file generator source."""
 
-        script_name = self.script
-        script_key = action.get_app_data_script_path(self.script)
-        script_path = self.app.scripts.get(script_key)
-        script_main_func = Path(script_name).stem
-
-        with script_path.open("rt") as fp:
+        snip_path = action.get_snippet_script_path(self.script)
+        script_main_func = snip_path.stem
+        with snip_path.open("rt") as fp:
             script_str = fp.read()
 
         main_block = dedent(
@@ -261,12 +258,9 @@ class OutputFileParser(JSONLike):
     def compose_source(self, action) -> str:
         """Generate the file contents of this output file parser source."""
 
-        script_name = self.script
-        script_key = action.get_app_data_script_path(self.script)
-        script_path = self.app.scripts.get(script_key)
-        script_main_func = Path(script_name).stem
-
-        with script_path.open("rt") as fp:
+        snip_path = action.get_snippet_script_path(self.script)
+        script_main_func = snip_path.stem
+        with snip_path.open("rt") as fp:
             script_str = fp.read()
 
         main_block = dedent(

{hpcflow_new2-0.2.0a108 → hpcflow_new2-0.2.0a109}/hpcflow/sdk/core/task_schema.py

@@ -217,6 +217,27 @@ class TaskSchema(JSONLike):
                 tab_cmds_i = Table(show_header=False, box=None)
                 tab_cmds_i.add_column(justify="right")
                 tab_cmds_i.add_column()
+                if act.rules:
+                    seen_rules = []  # bug: some rules seem to be repeated
+                    for act_rule_j in act.rules:
+                        if act_rule_j.rule in seen_rules:
+                            continue
+                        else:
+                            seen_rules.append(act_rule_j.rule)
+                        r_path = ""
+                        if act_rule_j.rule.check_missing:
+                            r_cond = f"check missing: {act_rule_j.rule.check_missing}"
+                        elif act_rule_j.rule.check_exists:
+                            r_cond = f"check exists: {act_rule_j.rule.check_exists}"
+                        elif act_rule_j.rule.condition:
+                            r_path = f"{act_rule_j.rule.path}: "
+                            r_cond = str(act_rule_j.rule.condition.to_json_like())
+                        else:
+                            continue
+                        tab_cmds_i.add_row(
+                            "[italic]rule:[/italic]",
+                            escape(f"{r_path}{r_cond}"),
+                        )
                 tab_cmds_i.add_row(
                     "[italic]scope:[/italic]",
                     escape(act.get_precise_scope().to_string()),

{hpcflow_new2-0.2.0a108 → hpcflow_new2-0.2.0a109}/hpcflow/tests/unit/test_action.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 import pytest
 
 from hpcflow.app import app as hf
@@ -215,3 +216,39 @@ def test_get_command_input_types_label_sub_parameters_false_no_sub_param():
 def test_get_command_input_types_label_sub_parameters_false_with_sub_parameter():
     act = hf.Action(commands=[hf.Command("Write-Output (<<parameter:p1[one].a>> + 100)")])
     assert act.get_command_input_types(sub_parameters=False) == ("p1[one]",)
+
+
+def test_get_script_name(null_config):
+    expected = {
+        "<<script:/software/hello.py>>": "hello.py",
+        "<<script:software/hello.py>>": "hello.py",
+        r"<<script:C:\long\path\to\script.py>>": "script.py",
+        "/path/to/script.py": "/path/to/script.py",
+    }
+    for k, v in expected.items():
+        assert hf.Action.get_script_name(k) == v
+
+
+def test_is_snippet_script(null_config):
+    expected = {
+        "<<script:/software/hello.py>>": True,
+        "<<script:software/hello.py>>": True,
+        r"<<script:C:\long\path\to\script.py>>": True,
+        "/path/to/script.py": False,
+    }
+    for k, v in expected.items():
+        assert hf.Action.is_snippet_script(k) == v
+
+
+def test_get_snippet_script_path(null_config):
+    expected = {
+        "<<script:/software/hello.py>>": Path("/software/hello.py"),
+        "<<script:software/hello.py>>": Path("software/hello.py"),
+        r"<<script:C:\long\path\to\script.py>>": Path(r"C:\long\path\to\script.py"),
+    }
+    for k, v in expected.items():
+        assert hf.Action.get_snippet_script_path(k) == v
+
+
+def test_get_snippet_script_path_False(null_config):
+    assert not hf.Action.get_snippet_script_path("/path/to/script.py")

{hpcflow_new2-0.2.0a108 → hpcflow_new2-0.2.0a109}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [tool.poetry]
 name = "hpcflow-new2"
-version = "0.2.0a108"
+version = "0.2.0a109"
 
 description = "Computational workflow management"
 authors = ["aplowman <adam.plowman@manchester.ac.uk>"]
@@ -68,7 +68,7 @@ hook-dirs = "hpcflow.__pyinstaller:get_hook_dirs"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.2.0a108"
+version = "0.2.0a109"
 tag_format = "v$version"
 version_files = [ 
     "pyproject.toml:version",

hpcflow_new2-0.2.0a108/hpcflow/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.0a108"