Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 86a0ffe4 by YeYuheng Committed by GitHub
Options

fix: include query extension selection time (#7119)

parent 9f383002
Showing with 8 additions and 8 deletions
packages/service/core/ai/functions/queryExtension.ts
...@@ -133,6 +133,8 @@ export const queryExtension = async ({ ...@@ -133,6 +133,8 @@ export const queryExtension = async ({
usedUserOpenAIKey: boolean; usedUserOpenAIKey: boolean;
embeddingTokens: number; embeddingTokens: number;
}> => { }> => {
const startTime = Date.now();
const getSeconds = () => +((Date.now() - startTime) / 1000).toFixed(2);
// 1. Request model // 1. Request model
const modelData = getLLMModel(llmModel); const modelData = getLLMModel(llmModel);
const filterHistories = await filterGPTMessageByMaxContext({ const filterHistories = await filterGPTMessageByMaxContext({
...@@ -170,7 +172,6 @@ export const queryExtension = async ({ ...@@ -170,7 +172,6 @@ export const queryExtension = async ({
} }
] as any; ] as any;
const llmStartTime = Date.now();
const { const {
answerText: answer, answerText: answer,
requestId, requestId,
...@@ -183,7 +184,6 @@ export const queryExtension = async ({ ...@@ -183,7 +184,6 @@ export const queryExtension = async ({
messages messages
} }
}); });
const seconds = +((Date.now() - llmStartTime) / 1000).toFixed(2);
if (!answer) { if (!answer) {
return { return {
...@@ -192,7 +192,7 @@ export const queryExtension = async ({ ...@@ -192,7 +192,7 @@ export const queryExtension = async ({
llmModel: modelData.model, llmModel: modelData.model,
embeddingModel, embeddingModel,
requestId, requestId,
seconds, seconds: getSeconds(),
inputTokens: inputTokens, inputTokens: inputTokens,
outputTokens: outputTokens, outputTokens: outputTokens,
usedUserOpenAIKey, usedUserOpenAIKey,
...@@ -213,7 +213,7 @@ export const queryExtension = async ({ ...@@ -213,7 +213,7 @@ export const queryExtension = async ({
llmModel: modelData.model, llmModel: modelData.model,
embeddingModel, embeddingModel,
requestId, requestId,
seconds, seconds: getSeconds(),
inputTokens: inputTokens, inputTokens: inputTokens,
outputTokens: outputTokens, outputTokens: outputTokens,
usedUserOpenAIKey, usedUserOpenAIKey,
...@@ -237,7 +237,7 @@ export const queryExtension = async ({ ...@@ -237,7 +237,7 @@ export const queryExtension = async ({
llmModel: modelData.model, llmModel: modelData.model,
embeddingModel, embeddingModel,
requestId, requestId,
seconds, seconds: getSeconds(),
inputTokens, inputTokens,
outputTokens, outputTokens,
usedUserOpenAIKey, usedUserOpenAIKey,
...@@ -257,7 +257,7 @@ export const queryExtension = async ({ ...@@ -257,7 +257,7 @@ export const queryExtension = async ({
llmModel: modelData.model, llmModel: modelData.model,
embeddingModel, embeddingModel,
requestId, requestId,
seconds, seconds: getSeconds(),
inputTokens, inputTokens,
outputTokens, outputTokens,
usedUserOpenAIKey, usedUserOpenAIKey,
...@@ -278,7 +278,7 @@ export const queryExtension = async ({ ...@@ -278,7 +278,7 @@ export const queryExtension = async ({
llmModel: modelData.model, llmModel: modelData.model,
embeddingModel: useEmbeddingModel, embeddingModel: useEmbeddingModel,
requestId, requestId,
seconds, seconds: getSeconds(),
inputTokens, inputTokens,
outputTokens, outputTokens,
usedUserOpenAIKey, usedUserOpenAIKey,
...@@ -295,7 +295,7 @@ export const queryExtension = async ({ ...@@ -295,7 +295,7 @@ export const queryExtension = async ({
llmModel: modelData.model, llmModel: modelData.model,
embeddingModel, embeddingModel,
requestId, requestId,
seconds, seconds: getSeconds(),
inputTokens, inputTokens,
outputTokens, outputTokens,
usedUserOpenAIKey, usedUserOpenAIKey,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment