hpcflow-new2 0.2.0a108__py3-none-any.whl → 0.2.0a109__py3-none-any.whl

hpcflow/_version.py

@@ -1 +1 @@
-__version__ = "0.2.0a108"
+__version__ = "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/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/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/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.dist-info → hpcflow_new2-0.2.0a109.dist-info}/METADATA

@@ -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.0a108.dist-info → hpcflow_new2-0.2.0a109.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=xyEXMIKYRpy0cf3N2ksLEbZxNb6Bw9WOYbLuuj4t1qM,924
-hpcflow/_version.py,sha256=jlvKXkU9xWla9lXzwjlPC-YeGbUpXqlx4tvVkVza2Pc,26
+hpcflow/_version.py,sha256=Nkwb1thRPq6eII0fnUVrpgGvVYJ0wpqCGaJ0ybaTlvE,26
 hpcflow/app.py,sha256=CMr8XlaGbAEQ0uvKrmnhnYw7TSQ7KhVkOUbLioecjL4,1377
 hpcflow/cli.py,sha256=G2J3D9v6MnMWOWMMWK6UEKLn_6wnV9lT_qygEBBxg-I,66
 hpcflow/examples.ipynb,sha256=cLKp4QsxwwMXRanDnfWY9kqsV23q6G4raOpu6IZXnMw,28553
@@ -16,8 +16,8 @@ hpcflow/sdk/config/config.py,sha256=0HLUtoah3kWm985rwuvvOsoIQxEw0yzm838kfcv3O90,
 hpcflow/sdk/config/config_file.py,sha256=JlMcprj0aujFVk8552ahP2f8EXB0tglMaHwzbcGZH6w,12373
 hpcflow/sdk/config/errors.py,sha256=2D7HJ1dbyeoD3xk4MuaGSsbJsUyQzyw8kaThEBZfP2I,6876
 hpcflow/sdk/core/__init__.py,sha256=GcIklEsXy3M5PWpmxyhd2KoI0u6HjXRIjD_aR1bgRjo,215
-hpcflow/sdk/core/actions.py,sha256=H4TmDaJI4F8w1_5vu4kv88_yI-PvAr49qZx3EbbXgUA,63146
-hpcflow/sdk/core/command_files.py,sha256=3eHU5IByDnLVQWRLwkSHhDhNM-MdnmEgLsmGcZJe51g,17139
+hpcflow/sdk/core/actions.py,sha256=r8ZiPsOYmgdY7DIywjoK-_c6gos4JHoqhzQreQozgDs,63480
+hpcflow/sdk/core/command_files.py,sha256=vdxpQYDfyg2EoytsTD5NzsOsZNypHwBq0Gu6IkQSnGo,16935
 hpcflow/sdk/core/commands.py,sha256=1nVU_E7QntuY0FiNluhf_ouxu3ML4KoRqwvbfsqXOz0,11061
 hpcflow/sdk/core/element.py,sha256=HBX1mGpgr_UNFvvC4zJJ1tI6SH2qCQxA0-_3Onh6SYQ,44524
 hpcflow/sdk/core/environment.py,sha256=DGUz1NvliKh6opP0IueGHD69rn_8wFLhDsq6kAmEgM4,4849
@@ -29,7 +29,7 @@ hpcflow/sdk/core/parallel.py,sha256=LI-g-qOuOR1oaEUWVT0qW0hmiP9hsJyUP8_IfSTKYYo,
 hpcflow/sdk/core/parameters.py,sha256=KZc0BLqPkbMIcsCerDgQ1zPQQ33s0LsCUfmR_hFy0GM,60462
 hpcflow/sdk/core/rule.py,sha256=chMn-Unu_4Mtc3T4z93OpmYcqOapqYAdBWuRSP8CBdg,4510
 hpcflow/sdk/core/task.py,sha256=MIleH_ahiLlPe1cDRAJ4rolFJLN0ixum_faJRMSB7Jk,103373
