Merge pull request #557 from yibeichan/fix-specs

allow more output types to use callables

Author: djarecka

pydra/engine/specs.py

@@ -486,7 +486,7 @@ def generated_output_names(self, inputs, output_dir):
         inputs.check_fields_input_spec()
         output_names = ["return_code", "stdout", "stderr"]
         for fld in attr_fields(self, exclude_names=("return_code", "stdout", "stderr")):
-            if fld.type is not File:
+            if fld.type not in [File, MultiOutputFile, Directory]:
                 raise Exception("not implemented (collect_additional_output)")
             # assuming that field should have either default or metadata, but not both
             if (

pydra/engine/tests/test_shelltask.py

@@ -2769,7 +2769,12 @@ def gather_output(field, output_dir):
 
     my_output_spec = SpecInfo(
         name="Output",
-        fields=[("newfile", attr.ib(type=File, metadata={"callable": gather_output}))],
+        fields=[
+            (
+                "newfile",
+                attr.ib(type=MultiOutputFile, metadata={"callable": gather_output}),
+            )
+        ],
         bases=(ShellOutSpec,),
     )
     shelly = ShellCommandTask(
@@ -2781,6 +2786,11 @@ def gather_output(field, output_dir):
     # newfile is a list
     assert len(res.output.newfile) == 2
     assert all([file.exists for file in res.output.newfile])
+    assert (
+        shelly.output_names
+        == shelly.generated_output_names
+        == ["return_code", "stdout", "stderr", "newfile"]
+    )
 
 
 @pytest.mark.parametrize("results_function", [result_no_submitter, result_submitter])
@@ -3238,7 +3248,11 @@ def get_lowest_directory(directory_path):
         cache_dir=tmpdir,
         resultsDir="test",  # Path(tmpdir) / "test" TODO: Not working without absolute path support
     )
-
+    assert (
+        shelly.output_names
+        == shelly.generated_output_names
+        == ["return_code", "stdout", "stderr", "resultsDir"]
+    )
     res = results_function(shelly, plugin)
     print("Cache_dirr:", shelly.cache_dir)
     assert (shelly.output_dir / Path("test")).exists() == True