V4.6.6-2 (#673)

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

@@ -6,7 +6,7 @@ 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 { countModelPrice } from '@/service/support/wallet/bill/utils';
+import { formatModelPrice2Store } from '@/service/support/wallet/bill/utils';
 import type { ChatModelItemType } from '@fastgpt/global/core/ai/model.d';
 import { postTextCensor } from '@/service/common/censor';
 import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constant';
@@ -151,7 +151,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
     }
   );
 
-  const { answerText, totalTokens, completeMessages } = await (async () => {
+  const { answerText, inputTokens, outputTokens, completeMessages } = await (async () => {
     if (stream) {
       // sse response
       const { answer } = await streamResponse({
@@ -165,21 +165,26 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
         value: answer
       });
 
-      const totalTokens = countMessagesTokens({
-        messages: completeMessages
-      });
-
       targetResponse({ res, detail, outputs });
 
       return {
         answerText: answer,
-        totalTokens,
+        inputTokens: countMessagesTokens({
+          messages: filterMessages
+        }),
+        outputTokens: countMessagesTokens({
+          messages: [
+            {
+              obj: ChatRoleEnum.AI,
+              value: answer
+            }
+          ]
+        }),
         completeMessages
       };
     } else {
       const unStreamResponse = response as ChatCompletion;
       const answer = unStreamResponse.choices?.[0]?.message?.content || '';
-      const totalTokens = unStreamResponse.usage?.total_tokens || 0;
 
       const completeMessages = filterMessages.concat({
         obj: ChatRoleEnum.AI,
@@ -188,20 +193,27 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
 
       return {
         answerText: answer,
-        totalTokens,
+        inputTokens: unStreamResponse.usage?.prompt_tokens || 0,
+        outputTokens: unStreamResponse.usage?.completion_tokens || 0,
         completeMessages
       };
     }
   })();
 
+  const { total, modelName } = formatModelPrice2Store({
+    model,
+    inputLen: inputTokens,
+    outputLen: outputTokens,
+    type: ModelTypeEnum.chat
+  });
+
   return {
     answerText,
     responseData: {
-      price: user.openaiAccount?.key
-        ? 0
-        : countModelPrice({ model, tokens: totalTokens, type: ModelTypeEnum.chat }),
-      model: modelConstantsData.name,
-      tokens: totalTokens,
+      price: user.openaiAccount?.key ? 0 : total,
+      model: modelName,
+      inputTokens,
+      outputTokens,
       query: userChatInput,
       maxToken: max_tokens,
       quoteList: filterQuoteQA,
@@ -227,8 +239,7 @@ function filterQuote({
       a: item.a,
       source: item.sourceName,
       sourceId: String(item.sourceId || 'UnKnow'),
-      index: index + 1,
-      score: item.score?.toFixed(4)
+      index: index + 1
     });
   }