ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2026-05-03 01:02:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

V4.14.10 dev (#6674)

Browse Source 
* feat: model config with brand-new price calculate machanism (#6616)

* fix: image read and json error (Agent) (#6502)

* fix:
1.image read
2.JSON parsing error

* dataset cite and pause

* perf: plancall second parse

* add test

---------

Co-authored-by: archer <545436317@qq.com>

* master message

* remove invalid code

* wip: model config

* feat: model config with brand-new price calculate machanism

* merge main branch

* ajust calculate way

* ajust priceTiers resolve procession

* perf: price config code

* fix: default price

* fix: test

* fix: comment

* fix test

---------

Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com>
Co-authored-by: archer <545436317@qq.com>

* wip: fix modal UI (#6634)

* wip: fix modal UI

* fix: maxInputToken set

* chore: add price unit for non llm models

* chore: replace question mark icon with beta tag (#6672)

* feat:rerank too long; fix:rerank ui(agent),embedding returns 0 (#6663)

* feat:rerank too long; fix:rerank ui(agent),embedding returns 0

* rerank

* fix:rerank function

* perf: rerank code

* fix rerank

* perf: model price ui

---------

Co-authored-by: archer <545436317@qq.com>

* remove llmtype field

* revert model init

* fix: filed

* fix: model select filter

* perf: multiple selector render

* remove invalid checker

* remove invalid i18n

* perf: model selector tip

* perf: model selector tip

* fix cr

* limit pnpm version

* fix: i18n

* fix action

* set default mintoken

* update i18n

* perf: usage push

* fix:rerank model ui (#6677)

* fix: tier match error

* fix: testr

---------

Co-authored-by: Ryo <whoeverimf5@gmail.com>
Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com>
This commit is contained in:
Archer
2026-03-30 10:05:42 +08:00
committed by GitHub
parent 03dd9c00a8
commit 3f4400a500
108 changed files with 3774 additions and 1469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/service/support/wallet/usage/utils.ts
+9 -7
View File
@@ -1,4 +1,6 @@
import { findAIModel } from '../../../core/ai/model';
import { calculateModelPrice } from '@fastgpt/global/core/ai/pricing';
import type { SystemModelItemType } from '../../../core/ai/type';
export const formatModelChars2Points = ({
model,
@@ -6,7 +8,7 @@ export const formatModelChars2Points = ({
outputTokens = 0,
multiple = 1000
}: {
model: string;
model: string | SystemModelItemType;
inputTokens?: number;
outputTokens?: number;
multiple?: number;
@@ -19,12 +21,12 @@ export const formatModelChars2Points = ({
};
}
const isIOPriceType = typeof modelData.inputPrice === 'number' && modelData.inputPrice > 0;
const totalPoints = isIOPriceType
? (modelData.inputPrice || 0) * (inputTokens / multiple) +
(modelData.outputPrice || 0) * (outputTokens / multiple)
: (modelData.charsPointsPrice || 0) * ((inputTokens + outputTokens) / multiple);
const { totalPoints } = calculateModelPrice({
config: modelData,
inputTokens,
outputTokens,
multiple
});
return {
modelName: modelData.name,