diff --git a/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx b/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx index 4bf1f60fbe..57205f38c4 100644 --- a/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx +++ b/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx @@ -448,6 +448,66 @@ describe('useChat', () => { expect(lastResponse.workflowProcess?.status).toBe('failed') }) + it('should keep separate iteration traces for repeated executions of the same iteration node', async () => { + let callbacks: HookCallbacks + + vi.mocked(ssePost).mockImplementation(async (_url, _params, options) => { + callbacks = options as HookCallbacks + }) + + const { result } = renderHook(() => useChat()) + + act(() => { + result.current.handleSend('test-url', { query: 'iteration trace test' }, {}) + }) + + act(() => { + callbacks.onWorkflowStarted({ workflow_run_id: 'wr-1', task_id: 't-1' }) + callbacks.onIterationStart({ data: { id: 'iter-run-1', node_id: 'iter-1' } }) + callbacks.onIterationStart({ data: { id: 'iter-run-2', node_id: 'iter-1' } }) + callbacks.onIterationFinish({ data: { id: 'iter-run-1', node_id: 'iter-1', status: 'succeeded' } }) + callbacks.onIterationFinish({ data: { id: 'iter-run-2', node_id: 'iter-1', status: 'succeeded' } }) + }) + + const tracing = result.current.chatList[1].workflowProcess?.tracing ?? [] + + expect(tracing).toHaveLength(2) + expect(tracing).toEqual(expect.arrayContaining([ + expect.objectContaining({ id: 'iter-run-1', status: 'succeeded' }), + expect.objectContaining({ id: 'iter-run-2', status: 'succeeded' }), + ])) + }) + + it('should keep separate top-level traces for repeated executions of the same node', async () => { + let callbacks: HookCallbacks + + vi.mocked(ssePost).mockImplementation(async (_url, _params, options) => { + callbacks = options as HookCallbacks + }) + + const { result } = renderHook(() => useChat()) + + act(() => { + result.current.handleSend('test-url', { query: 'top-level trace test' }, {}) + }) + + act(() => { + callbacks.onWorkflowStarted({ workflow_run_id: 'wr-1', task_id: 't-1' }) + callbacks.onNodeStarted({ data: { id: 'node-run-1', node_id: 'node-1', title: 'Node 1' } }) + callbacks.onNodeStarted({ data: { id: 'node-run-2', node_id: 'node-1', title: 'Node 1 retry' } }) + callbacks.onNodeFinished({ data: { id: 'node-run-1', node_id: 'node-1', status: 'succeeded' } }) + callbacks.onNodeFinished({ data: { id: 'node-run-2', node_id: 'node-1', status: 'succeeded' } }) + }) + + const tracing = result.current.chatList[1].workflowProcess?.tracing ?? [] + + expect(tracing).toHaveLength(2) + expect(tracing).toEqual(expect.arrayContaining([ + expect.objectContaining({ id: 'node-run-1', status: 'succeeded' }), + expect.objectContaining({ id: 'node-run-2', status: 'succeeded' }), + ])) + }) + it('should handle early exits in tracing events during iteration or loop', async () => { let callbacks: HookCallbacks @@ -483,7 +543,7 @@ describe('useChat', () => { callbacks.onNodeFinished({ data: { id: 'n-1', iteration_id: 'iter-1' } }) }) - const traceLen1 = result.current.chatList[result.current.chatList.length - 1].workflowProcess?.tracing?.length + const traceLen1 = result.current.chatList.at(-1)!.workflowProcess?.tracing?.length expect(traceLen1).toBe(0) // None added due to iteration early hits }) @@ -567,7 +627,7 @@ describe('useChat', () => { expect(result.current.chatList.some(item => item.id === 'question-m-child')).toBe(true) expect(result.current.chatList.some(item => item.id === 'm-child')).toBe(true) - expect(result.current.chatList[result.current.chatList.length - 1].content).toBe('child answer') + expect(result.current.chatList.at(-1)!.content).toBe('child answer') }) it('should strip local file urls before sending payload', () => { @@ -665,7 +725,7 @@ describe('useChat', () => { }) expect(onGetConversationMessages).toHaveBeenCalled() - expect(result.current.chatList[result.current.chatList.length - 1].content).toBe('streamed content') + expect(result.current.chatList.at(-1)!.content).toBe('streamed content') }) it('should clear suggested questions when suggestion fetch fails after completion', async () => { @@ -711,7 +771,7 @@ describe('useChat', () => { callbacks.onNodeFinished({ data: { node_id: 'n-loop', id: 'n-loop' } }) }) - const latestResponse = result.current.chatList[result.current.chatList.length - 1] + const latestResponse = result.current.chatList.at(-1)! expect(latestResponse.workflowProcess?.tracing).toHaveLength(0) }) @@ -738,7 +798,7 @@ describe('useChat', () => { callbacks.onTTSChunk('m-th-bind', '') }) - const latestResponse = result.current.chatList[result.current.chatList.length - 1] + const latestResponse = result.current.chatList.at(-1)! expect(latestResponse.id).toBe('m-th-bind') expect(latestResponse.conversationId).toBe('c-th-bind') expect(latestResponse.workflowProcess?.status).toBe('succeeded') @@ -831,7 +891,7 @@ describe('useChat', () => { callbacks.onCompleted() }) - const lastResponse = result.current.chatList[result.current.chatList.length - 1] + const lastResponse = result.current.chatList.at(-1)! expect(lastResponse.agent_thoughts![0].thought).toContain('resumed') expect(lastResponse.workflowProcess?.tracing?.length).toBeGreaterThan(0) diff --git a/web/app/components/base/chat/chat/hooks.ts b/web/app/components/base/chat/chat/hooks.ts index 307fd52443..e8ce744236 100644 --- a/web/app/components/base/chat/chat/hooks.ts +++ b/web/app/components/base/chat/chat/hooks.ts @@ -32,6 +32,7 @@ import { } from '@/app/components/base/file-uploader/utils' import { useToastContext } from '@/app/components/base/toast/context' import { NodeRunningStatus, WorkflowRunningStatus } from '@/app/components/workflow/types' +import { upsertTopLevelTracingNodeOnStart } from '@/app/components/workflow/utils/top-level-tracing' import useTimestamp from '@/hooks/use-timestamp' import { sseGet, @@ -395,8 +396,7 @@ export const useChat = ( if (!responseItem.workflowProcess?.tracing) return const tracing = responseItem.workflowProcess.tracing - const iterationIndex = tracing.findIndex(item => item.node_id === iterationFinishedData.node_id - && (item.execution_metadata?.parallel_id === iterationFinishedData.execution_metadata?.parallel_id || item.parallel_id === iterationFinishedData.execution_metadata?.parallel_id))! + const iterationIndex = tracing.findIndex(item => item.id === iterationFinishedData.id)! if (iterationIndex > -1) { tracing[iterationIndex] = { ...tracing[iterationIndex], @@ -413,33 +413,26 @@ export const useChat = ( if (!responseItem.workflowProcess.tracing) responseItem.workflowProcess.tracing = [] - const currentIndex = responseItem.workflowProcess.tracing.findIndex(item => item.node_id === nodeStartedData.node_id) - // if the node is already started, update the node - if (currentIndex > -1) { - responseItem.workflowProcess.tracing[currentIndex] = { - ...nodeStartedData, - status: NodeRunningStatus.Running, - } - } - else { - if (nodeStartedData.iteration_id) - return - - responseItem.workflowProcess.tracing.push({ - ...nodeStartedData, - status: WorkflowRunningStatus.Running, - }) - } + upsertTopLevelTracingNodeOnStart(responseItem.workflowProcess.tracing, { + ...nodeStartedData, + status: WorkflowRunningStatus.Running, + }) }) }, onNodeFinished: ({ data: nodeFinishedData }) => { updateChatTreeNode(messageId, (responseItem) => { + if (params.loop_id) + return + if (!responseItem.workflowProcess?.tracing) return if (nodeFinishedData.iteration_id) return + if (nodeFinishedData.loop_id) + return + const currentIndex = responseItem.workflowProcess.tracing.findIndex((item) => { if (!item.execution_metadata?.parallel_id) return item.id === nodeFinishedData.id @@ -481,8 +474,7 @@ export const useChat = ( if (!responseItem.workflowProcess?.tracing) return const tracing = responseItem.workflowProcess.tracing - const loopIndex = tracing.findIndex(item => item.node_id === loopFinishedData.node_id - && (item.execution_metadata?.parallel_id === loopFinishedData.execution_metadata?.parallel_id || item.parallel_id === loopFinishedData.execution_metadata?.parallel_id))! + const loopIndex = tracing.findIndex(item => item.id === loopFinishedData.id)! if (loopIndex > -1) { tracing[loopIndex] = { ...tracing[loopIndex], @@ -948,12 +940,13 @@ export const useChat = ( }, onIterationFinish: ({ data: iterationFinishedData }) => { const tracing = responseItem.workflowProcess!.tracing! - const iterationIndex = tracing.findIndex(item => item.node_id === iterationFinishedData.node_id - && (item.execution_metadata?.parallel_id === iterationFinishedData.execution_metadata?.parallel_id || item.parallel_id === iterationFinishedData.execution_metadata?.parallel_id))! - tracing[iterationIndex] = { - ...tracing[iterationIndex], - ...iterationFinishedData, - status: WorkflowRunningStatus.Succeeded, + const iterationIndex = tracing.findIndex(item => item.id === iterationFinishedData.id)! + if (iterationIndex > -1) { + tracing[iterationIndex] = { + ...tracing[iterationIndex], + ...iterationFinishedData, + status: WorkflowRunningStatus.Succeeded, + } } updateCurrentQAOnTree({ @@ -964,30 +957,18 @@ export const useChat = ( }) }, onNodeStarted: ({ data: nodeStartedData }) => { + if (data.loop_id) + return + if (!responseItem.workflowProcess) return if (!responseItem.workflowProcess.tracing) responseItem.workflowProcess.tracing = [] - const currentIndex = responseItem.workflowProcess.tracing.findIndex(item => item.node_id === nodeStartedData.node_id) - if (currentIndex > -1) { - responseItem.workflowProcess.tracing[currentIndex] = { - ...nodeStartedData, - status: NodeRunningStatus.Running, - } - } - else { - if (nodeStartedData.iteration_id) - return - - if (data.loop_id) - return - - responseItem.workflowProcess.tracing.push({ - ...nodeStartedData, - status: WorkflowRunningStatus.Running, - }) - } + upsertTopLevelTracingNodeOnStart(responseItem.workflowProcess.tracing, { + ...nodeStartedData, + status: WorkflowRunningStatus.Running, + }) updateCurrentQAOnTree({ placeholderQuestionId, questionItem, @@ -996,10 +977,13 @@ export const useChat = ( }) }, onNodeFinished: ({ data: nodeFinishedData }) => { + if (data.loop_id) + return + if (nodeFinishedData.iteration_id) return - if (data.loop_id) + if (nodeFinishedData.loop_id) return const currentIndex = responseItem.workflowProcess!.tracing!.findIndex((item) => { @@ -1045,12 +1029,13 @@ export const useChat = ( }, onLoopFinish: ({ data: loopFinishedData }) => { const tracing = responseItem.workflowProcess!.tracing! - const loopIndex = tracing.findIndex(item => item.node_id === loopFinishedData.node_id - && (item.execution_metadata?.parallel_id === loopFinishedData.execution_metadata?.parallel_id || item.parallel_id === loopFinishedData.execution_metadata?.parallel_id))! - tracing[loopIndex] = { - ...tracing[loopIndex], - ...loopFinishedData, - status: WorkflowRunningStatus.Succeeded, + const loopIndex = tracing.findIndex(item => item.id === loopFinishedData.id)! + if (loopIndex > -1) { + tracing[loopIndex] = { + ...tracing[loopIndex], + ...loopFinishedData, + status: WorkflowRunningStatus.Succeeded, + } } updateCurrentQAOnTree({ diff --git a/web/app/components/share/text-generation/result/index.tsx b/web/app/components/share/text-generation/result/index.tsx index 2bcd1c9d94..e3ffe9d209 100644 --- a/web/app/components/share/text-generation/result/index.tsx +++ b/web/app/components/share/text-generation/result/index.tsx @@ -337,11 +337,12 @@ const Result: FC = ({ onIterationFinish: ({ data }) => { setWorkflowProcessData(produce(getWorkflowProcessData()!, (draft) => { draft.expand = true - const iterationsIndex = draft.tracing.findIndex(item => item.node_id === data.node_id - && (item.execution_metadata?.parallel_id === data.execution_metadata?.parallel_id || item.parallel_id === data.execution_metadata?.parallel_id))! - draft.tracing[iterationsIndex] = { - ...data, - expand: !!data.error, + const iterationsIndex = draft.tracing.findIndex(item => item.id === data.id)! + if (iterationsIndex > -1) { + draft.tracing[iterationsIndex] = { + ...data, + expand: !!data.error, + } } })) }, @@ -366,11 +367,12 @@ const Result: FC = ({ onLoopFinish: ({ data }) => { setWorkflowProcessData(produce(getWorkflowProcessData()!, (draft) => { draft.expand = true - const loopsIndex = draft.tracing.findIndex(item => item.node_id === data.node_id - && (item.execution_metadata?.parallel_id === data.execution_metadata?.parallel_id || item.parallel_id === data.execution_metadata?.parallel_id))! - draft.tracing[loopsIndex] = { - ...data, - expand: !!data.error, + const loopsIndex = draft.tracing.findIndex(item => item.id === data.id)! + if (loopsIndex > -1) { + draft.tracing[loopsIndex] = { + ...data, + expand: !!data.error, + } } })) }, diff --git a/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-store-only.spec.ts b/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-store-only.spec.ts index 2085e5ab47..6a3347f77a 100644 --- a/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-store-only.spec.ts +++ b/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-store-only.spec.ts @@ -178,6 +178,28 @@ describe('useWorkflowAgentLog', () => { expect(store.getState().workflowRunningData!.tracing![0].execution_metadata!.agent_log).toHaveLength(1) }) + + it('should attach the log to the matching execution id when a node runs multiple times', () => { + const { result, store } = renderWorkflowHook(() => useWorkflowAgentLog(), { + initialStoreState: { + workflowRunningData: baseRunningData({ + tracing: [ + { id: 'trace-1', node_id: 'n1', execution_metadata: {} }, + { id: 'trace-2', node_id: 'n1', execution_metadata: {} }, + ], + }), + }, + }) + + result.current.handleWorkflowAgentLog({ + data: { node_id: 'n1', node_execution_id: 'trace-2', message_id: 'm2' }, + } as AgentLogResponse) + + const tracing = store.getState().workflowRunningData!.tracing! + expect(tracing[0].execution_metadata!.agent_log).toBeUndefined() + expect(tracing[1].execution_metadata!.agent_log).toHaveLength(1) + expect(tracing[1].execution_metadata!.agent_log![0].message_id).toBe('m2') + }) }) describe('useWorkflowNodeHumanInputFormFilled', () => { diff --git a/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-with-viewport.spec.ts b/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-with-viewport.spec.ts index 51d1ba5b74..1495c1b2b8 100644 --- a/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-with-viewport.spec.ts +++ b/web/app/components/workflow/hooks/__tests__/use-workflow-run-event-with-viewport.spec.ts @@ -77,15 +77,15 @@ describe('useWorkflowNodeStarted', () => { initialStoreState: { workflowRunningData: baseRunningData({ tracing: [ - { node_id: 'n0', status: NodeRunningStatus.Succeeded }, - { node_id: 'n1', status: NodeRunningStatus.Succeeded }, + { id: 'trace-0', node_id: 'n0', status: NodeRunningStatus.Succeeded }, + { id: 'trace-1', node_id: 'n1', status: NodeRunningStatus.Succeeded }, ], }), }, }) result.current.handleWorkflowNodeStarted( - { data: { node_id: 'n1' } } as NodeStartedResponse, + { data: { id: 'trace-1', node_id: 'n1' } } as NodeStartedResponse, containerParams, ) @@ -93,6 +93,30 @@ describe('useWorkflowNodeStarted', () => { expect(tracing).toHaveLength(2) expect(tracing[1].status).toBe(NodeRunningStatus.Running) }) + + it('should append a new tracing entry when the same node starts a new execution id', () => { + const { result, store } = renderWorkflowHook(() => useWorkflowNodeStarted(), { + initialStoreState: { + workflowRunningData: baseRunningData({ + tracing: [ + { id: 'trace-0', node_id: 'n0', status: NodeRunningStatus.Succeeded }, + { id: 'trace-1', node_id: 'n1', status: NodeRunningStatus.Succeeded }, + ], + }), + }, + }) + + result.current.handleWorkflowNodeStarted( + { data: { id: 'trace-2', node_id: 'n1' } } as NodeStartedResponse, + containerParams, + ) + + const tracing = store.getState().workflowRunningData!.tracing! + expect(tracing).toHaveLength(3) + expect(tracing[2].id).toBe('trace-2') + expect(tracing[2].node_id).toBe('n1') + expect(tracing[2].status).toBe(NodeRunningStatus.Running) + }) }) describe('useWorkflowNodeIterationStarted', () => { diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts index 08fb526000..31f82ffdc8 100644 --- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts +++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts @@ -14,7 +14,12 @@ export const useWorkflowAgentLog = () => { } = workflowStore.getState() setWorkflowRunningData(produce(workflowRunningData!, (draft) => { - const currentIndex = draft.tracing!.findIndex(item => item.node_id === data.node_id) + const currentIndex = draft.tracing!.findIndex((item) => { + if (data.node_execution_id) + return item.id === data.node_execution_id + + return item.node_id === data.node_id + }) if (currentIndex > -1) { const current = draft.tracing![currentIndex] diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts index 01f60e12e9..1528a99468 100644 --- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts +++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts @@ -33,8 +33,8 @@ export const useWorkflowNodeStarted = () => { transform, } = store.getState() const nodes = getNodes() - const currentIndex = workflowRunningData?.tracing?.findIndex(item => item.node_id === data.node_id) - if (currentIndex && currentIndex > -1) { + const currentIndex = workflowRunningData?.tracing?.findIndex(item => item.id === data.id) + if (currentIndex !== undefined && currentIndex > -1) { setWorkflowRunningData(produce(workflowRunningData!, (draft) => { draft.tracing![currentIndex] = { ...data, diff --git a/web/app/components/workflow/panel/debug-and-preview/hooks.ts b/web/app/components/workflow/panel/debug-and-preview/hooks.ts index 3481733cd2..2807976bad 100644 --- a/web/app/components/workflow/panel/debug-and-preview/hooks.ts +++ b/web/app/components/workflow/panel/debug-and-preview/hooks.ts @@ -42,6 +42,7 @@ import { import { useHooksStore } from '../../hooks-store' import { useWorkflowStore } from '../../store' import { NodeRunningStatus, WorkflowRunningStatus } from '../../types' +import { upsertTopLevelTracingNodeOnStart } from '../../utils/top-level-tracing' type GetAbortController = (abortController: AbortController) => void type SendCallback = { @@ -486,19 +487,13 @@ export const useChat = ( } }, onNodeStarted: ({ data }) => { - const currentIndex = responseItem.workflowProcess!.tracing!.findIndex(item => item.node_id === data.node_id) - if (currentIndex > -1) { - responseItem.workflowProcess!.tracing![currentIndex] = { - ...data, - status: NodeRunningStatus.Running, - } - } - else { - responseItem.workflowProcess!.tracing!.push({ - ...data, - status: NodeRunningStatus.Running, - }) - } + if (params.loop_id) + return + + upsertTopLevelTracingNodeOnStart(responseItem.workflowProcess!.tracing!, { + ...data, + status: NodeRunningStatus.Running, + }) updateCurrentQAOnTree({ placeholderQuestionId, questionItem, @@ -517,6 +512,9 @@ export const useChat = ( }) }, onNodeFinished: ({ data }) => { + if (params.loop_id) + return + const currentTracingIndex = responseItem.workflowProcess!.tracing!.findIndex(item => item.id === data.id) if (currentTracingIndex > -1) { responseItem.workflowProcess!.tracing[currentTracingIndex] = { @@ -758,8 +756,7 @@ export const useChat = ( if (!responseItem.workflowProcess?.tracing) return const tracing = responseItem.workflowProcess.tracing - const iterationIndex = tracing.findIndex(item => item.node_id === iterationFinishedData.node_id - && (item.execution_metadata?.parallel_id === iterationFinishedData.execution_metadata?.parallel_id || item.parallel_id === iterationFinishedData.execution_metadata?.parallel_id))! + const iterationIndex = tracing.findIndex(item => item.id === iterationFinishedData.id)! if (iterationIndex > -1) { tracing[iterationIndex] = { ...tracing[iterationIndex], @@ -776,22 +773,10 @@ export const useChat = ( if (!responseItem.workflowProcess.tracing) responseItem.workflowProcess.tracing = [] - const currentIndex = responseItem.workflowProcess.tracing.findIndex(item => item.node_id === nodeStartedData.node_id) - if (currentIndex > -1) { - responseItem.workflowProcess.tracing[currentIndex] = { - ...nodeStartedData, - status: NodeRunningStatus.Running, - } - } - else { - if (nodeStartedData.iteration_id) - return - - responseItem.workflowProcess.tracing.push({ - ...nodeStartedData, - status: WorkflowRunningStatus.Running, - }) - } + upsertTopLevelTracingNodeOnStart(responseItem.workflowProcess.tracing, { + ...nodeStartedData, + status: WorkflowRunningStatus.Running, + }) }) }, onNodeFinished: ({ data: nodeFinishedData }) => { @@ -802,6 +787,9 @@ export const useChat = ( if (nodeFinishedData.iteration_id) return + if (nodeFinishedData.loop_id) + return + const currentIndex = responseItem.workflowProcess.tracing.findIndex((item) => { if (!item.execution_metadata?.parallel_id) return item.id === nodeFinishedData.id @@ -829,8 +817,7 @@ export const useChat = ( if (!responseItem.workflowProcess?.tracing) return const tracing = responseItem.workflowProcess.tracing - const loopIndex = tracing.findIndex(item => item.node_id === loopFinishedData.node_id - && (item.execution_metadata?.parallel_id === loopFinishedData.execution_metadata?.parallel_id || item.parallel_id === loopFinishedData.execution_metadata?.parallel_id))! + const loopIndex = tracing.findIndex(item => item.id === loopFinishedData.id)! if (loopIndex > -1) { tracing[loopIndex] = { ...tracing[loopIndex], diff --git a/web/app/components/workflow/utils/top-level-tracing.spec.ts b/web/app/components/workflow/utils/top-level-tracing.spec.ts new file mode 100644 index 0000000000..da01cc2a6c --- /dev/null +++ b/web/app/components/workflow/utils/top-level-tracing.spec.ts @@ -0,0 +1,133 @@ +import type { NodeTracing } from '@/types/workflow' +import { NodeRunningStatus } from '@/app/components/workflow/types' +import { upsertTopLevelTracingNodeOnStart } from './top-level-tracing' + +const createTrace = (overrides: Partial = {}): NodeTracing => ({ + id: 'trace-1', + index: 0, + predecessor_node_id: '', + node_id: 'node-1', + node_type: 'llm' as NodeTracing['node_type'], + title: 'Node 1', + inputs: {}, + inputs_truncated: false, + process_data: {}, + process_data_truncated: false, + outputs: {}, + outputs_truncated: false, + status: NodeRunningStatus.Succeeded, + elapsed_time: 0, + metadata: { + iterator_length: 0, + iterator_index: 0, + loop_length: 0, + loop_index: 0, + }, + created_at: 0, + created_by: { + id: 'user-1', + name: 'User', + email: 'user@example.com', + }, + finished_at: 0, + ...overrides, +}) + +describe('upsertTopLevelTracingNodeOnStart', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('should append a new top-level node when no matching trace exists', () => { + const tracing: NodeTracing[] = [] + const startedNode = createTrace({ + id: 'trace-2', + node_id: 'node-2', + status: NodeRunningStatus.Running, + }) + + const updated = upsertTopLevelTracingNodeOnStart(tracing, startedNode) + + expect(updated).toBe(true) + expect(tracing).toEqual([startedNode]) + }) + + it('should update an existing top-level node when the execution id matches', () => { + const tracing: NodeTracing[] = [ + createTrace({ + id: 'trace-1', + node_id: 'node-1', + status: NodeRunningStatus.Succeeded, + }), + ] + const startedNode = createTrace({ + id: 'trace-1', + node_id: 'node-1', + status: NodeRunningStatus.Running, + }) + + const updated = upsertTopLevelTracingNodeOnStart(tracing, startedNode) + + expect(updated).toBe(true) + expect(tracing).toEqual([startedNode]) + }) + + it('should append a new top-level node when the same node starts with a new execution id', () => { + const existingTrace = createTrace({ + id: 'trace-1', + node_id: 'node-1', + status: NodeRunningStatus.Succeeded, + }) + const tracing: NodeTracing[] = [existingTrace] + const startedNode = createTrace({ + id: 'trace-2', + node_id: 'node-1', + status: NodeRunningStatus.Running, + }) + + const updated = upsertTopLevelTracingNodeOnStart(tracing, startedNode) + + expect(updated).toBe(true) + expect(tracing).toEqual([existingTrace, startedNode]) + }) + + it('should ignore nested iteration node starts even when the node id matches a top-level trace', () => { + const existingTrace = createTrace({ + id: 'top-level-trace', + node_id: 'node-1', + status: NodeRunningStatus.Succeeded, + }) + const tracing: NodeTracing[] = [existingTrace] + const nestedIterationTrace = createTrace({ + id: 'iteration-trace', + node_id: 'node-1', + iteration_id: 'iteration-1', + status: NodeRunningStatus.Running, + }) + + const updated = upsertTopLevelTracingNodeOnStart(tracing, nestedIterationTrace) + + expect(updated).toBe(false) + expect(tracing).toEqual([existingTrace]) + }) + + it('should ignore nested loop node starts even when the node id matches a top-level trace', () => { + const existingTrace = createTrace({ + id: 'top-level-trace', + node_id: 'node-1', + status: NodeRunningStatus.Succeeded, + }) + const tracing: NodeTracing[] = [existingTrace] + const nestedLoopTrace = createTrace({ + id: 'loop-trace', + node_id: 'node-1', + loop_id: 'loop-1', + status: NodeRunningStatus.Running, + }) + + const updated = upsertTopLevelTracingNodeOnStart(tracing, nestedLoopTrace) + + expect(updated).toBe(false) + expect(tracing).toEqual([existingTrace]) + }) +}) diff --git a/web/app/components/workflow/utils/top-level-tracing.ts b/web/app/components/workflow/utils/top-level-tracing.ts new file mode 100644 index 0000000000..564812b105 --- /dev/null +++ b/web/app/components/workflow/utils/top-level-tracing.ts @@ -0,0 +1,23 @@ +import type { NodeTracing } from '@/types/workflow' + +const isNestedTracingNode = (trace: Pick) => { + return Boolean(trace.iteration_id || trace.loop_id) +} + +export const upsertTopLevelTracingNodeOnStart = ( + tracing: NodeTracing[], + startedNode: NodeTracing, +) => { + if (isNestedTracingNode(startedNode)) + return false + + const currentIndex = startedNode.id + ? tracing.findIndex(item => item.id === startedNode.id) + : tracing.findIndex(item => item.node_id === startedNode.node_id) + if (currentIndex > -1) + tracing[currentIndex] = startedNode + else + tracing.push(startedNode) + + return true +}