Test completion v2 (#4438)

* add v2 completions (#4364)

* add v2 completions

* completion config

* config version

* fix

* frontend

* doc

* fix

* fix: completions v2 api

---------

Co-authored-by: heheer <[email protected]>

Author: c121914yu

docSite/content/zh-cn/docs/development/openapi/chat.md

@@ -5,6 +5,7 @@ export enum SseResponseEventEnum {
   answer = 'answer', // animation stream
   fastAnswer = 'fastAnswer', // direct answer text, not animation
   flowNodeStatus = 'flowNodeStatus', // update node status
+  flowNodeResponse = 'flowNodeResponse', // node response
 
   toolCall = 'toolCall', // tool start
   toolParams = 'toolParams', // tool params return

packages/global/core/workflow/runtime/constants.ts

@@ -59,6 +59,7 @@ export type ChatDispatchProps = {
   isToolCall?: boolean;
   workflowStreamResponse?: WorkflowResponseType;
   workflowDispatchDeep?: number;
+  version?: 'v1' | 'v2';
 };
 
 export type ModuleDispatchProps<T> = ChatDispatchProps & {

packages/global/core/workflow/runtime/type.d.ts

@@ -130,6 +130,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
     timezone,
     externalProvider,
     stream = false,
+    version = 'v1',
     ...props
   } = data;
 
@@ -626,6 +627,21 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
       };
     })();
 
+    // Response node response
+    if (
+      version === 'v2' &&
+      !props.isToolCall &&
+      !props.runningAppInfo.isChildApp &&
+      formatResponseData
+    ) {
+      props.workflowStreamResponse?.({
+        event: SseResponseEventEnum.flowNodeResponse,
+        data: {
+          ...formatResponseData
+        }
+      });
+    }
+
     // Add output default value
     node.outputs.forEach((item) => {
       if (!item.required) return;

packages/service/core/workflow/dispatch/index.ts

@@ -53,7 +53,8 @@ export const getWorkflowResponseWrite = ({
       [SseResponseEventEnum.toolCall]: 1,
       [SseResponseEventEnum.toolParams]: 1,
       [SseResponseEventEnum.toolResponse]: 1,
-      [SseResponseEventEnum.updateVariables]: 1
+      [SseResponseEventEnum.updateVariables]: 1,
+      [SseResponseEventEnum.flowNodeResponse]: 1
     };
     if (!detail && detailEvent[event]) return;
 

packages/service/core/workflow/dispatch/utils.ts

@@ -219,7 +219,8 @@ const ChatBox = ({
       tool,
       interactive,
       autoTTSResponse,
-      variables
+      variables,
+      nodeResponse
     }: generatingMessageProps & { autoTTSResponse?: boolean }) => {
       setChatRecords((state) =>
         state.map((item, index) => {
@@ -232,7 +233,14 @@ const ChatBox = ({
             JSON.stringify(item.value[item.value.length - 1])
           );
 
-          if (event === SseResponseEventEnum.flowNodeStatus && status) {
+          if (event === SseResponseEventEnum.flowNodeResponse && nodeResponse) {
+            return {
+              ...item,
+              responseData: item.responseData
+                ? [...item.responseData, nodeResponse]
+                : [nodeResponse]
+            };
+          } else if (event === SseResponseEventEnum.flowNodeStatus && status) {
             return {
               ...item,
               status,
@@ -518,36 +526,34 @@ const ChatBox = ({
               reserveTool: true
             });
 
-            const {
-              responseData,
-              responseText,
-              isNewChat = false
-            } = await onStartChat({
+            const { responseText } = await onStartChat({
               messages, // 保证最后一条是 Human 的消息
               responseChatItemId: responseChatId,
               controller: abortSignal,
               generatingMessage: (e) => generatingMessage({ ...e, autoTTSResponse }),
               variables: requestVariables
             });
-            if (responseData?.[responseData.length - 1]?.error) {
-              toast({
-                title: t(responseData[responseData.length - 1].error?.message),
-                status: 'error'
-              });
-            }
 
             // Set last chat finish status
             let newChatHistories: ChatSiteItemType[] = [];
             setChatRecords((state) => {
               newChatHistories = state.map((item, index) => {
                 if (index !== state.length - 1) return item;
+
+                // Check node response error
+                const responseData = mergeChatResponseData(item.responseData || []);
+                if (responseData[responseData.length - 1]?.error) {
+                  toast({
+                    title: t(responseData[responseData.length - 1].error?.message),
+                    status: 'error'
+                  });
+                }
+
                 return {
                   ...item,
                   status: ChatStatusEnum.finish,
                   time: new Date(),
-                  responseData: item.responseData
-                    ? mergeChatResponseData([...item.responseData, ...responseData])
-                    : responseData
+                  responseData
                 };
               });
               return newChatHistories;
@@ -567,7 +573,7 @@ const ChatBox = ({
           } catch (err: any) {
             console.log(err);
             toast({
-              title: t(getErrText(err, 'core.chat.error.Chat error') as any),
+              title: t(getErrText(err, t('common:core.chat.error.Chat error') as any)),
               status: 'error',
               duration: 5000,
               isClosable: true

projects/app/src/components/core/chat/ChatContainer/ChatBox/index.tsx

@@ -1,6 +1,10 @@
 import { StreamResponseType } from '@/web/common/api/fetch';
 import { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type';
-import { ChatSiteItemType, ToolModuleResponseItemType } from '@fastgpt/global/core/chat/type';
+import {
+  ChatHistoryItemResType,
+  ChatSiteItemType,
+  ToolModuleResponseItemType
+} from '@fastgpt/global/core/chat/type';
 import { WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
 
 export type generatingMessageProps = {
@@ -12,6 +16,7 @@ export type generatingMessageProps = {
   tool?: ToolModuleResponseItemType;
   interactive?: WorkflowInteractiveResponseType;
   variables?: Record<string, any>;
+  nodeResponse?: ChatHistoryItemResType;
 };
 
 export type StartChatFnProps = {

projects/app/src/components/core/chat/ChatContainer/type.d.ts

@@ -182,7 +182,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
       histories: newHistories,
       stream: true,
       maxRunTimes: WORKFLOW_MAX_RUN_TIMES,
-      workflowStreamResponse: workflowResponseWrite
+      workflowStreamResponse: workflowResponseWrite,
+      version: 'v2'
     });
 
     workflowResponseWrite({
@@ -197,11 +198,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
       event: SseResponseEventEnum.answer,
       data: '[DONE]'
     });
-    responseWrite({
-      res,
-      event: SseResponseEventEnum.flowResponses,
-      data: JSON.stringify(flowResponses)
-    });
 
     // save chat
     const isInteractiveRequest = !!getLastInteractiveValue(histories);