fixed up handling of union types

Author: tclose

nipype2pydra/interface/__init__.py

@@ -1,6 +1,6 @@
 from .base import BaseInterfaceConverter
-from .function import FunctionInterfaceConverter
-from .shell_command import ShellCommandInterfaceConverter
+from .python import PythonInterfaceConverter
+from .shell import ShellInterfaceConverter
 from .base import (
     InputsConverter,
     OutputsConverter,
@@ -11,8 +11,8 @@
 
 __all__ = [
     "BaseInterfaceConverter",
-    "FunctionInterfaceConverter",
-    "ShellCommandInterfaceConverter",
+    "PythonInterfaceConverter",
+    "ShellInterfaceConverter",
     "InputsConverter",
     "OutputsConverter",
     "TestGenerator",

nipype2pydra/interface/loaders.py

@@ -6,8 +6,8 @@ def get_converter(nipype_module: str, nipype_name: str, **kwargs):
     nipype_interface = getattr(import_module(nipype_module), nipype_name)
 
     if hasattr(nipype_interface, "_cmd"):
-        from .shell_command import ShellCommandInterfaceConverter as Converter
+        from .shell import ShellInterfaceConverter as Converter
     else:
-        from .function import FunctionInterfaceConverter as Converter
+        from .python import PythonInterfaceConverter as Converter
 
     return Converter(nipype_module=nipype_module, nipype_name=nipype_name, **kwargs)

nipype2pydra/interface/function.py renamed to nipype2pydra/interface/python.py

@@ -13,7 +13,7 @@
 
 
 @attrs.define(slots=False)
-class FunctionInterfaceConverter(BaseInterfaceConverter):
+class PythonInterfaceConverter(BaseInterfaceConverter):
 
     converter_type = "function"
 
@@ -153,7 +153,11 @@ def generate_code(self, input_fields, nonstd_types, output_fields) -> ty.Tuple[
                 spec_str += f"    {name}: {type_}\n"
 
         spec_str += "    @staticmethod\n"
-        spec_str += "    def function(" + ", ".join(f"{n}: {t}" for n, t, _ in input_fields) + ")"
+        spec_str += (
+            "    def function("
+            + ", ".join(f"{n}: {t}" for n, t, _ in input_fields)
+            + ")"
+        )
         output_types = [o[1] for o in output_fields]
         if any(t is not ty.Any for t in output_types):
             spec_str += "-> "

nipype2pydra/interface/shell_command.py renamed to nipype2pydra/interface/shell.py

@@ -26,7 +26,7 @@
 
 
 @attrs.define(slots=False)
-class ShellCommandInterfaceConverter(BaseInterfaceConverter):
+class ShellInterfaceConverter(BaseInterfaceConverter):
 
     converter_type = "shell_command"
     _format_argstrs: ty.Dict[str, str] = attrs.field(factory=dict)

nipype2pydra/utils/misc.py

@@ -10,6 +10,7 @@
 from pathlib import Path
 from fileformats.core import FileSet, from_mime
 from fileformats.core.mixin import WithClassifiers
+from pydra.utils.typing import is_union, is_optional
 from ..exceptions import (
     UnmatchedParensException,
     UnmatchedQuoteException,
@@ -590,8 +591,15 @@ def type_to_str(type_: type, mandatory: bool = False) -> str:
         type_str = type_.__name__
     else:
         type_str = str(type_)
-    if origin := ty.get_origin(type):
-        args = [type_to_str(arg) for arg in ty.get_args(type_)]
+    if is_union(type_):
+        args = [t if t is not type(None) else None for t in ty.get_args(type_)]
+        if not mandatory and not is_optional(type_):
+            args.append(None)
+        return " | ".join(
+            type_to_str(a, mandatory=True) if a is not None else "None" for a in args
+        )
+    if origin := ty.get_origin(type_):
+        args = [type_to_str(arg, mandatory=True) for arg in ty.get_args(type_)]
         type_str = f"{origin.__name__}[{', '.join(args)}]"
         module = origin.__module__
     else: