v4.5.2 (#439)

projects/app/src/service/moduleDispatch/chat/oneapi.ts

@@ -1,7 +1,6 @@
 import type { NextApiResponse } from 'next';
 import { ChatContextFilter } from '@/service/common/tiktoken';
-import type { ChatItemType } from '@/types/chat';
-import type { ChatHistoryItemResType } from '@/types/chat';
+import type { ChatItemType, moduleDispatchResType } from '@/types/chat';
 import { ChatRoleEnum, sseResponseEventEnum } from '@/constants/chat';
 import { textAdaptGptResponse } from '@/utils/adapt';
 import { getAIApi } from '@fastgpt/service/core/ai/config';
@@ -11,13 +10,12 @@ import { countModelPrice } from '@/service/common/bill/push';
 import { ChatModelItemType } from '@/types/model';
 import { postTextCensor } from '@/web/common/plusApi/censor';
 import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constant';
-import { AppModuleItemType } from '@/types/app';
+import type { ModuleItemType } from '@fastgpt/global/core/module/type.d';
 import { countMessagesTokens, sliceMessagesTB } from '@/global/common/tiktoken';
 import { adaptChat2GptMessages } from '@/utils/common/adapt/message';
 import { Prompt_QuotePromptList, Prompt_QuoteTemplateList } from '@/global/core/prompt/AIChat';
 import type { AIChatProps } from '@/types/core/aiChat';
 import { replaceVariable } from '@/global/common/string/tools';
-import { FlowModuleTypeEnum } from '@/constants/flow';
 import type { ModuleDispatchProps } from '@/types/core/chat/type';
 import { responseWrite, responseWriteController } from '@fastgpt/service/common/response';
 import { getChatModel, ModelTypeEnum } from '@/service/core/ai/model';
@@ -33,7 +31,7 @@ export type ChatProps = ModuleDispatchProps<
 >;
 export type ChatResponse = {
   [TaskResponseKeyEnum.answerText]: string;
-  [TaskResponseKeyEnum.responseData]: ChatHistoryItemResType;
+  [TaskResponseKeyEnum.responseData]: moduleDispatchResType;
   [TaskResponseKeyEnum.history]: ChatItemType[];
 };
 
@@ -41,7 +39,6 @@ export type ChatResponse = {
 export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResponse> => {
   let {
     res,
-    moduleName,
     stream = false,
     detail = false,
     user,
@@ -180,8 +177,6 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
   return {
     [TaskResponseKeyEnum.answerText]: answerText,
     [TaskResponseKeyEnum.responseData]: {
-      moduleType: FlowModuleTypeEnum.chatNode,
-      moduleName,
       price: user.openaiAccount?.key
         ? 0
         : countModelPrice({ model, tokens: totalTokens, type: ModelTypeEnum.chat }),
@@ -205,17 +200,21 @@ function filterQuote({
   model: ChatModelItemType;
   quoteTemplate?: string;
 }) {
+  function getValue(item: SearchDataResponseItemType, index: number) {
+    return replaceVariable(quoteTemplate || Prompt_QuoteTemplateList[0].value, {
+      q: item.q,
+      a: item.a,
+      source: item.sourceName,
+      sourceId: String(item.sourceId || 'UnKnow'),
+      index: index + 1,
+      score: item.score.toFixed(4)
+    });
+  }
   const sliceResult = sliceMessagesTB({
     maxTokens: model.quoteMaxToken,
     messages: quoteQA.map((item, index) => ({
       obj: ChatRoleEnum.System,
-      value: replaceVariable(quoteTemplate || Prompt_QuoteTemplateList[0].value, {
-        q: item.q,
-        a: item.a,
-        source: item.sourceName,
-        sourceId: item.sourceId || 'UnKnow',
-        index: index + 1
-      })
+      value: getValue(item, index)
     }))
   });
 
@@ -224,17 +223,7 @@ function filterQuote({
 
   const quoteText =
     filterQuoteQA.length > 0
-      ? `${filterQuoteQA
-          .map((item, index) =>
-            replaceVariable(quoteTemplate || Prompt_QuoteTemplateList[0].value, {
-              q: item.q,
-              a: item.a,
-              source: item.sourceName,
-              sourceId: item.sourceId || 'UnKnow',
-              index: index + 1
-            })
-          )
-          .join('\n')}`
+      ? `${filterQuoteQA.map((item, index) => getValue(item, index)).join('\n')}`
       : '';
 
   return {
@@ -330,7 +319,7 @@ function targetResponse({
   detail
 }: {
   res: NextApiResponse;
-  outputs: AppModuleItemType['outputs'];
+  outputs: ModuleItemType['outputs'];
   detail: boolean;
 }) {
   const targets =