ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-23 13:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:variable not update in nested workflow runs (#2830)

Browse Source
This commit is contained in:
heheer
2024-09-28 13:59:35 +08:00
committed by GitHub
parent d95f71e9e3
commit f7a8203454
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/global/core/workflow/runtime/constants.ts
View File

@@ -25,7 +25,8 @@ export enum DispatchNodeResponseKeyEnum {
rewriteHistories = 'rewriteHistories', // If have the response, workflow histories will be rewrite rewriteHistories = 'rewriteHistories', // If have the response, workflow histories will be rewrite
interactive = 'INTERACTIVE', // is interactive interactive = 'INTERACTIVE', // is interactive
runTimes = 'runTimes' // run times runTimes = 'runTimes', // run times
newVariables = 'newVariables' // new variables
} }
export const needReplaceReferenceInputTypeList = [ export const needReplaceReferenceInputTypeList = [

1
packages/global/core/workflow/runtime/type.d.ts vendored
View File

@@ -196,6 +196,7 @@ export type DispatchNodeResultType<T = {}> = {
[DispatchNodeResponseKeyEnum.assistantResponses]?: AIChatItemValueItemType[]; // Assistant response(Store to db) [DispatchNodeResponseKeyEnum.assistantResponses]?: AIChatItemValueItemType[]; // Assistant response(Store to db)
[DispatchNodeResponseKeyEnum.rewriteHistories]?: ChatItemType[]; [DispatchNodeResponseKeyEnum.rewriteHistories]?: ChatItemType[];
[DispatchNodeResponseKeyEnum.runTimes]?: number; [DispatchNodeResponseKeyEnum.runTimes]?: number;
[DispatchNodeResponseKeyEnum.newVariables]?: Record<string, any>;
} & T; } & T;
/* Single node props */ /* Single node props */

4
packages/service/core/workflow/dispatch/agent/runTool/index.ts
View File

@@ -184,6 +184,7 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
// flat child tool response // flat child tool response
const childToolResponse = dispatchFlowResponse.map((item) => item.flowResponses).flat(); const childToolResponse = dispatchFlowResponse.map((item) => item.flowResponses).flat();
const newVariables = dispatchFlowResponse[dispatchFlowResponse.length - 1]?.newVariables;
// concat tool usage // concat tool usage
const totalPointsUsage = const totalPointsUsage =
@@ -219,6 +220,7 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
tokens: totalTokens tokens: totalTokens
}, },
...flatUsages ...flatUsages
] ],
[DispatchNodeResponseKeyEnum.newVariables]: newVariables
}; };
}; };

8
packages/service/core/workflow/dispatch/index.ts
View File

@@ -555,6 +555,14 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
dispatchRes[item.key] = valueTypeFormat(item.defaultValue, item.valueType); dispatchRes[item.key] = valueTypeFormat(item.defaultValue, item.valueType);
}); });
// Update new variables
if (dispatchRes[DispatchNodeResponseKeyEnum.newVariables]) {
variables = {
...variables,
...dispatchRes[DispatchNodeResponseKeyEnum.newVariables]
};
}
return { return {
node, node,
runStatus: 'run', runStatus: 'run',

8
packages/service/core/workflow/dispatch/loop/runLoop.ts
View File

@@ -38,6 +38,7 @@ export const dispatchLoop = async (props: Props): Promise<Response> => {
const loopDetail: ChatHistoryItemResType[] = []; const loopDetail: ChatHistoryItemResType[] = [];
let assistantResponses: AIChatItemValueItemType[] = []; let assistantResponses: AIChatItemValueItemType[] = [];
let totalPoints = 0; let totalPoints = 0;
let newVariables: Record<string, any> = {};
for await (const item of loopInputArray) { for await (const item of loopInputArray) {
const response = await dispatchWorkFlow({ const response = await dispatchWorkFlow({
@@ -72,6 +73,10 @@ export const dispatchLoop = async (props: Props): Promise<Response> => {
assistantResponses.push(...response.assistantResponses); assistantResponses.push(...response.assistantResponses);
totalPoints = response.flowUsages.reduce((acc, usage) => acc + usage.totalPoints, 0); totalPoints = response.flowUsages.reduce((acc, usage) => acc + usage.totalPoints, 0);
newVariables = {
...newVariables,
...response.newVariables
};
} }
return { return {
@@ -88,6 +93,7 @@ export const dispatchLoop = async (props: Props): Promise<Response> => {
moduleName: name moduleName: name
} }
], ],
[NodeOutputKeyEnum.loopArray]: outputValueArr [NodeOutputKeyEnum.loopArray]: outputValueArr,
[DispatchNodeResponseKeyEnum.newVariables]: newVariables
}; };
}; };