opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-05 00:57:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: not parall not group by branch

Browse Source
This commit is contained in:
Joel 2024-12-27 13:07:55 +08:00
parent 5cdca9cafe
commit 2f65d0439c
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/workflow/run/tracing-panel.tsx
View File

@ -30,7 +30,6 @@ const TracingPanel: FC<TracingPanelProps> = ({
hideNodeProcessDetail = false, hideNodeProcessDetail = false,
}) => { }) => {
const treeNodes = list const treeNodes = list
console.log(treeNodes)
const [collapsedNodes, setCollapsedNodes] = useState<Set<string>>(new Set()) const [collapsedNodes, setCollapsedNodes] = useState<Set<string>>(new Set())
const [hoveredParallel, setHoveredParallel] = useState<string | null>(null) const [hoveredParallel, setHoveredParallel] = useState<string | null>(null)
@ -84,7 +83,6 @@ const TracingPanel: FC<TracingPanelProps> = ({
setAgentResultList, setAgentResultList,
} = useLogs() } = useLogs()
const renderNode = (node: NodeTracing) => { const renderNode = (node: NodeTracing) => {
const isParallelFirstNode = !!node.parallelDetail?.isParallelStartNode const isParallelFirstNode = !!node.parallelDetail?.isParallelStartNode
if (isParallelFirstNode) { if (isParallelFirstNode) {

20
web/app/components/workflow/run/utils/format-log/parallel/index.ts
View File

@ -65,10 +65,11 @@ const format = (list: NodeTracing[], t: any): NodeTracing[] => {
// console.log(list) // console.log(list)
const result: NodeTracing[] = [...list] const result: NodeTracing[] = [...list]
const parallelFirstNodeMap: Record<string, string> = {} const parallelFirstNodeMap: Record<string, string> = {}
// list to tree by parent_parallel_start_node_id and parallel_start_node_id // list to tree by parent_parallel_start_node_id and branch by parallel_start_node_id. Each parallel may has more than one branch.
result.forEach((node) => { result.forEach((node) => {
const parallel_id = node.parallel_id ?? node.execution_metadata?.parallel_id ?? null const parallel_id = node.parallel_id ?? node.execution_metadata?.parallel_id ?? null
const parent_parallel_id = node.parent_parallel_id ?? node.execution_metadata?.parent_parallel_id ?? null const parent_parallel_id = node.parent_parallel_id ?? node.execution_metadata?.parent_parallel_id ?? null
const branchStartNodeId = node.parallel_start_node_id ?? node.execution_metadata?.parallel_start_node_id ?? null
const parent_parallel_start_node_id = node.parent_parallel_start_node_id ?? node.execution_metadata?.parent_parallel_start_node_id ?? null const parent_parallel_start_node_id = node.parent_parallel_start_node_id ?? node.execution_metadata?.parent_parallel_start_node_id ?? null
const isNotInParallel = !parallel_id || node.node_type === BlockEnum.End const isNotInParallel = !parallel_id || node.node_type === BlockEnum.End
if (isNotInParallel) if (isNotInParallel)
@ -100,10 +101,21 @@ const format = (list: NodeTracing[], t: any): NodeTracing[] => {
return return
} }
// append to parallel start node // append to parallel start node and after the same branch
const parallelStartNode = result.find(item => item.node_id === parallelFirstNodeMap[parallel_id]) const parallelStartNode = result.find(item => item.node_id === parallelFirstNodeMap[parallel_id])
if (parallelStartNode && parallelStartNode.parallelDetail && parallelStartNode!.parallelDetail!.children) if (parallelStartNode && parallelStartNode.parallelDetail && parallelStartNode!.parallelDetail!.children) {
parallelStartNode!.parallelDetail!.children.push(node) const sameBranchNodesLastIndex = parallelStartNode.parallelDetail.children.findLastIndex((node) => {
const currStartNodeId = node.parallel_start_node_id ?? node.execution_metadata?.parallel_start_node_id ?? null
return currStartNodeId === branchStartNodeId
})
if (sameBranchNodesLastIndex !== -1) {
parallelStartNode.parallelDetail.children.splice(sameBranchNodesLastIndex + 1, 0, node)
}
else { // new branch
parallelStartNode.parallelDetail.children.push(node)
}
}
// parallelStartNode!.parallelDetail!.children.push(node)
}) })
const filteredInParallelSubNodes = result.filter((node) => { const filteredInParallelSubNodes = result.filter((node) => {