gitea/FastGPT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.8.21 feature (#3742)

Browse Source 
* model config

* feat: normalization embedding

* adapt unstrea  reasoning response

* remove select app

* perf: dataset search code

* fix: multiple audio video show

* perf: query extension output

* perf: link check

* perf: faq doc

* fix: ts

* feat: support reasoning text output

* feat: workflow support reasoning output
This commit is contained in:
Archer
2025-02-11 13:53:08 +08:00
committed by GitHub
parent 896a3f1472
commit 8738c32fb0
45 changed files with 640 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
projects/app/src/service/support/wallet/usage/push.ts
View File

@@ -95,7 +95,10 @@ export const pushGenerateVectorUsage = ({
source = UsageSourceEnum.fastgpt,
extensionModel,
extensionInputTokens,
extensionOutputTokens
extensionOutputTokens,
deepSearchModel,
deepSearchInputTokens,
deepSearchOutputTokens
}: {
billId?: string;
teamId: string;
@@ -107,6 +110,10 @@ export const pushGenerateVectorUsage = ({
extensionModel?: string;
extensionInputTokens?: number;
extensionOutputTokens?: number;
deepSearchModel?: string;
deepSearchInputTokens?: number;
deepSearchOutputTokens?: number;
}) => {
const { totalPoints: totalVector, modelName: vectorModelName } = formatModelChars2Points({
modelType: ModelTypeEnum.embedding,
@@ -131,8 +138,25 @@ export const pushGenerateVectorUsage = ({
extensionModelName: modelName
};
})();
const { deepSearchTotalPoints, deepSearchModelName } = (() => {
if (!deepSearchModel || !deepSearchInputTokens)
return {
deepSearchTotalPoints: 0,
deepSearchModelName: ''
};
const { totalPoints, modelName } = formatModelChars2Points({
modelType: ModelTypeEnum.llm,
model: deepSearchModel,
inputTokens: deepSearchInputTokens,
outputTokens: deepSearchOutputTokens
});
return {
deepSearchTotalPoints: totalPoints,
deepSearchModelName: modelName
};
})();
const totalPoints = totalVector + extensionTotalPoints;
const totalPoints = totalVector + extensionTotalPoints + deepSearchTotalPoints;
// 插入 Bill 记录
if (billId) {
@@ -148,12 +172,12 @@ export const pushGenerateVectorUsage = ({
createUsage({
teamId,
tmbId,
appName: 'support.wallet.moduleName.index',
appName: i18nT('common:support.wallet.moduleName.index'),
totalPoints,
source,
list: [
{
moduleName: 'support.wallet.moduleName.index',
moduleName: i18nT('common:support.wallet.moduleName.index'),
amount: totalVector,
model: vectorModelName,
inputTokens
@@ -161,13 +185,24 @@ export const pushGenerateVectorUsage = ({
...(extensionModel !== undefined
? [
{
moduleName: 'core.module.template.Query extension',
moduleName: i18nT('common:core.module.template.Query extension'),
amount: extensionTotalPoints,
model: extensionModelName,
inputTokens: extensionInputTokens,
outputTokens: extensionOutputTokens
}
]
: []),
...(deepSearchModel !== undefined
? [
{
moduleName: i18nT('common:deep_rag_search'),
amount: deepSearchTotalPoints,
model: deepSearchModelName,
inputTokens: deepSearchInputTokens,
outputTokens: deepSearchOutputTokens
}
]
: [])
]
});