added subclass tests for unions

Author: tclose

pydra/engine/specs.py

@@ -445,7 +445,7 @@ def collect_additional_outputs(self, inputs, output_dir, outputs):
                 ),
             ):
                 raise TypeError(
-                    f"Support for {fld.type} type, required for {fld.name} in {self}, "
+                    f"Support for {fld.type} type, required for '{fld.name}' in {self}, "
                     "has not been implemented in collect_additional_output"
                 )
             # assuming that field should have either default or metadata, but not both

pydra/utils/tests/test_typing.py

@@ -8,7 +8,7 @@
 from ...engine.specs import File, LazyOutField
 from ..typing import TypeParser
 from pydra import Workflow
-from fileformats.application import Json
+from fileformats.application import Json, Yaml, Xml
 from .utils import (
     generic_func_task,
     GenericShellTask,
@@ -611,6 +611,14 @@ def test_type_is_subclass3():
     assert TypeParser.is_subclass(ty.Type[Json], ty.Type[File])
 
 
+def test_type_is_subclass4():
+    assert TypeParser.is_subclass(ty.Union[Json, Yaml], ty.Union[Json, Yaml, Xml])
+
+
+def test_type_is_subclass5():
+    assert not TypeParser.is_subclass(ty.Union[Json, Yaml, Xml], ty.Union[Json, Yaml])
+
+
 def test_type_is_instance1():
     assert TypeParser.is_instance(File, ty.Type[File])
 

pydra/utils/typing.py

@@ -649,7 +649,7 @@ def is_subclass(
                     else:
                         candidate_args = [candidate]
                     return all(
-                        any(cls.is_subclass(a, c) for a in args) for c in candidate_args
+                        any(cls.is_subclass(a, c) for c in candidate_args) for a in args
                     )
                 if origin is not None:
                     klass = origin