V4.8.17 feature (#3493)

* split tokens into input and output (#3477)

* split tokens into input and output

* query extension & tool call & question guide

* fix

* perf: input and output tokens

* perf: tool call if else

* perf: remove code

* fix: extract usage count

* fix: qa usage count

---------

Co-authored-by: heheer <heheer@sealos.io>

projects/app/src/service/events/generateQA.ts

@@ -12,7 +12,10 @@ import { getLLMModel } from '@fastgpt/service/core/ai/model';
 import { checkTeamAiPointsAndLock } from './utils';
 import { checkInvalidChunkAndLock } from '@fastgpt/service/core/dataset/training/utils';
 import { addMinutes } from 'date-fns';
-import { countGptMessagesTokens } from '@fastgpt/service/common/string/tiktoken/index';
+import {
+  countGptMessagesTokens,
+  countPromptTokens
+} from '@fastgpt/service/common/string/tiktoken/index';
 import { pushDataListToTrainingQueueByCollectionId } from '@fastgpt/service/core/dataset/training/controller';
 import { loadRequestMessages } from '@fastgpt/service/core/chat/utils';
 import { llmCompletionsBodyFormat } from '@fastgpt/service/core/ai/utils';
@@ -153,7 +156,8 @@ ${replaceVariable(Prompt_AgentQA.fixedText, { text })}`;
       pushQAUsage({
         teamId: data.teamId,
         tmbId: data.tmbId,
-        tokens: await countGptMessagesTokens(messages),
+        inputTokens: await countGptMessagesTokens(messages),
+        outputTokens: await countPromptTokens(answer),
         billId: data.billId,
         model: modelData.model
       });

projects/app/src/service/events/generateVector.ts

@@ -111,7 +111,7 @@ export async function generateVector(): Promise<any> {
     pushGenerateVectorUsage({
       teamId: data.teamId,
       tmbId: data.tmbId,
-      tokens,
+      inputTokens: tokens,
       model: data.model,
       billId: data.billId
     });

projects/app/src/service/support/wallet/usage/push.ts

@@ -37,7 +37,8 @@ export const pushChatUsage = ({
       moduleName: item.moduleName,
       amount: item.totalPoints || 0,
       model: item.model,
-      tokens: item.tokens
+      inputTokens: item.inputTokens,
+      outputTokens: item.outputTokens
     }))
   });
   addLog.info(`finish completions`, {
@@ -52,20 +53,23 @@ export const pushQAUsage = async ({
   teamId,
   tmbId,
   model,
-  tokens,
+  inputTokens,
+  outputTokens,
   billId
 }: {
   teamId: string;
   tmbId: string;
   model: string;
-  tokens: number;
+  inputTokens: number;
+  outputTokens: number;
   billId: string;
 }) => {
   // 计算价格
   const { totalPoints } = formatModelChars2Points({
     model,
     modelType: ModelTypeEnum.llm,
-    tokens
+    inputTokens,
+    outputTokens
   });
 
   concatUsage({
@@ -73,7 +77,8 @@ export const pushQAUsage = async ({
     teamId,
     tmbId,
     totalPoints,
-    tokens,
+    inputTokens,
+    outputTokens,
     listIndex: 1
   });
 
@@ -84,30 +89,32 @@ export const pushGenerateVectorUsage = ({
   billId,
   teamId,
   tmbId,
-  tokens,
+  inputTokens,
   model,
   source = UsageSourceEnum.fastgpt,
   extensionModel,
-  extensionTokens
+  extensionInputTokens,
+  extensionOutputTokens
 }: {
   billId?: string;
   teamId: string;
   tmbId: string;
-  tokens: number;
+  inputTokens: number;
   model: string;
   source?: UsageSourceEnum;
 
   extensionModel?: string;
-  extensionTokens?: number;
+  extensionInputTokens?: number;
+  extensionOutputTokens?: number;
 }) => {
   const { totalPoints: totalVector, modelName: vectorModelName } = formatModelChars2Points({
     modelType: ModelTypeEnum.vector,
     model,
-    tokens
+    inputTokens
   });
 
   const { extensionTotalPoints, extensionModelName } = (() => {
-    if (!extensionModel || !extensionTokens)
+    if (!extensionModel || !extensionInputTokens)
       return {
         extensionTotalPoints: 0,
         extensionModelName: ''
@@ -115,7 +122,8 @@ export const pushGenerateVectorUsage = ({
     const { totalPoints, modelName } = formatModelChars2Points({
       modelType: ModelTypeEnum.llm,
       model: extensionModel,
-      tokens: extensionTokens
+      inputTokens: extensionInputTokens,
+      outputTokens: extensionOutputTokens
     });
     return {
       extensionTotalPoints: totalPoints,
@@ -132,7 +140,7 @@ export const pushGenerateVectorUsage = ({
       tmbId,
       totalPoints,
       billId,
-      tokens,
+      inputTokens,
       listIndex: 0
     });
   } else {
@@ -147,7 +155,7 @@ export const pushGenerateVectorUsage = ({
           moduleName: 'support.wallet.moduleName.index',
           amount: totalVector,
           model: vectorModelName,
-          tokens
+          inputTokens
         },
         ...(extensionModel !== undefined
           ? [
@@ -155,7 +163,8 @@ export const pushGenerateVectorUsage = ({
                 moduleName: 'core.module.template.Query extension',
                 amount: extensionTotalPoints,
                 model: extensionModelName,
-                tokens: extensionTokens
+                inputTokens: extensionInputTokens,
+                outputTokens: extensionOutputTokens
               }
             ]
           : [])
@@ -166,17 +175,20 @@ export const pushGenerateVectorUsage = ({
 };
 
 export const pushQuestionGuideUsage = ({
-  tokens,
+  inputTokens,
+  outputTokens,
   teamId,
   tmbId
 }: {
-  tokens: number;
+  inputTokens: number;
+  outputTokens: number;
   teamId: string;
   tmbId: string;
 }) => {
   const qgModel = global.llmModels[0];
   const { totalPoints, modelName } = formatModelChars2Points({
-    tokens,
+    inputTokens,
+    outputTokens,
     model: qgModel.model,
     modelType: ModelTypeEnum.llm
   });
@@ -192,7 +204,8 @@ export const pushQuestionGuideUsage = ({
         moduleName: 'core.app.Question Guide',
         amount: totalPoints,
         model: modelName,
-        tokens
+        inputTokens,
+        outputTokens
       }
     ]
   });
@@ -215,7 +228,7 @@ export function pushAudioSpeechUsage({
 }) {
   const { totalPoints, modelName } = formatModelChars2Points({
     model,
-    tokens: charsLength,
+    inputTokens: charsLength,
     modelType: ModelTypeEnum.audioSpeech
   });
 
@@ -251,7 +264,7 @@ export function pushWhisperUsage({
 
   const { totalPoints, modelName } = formatModelChars2Points({
     model: whisperModel.model,
-    tokens: duration,
+    inputTokens: duration,
     modelType: ModelTypeEnum.whisper,
     multiple: 60
   });