From b381b6b507301df9cbd74de6698862c715a13c0e Mon Sep 17 00:00:00 2001 From: sapetnioc Date: Mon, 13 Nov 2023 16:59:00 +0100 Subject: [PATCH] #316 fixed nipype tuples types management --- capsul/process/nipype_process.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/capsul/process/nipype_process.py b/capsul/process/nipype_process.py index f636bf90..8f68d77c 100644 --- a/capsul/process/nipype_process.py +++ b/capsul/process/nipype_process.py @@ -120,10 +120,25 @@ def sync_nypipe_traits(value, old, name, process_instance): value = replace_Undef(value) if name.startswith("nipype_"): - setattr(process_instance._nipype_interface.inputs, name[7:], value) - + field_name = name[7:] else: - setattr(process_instance._nipype_interface.inputs, name, value) + field_name = name + if isinstance(value, tuple): + # Check item types inside the tuple + f = process_instance.field(field_name) + subtypes = f.subtypes() + if subtypes: + for i in range(len(subtypes)): + if i < len(value): + subtype = subtypes[i] + if ( + isinstance(subtype, type) + and issubclass(subtype, tuple) + and not issubclass(value[i], tuple) + ): + value[i] = tuple(value[i]) + + setattr(process_instance._nipype_interface.inputs, field_name, value) def _replace_dir(value, directory): """Replace directory in filename(s) in value. @@ -513,8 +528,8 @@ def parse_trait(trait): sub_traits = handler.handlers elif handler.has_items: sub_traits = handler.inner_traits() - elif hasattr(trait, "types"): - sub_traits = trait.types + if not sub_traits and hasattr(handler, "types"): + sub_traits = handler.types if sub_traits: tree["children"] = [parse_trait(t) for t in sub_traits]