fix: usage repeat (#5735)

* fix: usage repeat

* remove invalid code
This commit is contained in:
Archer
2025-10-09 09:53:19 +08:00
committed by GitHub
parent b8c2c7ad98
commit 7942805af9
3 changed files with 53 additions and 50 deletions

View File

@@ -386,6 +386,7 @@ export const runToolCall = async (
initToolNodes(runtimeNodes, [toolNode.nodeId], startParams);
const toolRunResponse = await runWorkflow({
...workflowProps,
usageId: undefined,
isToolCall: true
});

View File

@@ -8,52 +8,60 @@ import {
} from '@fastgpt/global/support/user/team/constant';
import { UsageCollectionName, UsageItemCollectionName } from './constants';
const UsageSchema = new Schema({
teamId: {
type: Schema.Types.ObjectId,
ref: TeamCollectionName,
required: true
},
tmbId: {
type: Schema.Types.ObjectId,
ref: TeamMemberCollectionName,
required: true
},
source: {
type: String,
enum: Object.values(UsageSourceEnum),
required: true
},
appName: {
// usage name
type: String,
default: ''
},
totalPoints: {
// total points
type: Number,
required: true
},
appId: {
type: Schema.Types.ObjectId,
ref: 'apps',
required: false
},
pluginId: {
type: Schema.Types.ObjectId,
ref: 'plugins',
required: false
},
time: {
type: Date,
default: () => new Date()
},
const UsageSchema = new Schema(
{
teamId: {
type: Schema.Types.ObjectId,
ref: TeamCollectionName,
required: true
},
tmbId: {
type: Schema.Types.ObjectId,
ref: TeamMemberCollectionName,
required: true
},
source: {
type: String,
enum: Object.values(UsageSourceEnum),
required: true
},
appName: {
// usage name
type: String,
default: ''
},
totalPoints: {
// total points
type: Number,
required: true
},
appId: {
type: Schema.Types.ObjectId,
ref: 'apps',
required: false
},
pluginId: {
type: Schema.Types.ObjectId,
ref: 'plugins',
required: false
},
time: {
type: Date,
default: () => new Date()
},
// @description It will not be used again in the future.
list: {
type: Array
// @description It will not be used again in the future.
list: {
type: Array
}
},
{
// Auto update time
timestamps: {
updatedAt: 'time'
}
}
});
);
UsageSchema.virtual('usageItems', {
ref: UsageItemCollectionName,

View File

@@ -1,6 +0,0 @@
import type { ConcatUsageProps } from '@fastgpt/global/support/wallet/usage/api';
declare global {
var reduceAiPointsQueue: { teamId: string; totalPoints: number }[];
var concatBillQueue: ConcatUsageProps[];
}