Merge branch 'fix/workflow-retry' into deploy/dev

langgenius · Dec 23, 2024 · 265f6fe · 265f6fe
2 parents f1e3434 + db1f1d8
commit 265f6fe
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 15 deletions.
diff --git a/web/app/components/workflow/hooks/use-workflow-run.ts b/web/app/components/workflow/hooks/use-workflow-run.ts
@@ -629,6 +629,8 @@ export const useWorkflowRun = () => {
           const {
             workflowRunningData,
             setWorkflowRunningData,
+            iterParallelLogMap,
+            setIterParallelLogMap,
           } = workflowStore.getState()
           const {
             getNodes,
@@ -639,21 +641,47 @@ export const useWorkflowRun = () => {
           const currentNode = nodes.find(node => node.id === data.node_id)!
           const nodeParent = nodes.find(node => node.id === currentNode.parentId)
           if (nodeParent) {
-            setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
-              const tracing = draft.tracing!
-              const iteration = tracing.find(trace => trace.node_id === nodeParent.id)
+            if (!data.execution_metadata.parallel_mode_run_id) {
+              setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
+                const tracing = draft.tracing!
+                const iteration = tracing.find(trace => trace.node_id === nodeParent.id)
 
-              if (iteration && iteration.details?.length) {
-                const currentNodeRetry = iteration.details[nodeParent.data._iterationIndex - 1]?.find(item => item.node_id === data.node_id)
+                if (iteration && iteration.details?.length) {
+                  const currentNodeRetry = iteration.details[nodeParent.data._iterationIndex - 1]?.find(item => item.node_id === data.node_id)
 
-                if (currentNodeRetry) {
-                  if (currentNodeRetry?.retryDetail)
-                    currentNodeRetry?.retryDetail.push(data as NodeTracing)
-                  else
-                    currentNodeRetry.retryDetail = [data as NodeTracing]
+                  if (currentNodeRetry) {
+                    if (currentNodeRetry?.retryDetail)
+                      currentNodeRetry?.retryDetail.push(data as NodeTracing)
+                    else
+                      currentNodeRetry.retryDetail = [data as NodeTracing]
+                  }
                 }
-              }
-            }))
+              }))
+            }
+            else {
+              setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
+                const tracing = draft.tracing!
+                const iteration = tracing.find(trace => trace.node_id === nodeParent.id)
+
+                if (iteration && iteration.details?.length) {
+                  const iterRunID = data.execution_metadata?.parallel_mode_run_id
+
+                  const currIteration = iterParallelLogMap.get(iteration.node_id)?.get(iterRunID)
+                  const currentNodeRetry = currIteration?.find(item => item.node_id === data.node_id)
+
+                  if (currentNodeRetry) {
+                    if (currentNodeRetry?.retryDetail)
+                      currentNodeRetry?.retryDetail.push(data as NodeTracing)
+                    else
+                      currentNodeRetry.retryDetail = [data as NodeTracing]
+                  }
+                  setIterParallelLogMap(iterParallelLogMap)
+                  const iterLogMap = iterParallelLogMap.get(iteration.node_id)
+                  if (iterLogMap)
+                    iteration.details = Array.from(iterLogMap.values())
+                }
+              }))
+            }
           }
           else {
             setWorkflowRunningData(produce(workflowRunningData!, (draft) => {

diff --git a/web/app/components/workflow/run/index.tsx b/web/app/components/workflow/run/index.tsx
@@ -78,11 +78,24 @@ const RunPanel: FC<RunProps> = ({ hideResult, activeTab = 'RESULT', runID, getRe
 
       const groupMap = nodeGroupMap.get(iterationNode.node_id)!
 
-      if (!groupMap.has(runId))
+      if (!groupMap.has(runId)) {
         groupMap.set(runId, [item])
+      }
+      else {
+        if (item.status === 'retry') {
+          const retryNode = groupMap.get(runId)!.find(node => node.node_id === item.node_id)
 
-      else
-        groupMap.get(runId)!.push(item)
+          if (retryNode) {
+            if (retryNode?.retryDetail)
+              retryNode.retryDetail.push(item)
+            else
+              retryNode.retryDetail = [item]
+          }
+        }
+        else {
+          groupMap.get(runId)!.push(item)
+        }
+      }
 
       if (item.status === 'failed') {
         iterationNode.status = 'failed'