AP-25344: Option to remove failed tools from combined tools workflow

AP-25344 (Properly handle failing tools in combined tools workflow)

Author: hornm-knime

org.knime.python3.nodes/src/main/java/org/knime/python3/nodes/CloseablePythonNodeProxy.java

@@ -555,7 +555,7 @@ public PythonToolResult execute_tool(final PurePythonTablePortObject toolTable,
 
             @Override
             public CombinedToolsWorkflowInfo init_combined_tools_workflow(final List<PythonPortObject> inputs,
-                final String execMode) {
+                final String execMode, final boolean removeFailedTools) {
                 throw new UnsupportedOperationException(
                     "Initializing a combined tools workflow is not supported here.");
             }

org.knime.python3.nodes/src/main/java/org/knime/python3/nodes/DefaultViewContext.java

@@ -114,8 +114,8 @@ public PythonToolResult execute_tool(final PurePythonTablePortObject toolTable,
 
     @Override
     public CombinedToolsWorkflowInfo init_combined_tools_workflow(final List<PythonPortObject> inputs,
-        final String execMode) {
-        return m_toolExecutor.initCombinedToolsWorkflow(inputs, execMode);
+        final String execMode, final boolean removeFailedTools) {
+        return m_toolExecutor.initCombinedToolsWorkflow(inputs, execMode, removeFailedTools);
     }
 
     @Override

org.knime.python3.nodes/src/main/java/org/knime/python3/nodes/ToolExecutor.java

@@ -181,7 +181,7 @@ PythonToolResult executeTool(final PurePythonTablePortObject pythonToolTable, fi
     }
 
     CombinedToolsWorkflowInfo initCombinedToolsWorkflow(final List<PythonPortObject> inputs,
-        final String execModeString) {
+        final String execModeString, final boolean removeFailedTools) {
         m_fileStoreSwitcher.switchFileStoreHandler(m_nodeContainer, false);
 
         Map<String, FileStore> dummyFileStoreMap = Map.of();
@@ -194,7 +194,7 @@ CombinedToolsWorkflowInfo initCombinedToolsWorkflow(final List<PythonPortObject>
                 .toArray(PortObject[]::new);
             m_workflowExecutor =
                 WorkflowSegmentExecutor.builder(m_nodeContainer, execMode, "Combined tools workflow", warning -> {
-                }, m_exec, false).combined(inputPortObjects).build();
+                }, m_exec, false).combined(inputPortObjects).removeFailedSegments(removeFailedTools).build();
             var combinedToolsWorkflowId = m_workflowExecutor.getWorkflow().getID();
             m_disposeCombinedToolsWorkflowOnClose = true;
             m_combinedToolsWorkflow = new VirtualProject(combinedToolsWorkflowId);
@@ -203,7 +203,8 @@ CombinedToolsWorkflowInfo initCombinedToolsWorkflow(final List<PythonPortObject>
         } else {
             m_workflowExecutor =
                 WorkflowSegmentExecutor.builder(m_nodeContainer, execMode, "Combined tools workflow", warning -> {
-                }, m_exec, false).combined(m_combinedToolsWorkflow.loadAndGetWorkflow()).build();
+                }, m_exec, false).combined(m_combinedToolsWorkflow.loadAndGetWorkflow())
+                    .removeFailedSegments(removeFailedTools).build();
             assert inputs.isEmpty();
             inputPortIds = List.of();
         }
@@ -411,8 +412,7 @@ private static WorkflowSegment createWorkflowSegmentWithRemovedIONodes(final Wor
         segmentWfm = createEmptyWorkflow("workflow_segment");
         var copyContent = WorkflowCopyContent.builder()
             .setNodeIDs(wfm.getNodeContainers().stream().map(NodeContainer::getID).toArray(NodeID[]::new)).build();
-        var persistor = wfm.copy(copyContent);
-        segmentWfm.paste(persistor);
+        segmentWfm.copyFromAndPasteHere(wfm, copyContent);
         List<Input> inputs = new ArrayList<>();
         List<Output> outputs = new ArrayList<>();
         removeAndCollectContainerInputsAndOutputs(segmentWfm, inputs, inputIds, outputs, outputIds);

org.knime.python3.nodes/src/main/java/org/knime/python3/nodes/proxy/PythonToolContext.java

@@ -100,9 +100,11 @@ public record CombinedToolsWorkflowInfo(String projectId, String workflowId, Lis
      *
      * @param inputs the source inputs of the combined-tools workflow
      * @param execMode DEFAUTL, DETACHED or DEBUG
+     * @param removeFailedTools whether to remove failed tools from the combined workflow
      * @return info about the initialized combined-tools workflow
      */
-    CombinedToolsWorkflowInfo init_combined_tools_workflow(List<PythonPortObject> inputs, String execMode);
+    CombinedToolsWorkflowInfo init_combined_tools_workflow(List<PythonPortObject> inputs, String execMode,
+        boolean removeFailedTools);
 
     /**
      * @return the combined-tools workflow as a Python port object

org.knime.python3.nodes/src/main/python/_node_backend_launcher.py

@@ -1473,13 +1473,15 @@ def execute_tool(self, tool, parameters: dict, inputs: List, execution_hints: di
 
         return result.message(), outputs, result.viewNodeIds()
 
-    def init_combined_tools_workflow(self, inputs: List, execution_mode: str):
+    def init_combined_tools_workflow(
+        self, inputs: List, execution_mode: str, remove_failed_tools: bool
+    ):
         prepared_inputs = []
         for input in inputs:
             prepared_input = self._type_registry.table_from_python(input)
             prepared_inputs.append(prepared_input)
         result = self._java_ctx.init_combined_tools_workflow(
-            prepared_inputs, execution_mode
+            prepared_inputs, execution_mode, remove_failed_tools
         )
         return result.projectId(), result.workflowId(), result.inputPortIds()