sub plan page (#885)

* perf: insert mongo dataset data session * perf: dataset data index * remove delay * rename bill schema * rename bill record * perf: bill table * perf: prompt * perf: sub plan * change the usage count * feat: usage bill * publish usages * doc * 新增团队聊天功能 (#20) * perf: doc * feat 添加标签部分 feat 信息团队标签配置 feat 新增团队同步管理 feat team分享页面 feat 完成team分享页面 feat 实现模糊搜索 style 格式化 fix 修复迷糊匹配 style 样式修改 fix 团队标签功能修复 * fix 修复鉴权功能 * merge 合并代码 * fix 修复引用错误 * fix 修复pr问题 * fix 修复ts格式问题 --------- Co-authored-by: archer <545436317@qq.com> Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com> * update extra plan * fix: ts * format * perf: bill field * feat: standard plan * fix: ts * feat 个人账号页面修改 (#22) * feat 添加标签部分 feat 信息团队标签配置 feat 新增团队同步管理 feat team分享页面 feat 完成team分享页面 feat 实现模糊搜索 style 格式化 fix 修复迷糊匹配 style 样式修改 fix 团队标签功能修复 * fix 修复鉴权功能 * merge 合并代码 * fix 修复引用错误 * fix 修复pr问题 * fix 修复ts格式问题 * feat 修改个人账号页 --------- Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com> * fix chunk index; error page text * feat: dataset process Integral prediction * feat: stand plan field * feat: sub plan limit * perf: index * query extension * perf: share link push app name * perf: plan point unit * perf: get sub plan * perf: account page --------- Co-authored-by: yst <77910600+yu-and-liu@users.noreply.github.com> Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>
2024-02-23 17:47:34 +08:00
parent 7a87f13aa8
commit 443ad37b6a
246 changed files with 6277 additions and 4272 deletions
--- a/projects/app/src/service/moduleDispatch/agent/classifyQuestion.ts
+++ b/projects/app/src/service/moduleDispatch/agent/classifyQuestion.ts
@@ -1,9 +1,12 @@
 import { adaptChat2GptMessages } from '@fastgpt/global/core/chat/adapt';
-import { ChatContextFilter } from '@fastgpt/service/core/chat/utils';
+import { ChatContextFilter, countMessagesChars } from '@fastgpt/service/core/chat/utils';
 import type { moduleDispatchResType, ChatItemType } from '@fastgpt/global/core/chat/type.d';
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { getAIApi } from '@fastgpt/service/core/ai/config';
-import type { ClassifyQuestionAgentItemType } from '@fastgpt/global/core/module/type.d';
+import type {
+  ClassifyQuestionAgentItemType,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type.d';
 import { ModuleInputKeyEnum, ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
 import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
 import { replaceVariable } from '@fastgpt/global/common/string/tools';
@@ -11,7 +14,7 @@ import { Prompt_CQJson } from '@/global/core/prompt/agent';
 import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
 import { ModelTypeEnum, getLLMModel } from '@/service/core/ai/model';
 import { getHistories } from '../utils';
-import { formatModelPrice2Store } from '@/service/support/wallet/bill/utils';
+import { formatModelChars2Points } from '@/service/support/wallet/usage/utils';

 type Props = ModuleDispatchProps<{
  [ModuleInputKeyEnum.aiModel]: string;
@@ -20,10 +23,9 @@ type Props = ModuleDispatchProps<{
  [ModuleInputKeyEnum.userChatInput]: string;
  [ModuleInputKeyEnum.agents]: ClassifyQuestionAgentItemType[];
 }>;
-type CQResponse = {
-  [ModuleOutputKeyEnum.responseData]: moduleDispatchResType;
+type CQResponse = ModuleDispatchResponse<{
  [key: string]: any;
-};
+}>;

 const agentFunName = 'classify_question';

@@ -31,6 +33,7 @@ const agentFunName = 'classify_question';
 export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse> => {
  const {
    user,
+    module: { name },
    histories,
    params: { model, history = 6, agents, userChatInput }
  } = props as Props;
@@ -43,7 +46,7 @@ export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse

  const chatHistories = getHistories(history, histories);

-  const { arg, inputTokens, outputTokens } = await (async () => {
+  const { arg, charsLength } = await (async () => {
    if (cqModel.toolChoice) {
      return toolChoice({
        ...props,
@@ -60,25 +63,31 @@ export const dispatchClassifyQuestion = async (props: Props): Promise<CQResponse

  const result = agents.find((item) => item.key === arg?.type) || agents[agents.length - 1];

-  const { total, modelName } = formatModelPrice2Store({
+  const { totalPoints, modelName } = formatModelChars2Points({
    model: cqModel.model,
-    inputLen: inputTokens,
-    outputLen: outputTokens,
-    type: ModelTypeEnum.llm
+    charsLength,
+    modelType: ModelTypeEnum.llm
  });

  return {
    [result.key]: true,
    [ModuleOutputKeyEnum.responseData]: {
-      price: user.openaiAccount?.key ? 0 : total,
+      totalPoints: user.openaiAccount?.key ? 0 : totalPoints,
      model: modelName,
      query: userChatInput,
-      inputTokens,
-      outputTokens,
+      charsLength,
      cqList: agents,
      cqResult: result.value,
      contextTotalLen: chatHistories.length + 2
-    }
+    },
+    [ModuleOutputKeyEnum.moduleDispatchBills]: [
+      {
+        moduleName: name,
+        totalPoints,
+        model: modelName,
+        charsLength
+      }
+    ]
  };
 };

@@ -149,11 +158,13 @@ ${systemPrompt}
    const arg = JSON.parse(
      response?.choices?.[0]?.message?.tool_calls?.[0]?.function?.arguments || ''
    );
+    const functionChars =
+      agentFunction.description.length +
+      agentFunction.parameters.properties.type.description.length;

    return {
      arg,
-      inputTokens: response.usage?.prompt_tokens || 0,
-      outputTokens: response.usage?.completion_tokens || 0
+      charsLength: countMessagesChars(messages) + functionChars
    };
  } catch (error) {
    console.log(agentFunction.parameters);
@@ -163,8 +174,7 @@ ${systemPrompt}

    return {
      arg: {},
-      inputTokens: 0,
-      outputTokens: 0
+      charsLength: 0
    };
  }
 }
@@ -206,8 +216,7 @@ async function completions({
    agents.find((item) => answer.includes(item.key) || answer.includes(item.value))?.key || '';

  return {
-    inputTokens: data.usage?.prompt_tokens || 0,
-    outputTokens: data.usage?.completion_tokens || 0,
+    charsLength: countMessagesChars(messages),
    arg: { type: id }
  };
 }
--- a/projects/app/src/service/moduleDispatch/agent/extract.ts
+++ b/projects/app/src/service/moduleDispatch/agent/extract.ts
@@ -1,9 +1,12 @@
 import { adaptChat2GptMessages } from '@fastgpt/global/core/chat/adapt';
-import { ChatContextFilter } from '@fastgpt/service/core/chat/utils';
+import { ChatContextFilter, countMessagesChars } from '@fastgpt/service/core/chat/utils';
 import type { moduleDispatchResType, ChatItemType } from '@fastgpt/global/core/chat/type.d';
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { getAIApi } from '@fastgpt/service/core/ai/config';
-import type { ContextExtractAgentItemType } from '@fastgpt/global/core/module/type';
+import type {
+  ContextExtractAgentItemType,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type';
 import { ModuleInputKeyEnum, ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
 import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
 import { Prompt_ExtractJson } from '@/global/core/prompt/agent';
@@ -11,7 +14,7 @@ import { replaceVariable } from '@fastgpt/global/common/string/tools';
 import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
 import { getHistories } from '../utils';
 import { ModelTypeEnum, getLLMModel } from '@/service/core/ai/model';
-import { formatModelPrice2Store } from '@/service/support/wallet/bill/utils';
+import { formatModelChars2Points } from '@/service/support/wallet/usage/utils';

 type Props = ModuleDispatchProps<{
  [ModuleInputKeyEnum.history]?: ChatItemType[];
@@ -20,18 +23,18 @@ type Props = ModuleDispatchProps<{
  [ModuleInputKeyEnum.description]: string;
  [ModuleInputKeyEnum.aiModel]: string;
 }>;
-type Response = {
+type Response = ModuleDispatchResponse<{
  [ModuleOutputKeyEnum.success]?: boolean;
  [ModuleOutputKeyEnum.failed]?: boolean;
  [ModuleOutputKeyEnum.contextExtractFields]: string;
-  [ModuleOutputKeyEnum.responseData]: moduleDispatchResType;
-};
+}>;

 const agentFunName = 'extract_json_data';

 export async function dispatchContentExtract(props: Props): Promise<Response> {
  const {
    user,
+    module: { name },
    histories,
    params: { content, history = 6, model, description, extractKeys }
  } = props;
@@ -43,7 +46,7 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
  const extractModel = getLLMModel(model);
  const chatHistories = getHistories(history, histories);

-  const { arg, inputTokens, outputTokens } = await (async () => {
+  const { arg, charsLength } = await (async () => {
    if (extractModel.toolChoice) {
      return toolChoice({
        ...props,
@@ -80,11 +83,10 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
    }
  }

-  const { total, modelName } = formatModelPrice2Store({
+  const { totalPoints, modelName } = formatModelChars2Points({
    model: extractModel.model,
-    inputLen: inputTokens,
-    outputLen: outputTokens,
-    type: ModelTypeEnum.llm
+    charsLength,
+    modelType: ModelTypeEnum.llm
  });

  return {
@@ -93,15 +95,22 @@ export async function dispatchContentExtract(props: Props): Promise<Response> {
    [ModuleOutputKeyEnum.contextExtractFields]: JSON.stringify(arg),
    ...arg,
    [ModuleOutputKeyEnum.responseData]: {
-      price: user.openaiAccount?.key ? 0 : total,
+      totalPoints: user.openaiAccount?.key ? 0 : totalPoints,
      model: modelName,
      query: content,
-      inputTokens,
-      outputTokens,
+      charsLength,
      extractDescription: description,
      extractResult: arg,
      contextTotalLen: chatHistories.length + 2
-    }
+    },
+    [ModuleOutputKeyEnum.moduleDispatchBills]: [
+      {
+        moduleName: name,
+        totalPoints,
+        model: modelName,
+        charsLength
+      }
+    ]
  };
 }

@@ -193,10 +202,12 @@ ${description || '根据用户要求获取适当的 JSON 字符串。'}
    }
  })();

+  const functionChars =
+    description.length + extractKeys.reduce((sum, item) => sum + item.desc.length, 0);
+
  return {
    rawResponse: response?.choices?.[0]?.message?.tool_calls?.[0]?.function?.arguments || '',
-    inputTokens: response.usage?.prompt_tokens || 0,
-    outputTokens: response.usage?.completion_tokens || 0,
+    charsLength: countMessagesChars(messages) + functionChars,
    arg
  };
 }
@@ -238,8 +249,6 @@ Human: ${content}`
    stream: false
  });
  const answer = data.choices?.[0].message?.content || '';
-  const inputTokens = data.usage?.prompt_tokens || 0;
-  const outputTokens = data.usage?.completion_tokens || 0;

  // parse response
  const start = answer.indexOf('{');
@@ -248,8 +257,7 @@ Human: ${content}`
  if (start === -1 || end === -1)
    return {
      rawResponse: answer,
-      inputTokens,
-      outputTokens,
+      charsLength: countMessagesChars(messages),
      arg: {}
    };

@@ -261,15 +269,14 @@ Human: ${content}`
  try {
    return {
      rawResponse: answer,
-      inputTokens,
-      outputTokens,
+      charsLength: countMessagesChars(messages),
+
      arg: JSON.parse(jsonStr) as Record<string, any>
    };
  } catch (error) {
    return {
      rawResponse: answer,
-      inputTokens,
-      outputTokens,
+      charsLength: countMessagesChars(messages),
      arg: {}
    };
  }
--- a/projects/app/src/service/moduleDispatch/chat/oneapi.ts
+++ b/projects/app/src/service/moduleDispatch/chat/oneapi.ts
@@ -1,16 +1,16 @@
 import type { NextApiResponse } from 'next';
-import { ChatContextFilter } from '@fastgpt/service/core/chat/utils';
+import { ChatContextFilter, countMessagesChars } from '@fastgpt/service/core/chat/utils';
 import type { moduleDispatchResType, ChatItemType } from '@fastgpt/global/core/chat/type.d';
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { sseResponseEventEnum } from '@fastgpt/service/common/response/constant';
 import { textAdaptGptResponse } from '@/utils/adapt';
 import { getAIApi } from '@fastgpt/service/core/ai/config';
 import type { ChatCompletion, StreamChatType } from '@fastgpt/global/core/ai/type.d';
-import { formatModelPrice2Store } from '@/service/support/wallet/bill/utils';
+import { formatModelChars2Points } from '@/service/support/wallet/usage/utils';
 import type { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
 import { postTextCensor } from '@/service/common/censor';
 import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constant';
-import type { ModuleItemType } from '@fastgpt/global/core/module/type.d';
+import type { ModuleDispatchResponse, ModuleItemType } from '@fastgpt/global/core/module/type.d';
 import { countMessagesTokens, sliceMessagesTB } from '@fastgpt/global/common/string/tiktoken';
 import { adaptChat2GptMessages } from '@fastgpt/global/core/chat/adapt';
 import { Prompt_QuotePromptList, Prompt_QuoteTemplateList } from '@/global/core/prompt/AIChat';
@@ -32,11 +32,10 @@ export type ChatProps = ModuleDispatchProps<
    [ModuleInputKeyEnum.aiChatDatasetQuote]?: SearchDataResponseItemType[];
  }
 >;
-export type ChatResponse = {
+export type ChatResponse = ModuleDispatchResponse<{
  [ModuleOutputKeyEnum.answerText]: string;
-  [ModuleOutputKeyEnum.responseData]: moduleDispatchResType;
  [ModuleOutputKeyEnum.history]: ChatItemType[];
-};
+}>;

 /* request openai chat */
 export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResponse> => {
@@ -46,7 +45,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
    detail = false,
    user,
    histories,
-    outputs,
+    module: { name, outputs },
    params: {
      model,
      temperature = 0,
@@ -154,7 +153,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
    }
  );

-  const { answerText, inputTokens, outputTokens, completeMessages } = await (async () => {
+  const { answerText, completeMessages } = await (async () => {
    if (stream) {
      // sse response
      const { answer } = await streamResponse({
@@ -172,17 +171,6 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp

      return {
        answerText: answer,
-        inputTokens: countMessagesTokens({
-          messages: filterMessages
-        }),
-        outputTokens: countMessagesTokens({
-          messages: [
-            {
-              obj: ChatRoleEnum.AI,
-              value: answer
-            }
-          ]
-        }),
        completeMessages
      };
    } else {
@@ -196,33 +184,38 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp

      return {
        answerText: answer,
-        inputTokens: unStreamResponse.usage?.prompt_tokens || 0,
-        outputTokens: unStreamResponse.usage?.completion_tokens || 0,
        completeMessages
      };
    }
  })();

-  const { total, modelName } = formatModelPrice2Store({
+  const charsLength = countMessagesChars(completeMessages);
+  const { totalPoints, modelName } = formatModelChars2Points({
    model,
-    inputLen: inputTokens,
-    outputLen: outputTokens,
-    type: ModelTypeEnum.llm
+    charsLength,
+    modelType: ModelTypeEnum.llm
  });

  return {
    answerText,
-    responseData: {
-      price: user.openaiAccount?.key ? 0 : total,
+    [ModuleOutputKeyEnum.responseData]: {
+      totalPoints: user.openaiAccount?.key ? 0 : totalPoints,
      model: modelName,
-      inputTokens,
-      outputTokens,
+      charsLength,
      query: `${userChatInput}`,
      maxToken: max_tokens,
      quoteList: filterQuoteQA,
      historyPreview: getHistoryPreview(completeMessages),
      contextTotalLen: completeMessages.length
    },
+    [ModuleOutputKeyEnum.moduleDispatchBills]: [
+      {
+        moduleName: name,
+        totalPoints,
+        model: modelName,
+        charsLength
+      }
+    ],
    history: completeMessages
  };
 };
@@ -249,30 +242,13 @@ function filterQuote({
  // slice filterSearch
  const filterQuoteQA = filterSearchResultsByMaxChars(quoteQA, model.quoteMaxToken);

-  // filterQuoteQA按collectionId聚合在一起后，再按chunkIndex从小到大排序
-  const sortQuoteQAMap: Record<string, SearchDataResponseItemType[]> = {};
-  filterQuoteQA.forEach((item) => {
-    if (sortQuoteQAMap[item.collectionId]) {
-      sortQuoteQAMap[item.collectionId].push(item);
-    } else {
-      sortQuoteQAMap[item.collectionId] = [item];
-    }
-  });
-  const sortQuoteQAList = Object.values(sortQuoteQAMap);
-
-  sortQuoteQAList.forEach((qaList) => {
-    qaList.sort((a, b) => a.chunkIndex - b.chunkIndex);
-  });
-
-  const flatQuoteList = sortQuoteQAList.flat();
-
  const quoteText =
-    flatQuoteList.length > 0
-      ? `${flatQuoteList.map((item, index) => getValue(item, index)).join('\n')}`
+    filterQuoteQA.length > 0
+      ? `${filterQuoteQA.map((item, index) => getValue(item, index).trim()).join('\n------\n')}`
      : '';

  return {
-    filterQuoteQA: flatQuoteList,
+    filterQuoteQA: filterQuoteQA,
    quoteText
  };
 }
--- a/projects/app/src/service/moduleDispatch/dataset/search.ts
+++ b/projects/app/src/service/moduleDispatch/dataset/search.ts
@@ -1,15 +1,19 @@
 import type { moduleDispatchResType } from '@fastgpt/global/core/chat/type.d';
-import { formatModelPrice2Store } from '@/service/support/wallet/bill/utils';
+import { formatModelChars2Points } from '@/service/support/wallet/usage/utils';
 import type { SelectedDatasetType } from '@fastgpt/global/core/module/api.d';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
+import type {
+  ModuleDispatchProps,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type.d';
 import { ModelTypeEnum, getLLMModel, getVectorModel } from '@/service/core/ai/model';
 import { searchDatasetData } from '@/service/core/dataset/data/controller';
 import { ModuleInputKeyEnum, ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
 import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
-import { queryExtension } from '@fastgpt/service/core/ai/functions/queryExtension';
 import { getHistories } from '../utils';
 import { datasetSearchQueryExtension } from '@fastgpt/service/core/dataset/search/utils';
+import { ChatModuleBillType } from '@fastgpt/global/support/wallet/bill/type';
+import { checkTeamReRankPermission } from '@/service/support/permission/teamLimit';

 type DatasetSearchProps = ModuleDispatchProps<{
  [ModuleInputKeyEnum.datasetSelectList]: SelectedDatasetType;
@@ -22,12 +26,11 @@ type DatasetSearchProps = ModuleDispatchProps<{
  [ModuleInputKeyEnum.datasetSearchExtensionModel]: string;
  [ModuleInputKeyEnum.datasetSearchExtensionBg]: string;
 }>;
-export type DatasetSearchResponse = {
-  [ModuleOutputKeyEnum.responseData]: moduleDispatchResType;
+export type DatasetSearchResponse = ModuleDispatchResponse<{
  [ModuleOutputKeyEnum.datasetIsEmpty]?: boolean;
  [ModuleOutputKeyEnum.datasetUnEmpty]?: boolean;
  [ModuleOutputKeyEnum.datasetQuoteQA]: SearchDataResponseItemType[];
-};
+}>;

 export async function dispatchDatasetSearch(
  props: DatasetSearchProps
@@ -35,6 +38,7 @@ export async function dispatchDatasetSearch(
  const {
    teamId,
    histories,
+    module,
    params: {
      datasets = [],
      similarity,
@@ -73,6 +77,8 @@ export async function dispatchDatasetSearch(
    histories: getHistories(6, histories)
  });

+  // console.log(concatQueries, rewriteQuery, aiExtensionResult);
+
  // get vector
  const vectorModel = getVectorModel(datasets[0]?.vectorModel?.model);

@@ -91,18 +97,18 @@ export async function dispatchDatasetSearch(
    limit,
    datasetIds: datasets.map((item) => item.datasetId),
    searchMode,
-    usingReRank
+    usingReRank: usingReRank && (await checkTeamReRankPermission(teamId))
  });

  // count bill results
  // vector
-  const { total, modelName } = formatModelPrice2Store({
+  const { totalPoints, modelName } = formatModelChars2Points({
    model: vectorModel.model,
-    inputLen: charsLength,
-    type: ModelTypeEnum.vector
+    charsLength,
+    modelType: ModelTypeEnum.vector
  });
-  const responseData: moduleDispatchResType & { price: number } = {
-    price: total,
+  const responseData: moduleDispatchResType & { totalPoints: number } = {
+    totalPoints,
    query: concatQueries.join('\n'),
    model: modelName,
    charsLength,
@@ -111,28 +117,42 @@ export async function dispatchDatasetSearch(
    searchMode,
    searchUsingReRank: searchUsingReRank
  };
+  const moduleDispatchBills: ChatModuleBillType[] = [
+    {
+      totalPoints,
+      moduleName: module.name,
+      model: modelName,
+      charsLength
+    }
+  ];

  if (aiExtensionResult) {
-    const { total, modelName } = formatModelPrice2Store({
+    const { totalPoints, modelName } = formatModelChars2Points({
      model: aiExtensionResult.model,
-      inputLen: aiExtensionResult.inputTokens,
-      outputLen: aiExtensionResult.outputTokens,
-      type: ModelTypeEnum.llm
+      charsLength: aiExtensionResult.charsLength,
+      modelType: ModelTypeEnum.llm
    });

-    responseData.price += total;
-    responseData.inputTokens = aiExtensionResult.inputTokens;
-    responseData.outputTokens = aiExtensionResult.outputTokens;
+    responseData.totalPoints += totalPoints;
+    responseData.charsLength = aiExtensionResult.charsLength;
    responseData.extensionModel = modelName;
    responseData.extensionResult =
      aiExtensionResult.extensionQueries?.join('\n') ||
      JSON.stringify(aiExtensionResult.extensionQueries);
+
+    moduleDispatchBills.push({
+      totalPoints,
+      moduleName: 'core.module.template.Query extension',
+      model: modelName,
+      charsLength: aiExtensionResult.charsLength
+    });
  }

  return {
    isEmpty: searchRes.length === 0 ? true : undefined,
    unEmpty: searchRes.length > 0 ? true : undefined,
    quoteQA: searchRes,
-    responseData
+    responseData,
+    moduleDispatchBills
  };
 }
--- a/projects/app/src/service/moduleDispatch/index.ts
+++ b/projects/app/src/service/moduleDispatch/index.ts
@@ -23,11 +23,12 @@ import { dispatchContentExtract } from './agent/extract';
 import { dispatchHttpRequest } from './tools/http';
 import { dispatchHttp468Request } from './tools/http468';
 import { dispatchAppRequest } from './tools/runApp';
-import { dispatchCFR } from './tools/cfr';
+import { dispatchQueryExtension } from './tools/queryExternsion';
 import { dispatchRunPlugin } from './plugin/run';
 import { dispatchPluginInput } from './plugin/runInput';
 import { dispatchPluginOutput } from './plugin/runOutput';
 import { valueTypeFormat } from './utils';
+import { ChatModuleBillType } from '@fastgpt/global/support/wallet/bill/type';

 const callbackMap: Record<`${FlowNodeTypeEnum}`, Function> = {
  [FlowNodeTypeEnum.historyNode]: dispatchHistory,
@@ -44,7 +45,7 @@ const callbackMap: Record<`${FlowNodeTypeEnum}`, Function> = {
  [FlowNodeTypeEnum.pluginModule]: dispatchRunPlugin,
  [FlowNodeTypeEnum.pluginInput]: dispatchPluginInput,
  [FlowNodeTypeEnum.pluginOutput]: dispatchPluginOutput,
-  [FlowNodeTypeEnum.cfr]: dispatchCFR,
+  [FlowNodeTypeEnum.queryExtension]: dispatchQueryExtension,

  // none
  [FlowNodeTypeEnum.userGuide]: () => Promise.resolve()
@@ -82,16 +83,19 @@ export async function dispatchModules({
  // let storeData: Record<string, any> = {}; // after module used
  let chatResponse: ChatHistoryItemResType[] = []; // response request and save to database
  let chatAnswerText = ''; // AI answer
+  let chatModuleBills: ChatModuleBillType[] = [];
  let runningTime = Date.now();

  function pushStore(
    { inputs = [] }: RunningModuleItemType,
    {
      answerText = '',
-      responseData
+      responseData,
+      moduleDispatchBills
    }: {
      answerText?: string;
      responseData?: ChatHistoryItemResType | ChatHistoryItemResType[];
+      moduleDispatchBills?: ChatModuleBillType[];
    }
  ) {
    const time = Date.now();
@@ -105,6 +109,9 @@ export async function dispatchModules({
        });
      }
    }
+    if (moduleDispatchBills) {
+      chatModuleBills = chatModuleBills.concat(moduleDispatchBills);
+    }
    runningTime = time;

    const isResponseAnswerText =
@@ -158,6 +165,7 @@ export async function dispatchModules({
    const filterModules = nextRunModules.filter((module) => {
      if (set.has(module.moduleId)) return false;
      set.add(module.moduleId);
+      ``;
      return true;
    });

@@ -199,8 +207,7 @@ export async function dispatchModules({
      user,
      stream,
      detail,
-      outputs: module.outputs,
-      inputs: module.inputs,
+      module,
      params
    };

@@ -237,10 +244,11 @@ export async function dispatchModules({
        ? params[ModuleOutputKeyEnum.userChatInput]
        : undefined,
      ...dispatchRes,
-      [ModuleOutputKeyEnum.responseData]: formatResponseData
+      [ModuleOutputKeyEnum.responseData]: formatResponseData,
+      [ModuleOutputKeyEnum.moduleDispatchBills]:
+        dispatchRes[ModuleOutputKeyEnum.moduleDispatchBills]
    });
  }
-
  // start process width initInput
  const initModules = runningModules.filter((item) => initRunningModuleType[item.flowType]);

@@ -266,7 +274,8 @@ export async function dispatchModules({

  return {
    [ModuleOutputKeyEnum.answerText]: chatAnswerText,
-    [ModuleOutputKeyEnum.responseData]: chatResponse
+    [ModuleOutputKeyEnum.responseData]: chatResponse,
+    [ModuleOutputKeyEnum.moduleDispatchBills]: chatModuleBills
  };
 }

--- a/projects/app/src/service/moduleDispatch/plugin/run.ts
+++ b/projects/app/src/service/moduleDispatch/plugin/run.ts
@@ -1,4 +1,7 @@
-import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
+import type {
+  ModuleDispatchProps,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type.d';
 import { dispatchModules } from '../index';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import {
@@ -14,10 +17,9 @@ type RunPluginProps = ModuleDispatchProps<{
  [ModuleInputKeyEnum.pluginId]: string;
  [key: string]: any;
 }>;
-type RunPluginResponse = {
+type RunPluginResponse = ModuleDispatchResponse<{
  [ModuleOutputKeyEnum.answerText]: string;
-  [ModuleOutputKeyEnum.responseData]?: moduleDispatchResType;
-};
+}>;

 export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPluginResponse> => {
  const {
@@ -58,7 +60,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
    return params;
  })();

-  const { responseData, answerText } = await dispatchModules({
+  const { responseData, moduleDispatchBills, answerText } = await dispatchModules({
    ...props,
    modules: plugin.modules.map((module) => ({
      ...module,
@@ -76,9 +78,9 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
  return {
    answerText,
    // responseData, // debug
-    responseData: {
+    [ModuleOutputKeyEnum.responseData]: {
      moduleLogo: plugin.avatar,
-      price: responseData.reduce((sum, item) => sum + (item.price || 0), 0),
+      totalPoints: responseData.reduce((sum, item) => sum + (item.totalPoints || 0), 0),
      runningTime: responseData.reduce((sum, item) => sum + (item.runningTime || 0), 0),
      pluginOutput: output?.pluginOutput,
      pluginDetail:
@@ -89,6 +91,14 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
            })
          : undefined
    },
+    [ModuleOutputKeyEnum.moduleDispatchBills]: [
+      {
+        moduleName: plugin.name,
+        totalPoints: moduleDispatchBills.reduce((sum, item) => sum + (item.totalPoints || 0), 0),
+        model: plugin.name,
+        charsLength: 0
+      }
+    ],
    ...(output ? output.pluginOutput : {})
  };
 };
--- a/projects/app/src/service/moduleDispatch/plugin/runOutput.ts
+++ b/projects/app/src/service/moduleDispatch/plugin/runOutput.ts
@@ -14,7 +14,7 @@ export const dispatchPluginOutput = (props: PluginOutputProps): PluginOutputResp

  return {
    responseData: {
-      price: 0,
+      totalPoints: 0,
      pluginOutput: params
    }
  };
--- a/projects/app/src/service/moduleDispatch/tools/cfr.ts
+++ b/projects/app/src/service/moduleDispatch/tools/cfr.ts
@@ -1,64 +0,0 @@
-import type { ChatItemType, moduleDispatchResType } from '@fastgpt/global/core/chat/type.d';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
-import { ModuleInputKeyEnum, ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
-import { ModelTypeEnum, getLLMModel } from '@/service/core/ai/model';
-import { formatModelPrice2Store } from '@/service/support/wallet/bill/utils';
-import { queryCfr } from '@fastgpt/service/core/ai/functions/cfr';
-import { getHistories } from '../utils';
-
-type Props = ModuleDispatchProps<{
-  [ModuleInputKeyEnum.aiModel]: string;
-  [ModuleInputKeyEnum.aiSystemPrompt]?: string;
-  [ModuleInputKeyEnum.history]?: ChatItemType[] | number;
-  [ModuleInputKeyEnum.userChatInput]: string;
-}>;
-type Response = {
-  [ModuleOutputKeyEnum.text]: string;
-  [ModuleOutputKeyEnum.responseData]?: moduleDispatchResType;
-};
-
-export const dispatchCFR = async ({
-  histories,
-  params: { model, systemPrompt, history, userChatInput }
-}: Props): Promise<Response> => {
-  if (!userChatInput) {
-    return Promise.reject('Question is empty');
-  }
-
-  // none
-  // first chat and no system prompt
-  if (systemPrompt === 'none' || (histories.length === 0 && !systemPrompt)) {
-    return {
-      [ModuleOutputKeyEnum.text]: userChatInput
-    };
-  }
-
-  const cfrModel = getLLMModel(model);
-  const chatHistories = getHistories(history, histories);
-
-  const { cfrQuery, inputTokens, outputTokens } = await queryCfr({
-    chatBg: systemPrompt,
-    query: userChatInput,
-    histories: chatHistories,
-    model: cfrModel.model
-  });
-
-  const { total, modelName } = formatModelPrice2Store({
-    model: cfrModel.model,
-    inputLen: inputTokens,
-    outputLen: outputTokens,
-    type: ModelTypeEnum.llm
-  });
-
-  return {
-    [ModuleOutputKeyEnum.responseData]: {
-      price: total,
-      model: modelName,
-      inputTokens,
-      outputTokens,
-      query: userChatInput,
-      textOutput: cfrQuery
-    },
-    [ModuleOutputKeyEnum.text]: cfrQuery
-  };
-};
--- a/projects/app/src/service/moduleDispatch/tools/http.ts
+++ b/projects/app/src/service/moduleDispatch/tools/http.ts
@@ -1,5 +1,8 @@
 import type { moduleDispatchResType } from '@fastgpt/global/core/chat/type.d';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
+import type {
+  ModuleDispatchProps,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type.d';
 import {
  DYNAMIC_INPUT_KEY,
  ModuleInputKeyEnum,
@@ -16,11 +19,10 @@ type HttpRequestProps = ModuleDispatchProps<{
  [ModuleInputKeyEnum.httpHeaders]: string;
  [key: string]: any;
 }>;
-type HttpResponse = {
+type HttpResponse = ModuleDispatchResponse<{
  [ModuleOutputKeyEnum.failed]?: boolean;
-  [ModuleOutputKeyEnum.responseData]: moduleDispatchResType;
  [key: string]: any;
-};
+}>;

 const flatDynamicParams = (params: Record<string, any>) => {
  const dynamicParams = params[DYNAMIC_INPUT_KEY];
@@ -38,7 +40,7 @@ export const dispatchHttpRequest = async (props: HttpRequestProps): Promise<Http
    chatId,
    responseChatItemId,
    variables,
-    outputs,
+    module: { outputs },
    params: {
      system_httpMethod: httpMethod = 'POST',
      system_httpReqUrl: httpReqUrl,
@@ -97,8 +99,8 @@ export const dispatchHttpRequest = async (props: HttpRequestProps): Promise<Http
    }

    return {
-      responseData: {
-        price: 0,
+      [ModuleOutputKeyEnum.responseData]: {
+        totalPoints: 0,
        body: formatBody,
        httpResult: response
      },
@@ -109,8 +111,8 @@ export const dispatchHttpRequest = async (props: HttpRequestProps): Promise<Http

    return {
      [ModuleOutputKeyEnum.failed]: true,
-      responseData: {
-        price: 0,
+      [ModuleOutputKeyEnum.responseData]: {
+        totalPoints: 0,
        body: formatBody,
        httpResult: { error }
      }
--- a/projects/app/src/service/moduleDispatch/tools/http468.ts
+++ b/projects/app/src/service/moduleDispatch/tools/http468.ts
@@ -1,5 +1,7 @@
-import type { moduleDispatchResType } from '@fastgpt/global/core/chat/type.d';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
+import type {
+  ModuleDispatchProps,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type.d';
 import {
  DYNAMIC_INPUT_KEY,
  ModuleInputKeyEnum,
@@ -24,11 +26,10 @@ type HttpRequestProps = ModuleDispatchProps<{
  [DYNAMIC_INPUT_KEY]: Record<string, any>;
  [key: string]: any;
 }>;
-type HttpResponse = {
+type HttpResponse = ModuleDispatchResponse<{
  [ModuleOutputKeyEnum.failed]?: boolean;
-  [ModuleOutputKeyEnum.responseData]: moduleDispatchResType;
  [key: string]: any;
-};
+}>;

 const UNDEFINED_SIGN = 'UNDEFINED_SIGN';

@@ -38,7 +39,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
    chatId,
    responseChatItemId,
    variables,
-    outputs,
+    module: { outputs },
    histories,
    params: {
      system_httpMethod: httpMethod = 'POST',
@@ -119,8 +120,8 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
    }

    return {
-      responseData: {
-        price: 0,
+      [ModuleOutputKeyEnum.responseData]: {
+        totalPoints: 0,
        params: Object.keys(params).length > 0 ? params : undefined,
        body: Object.keys(requestBody).length > 0 ? requestBody : undefined,
        headers: Object.keys(headers).length > 0 ? headers : undefined,
@@ -131,8 +132,8 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
  } catch (error) {
    return {
      [ModuleOutputKeyEnum.failed]: true,
-      responseData: {
-        price: 0,
+      [ModuleOutputKeyEnum.responseData]: {
+        totalPoints: 0,
        params: Object.keys(params).length > 0 ? params : undefined,
        body: Object.keys(requestBody).length > 0 ? requestBody : undefined,
        headers: Object.keys(headers).length > 0 ? headers : undefined,
--- a/projects/app/src/service/moduleDispatch/tools/queryExternsion.ts
+++ b/projects/app/src/service/moduleDispatch/tools/queryExternsion.ts
@@ -0,0 +1,77 @@
+import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
+import type {
+  ModuleDispatchProps,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type.d';
+import { ModuleInputKeyEnum, ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
+import { ModelTypeEnum, getLLMModel } from '@/service/core/ai/model';
+import { formatModelChars2Points } from '@/service/support/wallet/usage/utils';
+import { queryExtension } from '@fastgpt/service/core/ai/functions/queryExtension';
+import { getHistories } from '../utils';
+import { hashStr } from '@fastgpt/global/common/string/tools';
+
+type Props = ModuleDispatchProps<{
+  [ModuleInputKeyEnum.aiModel]: string;
+  [ModuleInputKeyEnum.aiSystemPrompt]?: string;
+  [ModuleInputKeyEnum.history]?: ChatItemType[] | number;
+  [ModuleInputKeyEnum.userChatInput]: string;
+}>;
+type Response = ModuleDispatchResponse<{
+  [ModuleOutputKeyEnum.text]: string;
+}>;
+
+export const dispatchQueryExtension = async ({
+  histories,
+  module,
+  params: { model, systemPrompt, history, userChatInput }
+}: Props): Promise<Response> => {
+  if (!userChatInput) {
+    return Promise.reject('Question is empty');
+  }
+
+  const queryExtensionModel = getLLMModel(model);
+  const chatHistories = getHistories(history, histories);
+
+  const { extensionQueries, charsLength } = await queryExtension({
+    chatBg: systemPrompt,
+    query: userChatInput,
+    histories: chatHistories,
+    model: queryExtensionModel.model
+  });
+
+  extensionQueries.unshift(userChatInput);
+
+  const { totalPoints, modelName } = formatModelChars2Points({
+    model: queryExtensionModel.model,
+    charsLength,
+    modelType: ModelTypeEnum.llm
+  });
+
+  const set = new Set<string>();
+  const filterSameQueries = extensionQueries.filter((item) => {
+    // 删除所有的标点符号与空格等，只对文本进行比较
+    const str = hashStr(item.replace(/[^\p{L}\p{N}]/gu, ''));
+    if (set.has(str)) return false;
+    set.add(str);
+    return true;
+  });
+
+  return {
+    [ModuleOutputKeyEnum.responseData]: {
+      totalPoints,
+      model: modelName,
+      charsLength,
+      query: userChatInput,
+      textOutput: JSON.stringify(filterSameQueries)
+    },
+    [ModuleOutputKeyEnum.moduleDispatchBills]: [
+      {
+        moduleName: module.name,
+        totalPoints,
+        model: modelName,
+        charsLength
+      }
+    ],
+    [ModuleOutputKeyEnum.text]: JSON.stringify(filterSameQueries)
+  };
+};
--- a/projects/app/src/service/moduleDispatch/tools/runApp.ts
+++ b/projects/app/src/service/moduleDispatch/tools/runApp.ts
@@ -1,5 +1,8 @@
 import type { moduleDispatchResType, ChatItemType } from '@fastgpt/global/core/chat/type.d';
-import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
+import type {
+  ModuleDispatchProps,
+  ModuleDispatchResponse
+} from '@fastgpt/global/core/module/type.d';
 import { SelectAppItemType } from '@fastgpt/global/core/module/type';
 import { dispatchModules } from '../index';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
@@ -15,11 +18,10 @@ type Props = ModuleDispatchProps<{
  [ModuleInputKeyEnum.history]?: ChatItemType[] | number;
  app: SelectAppItemType;
 }>;
-type Response = {
-  [ModuleOutputKeyEnum.responseData]: moduleDispatchResType[];
+type Response = ModuleDispatchResponse<{
  [ModuleOutputKeyEnum.answerText]: string;
  [ModuleOutputKeyEnum.history]: ChatItemType[];
-};
+}>;

 export const dispatchAppRequest = async (props: Props): Promise<Response> => {
  const {
@@ -30,6 +32,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
    histories,
    params: { userChatInput, history, app }
  } = props;
+  let start = Date.now();

  if (!userChatInput) {
    return Promise.reject('Input is empty');
@@ -56,7 +59,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {

  const chatHistories = getHistories(history, histories);

-  const { responseData, answerText } = await dispatchModules({
+  const { responseData, moduleDispatchBills, answerText } = await dispatchModules({
    ...props,
    appId: app.id,
    modules: appData.modules,
@@ -78,7 +81,20 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
  ]);

  return {
-    responseData,
+    [ModuleOutputKeyEnum.responseData]: {
+      moduleLogo: appData.avatar,
+      query: userChatInput,
+      textOutput: answerText,
+      totalPoints: responseData.reduce((sum, item) => sum + (item.totalPoints || 0), 0)
+    },
+    [ModuleOutputKeyEnum.moduleDispatchBills]: [
+      {
+        moduleName: appData.name,
+        totalPoints: responseData.reduce((sum, item) => sum + (item.totalPoints || 0), 0),
+        charsLength: 0,
+        model: appData.name
+      }
+    ],
    answerText: answerText,
    history: completeMessages
  };