merge: feature/channel → release (v0.1.105.14) — 使用记录计费模式

This commit is contained in:
erio committed 2026-03-30 22:14:24 +08:00
commit 54976c77ce
26 files changed
+1496 -48

No files matched your search

@@ -8032,6 +8032,17 @@ func (s *GatewayService) RecordUsage(ctx context.Context, input *RecordUsageInpu
CreatedAt: time.Now(),
}
// 设置计费模式
if result.MediaType != "image" && result.MediaType != "video" && result.MediaType != "prompt" {
if result.ImageCount > 0 {
billingMode := "image"
usageLog.BillingMode = &billingMode
} else {
billingMode := "token"
usageLog.BillingMode = &billingMode
}
}
// 添加 UserAgent
if input.UserAgent != "" {
usageLog.UserAgent = &input.UserAgent
@@ -8242,6 +8253,15 @@ func (s *GatewayService) RecordUsageWithLongContext(ctx context.Context, input *
CreatedAt: time.Now(),
}
// 设置计费模式
if result.ImageCount > 0 {
billingMode := "image"
usageLog.BillingMode = &billingMode
} else {
billingMode := "token"
usageLog.BillingMode = &billingMode
}
// 添加 UserAgent
if input.UserAgent != "" {
usageLog.UserAgent = &input.UserAgent
@@ -4207,6 +4207,11 @@ func (s *OpenAIGatewayService) RecordUsage(ctx context.Context, input *OpenAIRec
FirstTokenMs: result.FirstTokenMs,
CreatedAt: time.Now(),
}
// 设置计费模式(OpenAI 网关都是 token 计费)
{
billingMode := "token"
usageLog.BillingMode = &billingMode
}
// 添加 UserAgent
if input.UserAgent != "" {
usageLog.UserAgent = &input.UserAgent
+2
View File
@@ -110,6 +110,8 @@ type UsageLog struct {
ModelMappingChain *string
// BillingTier 计费层级标签(per_request/image 模式)
BillingTier *string
// BillingMode 计费模式:token/image(sora 路径为 nil)
BillingMode *string
// ServiceTier records the OpenAI service tier used for billing, e.g. "priority" / "flex".
ServiceTier *string
// ReasoningEffort is the request's reasoning effort level.