outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat/plugins' of https://github.com/langgenius/dify into feat/plugins

Browse Source
This commit is contained in:
AkaraChen 2024-12-25 14:06:08 +08:00
commit c0a8b89e93
2 changed files with 116 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

519
web/app/components/workflow/run/utils/format-log/iteration/data.ts
View File

@ -1,112 +1,80 @@
export const simpleIterationData = { export const simpleIterationData = (() => {
// start -> code(output: [1, 2, 3]) -> iteration(output: ['aaa', 'aaa', 'aaa']) -> end(output: ['aaa', 'aaa', 'aaa']) // start -> code(output: [1, 2, 3]) -> iteration(output: ['aaa', 'aaa', 'aaa']) -> end(output: ['aaa', 'aaa', 'aaa'])
in: [ const startNode = {
{ id: '36c9860a-39e6-4107-b750-655b07895f47',
id: '36c9860a-39e6-4107-b750-655b07895f47', index: 1,
index: 1, predecessor_node_id: null,
predecessor_node_id: null, node_id: '1735023354069',
node_id: '1735023354069', node_type: 'start',
node_type: 'start', title: 'Start',
title: 'Start', inputs: {
inputs: { 'sys.files': [],
'sys.files': [], 'sys.user_id': '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
'sys.user_id': '5ee03762-1d1a-46e8-ba0b-5f419a77da96', 'sys.app_id': '8a5e87f8-6433-40f4-a67a-4be78a558dc7',
'sys.app_id': '8a5e87f8-6433-40f4-a67a-4be78a558dc7', 'sys.workflow_id': 'bb5e2b89-40ac-45c9-9ccb-4f2cd926e080',
'sys.workflow_id': 'bb5e2b89-40ac-45c9-9ccb-4f2cd926e080', 'sys.workflow_run_id': '76adf675-a7d3-4cc1-9282-ed7ecfe4f65d',
'sys.workflow_run_id': '76adf675-a7d3-4cc1-9282-ed7ecfe4f65d',
},
process_data: null,
outputs: {
'sys.files': [],
'sys.user_id': '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
'sys.app_id': '8a5e87f8-6433-40f4-a67a-4be78a558dc7',
'sys.workflow_id': 'bb5e2b89-40ac-45c9-9ccb-4f2cd926e080',
'sys.workflow_run_id': '76adf675-a7d3-4cc1-9282-ed7ecfe4f65d',
},
status: 'succeeded',
error: null,
elapsed_time: 0.011458,
execution_metadata: null,
extras: {},
created_at: 1735023510,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023510,
}, },
{ process_data: null,
id: 'a3105c5d-ff9e-44ea-9f4c-ab428958af20', outputs: {
index: 2, 'sys.files': [],
predecessor_node_id: '1735023354069', 'sys.user_id': '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
node_id: '1735023361224', 'sys.app_id': '8a5e87f8-6433-40f4-a67a-4be78a558dc7',
node_type: 'code', 'sys.workflow_id': 'bb5e2b89-40ac-45c9-9ccb-4f2cd926e080',
title: 'Code', 'sys.workflow_run_id': '76adf675-a7d3-4cc1-9282-ed7ecfe4f65d',
inputs: null,
process_data: null,
outputs: {
result: [
1,
2,
3,
],
},
status: 'succeeded',
error: null,
elapsed_time: 0.103333,
execution_metadata: null,
extras: {},
created_at: 1735023510,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
}, },
{ status: 'succeeded',
id: 'a823134d-9f1a-45a4-8977-db838d076316', error: null,
index: 3, elapsed_time: 0.011458,
predecessor_node_id: '1735023361224', execution_metadata: null,
node_id: '1735023391914', extras: {},
node_type: 'iteration', created_by_end_user: null,
title: 'Iteration', finished_at: 1735023510,
inputs: null, }
process_data: null,
outputs: { const outputArrayNode = {
output: [ id: 'a3105c5d-ff9e-44ea-9f4c-ab428958af20',
'aaa', index: 2,
'aaa', predecessor_node_id: '1735023354069',
'aaa', node_id: '1735023361224',
], node_type: 'code',
}, title: 'Code',
status: 'succeeded', inputs: null,
error: null, process_data: null,
elapsed_time: 0.408383, outputs: {
execution_metadata: { result: [
iteration_duration_map: { 1,
0: 0.118153, 2,
1: 0.135956, 3,
2: 0.128251, ],
},
total_tokens: 0,
},
extras: {},
created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
}, },
status: 'succeeded',
error: null,
elapsed_time: 0.103333,
execution_metadata: null,
extras: {},
finished_at: 1735023511,
}
const iterationNode = {
id: 'a823134d-9f1a-45a4-8977-db838d076316',
index: 3,
predecessor_node_id: '1735023361224',
node_id: '1735023391914',
node_type: 'iteration',
title: 'Iteration',
inputs: null,
process_data: null,
outputs: {
output: [
'aaa',
'aaa',
'aaa',
],
},
}
const iterations = [
{ {
id: 'a84a22d8-0f08-4006-bee2-fa7a7aef0420', id: 'a84a22d8-0f08-4006-bee2-fa7a7aef0420',
index: 4, index: 4,
@ -128,13 +96,6 @@ export const simpleIterationData = {
}, },
extras: {}, extras: {},
created_at: 1735023511, created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511, finished_at: 1735023511,
}, },
{ {
@ -158,13 +119,6 @@ export const simpleIterationData = {
}, },
extras: {}, extras: {},
created_at: 1735023511, created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511, finished_at: 1735023511,
}, },
{ {
@ -188,294 +142,49 @@ export const simpleIterationData = {
}, },
extras: {}, extras: {},
created_at: 1735023511, created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511, finished_at: 1735023511,
}, },
{ ]
id: 'e6ad6560-1aa3-43f3-89e3-e5287c9ea272',
index: 7, const endNode = {
predecessor_node_id: '1735023391914', id: 'e6ad6560-1aa3-43f3-89e3-e5287c9ea272',
node_id: '1735023417757', index: 7,
node_type: 'end', predecessor_node_id: '1735023391914',
title: 'End', node_id: '1735023417757',
inputs: { node_type: 'end',
output: [ title: 'End',
'aaa', inputs: {
'aaa', output: [
'aaa', 'aaa',
], 'aaa',
}, 'aaa',
process_data: null,
outputs: {
output: [
'aaa',
'aaa',
'aaa',
],
},
status: 'succeeded',
error: null,
elapsed_time: 0.017552,
execution_metadata: null,
extras: {},
created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
},
],
output: [
{
id: '36c9860a-39e6-4107-b750-655b07895f47',
index: 1,
predecessor_node_id: null,
node_id: '1735023354069',
node_type: 'start',
title: 'Start',
inputs: {
'sys.files': [],
'sys.user_id': '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
'sys.app_id': '8a5e87f8-6433-40f4-a67a-4be78a558dc7',
'sys.workflow_id': 'bb5e2b89-40ac-45c9-9ccb-4f2cd926e080',
'sys.workflow_run_id': '76adf675-a7d3-4cc1-9282-ed7ecfe4f65d',
},
process_data: null,
outputs: {
'sys.files': [],
'sys.user_id': '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
'sys.app_id': '8a5e87f8-6433-40f4-a67a-4be78a558dc7',
'sys.workflow_id': 'bb5e2b89-40ac-45c9-9ccb-4f2cd926e080',
'sys.workflow_run_id': '76adf675-a7d3-4cc1-9282-ed7ecfe4f65d',
},
status: 'succeeded',
error: null,
elapsed_time: 0.011458,
execution_metadata: null,
extras: {},
created_at: 1735023510,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023510,
},
{
id: 'a3105c5d-ff9e-44ea-9f4c-ab428958af20',
index: 2,
predecessor_node_id: '1735023354069',
node_id: '1735023361224',
node_type: 'code',
title: 'Code',
inputs: null,
process_data: null,
outputs: {
result: [
1,
2,
3,
],
},
status: 'succeeded',
error: null,
elapsed_time: 0.103333,
execution_metadata: null,
extras: {},
created_at: 1735023510,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
},
{
id: 'a823134d-9f1a-45a4-8977-db838d076316',
index: 3,
predecessor_node_id: '1735023361224',
node_id: '1735023391914',
node_type: 'iteration',
title: 'Iteration',
inputs: null,
process_data: null,
outputs: {
output: [
'aaa',
'aaa',
'aaa',
],
},
status: 'succeeded',
error: null,
elapsed_time: 0.408383,
execution_metadata: {
iteration_duration_map: {
0: 0.118153,
1: 0.135956,
2: 0.128251,
},
total_tokens: 0,
},
extras: {},
created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
details: [
[
{
id: 'a84a22d8-0f08-4006-bee2-fa7a7aef0420',
index: 4,
predecessor_node_id: '1735023391914start',
node_id: '1735023409906',
node_type: 'code',
title: 'Code 2',
inputs: null,
process_data: null,
outputs: {
result: 'aaa',
},
status: 'succeeded',
error: null,
elapsed_time: 0.112688,
execution_metadata: {
iteration_id: '1735023391914',
iteration_index: 0,
},
extras: {},
created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
},
],
[
{
id: 'ff71d773-a916-4513-960f-d7dcc4fadd86',
index: 5,
predecessor_node_id: '1735023391914start',
node_id: '1735023409906',
node_type: 'code',
title: 'Code 2',
inputs: null,
process_data: null,
outputs: {
result: 'aaa',
},
status: 'succeeded',
error: null,
elapsed_time: 0.126034,
execution_metadata: {
iteration_id: '1735023391914',
iteration_index: 1,
},
extras: {},
created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
},
],
[
{
id: 'd91c3ef9-0162-4013-9272-d4cc7fb1f188',
index: 6,
predecessor_node_id: '1735023391914start',
node_id: '1735023409906',
node_type: 'code',
title: 'Code 2',
inputs: null,
process_data: null,
outputs: {
result: 'aaa',
},
status: 'succeeded',
error: null,
elapsed_time: 0.122716,
execution_metadata: {
iteration_id: '1735023391914',
iteration_index: 2,
},
extras: {},
created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
},
],
], ],
}, },
{ process_data: null,
id: 'e6ad6560-1aa3-43f3-89e3-e5287c9ea272', outputs: {
index: 7, output: [
predecessor_node_id: '1735023391914', 'aaa',
node_id: '1735023417757', 'aaa',
node_type: 'end', 'aaa',
title: 'End', ],
inputs: {
output: [
'aaa',
'aaa',
'aaa',
],
},
process_data: null,
outputs: {
output: [
'aaa',
'aaa',
'aaa',
],
},
status: 'succeeded',
error: null,
elapsed_time: 0.017552,
execution_metadata: null,
extras: {},
created_at: 1735023511,
created_by_role: 'account',
created_by_account: {
id: '5ee03762-1d1a-46e8-ba0b-5f419a77da96',
name: 'Joel',
email: 'iamjoel007@gmail.com',
},
created_by_end_user: null,
finished_at: 1735023511,
}, },
], status: 'succeeded',
} error: null,
elapsed_time: 0.017552,
execution_metadata: null,
extras: {},
finished_at: 1735023511,
}
return {
in: [startNode, outputArrayNode, iterationNode, ...iterations, endNode],
output: [startNode, outputArrayNode, {
...iterationNode,
details: [
[iterations[0]],
[iterations[1]],
[iterations[2]],
],
}, endNode],
}
})()

3
web/app/components/workflow/run/utils/format-log/iteration/index.spec.ts
View File

@ -2,8 +2,9 @@ import format from '.'
import { simpleIterationData } from './data' import { simpleIterationData } from './data'
describe('format api data to tracing panel data', () => { describe('format api data to tracing panel data', () => {
// test('result should have no nodes in iteration node', () => {
// }
test('iteration should put nodes in details', () => { test('iteration should put nodes in details', () => {
// console.log(format(simpleIterationData.in as any))
expect(format(simpleIterationData.in as any)).toEqual(simpleIterationData.output) expect(format(simpleIterationData.in as any)).toEqual(simpleIterationData.output)
}) })
}) })