hpcflow-new2 0.2.0a220__tar.gz → 0.2.0a221__tar.gz

{hpcflow_new2-0.2.0a220 → hpcflow_new2-0.2.0a221}/PKG-INFO

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

hpcflow_new2-0.2.0a221/hpcflow/_version.py

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

{hpcflow_new2-0.2.0a220 → hpcflow_new2-0.2.0a221}/hpcflow/sdk/core/actions.py

@@ -913,9 +913,16 @@ class ElementActionRun(AppAware):
         """
         kwargs: dict[str, Any] = {}
         if self.action.is_IFG:
-            ifg = self.action.input_file_generators[0]
-            path = ifg.input_file.name.value()
-            assert isinstance(path, str)
+            input_file = self.action.input_file_generators[0].input_file
+            if (fn_spec := input_file.name).is_regex:
+                # pass to the IFG the label rather than name (there is no point searching
+                # with the regular expression via `name.value()`; the file(s) won't exist
+                # yet!):
+                path = input_file.label
+            else:
+                path_ = fn_spec.value()
+                assert isinstance(path_, str)
+                path = path_
             kwargs["path"] = Path(path)
             kwargs.update(self.get_IFG_input_values(raise_on_unset=raise_on_unset))
 

{hpcflow_new2-0.2.0a220 → hpcflow_new2-0.2.0a221}/hpcflow/tests/unit/test_group.py

@@ -91,3 +91,25 @@ def test_group_raise_no_elements(null_config, tmp_path: Path):
             path=tmp_path,
             tasks=[t1, t2],
         )
+
+
+def test_group_on_input_only_task(null_config, tmp_path: Path):
+
+    s1 = hf.TaskSchema(objective="t1", inputs=[hf.SchemaInput("p1")])
+    s2 = hf.TaskSchema(objective="t2", inputs=[hf.SchemaInput("p1", group="all")])
+
+    t1 = hf.Task(
+        schema=s1,
+        inputs={"p1": 100},
+        repeats=2,
+        groups=[hf.ElementGroup(name="all")],  # define a group on a task with no actions
+    )
+    t2 = hf.Task(schema=s2)
+
+    wk = hf.Workflow.from_template_data(
+        template_name="test_input_group",
+        path=tmp_path,
+        tasks=[t1, t2],
+    )
+    assert wk.tasks.t1.num_elements == 2
+    assert wk.tasks.t2.num_elements == 1

{hpcflow_new2-0.2.0a220 → hpcflow_new2-0.2.0a221}/pyproject.toml

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

hpcflow_new2-0.2.0a220/hpcflow/_version.py

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