Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 59bd2a47 by heheer Committed by GitHub
Options

feat: add update variable node (#1362) 

* feat: add variable update node

* fix

* fix

* change component quote
parent d057ba29
Showing with 503 additions and 36 deletions
packages/global/core/workflow/constants.ts
...@@ -101,7 +101,10 @@ export enum NodeInputKeyEnum { ...@@ -101,7 +101,10 @@ export enum NodeInputKeyEnum {
// if else // if else
condition = 'condition', condition = 'condition',
ifElseList = 'ifElseList' ifElseList = 'ifElseList',
// variable update
updateList = 'updateList'
} }
export enum NodeOutputKeyEnum { export enum NodeOutputKeyEnum {
......
packages/global/core/workflow/node/constant.ts
...@@ -112,7 +112,8 @@ export enum FlowNodeTypeEnum { ...@@ -112,7 +112,8 @@ export enum FlowNodeTypeEnum {
tools = 'tools', tools = 'tools',
stopTool = 'stopTool', stopTool = 'stopTool',
lafModule = 'lafModule', lafModule = 'lafModule',
ifElseNode = 'ifElseNode' ifElseNode = 'ifElseNode',
variableUpdate = 'variableUpdate'
} }
export const EDGE_TYPE = 'default'; export const EDGE_TYPE = 'default';
packages/global/core/workflow/runtime/constants.ts
...@@ -9,7 +9,8 @@ export enum SseResponseEventEnum { ...@@ -9,7 +9,8 @@ export enum SseResponseEventEnum {
toolCall = 'toolCall', // tool start toolCall = 'toolCall', // tool start
toolParams = 'toolParams', // tool params return toolParams = 'toolParams', // tool params return
toolResponse = 'toolResponse', // tool response return toolResponse = 'toolResponse', // tool response return
flowResponses = 'flowResponses' // sse response request flowResponses = 'flowResponses', // sse response request
variables = 'variables'
} }
export enum DispatchNodeResponseKeyEnum { export enum DispatchNodeResponseKeyEnum {
......
packages/global/core/workflow/template/constants.ts
...@@ -18,10 +18,10 @@ import { PluginOutputModule } from './system/pluginOutput'; ...@@ -18,10 +18,10 @@ import { PluginOutputModule } from './system/pluginOutput';
import { RunPluginModule } from './system/runPlugin'; import { RunPluginModule } from './system/runPlugin';
import { AiQueryExtension } from './system/queryExtension'; import { AiQueryExtension } from './system/queryExtension';
import type { FlowNodeTemplateType, nodeTemplateListType } from '../type'; import type { FlowNodeTemplateType } from '../type';
import { FlowNodeTemplateTypeEnum } from '../../workflow/constants';
import { lafModule } from './system/laf'; import { lafModule } from './system/laf';
import { ifElseNode } from './system/ifElse/index'; import { ifElseNode } from './system/ifElse/index';
import { variableUpdateNode } from './system/variableUpdate';
/* app flow module templates */ /* app flow module templates */
export const appSystemModuleTemplates: FlowNodeTemplateType[] = [ export const appSystemModuleTemplates: FlowNodeTemplateType[] = [
...@@ -39,7 +39,8 @@ export const appSystemModuleTemplates: FlowNodeTemplateType[] = [ ...@@ -39,7 +39,8 @@ export const appSystemModuleTemplates: FlowNodeTemplateType[] = [
HttpModule468, HttpModule468,
AiQueryExtension, AiQueryExtension,
lafModule, lafModule,
ifElseNode ifElseNode,
variableUpdateNode
]; ];
/* plugin flow module templates */ /* plugin flow module templates */
export const pluginSystemModuleTemplates: FlowNodeTemplateType[] = [ export const pluginSystemModuleTemplates: FlowNodeTemplateType[] = [
...@@ -57,7 +58,8 @@ export const pluginSystemModuleTemplates: FlowNodeTemplateType[] = [ ...@@ -57,7 +58,8 @@ export const pluginSystemModuleTemplates: FlowNodeTemplateType[] = [
HttpModule468, HttpModule468,
AiQueryExtension, AiQueryExtension,
lafModule, lafModule,
ifElseNode ifElseNode,
variableUpdateNode
]; ];
/* all module */ /* all module */
...@@ -81,5 +83,6 @@ export const moduleTemplatesFlat: FlowNodeTemplateType[] = [ ...@@ -81,5 +83,6 @@ export const moduleTemplatesFlat: FlowNodeTemplateType[] = [
RunPluginModule, RunPluginModule,
AiQueryExtension, AiQueryExtension,
lafModule, lafModule,
ifElseNode ifElseNode,
variableUpdateNode
]; ];
packages/global/core/workflow/template/system/variableUpdate/index.tsx 0 → 100644
import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from '../../../node/constant';
import { FlowNodeTemplateType } from '../../../type/index.d';
import {
FlowNodeTemplateTypeEnum,
NodeInputKeyEnum,
WorkflowIOValueTypeEnum
} from '../../../constants';
import { getHandleConfig } from '../../utils';
export const variableUpdateNode: FlowNodeTemplateType = {
id: FlowNodeTypeEnum.variableUpdate,
templateType: FlowNodeTemplateTypeEnum.tools,
flowNodeType: FlowNodeTypeEnum.variableUpdate,
sourceHandle: getHandleConfig(true, true, true, true),
targetHandle: getHandleConfig(true, true, true, true),
avatar: '/imgs/workflow/variable.png',
name: '变量更新',
intro: '可以更新指定节点的输出值和全局变量',
showStatus: true,
isTool: false,
inputs: [
{
key: NodeInputKeyEnum.updateList,
valueType: WorkflowIOValueTypeEnum.any,
label: '',
renderTypeList: [FlowNodeInputTypeEnum.hidden],
editField: {
key: true,
valueType: true
},
value: []
}
],
outputs: []
};
packages/global/core/workflow/template/system/variableUpdate/type.d.ts 0 → 100644
export type TUpdateListItem = {
variable?: ReferenceValueProps;
value?: ReferenceValueProps;
renderType?: FlowNodeInputTypeEnum.input | FlowNodeInputTypeEnum.reference;
};
packages/service/core/workflow/dispatch/index.ts
...@@ -42,7 +42,8 @@ import { dispatchLafRequest } from './tools/runLaf'; ...@@ -42,7 +42,8 @@ import { dispatchLafRequest } from './tools/runLaf';
import { dispatchIfElse } from './tools/runIfElse'; import { dispatchIfElse } from './tools/runIfElse';
import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge'; import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils'; import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils';
import { dispatchSystemConfig } from './init/systemConfiig'; import { dispatchSystemConfig } from './init/systemConfig';
import { dispatchUpdateVariable } from './tools/runUpdateVar';
const callbackMap: Record<`${FlowNodeTypeEnum}`, Function> = { const callbackMap: Record<`${FlowNodeTypeEnum}`, Function> = {
[FlowNodeTypeEnum.workflowStart]: dispatchWorkflowStart, [FlowNodeTypeEnum.workflowStart]: dispatchWorkflowStart,
...@@ -62,6 +63,7 @@ const callbackMap: Record<`${FlowNodeTypeEnum}`, Function> = { ...@@ -62,6 +63,7 @@ const callbackMap: Record<`${FlowNodeTypeEnum}`, Function> = {
[FlowNodeTypeEnum.stopTool]: dispatchStopToolCall, [FlowNodeTypeEnum.stopTool]: dispatchStopToolCall,
[FlowNodeTypeEnum.lafModule]: dispatchLafRequest, [FlowNodeTypeEnum.lafModule]: dispatchLafRequest,
[FlowNodeTypeEnum.ifElseNode]: dispatchIfElse, [FlowNodeTypeEnum.ifElseNode]: dispatchIfElse,
[FlowNodeTypeEnum.variableUpdate]: dispatchUpdateVariable,
// none // none
[FlowNodeTypeEnum.systemConfig]: dispatchSystemConfig, [FlowNodeTypeEnum.systemConfig]: dispatchSystemConfig,
...@@ -355,7 +357,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons ...@@ -355,7 +357,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
if (pluginOutputModule && props.mode !== 'debug') { if (pluginOutputModule && props.mode !== 'debug') {
await nodeRunWithActive(pluginOutputModule); await nodeRunWithActive(pluginOutputModule);
} }
const { userChatInput, ...leftVariables } = variables;
return { return {
flowResponses: chatResponses, flowResponses: chatResponses,
flowUsages: chatNodeUsages, flowUsages: chatNodeUsages,
...@@ -366,7 +368,8 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons ...@@ -366,7 +368,8 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
}, },
[DispatchNodeResponseKeyEnum.assistantResponses]: [DispatchNodeResponseKeyEnum.assistantResponses]:
mergeAssistantResponseAnswerText(chatAssistantResponse), mergeAssistantResponseAnswerText(chatAssistantResponse),
[DispatchNodeResponseKeyEnum.toolResponses]: toolRunResponse [DispatchNodeResponseKeyEnum.toolResponses]: toolRunResponse,
newVariables: leftVariables
}; };
} }
......
packages/service/core/workflow/dispatch/init/systemConfig.tsx 0 → 100644
export const dispatchSystemConfig = (props: Record<string, any>) => {
const { variables } = props;
return variables;
};
packages/service/core/workflow/dispatch/init/systemConfiig.tsx deleted 100644 → 0
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
export type UserChatInputProps = ModuleDispatchProps<{
[NodeInputKeyEnum.userChatInput]: string;
}>;
export const dispatchSystemConfig = (props: Record<string, any>) => {
const { variables } = props as UserChatInputProps;
return variables;
};
packages/service/core/workflow/dispatch/tools/runUpdateVar.ts 0 → 100644
import { NodeInputKeyEnum, VARIABLE_NODE_ID } from '@fastgpt/global/core/workflow/constants';
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils';
import { TUpdateListItem } from '@fastgpt/global/core/workflow/template/system/variableUpdate/type';
import { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type';
type Props = ModuleDispatchProps<{
[NodeInputKeyEnum.updateList]: TUpdateListItem[];
}>;
export const dispatchUpdateVariable = async (
props: Props
): Promise<DispatchNodeResultType<any>> => {
const { params, variables, runtimeNodes } = props;
const { updateList } = params;
updateList.forEach((item) => {
const varNodeId = item.variable?.[0];
const varKey = item.variable?.[1];
if (!varNodeId || !varKey) {
return;
}
let value = '';
if (!item.value?.[0]) {
value = item.value?.[1];
} else {
value = getReferenceVariableValue({
value: item.value,
variables,
nodes: runtimeNodes
});
}
if (varNodeId === VARIABLE_NODE_ID) {
variables[varKey] = value;
} else {
const node = runtimeNodes.find((node) => node.nodeId === varNodeId);
if (node) {
const output = node.outputs.find((output) => output.id === varKey);
if (output) {
output.value = value;
}
}
}
});
return {
[DispatchNodeResponseKeyEnum.nodeResponse]: {
totalPoints: 0
}
};
};
packages/service/core/workflow/dispatch/type.d.ts
...@@ -19,4 +19,5 @@ export type DispatchFlowResponse = { ...@@ -19,4 +19,5 @@ export type DispatchFlowResponse = {
}; };
[DispatchNodeResponseKeyEnum.toolResponses]: ToolRunResponseItemType; [DispatchNodeResponseKeyEnum.toolResponses]: ToolRunResponseItemType;
[DispatchNodeResponseKeyEnum.assistantResponses]: AIChatItemValueItemType[]; [DispatchNodeResponseKeyEnum.assistantResponses]: AIChatItemValueItemType[];
newVariables: Record<string, string>;
}; };
packages/service/core/workflow/dispatchV1/type.d.ts
...@@ -12,4 +12,5 @@ export type DispatchFlowResponse = { ...@@ -12,4 +12,5 @@ export type DispatchFlowResponse = {
flowUsages: ChatNodeUsageType[]; flowUsages: ChatNodeUsageType[];
[DispatchNodeResponseKeyEnum.toolResponses]: ToolRunResponseItemType; [DispatchNodeResponseKeyEnum.toolResponses]: ToolRunResponseItemType;
[DispatchNodeResponseKeyEnum.assistantResponses]: AIChatItemValueItemType[]; [DispatchNodeResponseKeyEnum.assistantResponses]: AIChatItemValueItemType[];
newVariables: Record<string, string>;
}; };
projects/app/i18n/en/common.json
...@@ -1050,8 +1050,75 @@ ...@@ -1050,8 +1050,75 @@
"Intro placeholder": "If this plugin is invoked as a tool, this description will be used as the prompt." "Intro placeholder": "If this plugin is invoked as a tool, this description will be used as the prompt."
}, },
"shareChat": { "shareChat": {
"Init Error": "Conversation initialization failed", "Init Error": "Init Chat Error",
"Init History Error": "Chat history initialization failed" "Init History Error": "Init History Error"
},
"workflow": {
"Add variable": "Add",
"Can not delete node": "Can not delete the node",
"Change input type tip": "Changing the input type will empty the entered values, please confirm!",
"Check Failed": "Workflow verification fails. Check whether the node or connection is normal",
"Confirm stop debug": "Do you want to terminate debugging? Debugging information is not retained.",
"Copy node": "Copy node",
"Current workflow": "Current workflow",
"Custom inputs": "Inputs",
"Custom outputs": "Outputs",
"Custom variable": "Custom variable",
"Dataset quote": "Dataset quote",
"Debug": "Debug",
"Debug Node": "Workflow Debug",
"Failed": "Running failed",
"Not intro": "This node is not introduced",
"Run from here": "Run from here",
"Run result": "Run result",
"Running": "Running",
"Skipped": "Skipped",
"Stop debug": "Stop",
"Success": "Running success",
"Value type": "Type",
"Variable outputs": "Variables",
"chat": {
"Quote prompt": "Quote prompt"
},
"debug": {
"Done": "Done",
"Hide result": "Hide result",
"Not result": "Not result",
"Run result": "",
"Show result": "Show result"
},
"inputType": {
"JSON Editor": "JSON Editor",
"Manual input": "",
"Manual select": "Select",
"Reference": "Reference",
"Required": "Required",
"Select edit field": "Editable field",
"Select input default value": "Default value",
"Select input type": "Configurable input types",
"Select input type placeholder": "Please select a configurable input type",
"chat history": "History",
"dynamicTargetInput": "dynamic Target Input",
"input": "Input",
"number input": "number input",
"selectApp": "App Selector",
"selectDataset": "Dataset Selector",
"selectLLMModel": "Select Chat Model",
"switch": "Switch",
"target": "Target Data",
"textarea": "Textarea"
},
"publish": {
"OnRevert version": "Click back to that version",
"OnRevert version confirm": "Are you sure to roll back the version?",
"histories": "Publiish histories"
},
"tool": {
"Handle": "Tool handle",
"Select Tool": "Select Tool"
},
"value": "Value",
"variable": "Variable"
} }
}, },
"dataset": { "dataset": {
......
projects/app/i18n/zh/common.json
...@@ -1160,7 +1160,9 @@ ...@@ -1160,7 +1160,9 @@
"tool": { "tool": {
"Handle": "工具连接器", "Handle": "工具连接器",
"Select Tool": "选择工具" "Select Tool": "选择工具"
} },
"value": "值",
"variable": "变量"
} }
}, },
"dataset": { "dataset": {
......
projects/app/src/components/ChatBox/index.tsx
...@@ -91,6 +91,7 @@ type Props = OutLinkChatAuthProps & { ...@@ -91,6 +91,7 @@ type Props = OutLinkChatAuthProps & {
onStartChat?: (e: StartChatFnProps) => Promise<{ onStartChat?: (e: StartChatFnProps) => Promise<{
responseText: string; responseText: string;
[DispatchNodeResponseKeyEnum.nodeResponse]: ChatHistoryItemResType[]; [DispatchNodeResponseKeyEnum.nodeResponse]: ChatHistoryItemResType[];
newVariables?: Record<string, any>;
isNewChat?: boolean; isNewChat?: boolean;
}>; }>;
onDelMessage?: (e: { contentId: string }) => void; onDelMessage?: (e: { contentId: string }) => void;
...@@ -462,6 +463,7 @@ const ChatBox = ( ...@@ -462,6 +463,7 @@ const ChatBox = (
const { const {
responseData, responseData,
responseText, responseText,
newVariables,
isNewChat = false isNewChat = false
} = await onStartChat({ } = await onStartChat({
chatList: newChatList, chatList: newChatList,
...@@ -470,6 +472,7 @@ const ChatBox = ( ...@@ -470,6 +472,7 @@ const ChatBox = (
generatingMessage: (e) => generatingMessage({ ...e, autoTTSResponse }), generatingMessage: (e) => generatingMessage({ ...e, autoTTSResponse }),
variables variables
}); });
setValue('variables', newVariables || []);
isNewChatReplace.current = isNewChat; isNewChatReplace.current = isNewChat;
...@@ -549,6 +552,7 @@ const ChatBox = ( ...@@ -549,6 +552,7 @@ const ChatBox = (
resetInputVal, resetInputVal,
setAudioPlayingChatId, setAudioPlayingChatId,
setChatHistories, setChatHistories,
setValue,
splitText2Audio, splitText2Audio,
startSegmentedAudio, startSegmentedAudio,
t, t,
......
projects/app/src/components/core/workflow/Flow/ChatTest.tsx
...@@ -68,7 +68,7 @@ const ChatTest = ( ...@@ -68,7 +68,7 @@ const ChatTest = (
const history = chatList.slice(-historyMaxLen - 2, -2); const history = chatList.slice(-historyMaxLen - 2, -2);
// 流请求，获取数据 // 流请求，获取数据
const { responseText, responseData } = await streamFetch({ const { responseText, responseData, newVariables } = await streamFetch({
url: '/api/core/chat/chatTest', url: '/api/core/chat/chatTest',
data: { data: {
history, history,
...@@ -84,7 +84,7 @@ const ChatTest = ( ...@@ -84,7 +84,7 @@ const ChatTest = (
abortCtrl: controller abortCtrl: controller
}); });
return { responseText, responseData }; return { responseText, responseData, newVariables };
}, },
[app._id, app.name, edges, nodes] [app._id, app.name, edges, nodes]
); );
......
projects/app/src/components/core/workflow/Flow/index.tsx
...@@ -57,7 +57,8 @@ const nodeTypes: Record<`${FlowNodeTypeEnum}`, any> = { ...@@ -57,7 +57,8 @@ const nodeTypes: Record<`${FlowNodeTypeEnum}`, any> = {
<NodeSimple {...data} minW={'100px'} maxW={'300px'} /> <NodeSimple {...data} minW={'100px'} maxW={'300px'} />
), ),
[FlowNodeTypeEnum.lafModule]: dynamic(() => import('./nodes/NodeLaf')), [FlowNodeTypeEnum.lafModule]: dynamic(() => import('./nodes/NodeLaf')),
[FlowNodeTypeEnum.ifElseNode]: dynamic(() => import('./nodes/NodeIfElse')) [FlowNodeTypeEnum.ifElseNode]: dynamic(() => import('./nodes/NodeIfElse')),
[FlowNodeTypeEnum.variableUpdate]: dynamic(() => import('./nodes/NodeVariableUpdate'))
}; };
const edgeTypes = { const edgeTypes = {
[EDGE_TYPE]: ButtonEdge [EDGE_TYPE]: ButtonEdge
......
projects/app/src/pages/api/core/chat/chatTest.ts
...@@ -69,7 +69,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) ...@@ -69,7 +69,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const { text, files } = chatValue2RuntimePrompt(prompt); const { text, files } = chatValue2RuntimePrompt(prompt);
/* start process */ /* start process */
const { flowResponses, flowUsages } = await dispatchWorkFlow({ const { flowResponses, flowUsages, newVariables } = await dispatchWorkFlow({
res, res,
mode: 'test', mode: 'test',
teamId, teamId,
...@@ -99,6 +99,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) ...@@ -99,6 +99,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
event: SseResponseEventEnum.flowResponses, event: SseResponseEventEnum.flowResponses,
data: JSON.stringify(flowResponses) data: JSON.stringify(flowResponses)
}); });
responseWrite({
res,
event: SseResponseEventEnum.variables,
data: JSON.stringify(newVariables)
});
res.end(); res.end();
pushChatUsage({ pushChatUsage({
......
projects/app/src/pages/api/v1/chat/completions.ts
...@@ -179,7 +179,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -179,7 +179,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
const responseChatItemId: string | undefined = messages[messages.length - 1].dataId; const responseChatItemId: string | undefined = messages[messages.length - 1].dataId;
/* start flow controller */ /* start flow controller */
const { flowResponses, flowUsages, assistantResponses } = await (async () => { const { flowResponses, flowUsages, assistantResponses, newVariables } = await (async () => {
if (app.version === 'v2') { if (app.version === 'v2') {
return dispatchWorkFlow({ return dispatchWorkFlow({
res, res,
...@@ -247,7 +247,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -247,7 +247,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
appId: app._id, appId: app._id,
teamId, teamId,
tmbId: tmbId, tmbId: tmbId,
variables, variables: newVariables,
isUpdateUseTime: isOwnerUse && source === ChatSourceEnum.online, // owner update use time isUpdateUseTime: isOwnerUse && source === ChatSourceEnum.online, // owner update use time
shareId, shareId,
outLinkUid: outLinkUserId, outLinkUid: outLinkUserId,
...@@ -288,6 +288,11 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -288,6 +288,11 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
event: detail ? SseResponseEventEnum.answer : undefined, event: detail ? SseResponseEventEnum.answer : undefined,
data: '[DONE]' data: '[DONE]'
}); });
responseWrite({
res,
event: SseResponseEventEnum.variables,
data: JSON.stringify(newVariables)
});
if (responseDetail && detail) { if (responseDetail && detail) {
responseWrite({ responseWrite({
......
projects/app/src/pages/chat/index.tsx
...@@ -74,7 +74,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => { ...@@ -74,7 +74,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
const prompts = messages.slice(-2); const prompts = messages.slice(-2);
const completionChatId = chatId ? chatId : nanoid(); const completionChatId = chatId ? chatId : nanoid();
const { responseText, responseData } = await streamFetch({ const { responseText, responseData, newVariables } = await streamFetch({
data: { data: {
messages: prompts, messages: prompts,
variables, variables,
...@@ -123,7 +123,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => { ...@@ -123,7 +123,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
history: ChatBoxRef.current?.getChatHistories() || state.history history: ChatBoxRef.current?.getChatHistories() || state.history
})); }));
return { responseText, responseData, isNewChat: forbidRefresh.current }; return { responseText, responseData, isNewChat: forbidRefresh.current, newVariables };
}, },
[appId, chatId, histories, pushHistory, router, setChatData, updateHistory] [appId, chatId, histories, pushHistory, router, setChatData, updateHistory]
); );
......
projects/app/src/pages/chat/share.tsx
...@@ -95,7 +95,7 @@ const OutLink = ({ ...@@ -95,7 +95,7 @@ const OutLink = ({
'*' '*'
); );
const { responseText, responseData } = await streamFetch({ const { responseText, responseData, newVariables } = await streamFetch({
data: { data: {
messages: prompts, messages: prompts,
variables: { variables: {
...@@ -169,7 +169,7 @@ const OutLink = ({ ...@@ -169,7 +169,7 @@ const OutLink = ({
'*' '*'
); );
return { responseText, responseData, isNewChat: forbidRefresh.current }; return { responseText, responseData, isNewChat: forbidRefresh.current, newVariables };
}, },
[ [
chatId, chatId,
......
projects/app/src/pages/chat/team.tsx
...@@ -79,7 +79,7 @@ const OutLink = () => { ...@@ -79,7 +79,7 @@ const OutLink = () => {
const prompts = messages.slice(-2); const prompts = messages.slice(-2);
const completionChatId = chatId ? chatId : nanoid(); const completionChatId = chatId ? chatId : nanoid();
const { responseText, responseData } = await streamFetch({ const { responseText, responseData, newVariables } = await streamFetch({
data: { data: {
messages: prompts, messages: prompts,
variables: { variables: {
...@@ -135,7 +135,7 @@ const OutLink = () => { ...@@ -135,7 +135,7 @@ const OutLink = () => {
history: ChatBoxRef.current?.getChatHistories() || state.history history: ChatBoxRef.current?.getChatHistories() || state.history
})); }));
return { responseText, responseData, isNewChat: forbidRefresh.current }; return { responseText, responseData, isNewChat: forbidRefresh.current, newVariables };
}, },
[appId, teamToken, chatId, histories, pushHistory, router, setChatData, teamId, updateHistory] [appId, teamToken, chatId, histories, pushHistory, router, setChatData, teamId, updateHistory]
); );
......
projects/app/src/service/utils/chat/saveChat.ts
...@@ -69,6 +69,7 @@ export async function saveChat({ ...@@ -69,6 +69,7 @@ export async function saveChat({
chat.title = title; chat.title = title;
chat.updateTime = new Date(); chat.updateTime = new Date();
chat.metadata = metadataUpdate; chat.metadata = metadataUpdate;
chat.variables = variables || {};
await chat.save({ session }); await chat.save({ session });
} else { } else {
await MongoChat.create( await MongoChat.create(
......
projects/app/src/web/common/api/fetch.ts
...@@ -22,6 +22,7 @@ type StreamFetchProps = { ...@@ -22,6 +22,7 @@ type StreamFetchProps = {
type StreamResponseType = { type StreamResponseType = {
responseText: string; responseText: string;
[DispatchNodeResponseKeyEnum.nodeResponse]: ChatHistoryItemResType[]; [DispatchNodeResponseKeyEnum.nodeResponse]: ChatHistoryItemResType[];
newVariables: Record<string, any>;
}; };
class FatalError extends Error {} class FatalError extends Error {}
...@@ -50,6 +51,7 @@ export const streamFetch = ({ ...@@ -50,6 +51,7 @@ export const streamFetch = ({
)[] = []; )[] = [];
let errMsg: string | undefined; let errMsg: string | undefined;
let responseData: ChatHistoryItemResType[] = []; let responseData: ChatHistoryItemResType[] = [];
let newVariables: Record<string, any> = {};
let finished = false; let finished = false;
const finish = () => { const finish = () => {
...@@ -57,6 +59,7 @@ export const streamFetch = ({ ...@@ -57,6 +59,7 @@ export const streamFetch = ({
return failedFinish(); return failedFinish();
} }
return resolve({ return resolve({
newVariables,
responseText, responseText,
responseData responseData
}); });
...@@ -198,6 +201,8 @@ export const streamFetch = ({ ...@@ -198,6 +201,8 @@ export const streamFetch = ({
}); });
} else if (event === SseResponseEventEnum.flowResponses && Array.isArray(parseJson)) { } else if (event === SseResponseEventEnum.flowResponses && Array.isArray(parseJson)) {
responseData = parseJson; responseData = parseJson;
} else if (event === SseResponseEventEnum.variables) {
newVariables = parseJson;
} else if (event === SseResponseEventEnum.error) { } else if (event === SseResponseEventEnum.error) {
if (parseJson.statusText === TeamErrEnum.aiPointsNotEnough) { if (parseJson.statusText === TeamErrEnum.aiPointsNotEnough) {
useSystemStore.getState().setIsNotSufficientModal(true); useSystemStore.getState().setIsNotSufficientModal(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment