perf: response store

1ffe1be5 · archer · ba965320 · 1ffe1be5 · 1ffe1be5 · 1ffe1be5
Commit 1ffe1be5 authored Jul 23, 2023 by archer
20 changed files
--- a/client/data/config.json
+++ b/client/data/config.json
@@ -23,7 +23,7 @@
      "model": "gpt-3.5-turbo",
      "name": "FastAI-4k",
      "contextMaxToken": 4000,
-      "systemMaxToken": 2400,
+      "quoteMaxToken": 2000,
      "maxTemperature": 1.2,
      "price": 1.5
    },
@@ -31,7 +31,7 @@
      "model": "gpt-3.5-turbo-16k",
      "name": "FastAI-16k",
      "contextMaxToken": 16000,
-      "systemMaxToken": 8000,
+      "quoteMaxToken": 8000,
      "maxTemperature": 1.2,
      "price": 3
    },
@@ -39,7 +39,7 @@
      "model": "gpt-4",
      "name": "FastAI-Plus",
      "contextMaxToken": 8000,
-      "systemMaxToken": 4000,
+      "quoteMaxToken": 4000,
      "maxTemperature": 1.2,
      "price": 45
    }

--- a/client/src/api/fetch.ts
+++ b/client/src/api/fetch.ts
-import { sseResponseEventEnum } from '@/constants/chat';
+import { sseResponseEventEnum, TaskResponseKeyEnum } from '@/constants/chat';
 import { getErrText } from '@/utils/tools';
 import { parseStreamChunk } from '@/utils/adapt';
