fixed duplicate output issue caused by replacement mapping

nipype · May 14, 2024 · 28a2828 · 28a2828
1 parent 2f63f18
commit 28a2828
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/nipype2pydra/package.py b/nipype2pydra/package.py
@@ -365,10 +365,10 @@ def write(self, package_root: Path, to_include: ty.List[str] = None):
 
         nipype_ports = []
 
-        for workflow in tqdm(workflows_to_include, "preparing workflows for writing"):
+        for workflow in tqdm(workflows_to_include, "parsing workflow statements"):
             workflow.prepare()
 
-        for workflow in tqdm(workflows_to_include, "preparing workflow connections"):
+        for workflow in tqdm(workflows_to_include, "processing workflow connections"):
             workflow.prepare_connections()
 
         def collect_intra_pkg_objects(used: UsedSymbols, port_nipype: bool = True):

diff --git a/nipype2pydra/workflow.py b/nipype2pydra/workflow.py
@@ -1056,6 +1056,7 @@ def _parse_statements(self, func_body: str) -> ty.Tuple[
         statements = split_source_into_statements(func_body)
 
         parsed = []
+        outputs = []
         workflow_init = None
         workflow_init_index = None
         assignments = defaultdict(list)
@@ -1104,7 +1105,15 @@ def _parse_statements(self, func_body: str) -> ty.Tuple[
                 conn_stmts = ConnectionStatement.parse(statement, self, assignments)
                 for conn_stmt in conn_stmts:
                     self._unprocessed_connections.append(conn_stmt)
-                    if conn_stmt.wf_out or not conn_stmt.lzouttable:
+                    if conn_stmt.wf_out:
+                        if conn_stmt.conditional:
+                            parsed.append(conn_stmt)
+                        else:
+                            outpt = self.get_output_from_conn(conn_stmt)
+                            if outpt not in outputs:
+                                parsed.append(conn_stmt)
+                                outputs.append(outpt)
+                    elif not conn_stmt.lzouttable:
                         parsed.append(conn_stmt)
                 parsed_stmt = conn_stmts[-1]
             elif ReturnStatement.matches(statement):