-hpcflow/sdk/core/task_schema.py,sha256=BW6Gr1lNEdOHmGzHKY71LRcCaFZSrlJ9LIc4iFoySyA,17352
+hpcflow/sdk/core/task_schema.py,sha256=Z6yxywwVmF8a4ITumhqC8mZNwUYk32UHB7UMY4SGKkU,18471
 hpcflow/sdk/core/test_utils.py,sha256=Zrun61DdJWngVMneXhpJCp6nXbjS0OLfoSM1BT_55VI,6660
 hpcflow/sdk/core/utils.py,sha256=QHzVae2b3JheweeNWHbQjKB-kFHRwv0pBYpP2HY1QGo,19836
 hpcflow/sdk/core/validation.py,sha256=KBKiy5DdfGiGmMaB0HdKTY0V972u5dJzvkYkX0_KtCo,518
@@ -98,7 +98,7 @@ hpcflow/tests/conftest.py,sha256=Xjyq9tjVdFGIf5HD1G0iZ1V_-cJAYC6A240OX8eBexU,261
 hpcflow/tests/schedulers/direct_linux/test_direct_linux_submission.py,sha256=pgHHG4iak0tx-1JTtpo8sCIvcZF2XayzEysjqWa_9LM,456
 hpcflow/tests/schedulers/slurm/test_slurm_submission.py,sha256=XMv_0YQ6GUeDPpQ4tO2LEm_kT_A40t_JzK8v-gl-ji8,442
 hpcflow/tests/shells/wsl/test_wsl_submission.py,sha256=cRkl_1H2Y4k91TJOX9wXZthW8AJFuuWuQ8X98624JDw,589
-hpcflow/tests/unit/test_action.py,sha256=JP0g3Eb6wZOVeoQ2o7Bf7pB6VAruTvp8qFaTydmGN2U,7841
+hpcflow/tests/unit/test_action.py,sha256=qh8v9GhFxkK7zmBqHyjWQh6vlJYXADLysPE_qhmvEqo,9078
 hpcflow/tests/unit/test_action_rule.py,sha256=r3G7-EEdsF1ND6kCOGI0S6N9WLi1vd3OABRIp6EvtMA,547
 hpcflow/tests/unit/test_app.py,sha256=W89TvXt9AD9AEn0tBkZgmEpiEeg1R_SpuQLV2tjQSAs,2916
 hpcflow/tests/unit/test_cli.py,sha256=9oQZOlX0z5LC4e2JFLuIgGnUXgmR2RCAtbXR5XRwqJs,288
@@ -128,7 +128,7 @@ hpcflow/tests/unit/test_workflow.py,sha256=zHM9KCkbEupKocrnTOkYagas7amXSpj9QNuEG
 hpcflow/tests/unit/test_workflow_template.py,sha256=4AFA2d4ZYOHdOJEH485D-fg8x1O-psZ0Qr2kOlrCc88,963
 hpcflow/tests/workflows/test_workflows.py,sha256=xWx2x70_3WdGR0ijgjk2F5Tg_V9YRCgN0E02ZFUi9Hk,13390
 hpcflow/viz_demo.ipynb,sha256=1QdnVsk72vihv2L6hOGyk318uEa22ZSgGxQCa7hW2oo,6238
-hpcflow_new2-0.2.0a108.dist-info/METADATA,sha256=CETQcTbiIA4dFWfL169ZLTLkLNFinnCUT2HpRHqoCWo,1879
-hpcflow_new2-0.2.0a108.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-hpcflow_new2-0.2.0a108.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
-hpcflow_new2-0.2.0a108.dist-info/RECORD,,
+hpcflow_new2-0.2.0a109.dist-info/METADATA,sha256=Km5lIPZ33qmI4LpUEyqcMvh58koOEjj0tXrqJF19rhw,1879
+hpcflow_new2-0.2.0a109.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+hpcflow_new2-0.2.0a109.dist-info/entry_points.txt,sha256=aoGtCnFdfPcXfBdu2zZyMOJoz6fPgdR0elqsgrE-USU,106
+hpcflow_new2-0.2.0a109.dist-info/RECORD,,