-import { QuoteItemType } from '@/types/chat';
+import type { ChatHistoryItemResType } from '@/types/chat';

 interface StreamFetchProps {
  url?: string;
@@ -17,8 +17,7 @@ export const streamFetch = ({
 }: StreamFetchProps) =>
  new Promise<{
    responseText: string;
-    errMsg: string;
-    newChatId: string | null;
+    [TaskResponseKeyEnum.responseData]: ChatHistoryItemResType[];
  }>(async (resolve, reject) => {
    try {
      const response = await window.fetch(url, {
@@ -42,7 +41,7 @@ export const streamFetch = ({
      // response data
      let responseText = '';
      let errMsg = '';
-      const newChatId = response.headers.get('newChatId');
+      let responseData: ChatHistoryItemResType[] = [];

      const read = async () => {
        try {
@@ -51,8 +50,7 @@ export const streamFetch = ({
            if (response.status === 200 && !errMsg) {
              return resolve({
                responseText,
-                errMsg,
-                newChatId
+                responseData
              });
            } else {
              return reject({
@@ -78,7 +76,7 @@ export const streamFetch = ({
              onMessage(answer);
              responseText += answer;
            } else if (item.event === sseResponseEventEnum.appStreamResponse) {
-              console.log(data);
+              responseData = data;
            } else if (item.event === sseResponseEventEnum.error) {
              errMsg = getErrText(data, '流响应错误');
            }
@@ -88,8 +86,7 @@ export const streamFetch = ({
          if (err?.message === 'The user aborted a request.') {
            return resolve({
              responseText,
-              errMsg,
-              newChatId
+              responseData
            });
          }
          reject(getErrText(err, '请求异常'));

--- a/client/src/components/ChatBox/ResponseDetailModal.tsx
+++ b/client/src/components/ChatBox/ResponseDetailModal.tsx
+import React from 'react';
+
+const ResponseDetailModal = () => {
+  return <div>ResponseDetailModal</div>;
+};
+
+export default ResponseDetailModal;
--- a/client/src/components/ChatBox/index.tsx
+++ b/client/src/components/ChatBox/index.tsx
@@ -9,7 +9,12 @@ import React, {
  useEffect
 } from 'react';
 import { throttle } from 'lodash';
-import { ChatItemType, ChatSiteItemType, ExportChatType } from '@/types/chat';
+import {
+  ChatHistoryItemResType,
+  ChatItemType,
+  ChatSiteItemType,
+  ExportChatType
+} from '@/types/chat';
 import { useToast } from '@/hooks/useToast';
 import {
  useCopyData,
@@ -35,6 +40,7 @@ import { useRouter } from 'next/router';
 import { useGlobalStore } from '@/store/global';
 import { QuoteItemType } from '@/types/chat';
 import { FlowModuleTypeEnum } from '@/constants/flow';
+import { TaskResponseKeyEnum } from '@/constants/chat';

 import dynamic from 'next/dynamic';
 const QuoteModal = dynamic(() => import('./QuoteModal'));
@@ -131,9 +137,10 @@ const ChatBox = (
    variableModules?: VariableItemType[];
    welcomeText?: string;
    onUpdateVariable?: (e: Record<string, any>) => void;
-    onStartChat: (
-      e: StartChatFnProps
-    ) => Promise<{ responseText?: string; rawSearch?: QuoteItemType[] }>;
+    onStartChat: (e: StartChatFnProps) => Promise<{
+      responseText: string;
+      [TaskResponseKeyEnum.responseData]: ChatHistoryItemResType[];
+    }>;
    onDelMessage?: (e: { contentId?: string; index: number }) => void;
  },
  ref: ForwardedRef<ComponentRef>
@@ -294,7 +301,7 @@ const ChatBox = (

        const messages = adaptChatItem_openAI({ messages: newChatList, reserveId: true });

-        const { rawSearch } = await onStartChat({
+        const { responseData } = await onStartChat({
          messages,
          controller: abortSignal,
          generatingMessage,
@@ -308,7 +315,7 @@ const ChatBox = (
            return {
              ...item,
              status: 'finish',
-              rawSearch
+              responseData
            };
          })
        );

--- a/client/src/constants/chat.ts
+++ b/client/src/constants/chat.ts
@@ -51,5 +51,11 @@ export const ChatSourceMap = {
  }
 };

+export enum ChatModuleEnum {
+  'AIChat' = 'AI Chat',
+  'KBSearch' = 'KB Search',
+  'CQ' = 'Classify Question'
+}
+
 export const HUMAN_ICON = `https://fastgpt.run/icon/human.png`;
 export const LOGO_ICON = `https://fastgpt.run/icon/logo.png`;
--- a/client/src/pages/api/chat/delChatRecordByContentId.ts
+++ b/client/src/pages/api/chat/delChatRecordByContentId.ts
@@ -25,7 +25,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    // 删除一条数据库记录
    await Chat.updateOne(
      {
-        _id: chatId,
+        chatId,
        userId
      },
      { $pull: { content: { _id: contentId } } }

--- a/client/src/pages/api/chat/init.ts
+++ b/client/src/pages/api/chat/init.ts
@@ -8,6 +8,7 @@ import { authApp } from '@/service/utils/auth';
 import mongoose from 'mongoose';
 import type { ChatSchema } from '@/types/mongoSchema';
 import { getSpecialModule } from '@/components/ChatBox';
+import { TaskResponseKeyEnum } from '@/constants/chat';

 /* 初始化我的聊天框，需要身份验证 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -67,7 +68,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
                $project: {
                  _id: '$content._id',
                  obj: '$content.obj',
-                  value: '$content.value'
+                  value: '$content.value',
+                  [TaskResponseKeyEnum.responseData]: `$content.${TaskResponseKeyEnum.responseData}`
                }
              }
            ])

--- a/client/src/pages/api/openapi/text/gptMessagesSlice.ts
+++ b/client/src/pages/api/openapi/text/gptMessagesSlice.ts
@@ -46,7 +46,7 @@ export function gpt_chatItemTokenSlice({
  maxToken
 }: {
  messages: ChatItemType[];
-  model?: ModelType;
+  model?: string;
  maxToken: number;
 }) {
  let result: ChatItemType[] = [];

--- a/client/src/pages/api/system/getInitData.ts
+++ b/client/src/pages/api/system/getInitData.ts
@@ -68,7 +68,7 @@ export function setDefaultData() {
      model: 'gpt-3.5-turbo',
      name: 'FastAI-4k',
      contextMaxToken: 4000,
-      systemMaxToken: 2400,
+      quoteMaxToken: 2400,
      maxTemperature: 1.2,
      price: 1.5
    },
@@ -76,7 +76,7 @@ export function setDefaultData() {
      model: 'gpt-3.5-turbo-16k',
      name: 'FastAI-16k',
      contextMaxToken: 16000,
-      systemMaxToken: 8000,
+      quoteMaxToken: 8000,
      maxTemperature: 1.2,
      price: 3
    },
@@ -84,7 +84,7 @@ export function setDefaultData() {
      model: 'gpt-4',
      name: 'FastAI-Plus',
      contextMaxToken: 8000,
-      systemMaxToken: 4000,
+      quoteMaxToken: 4000,
      maxTemperature: 1.2,
      price: 45
    }

--- a/client/src/pages/app/detail/components/BasicEdit/index.tsx
+++ b/client/src/pages/app/detail/components/BasicEdit/index.tsx
@@ -454,7 +454,7 @@ const ChatTest = ({ appId }: { appId: string }) => {
      const history = messages.slice(-historyMaxLen - 2, -2);

      // 流请求，获取数据
-      const { responseText } = await streamFetch({
+      const { responseText, responseData } = await streamFetch({
        url: '/api/chat/chatTest',
        data: {
          history,
@@ -468,7 +468,7 @@ const ChatTest = ({ appId }: { appId: string }) => {
        abortSignal: controller
      });

-      return { responseText };
+      return { responseText, responseData };
    },
    [modules, appId, appDetail.name]
  );

--- a/client/src/pages/app/detail/components/Edit/components/ChatTest.tsx
+++ b/client/src/pages/app/detail/components/Edit/components/ChatTest.tsx
@@ -49,7 +49,7 @@ const ChatTest = (
      const history = messages.slice(-historyMaxLen - 2, -2);

      // 流请求，获取数据
-      const { responseText } = await streamFetch({
+      const { responseText, responseData } = await streamFetch({
        url: '/api/chat/chatTest',
        data: {
          history,
@@ -63,7 +63,7 @@ const ChatTest = (
        abortSignal: controller
      });

-      return { responseText };
+      return { responseText, responseData };
    },
    [app._id, app.name, modules]
  );

--- a/client/src/pages/chat/index.tsx
+++ b/client/src/pages/chat/index.tsx
@@ -60,7 +60,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
      const prompts = messages.slice(-2);
      const completionChatId = chatId ? chatId : nanoid();

-      const { responseText } = await streamFetch({
+      const { responseText, responseData } = await streamFetch({
        data: {
          messages: prompts,
          variables,
@@ -106,7 +106,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
        history: ChatBoxRef.current?.getChatHistory() || state.history
      }));

-      return { responseText };
+      return { responseText, responseData };
    },
    [appId, chatId, history, router, setChatData, updateHistory]
  );

--- a/client/src/pages/chat/share.tsx
+++ b/client/src/pages/chat/share.tsx
@@ -46,7 +46,7 @@ const ShareChat = ({ shareId, chatId }: { shareId: string; chatId: string }) => 
      const prompts = messages.slice(-2);
      const completionChatId = chatId ? chatId : nanoid();

-      const { responseText } = await streamFetch({
+      const { responseText, responseData } = await streamFetch({
        data: {
          messages: prompts,
          variables,
@@ -91,7 +91,7 @@ const ShareChat = ({ shareId, chatId }: { shareId: string; chatId: string }) => 
        '*'
      );

-      return { responseText };
+      return { responseText, responseData };
    },
    [chatId, router, saveChatResponse, shareId]
  );

--- a/client/src/service/models/chat.ts
+++ b/client/src/service/models/chat.ts
@@ -68,7 +68,8 @@ const ChatSchema = new Schema({
              answer: String,
              temperature: Number,
              maxToken: Number,
-              finishMessages: Array,
+              quoteList: Array,
+              completeMessages: Array,
              similarity: Number,
              limit: Number,
              cqList: Array,

--- a/client/src/service/moduleDispatch/agent/classifyQuestion.ts
+++ b/client/src/service/moduleDispatch/agent/classifyQuestion.ts
 import { adaptChatItem_openAI } from '@/utils/plugin/openai';
 import { ChatContextFilter } from '@/service/utils/chat/index';
 import type { ChatHistoryItemResType, ChatItemType } from '@/types/chat';
-import { ChatRoleEnum, TaskResponseKeyEnum } from '@/constants/chat';
+import { ChatModuleEnum, ChatRoleEnum, TaskResponseKeyEnum } from '@/constants/chat';
 import { getOpenAIApi, axiosConfig } from '@/service/ai/openai';
 import type { ClassifyQuestionAgentItemType } from '@/types/app';
 import { countModelPrice } from '@/service/events/pushBill';
@@ -17,7 +17,6 @@ export type CQResponse = {
  [key: string]: any;
 };

-const moduleName = 'Classify Question';
 const agentModel = 'gpt-3.5-turbo';
 const agentFunName = 'agent_user_question';
 const maxTokens = 2000;
@@ -88,7 +87,7 @@ export const dispatchClassifyQuestion = async (props: Record<string, any>): Prom
  return {
    [result.key]: 1,
    [TaskResponseKeyEnum.responseData]: {
-      moduleName,
+      moduleName: ChatModuleEnum.CQ,
      price: countModelPrice({ model: agentModel, tokens }),
      model: agentModel,
      tokens,

--- a/client/src/service/moduleDispatch/chat/oneapi.ts
+++ b/client/src/service/moduleDispatch/chat/oneapi.ts
@@ -6,12 +6,13 @@ import { modelToolMap } from '@/utils/plugin';
 import { ChatContextFilter } from '@/service/utils/chat/index';
 import type { ChatItemType, QuoteItemType } from '@/types/chat';
 import type { ChatHistoryItemResType } from '@/types/chat';
-import { ChatRoleEnum, sseResponseEventEnum } from '@/constants/chat';
+import { ChatModuleEnum, ChatRoleEnum, sseResponseEventEnum } from '@/constants/chat';
 import { parseStreamChunk, textAdaptGptResponse } from '@/utils/adapt';
 import { getOpenAIApi, axiosConfig } from '@/service/ai/openai';
 import { TaskResponseKeyEnum } from '@/constants/chat';
 import { getChatModel } from '@/service/utils/data';
 import { countModelPrice } from '@/service/events/pushBill';
+import { ChatModelItemType } from '@/types/model';

 export type ChatProps = {
  res: NextApiResponse;
@@ -30,8 +31,6 @@ export type ChatResponse = {
  [TaskResponseKeyEnum.responseData]: ChatHistoryItemResType;
 };

-const moduleName = 'AI Chat';
-
 /* request openai chat */
 export const dispatchChatCompletion = async (props: Record<string, any>): Promise<ChatResponse> => {
  let {
@@ -54,80 +53,36 @@ export const dispatchChatCompletion = async (props: Record<string, any>): Promis
    return Promise.reject('The chat model is undefined, you need to select a chat model.');
  }

-  // FastGpt temperature range: 1~10
-  temperature = +(modelConstantsData.maxTemperature * (temperature / 10)).toFixed(2);
-
-  const limitText = (() => {
-    if (limitPrompt) return limitPrompt;
-    if (quoteQA.length > 0 && !limitPrompt) {
-      return '根据知识库内容回答问题，仅回复知识库提供的内容，不要对知识库内容做补充说明。';
-    }
-    return '';
-  })();
-
-  const quotePrompt =
-    quoteQA.length > 0
-      ? `下面是知识库内容:
-${quoteQA.map((item, i) => `${i + 1}. [${item.q}\n${item.a}]`).join('\n')}
-`
-      : '';
-
-  const messages: ChatItemType[] = [
-    ...(quotePrompt
-      ? [
-          {
-            obj: ChatRoleEnum.System,
-            value: quotePrompt
-          }
-        ]
-      : []),
-    ...(systemPrompt
-      ? [
-          {
-            obj: ChatRoleEnum.System,
-            value: systemPrompt
-          }
-        ]
-      : []),
-    ...history,
-    ...(limitText
-      ? [
-          {
-            obj: ChatRoleEnum.System,
-            value: limitText
-          }
-        ]
-      : []),
-    {
-      obj: ChatRoleEnum.Human,
-      value: userChatInput
-    }
-  ];
-  const modelTokenLimit = getChatModel(model)?.contextMaxToken || 4000;
+  const { filterQuoteQA, quotePrompt } = filterQuote({
+    quoteQA,
+    model: modelConstantsData
+  });

-  const filterMessages = ChatContextFilter({
-    model,
-    prompts: messages,
-    maxTokens: Math.ceil(modelTokenLimit - 300) // filter token. not response maxToken
+  const { messages, filterMessages } = getChatMessages({
+    model: modelConstantsData,
+    history,
+    quotePrompt,
+    userChatInput,
+    systemPrompt,
+    limitPrompt
  });
+  const { max_tokens } = getMaxTokens({
+    model: modelConstantsData,
+    maxToken,
+    filterMessages
+  });
+  // console.log(messages);

-  const adaptMessages = adaptChatItem_openAI({ messages: filterMessages, reserveId: false });
+  // FastGpt temperature range: 1~10
+  temperature = +(modelConstantsData.maxTemperature * (temperature / 10)).toFixed(2);
  const chatAPI = getOpenAIApi();
-  console.log(adaptMessages);
-
-  /* count response max token */
-  const promptsToken = modelToolMap.countTokens({
-    model,
-    messages: filterMessages
-  });
-  maxToken = maxToken + promptsToken > modelTokenLimit ? modelTokenLimit - promptsToken : maxToken;

  const response = await chatAPI.createChatCompletion(
    {
      model,
      temperature: Number(temperature || 0),
-      max_tokens: maxToken,
-      messages: adaptMessages,
+      max_tokens,
+      messages,
      // frequency_penalty: 0.5, // 越大，重复内容越少
      // presence_penalty: -0.5, // 越大，越容易出现新内容
      stream
@@ -139,30 +94,30 @@ ${quoteQA.map((item, i) => `${i + 1}. [${item.q}\n${item.a}]`).join('\n')}
    }
  );

-  const { answerText, totalTokens, finishMessages } = await (async () => {
+  const { answerText, totalTokens, completeMessages } = await (async () => {
    if (stream) {
      // sse response
      const { answer } = await streamResponse({ res, response });
      // count tokens
-      const finishMessages = filterMessages.concat({
+      const completeMessages = filterMessages.concat({
        obj: ChatRoleEnum.AI,
        value: answer
      });

      const totalTokens = countOpenAIToken({
-        messages: finishMessages
+        messages: completeMessages
      });

      return {
        answerText: answer,
        totalTokens,
-        finishMessages
+        completeMessages
      };
    } else {
      const answer = stream ? '' : response.data.choices?.[0].message?.content || '';
      const totalTokens = stream ? 0 : response.data.usage?.total_tokens || 0;

-      const finishMessages = filterMessages.concat({
+      const completeMessages = filterMessages.concat({
        obj: ChatRoleEnum.AI,
        value: answer
      });
@@ -170,7 +125,7 @@ ${quoteQA.map((item, i) => `${i + 1}. [${item.q}\n${item.a}]`).join('\n')}
      return {
        answerText: answer,
        totalTokens,
-        finishMessages
+        completeMessages
      };
    }
  })();
@@ -178,18 +133,140 @@ ${quoteQA.map((item, i) => `${i + 1}. [${item.q}\n${item.a}]`).join('\n')}
  return {
    [TaskResponseKeyEnum.answerText]: answerText,
    [TaskResponseKeyEnum.responseData]: {
-      moduleName,
+      moduleName: ChatModuleEnum.AIChat,
      price: countModelPrice({ model, tokens: totalTokens }),
      model: modelConstantsData.name,
      tokens: totalTokens,
      question: userChatInput,
      answer: answerText,
      maxToken,
-      finishMessages
+      quoteList: filterQuoteQA,
+      completeMessages
    }
  };
 };

+function filterQuote({
+  quoteQA = [],
+  model
+}: {
+  quoteQA: ChatProps['quoteQA'];
+  model: ChatModelItemType;
+}) {
+  const sliceResult = modelToolMap.tokenSlice({
+    model: model.model,
+    maxToken: model.quoteMaxToken,
+    messages: quoteQA.map((item, i) => ({
+      obj: ChatRoleEnum.System,
+      value: `${i + 1}. [${item.q}\n${item.a}]`
+    }))
+  });
+
+  // slice filterSearch
+  const filterQuoteQA = quoteQA.slice(0, sliceResult.length);
+
+  const quotePrompt =
+    filterQuoteQA.length > 0
+      ? `下面是知识库内容:
+${filterQuoteQA.map((item, i) => `${i + 1}. [${item.q}\n${item.a}]`).join('\n')}
+`
+      : '';
+
+  return {
+    filterQuoteQA,
+    quotePrompt
+  };
+}
+function getChatMessages({
+  quotePrompt,
+  history = [],
+  systemPrompt,
+  limitPrompt,
+  userChatInput,
+  model
+}: {
+  quotePrompt: string;
+  history: ChatProps['history'];
+  systemPrompt: string;
+  limitPrompt: string;
+  userChatInput: string;
+  model: ChatModelItemType;
+}) {
+  const limitText = (() => {
+    if (limitPrompt) return limitPrompt;
+    if (quotePrompt && !limitPrompt) {
+      return '根据知识库内容回答问题，仅回复知识库提供的内容，不要对知识库内容做补充说明。';
+    }
+    return '';
+  })();
+
+  const messages: ChatItemType[] = [
+    ...(quotePrompt
+      ? [
+          {
+            obj: ChatRoleEnum.System,
+            value: quotePrompt
+          }
+        ]
+      : []),
+    ...(systemPrompt
+      ? [
+          {
+            obj: ChatRoleEnum.System,
+            value: systemPrompt
+          }
+        ]
+      : []),
+    ...history,
+    ...(limitText
+      ? [
+          {
+            obj: ChatRoleEnum.System,
+            value: limitText
+          }
+        ]
+      : []),
+    {
+      obj: ChatRoleEnum.Human,
+      value: userChatInput
+    }
+  ];
+
+  const filterMessages = ChatContextFilter({
+    model: model.model,
+    prompts: messages,
+    maxTokens: Math.ceil(model.contextMaxToken - 300) // filter token. not response maxToken
+  });
+
+  const adaptMessages = adaptChatItem_openAI({ messages: filterMessages, reserveId: false });
+
+  return {
+    messages: adaptMessages,
+    filterMessages
+  };
+}
+function getMaxTokens({
+  maxToken,
+  model,
+  filterMessages = []
+}: {
+  maxToken: number;
+  model: ChatModelItemType;
+  filterMessages: ChatProps['history'];
+}) {
+  const tokensLimit = model.contextMaxToken;
+  /* count response max token */
+  const promptsToken = modelToolMap.countTokens({
+    model: model.model,
+    messages: filterMessages
+  });
+  maxToken = maxToken + promptsToken > tokensLimit ? tokensLimit - promptsToken : maxToken;
+
+  return {
+    max_tokens: maxToken
+  };
+}
+
 async function streamResponse({ res, response }: { res: NextApiResponse; response: any }) {
  let answer = '';
  let error: any = null;

--- a/client/src/service/moduleDispatch/kb/search.ts
+++ b/client/src/service/moduleDispatch/kb/search.ts
 import { PgClient } from '@/service/pg';
 import type { ChatHistoryItemResType, ChatItemType } from '@/types/chat';
-import { TaskResponseKeyEnum } from '@/constants/chat';
+import { ChatModuleEnum, TaskResponseKeyEnum } from '@/constants/chat';
 import { getVector } from '@/pages/api/openapi/plugin/vector';
 import { countModelPrice } from '@/service/events/pushBill';
 import type { SelectedKbType } from '@/types/plugin';
@@ -20,8 +20,6 @@ export type KBSearchResponse = {
  quoteQA: QuoteItemType[];
 };

-const moduleName = 'KB Search';
-
 export async function dispatchKBSearch(props: Record<string, any>): Promise<KBSearchResponse> {
  const {
    kbList = [],
@@ -65,7 +63,7 @@ export async function dispatchKBSearch(props: Record<string, any>): Promise<KBSe
    unEmpty: searchRes.length > 0 ? true : undefined,
    quoteQA: searchRes,
    responseData: {
-      moduleName,
+      moduleName: ChatModuleEnum.KBSearch,
      price: countModelPrice({ model: vectorModel.model, tokens: tokenLen }),
      model: vectorModel.name,
      tokens: tokenLen,

--- a/client/src/service/utils/chat/index.ts
+++ b/client/src/service/utils/chat/index.ts
 import { ChatItemType } from '@/types/chat';
 import { modelToolMap } from '@/utils/plugin';
-import { ChatRoleEnum, sseResponseEventEnum } from '@/constants/chat';
-import { sseResponse } from '../tools';
+import { ChatRoleEnum } from '@/constants/chat';
 import { OpenAiChatEnum } from '@/constants/model';
 import type { NextApiResponse } from 'next';

@@ -18,18 +17,6 @@ export type StreamResponseType = {
  model: `${OpenAiChatEnum}`;
  [key: string]: any;
 };
-export type StreamResponseReturnType = {
-  responseContent: string;
-  totalTokens: number;
-  finishMessages: ChatItemType[];
-};
-
-/* delete invalid symbol */
-const simplifyStr = (str = '') =>
-  str
-    .replace(/\n+/g, '\n') // 连续空行
-    .replace(/[^\S\r\n]+/g, ' ') // 连续空白内容
-    .trim();

 /* slice chat context by tokens */
 export const ChatContextFilter = ({

--- a/client/src/types/chat.d.ts
+++ b/client/src/types/chat.d.ts
@@ -56,7 +56,8 @@ export type ChatHistoryItemResType = {
  question?: string;
  temperature?: number;
  maxToken?: number;
-  finishMessages?: ChatItemType[];
+  quoteList?: QuoteItemType[];
+  completeMessages?: ChatItemType[];

  // kb search
  similarity?: number;

--- a/client/src/types/model.d.ts
+++ b/client/src/types/model.d.ts
@@ -2,7 +2,7 @@ export type ChatModelItemType = {
  model: string;
  name: string;
  contextMaxToken: number;
-  systemMaxToken: number;
+  quoteMaxToken: number;
  maxTemperature: number;
  price: number;
 };