Skip to content

fix(task): record token usage in async billing logs #5841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElevenZhou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(task): record token usage in async billing logs #5841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions model/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,16 +407,18 @@ func RecordConsumeLog(c *gin.Context, userId int, params RecordConsumeLogParams)
}

type RecordTaskBillingLogParams struct {
UserId int
LogType int
Content string
ChannelId int
ModelName string
Quota int
TokenId int
Group string
Other map[string]interface{}
NodeName string // 任务发起节点；为空时回退当前节点
UserId int
LogType int
Content string
ChannelId int
ModelName string
Quota int
TokenId int
Group string
PromptTokens int
CompletionTokens int
Other map[string]interface{}
NodeName string // 任务发起节点；为空时回退当前节点
}

func RecordTaskBillingLog(params RecordTaskBillingLogParams) {
Expand All @@ -437,13 +439,15 @@ func RecordTaskBillingLog(params RecordTaskBillingLogParams) {
CreatedAt: createdAt,
Type: params.LogType,
Content: params.Content,
TokenName: tokenName,
ModelName: params.ModelName,
Quota: params.Quota,
ChannelId: params.ChannelId,
TokenId: params.TokenId,
Group: params.Group,
Other: common.MapToJsonStr(params.Other),
TokenName: tokenName,
ModelName: params.ModelName,
Quota: params.Quota,
PromptTokens: params.PromptTokens,
CompletionTokens: params.CompletionTokens,
ChannelId: params.ChannelId,
TokenId: params.TokenId,
Group: params.Group,
Other: common.MapToJsonStr(params.Other),
}
err := createLog(log)
if err != nil {
Expand All @@ -461,6 +465,7 @@ func RecordTaskBillingLog(params RecordTaskBillingLogParams) {
ModelName: params.ModelName,
Quota: params.Quota,
CreatedAt: createdAt,
TokenUsed: params.PromptTokens + params.CompletionTokens,
UseGroup: params.Group,
TokenID: params.TokenId,
ChannelID: params.ChannelId,
Expand Down
9 changes: 8 additions & 1 deletion service/task_billing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ func RefundTaskQuota(ctx context.Context, task *model.Task, reason string) {
// actualQuota 是任务完成后的实际应扣额度，与预扣额度 (task.Quota) 做差额结算。
// reason 用于日志记录（例如 "token重算" 或 "adaptor调整"）。
func RecalculateTaskQuota(ctx context.Context, task *model.Task, actualQuota int, reason string) {
RecalculateTaskQuotaWithUsage(ctx, task, actualQuota, reason, 0, 0)
}

// RecalculateTaskQuotaWithUsage records optional token usage when settling an async task.
func RecalculateTaskQuotaWithUsage(ctx context.Context, task *model.Task, actualQuota int, reason string, promptTokens int, completionTokens int) {
if actualQuota <= 0 {
return
}
Expand Down Expand Up @@ -240,6 +245,8 @@ func RecalculateTaskQuota(ctx context.Context, task *model.Task, actualQuota int
Quota: logQuota,
TokenId: task.PrivateData.TokenId,
Group: task.Group,
PromptTokens: promptTokens,
CompletionTokens: completionTokens,
Other: other,
NodeName: task.PrivateData.NodeName,
})
Expand Down Expand Up @@ -298,5 +305,5 @@ func RecalculateTaskQuotaByTokens(ctx context.Context, task *model.Task, totalTo
actualQuota := int(float64(totalTokens) * modelRatio * finalGroupRatio * otherMultiplier)

reason := fmt.Sprintf("token重算：tokens=%d, modelRatio=%.2f, groupRatio=%.2f, otherMultiplier=%.4f", totalTokens, modelRatio, finalGroupRatio, otherMultiplier)
RecalculateTaskQuota(ctx, task, actualQuota, reason)
RecalculateTaskQuotaWithUsage(ctx, task, actualQuota, reason, 0, totalTokens)
}