V4.7-alpha (#985)

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/api/core/chat/chatTest.ts

@@ -1,20 +1,22 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { connectToDatabase } from '@/service/mongo';
 import { sseErrRes } from '@fastgpt/service/common/response';
-import { sseResponseEventEnum } from '@fastgpt/service/common/response/constant';
+import { SseResponseEventEnum } from '@fastgpt/global/core/module/runtime/constants';
 import { responseWrite } from '@fastgpt/service/common/response';
 import type { ModuleItemType } from '@fastgpt/global/core/module/type.d';
 import { pushChatUsage } from '@/service/support/wallet/usage/push';
 import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
-import type { ChatItemType } from '@fastgpt/global/core/chat/type';
+import type { ChatItemType, ChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import { authApp } from '@fastgpt/service/support/permission/auth/app';
-import { dispatchModules } from '@/service/moduleDispatch';
+import { dispatchWorkFlow } from '@/service/moduleDispatch';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
+import { setEntryEntries } from '@/service/moduleDispatch/utils';
+import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 
 export type Props = {
   history: ChatItemType[];
-  prompt: string;
+  prompt: ChatItemValueItemType[];
   modules: ModuleItemType[];
   variables: Record<string, any>;
   appId: string;
@@ -33,7 +35,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   let { modules = [], history = [], prompt, variables = {}, appName, appId } = req.body as Props;
   try {
     await connectToDatabase();
-    if (!history || !modules || !prompt) {
+    if (!history || !modules || !prompt || prompt.length === 0) {
       throw new Error('Prams Error');
     }
     if (!Array.isArray(modules)) {
@@ -52,19 +54,22 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     // auth balance
     const { user } = await getUserChatInfoAndAuthTeamPoints(tmbId);
 
+    const { text, files } = chatValue2RuntimePrompt(prompt);
+
     /* start process */
-    const { responseData, moduleDispatchBills } = await dispatchModules({
+    const { flowResponses, flowUsages } = await dispatchWorkFlow({
       res,
       mode: 'test',
       teamId,
       tmbId,
       user,
       appId,
-      modules,
+      modules: setEntryEntries(modules),
       variables,
+      inputFiles: files,
       histories: history,
       startParams: {
-        userChatInput: prompt
+        userChatInput: text
       },
       stream: true,
       detail: true
@@ -72,13 +77,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     responseWrite({
       res,
-      event: sseResponseEventEnum.answer,
+      event: SseResponseEventEnum.answer,
       data: '[DONE]'
     });
     responseWrite({
       res,
-      event: sseResponseEventEnum.appStreamResponse,
-      data: JSON.stringify(responseData)
+      event: SseResponseEventEnum.flowResponses,
+      data: JSON.stringify(flowResponses)
     });
     res.end();
 
@@ -88,7 +93,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       teamId,
       tmbId,
       source: UsageSourceEnum.fastgpt,
-      moduleDispatchBills
+      flowUsages
     });
   } catch (err: any) {
     res.status(500);

projects/app/src/pages/api/core/chat/init.ts

@@ -4,11 +4,11 @@ import { connectToDatabase } from '@/service/mongo';
 import { authApp } from '@fastgpt/service/support/permission/auth/app';
 import { getGuideModule } from '@fastgpt/global/core/module/utils';
 import { getChatModelNameListByModules } from '@/service/core/app/module';
-import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
 import type { InitChatProps, InitChatResponse } from '@/global/core/chat/api.d';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/module/runtime/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
@@ -45,7 +45,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       chatId,
       limit: 30,
       field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback ${
-        ModuleOutputKeyEnum.responseData
+        DispatchNodeResponseKeyEnum.nodeResponse
       } ${loadCustomFeedbacks ? 'customFeedbacks' : ''}`
     });
 

projects/app/src/pages/api/core/chat/outLink/init.ts

@@ -4,15 +4,16 @@ import { connectToDatabase } from '@/service/mongo';
 import type { InitChatResponse, InitOutLinkChatProps } from '@/global/core/chat/api.d';
 import { getGuideModule } from '@fastgpt/global/core/module/utils';
 import { getChatModelNameListByModules } from '@/service/core/app/module';
-import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/module/runtime/constants';
 import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
 import { authOutLink } from '@/service/support/permission/auth/outLink';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
-import { selectSimpleChatResponse } from '@/utils/service/core/chat';
+import { filterPublicNodeResponseData } from '@fastgpt/global/core/chat/utils';
 import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
+import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
@@ -44,13 +45,15 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       chatId,
       limit: 30,
       field: `dataId obj value userGoodFeedback userBadFeedback ${
-        shareChat.responseDetail ? `adminFeedback ${ModuleOutputKeyEnum.responseData}` : ''
+        shareChat.responseDetail ? `adminFeedback ${DispatchNodeResponseKeyEnum.nodeResponse}` : ''
       } `
     });
 
     // pick share response field
     history.forEach((item) => {
-      item.responseData = selectSimpleChatResponse({ responseData: item.responseData });
+      if (item.obj === ChatRoleEnum.AI) {
+        item.responseData = filterPublicNodeResponseData({ flowResponses: item.responseData });
+      }
     });
 
     jsonRes<InitChatResponse>(res, {

projects/app/src/pages/api/core/chat/team/init.ts

@@ -3,7 +3,7 @@ import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { getGuideModule } from '@fastgpt/global/core/module/utils';
 import { getChatModelNameListByModules } from '@/service/core/app/module';
-import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/module/runtime/constants';
 import type { InitChatResponse, InitTeamChatProps } from '@/global/core/chat/api.d';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
@@ -12,7 +12,8 @@ import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
 import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
 import { MongoTeam } from '@fastgpt/service/support/user/team/teamSchema';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
-import { selectSimpleChatResponse } from '@/utils/service/core/chat';
+import { filterPublicNodeResponseData } from '@fastgpt/global/core/chat/utils';
+import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
@@ -49,12 +50,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       appId,
       chatId,
       limit: 30,
-      field: `dataId obj value userGoodFeedback userBadFeedback adminFeedback ${ModuleOutputKeyEnum.responseData}`
+      field: `dataId obj value userGoodFeedback userBadFeedback adminFeedback ${DispatchNodeResponseKeyEnum.nodeResponse}`
     });
 
     // pick share response field
     history.forEach((item) => {
-      item.responseData = selectSimpleChatResponse({ responseData: item.responseData });
+      if (item.obj === ChatRoleEnum.AI) {
+        item.responseData = filterPublicNodeResponseData({ flowResponses: item.responseData });
+      }
     });
 
     jsonRes<InitChatResponse>(res, {

projects/app/src/pages/api/core/chat/teamInit.ts

@@ -9,6 +9,7 @@ import type { InitChatProps, InitChatResponse } from '@/global/core/chat/api.d';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/module/runtime/constants';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
@@ -45,7 +46,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       chatId,
       limit: 30,
       field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback ${
-        ModuleOutputKeyEnum.responseData
+        DispatchNodeResponseKeyEnum.nodeResponse
       } ${loadCustomFeedbacks ? 'customFeedbacks' : ''}`
     });
 

projects/app/src/pages/api/v1/chat/completions.ts

@@ -5,11 +5,12 @@ import { sseErrRes, jsonRes } from '@fastgpt/service/common/response';
 import { addLog } from '@fastgpt/service/common/system/log';
 import { withNextCors } from '@fastgpt/service/common/middle/cors';
 import { ChatRoleEnum, ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
-import { sseResponseEventEnum } from '@fastgpt/service/common/response/constant';
-import { dispatchModules } from '@/service/moduleDispatch';
+import { SseResponseEventEnum } from '@fastgpt/global/core/module/runtime/constants';
+import { dispatchWorkFlow } from '@/service/moduleDispatch';
 import type { ChatCompletionCreateParams } from '@fastgpt/global/core/ai/type.d';
-import type { ChatMessageItemType } from '@fastgpt/global/core/ai/type.d';
-import { gptMessage2ChatType, textAdaptGptResponse } from '@/utils/adapt';
+import type { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type.d';
+import { textAdaptGptResponse } from '@fastgpt/global/core/module/runtime/utils';
+import { GPTMessages2Chats, chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { saveChat } from '@/service/utils/chat/saveChat';
 import { responseWrite } from '@fastgpt/service/common/response';
@@ -19,7 +20,7 @@ import { pushResult2Remote, addOutLinkUsage } from '@fastgpt/service/support/out
 import requestIp from 'request-ip';
 import { getUsageSourceByAuthType } from '@fastgpt/global/support/wallet/usage/tools';
 import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
-import { selectSimpleChatResponse } from '@/utils/service/core/chat';
+import { filterPublicNodeResponseData } from '@fastgpt/global/core/chat/utils';
 import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
 import { connectToDatabase } from '@/service/mongo';
 import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
@@ -31,6 +32,9 @@ import { AuthOutLinkChatProps } from '@fastgpt/global/support/outLink/api';
 import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
 import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
+import { setEntryEntries } from '@/service/moduleDispatch/utils';
+import { UserChatItemType } from '@fastgpt/global/core/chat/type';
+import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/module/runtime/constants';
 
 type FastGptWebChatProps = {
   chatId?: string; // undefined: nonuse history, '': new chat, 'xxxxx': use history
@@ -40,7 +44,7 @@ type FastGptWebChatProps = {
 export type Props = ChatCompletionCreateParams &
   FastGptWebChatProps &
   OutLinkChatAuthProps & {
-    messages: ChatMessageItemType[];
+    messages: ChatCompletionMessageParam[];
     stream?: boolean;
     detail?: boolean;
     variables: Record<string, any>;
@@ -102,17 +106,19 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
 
     let startTime = Date.now();
 
-    const chatMessages = gptMessage2ChatType(messages);
+    const chatMessages = GPTMessages2Chats(messages);
     if (chatMessages[chatMessages.length - 1].obj !== ChatRoleEnum.Human) {
       chatMessages.pop();
     }
 
     // user question
-    const question = chatMessages.pop();
+    const question = chatMessages.pop() as UserChatItemType;
     if (!question) {
       throw new Error('Question is empty');
     }
 
+    const { text, files } = chatValue2RuntimePrompt(question.value);
+
     /* 
       1. auth app permission
       2. auth balance
@@ -128,7 +134,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
             outLinkUid,
             chatId,
             ip: originIp,
-            question: question.value
+            question: text
           });
         }
         // team space chat
@@ -161,7 +167,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     const responseChatItemId: string | undefined = messages[messages.length - 1].dataId;
 
     /* start flow controller */
-    const { responseData, moduleDispatchBills, answerText } = await dispatchModules({
+    const { flowResponses, flowUsages, assistantResponses } = await dispatchWorkFlow({
       res,
       mode: 'chat',
       user,
@@ -170,11 +176,12 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       appId: String(app._id),
       chatId,
       responseChatItemId,
-      modules: app.modules,
+      modules: setEntryEntries(app.modules),
       variables,
+      inputFiles: files,
       histories: concatHistories,
       startParams: {
-        userChatInput: question.value
+        userChatInput: text
       },
       stream,
       detail
@@ -209,8 +216,8 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
           {
             dataId: responseChatItemId,
             obj: ChatRoleEnum.AI,
-            value: answerText,
-            responseData
+            value: assistantResponses,
+            [DispatchNodeResponseKeyEnum.nodeResponse]: flowResponses
           }
         ],
         metadata: {
@@ -222,12 +229,14 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     addLog.info(`completions running time: ${(Date.now() - startTime) / 1000}s`);
 
     /* select fe response field */
-    const feResponseData = canWrite ? responseData : selectSimpleChatResponse({ responseData });
+    const feResponseData = canWrite
+      ? flowResponses
+      : filterPublicNodeResponseData({ flowResponses });
 
     if (stream) {
       responseWrite({
         res,
-        event: detail ? sseResponseEventEnum.answer : undefined,
+        event: detail ? SseResponseEventEnum.answer : undefined,
         data: textAdaptGptResponse({
           text: null,
           finish_reason: 'stop'
@@ -235,20 +244,26 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       });
       responseWrite({
         res,
-        event: detail ? sseResponseEventEnum.answer : undefined,
+        event: detail ? SseResponseEventEnum.answer : undefined,
         data: '[DONE]'
       });
 
       if (responseDetail && detail) {
         responseWrite({
           res,
-          event: sseResponseEventEnum.appStreamResponse,
+          event: SseResponseEventEnum.flowResponses,
           data: JSON.stringify(feResponseData)
         });
       }
 
       res.end();
     } else {
+      const responseContent = (() => {
+        if (assistantResponses.length === 0) return '';
+        if (assistantResponses.length === 1 && assistantResponses[0].text?.content)
+          return assistantResponses[0].text?.content;
+        return assistantResponses;
+      })();
       res.json({
         ...(detail ? { responseData: feResponseData } : {}),
         id: chatId || '',
@@ -256,7 +271,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
         usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 1 },
         choices: [
           {
-            message: { role: 'assistant', content: answerText },
+            message: { role: 'assistant', content: responseContent },
             finish_reason: 'stop',
             index: 0
           }
@@ -271,11 +286,11 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       teamId,
       tmbId: tmbId,
       source: getUsageSourceByAuthType({ shareId, authType }),
-      moduleDispatchBills
+      flowUsages
     });
 
     if (shareId) {
-      pushResult2Remote({ outLinkUid, shareId, appName: app.name, responseData });
+      pushResult2Remote({ outLinkUid, shareId, appName: app.name, flowResponses });
       addOutLinkUsage({
         shareId,
         totalPoints