mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-02 16:32:14 +00:00
feeeei
75faedda95
此前 OpenAI service_tier 与 Anthropic speed 的计费档位只看请求侧，上游 因容量把 priority/fast 静默降为 default/standard 时仍按 2x 收费。现在： - upstreamResponseModelObserver 同时观察响应侧档位：OpenAI 只信终止事件 与无类型 body 里的 service_tier（response.created 为请求回显，忽略）， Anthropic 读 usage.speed；查找仅在带 model 的帧上触发 - ResolveBillingServiceTier 只降不升：响应档位比请求便宜才采纳，更贵、 未知或缺失一律沿用请求侧，与图片尺寸归并、response_model 计费的 "不得更贵"不变式一致 - usage_logs.service_tier 记录实际计费档位，降级写 billing.service_tier_downgraded 审计日志；HTTP、WS 及 ws_v2 relay 全覆盖
108 lines
4.0 KiB
Go
108 lines
4.0 KiB
Go
package service
|
|
|
|
import (
|
|
"log/slog"
|
|
"strings"
|
|
)
|
|
|
|
// ServiceTierBillingResolution describes how the billable service tier of one
|
|
// request was settled between the tier the client asked for and the tier the
|
|
// upstream reports having used.
|
|
type ServiceTierBillingResolution struct {
|
|
Requested string // tier carried by the request sent upstream ("" when none)
|
|
Observed string // tier declared by the upstream response ("" when none)
|
|
Billing string // tier used for billing and the usage log
|
|
Downgraded bool // Billing is cheaper than Requested
|
|
}
|
|
|
|
// ResolveBillingServiceTier picks the tier to bill. The upstream declaration is
|
|
// trusted only to lower the bill: a request served below the tier it asked for
|
|
// (OpenAI "priority" answered with service_tier "default", Anthropic speed=fast
|
|
// answered with usage.speed "standard") is billed at the cheaper tier. A response
|
|
// that claims a more expensive tier, an unknown one, or none at all leaves the
|
|
// requested tier in place, which is also the behaviour for upstreams that never
|
|
// declare a tier.
|
|
func ResolveBillingServiceTier(requested, observed string) ServiceTierBillingResolution {
|
|
requested = normalizeBillingServiceTier(requested)
|
|
observed = normalizeBillingServiceTier(observed)
|
|
resolution := ServiceTierBillingResolution{Requested: requested, Observed: observed, Billing: requested}
|
|
if observed == "" || observed == requested {
|
|
return resolution
|
|
}
|
|
observedRank, known := serviceTierCostRank(observed)
|
|
if !known {
|
|
return resolution
|
|
}
|
|
requestedRank, _ := serviceTierCostRank(requested)
|
|
if observedRank >= requestedRank {
|
|
return resolution
|
|
}
|
|
resolution.Billing = observed
|
|
resolution.Downgraded = true
|
|
return resolution
|
|
}
|
|
|
|
// serviceTierCostRank orders tiers by their cost relative to the base rate, so a
|
|
// lower rank is always cheaper. Unknown tiers rank as the base rate and report
|
|
// known=false so callers can refuse to act on them.
|
|
func serviceTierCostRank(tier string) (rank int, known bool) {
|
|
switch normalizeBillingServiceTier(tier) {
|
|
case "flex":
|
|
return 0, true
|
|
case "", "default", "standard", "auto", "scale":
|
|
return 1, true
|
|
case "priority", "fast":
|
|
return 2, true
|
|
default:
|
|
return 1, false
|
|
}
|
|
}
|
|
|
|
// ApplyOpenAIServiceTierBillingResolution lowers result.ServiceTier to the tier
|
|
// the upstream reports having used, so cost calculation and the usage log share
|
|
// one billable tier. The returned resolution is meant for the audit log.
|
|
func ApplyOpenAIServiceTierBillingResolution(result *OpenAIForwardResult) ServiceTierBillingResolution {
|
|
if result == nil {
|
|
return ServiceTierBillingResolution{}
|
|
}
|
|
resolution := ResolveBillingServiceTier(optionalStringValue(result.ServiceTier), result.UpstreamResponseServiceTier)
|
|
if resolution.Downgraded {
|
|
billing := resolution.Billing
|
|
result.ServiceTier = &billing
|
|
}
|
|
return resolution
|
|
}
|
|
|
|
// ApplyForwardServiceTierBillingResolution is the ForwardResult counterpart of
|
|
// ApplyOpenAIServiceTierBillingResolution.
|
|
func ApplyForwardServiceTierBillingResolution(result *ForwardResult) ServiceTierBillingResolution {
|
|
if result == nil {
|
|
return ServiceTierBillingResolution{}
|
|
}
|
|
resolution := ResolveBillingServiceTier(optionalStringValue(result.ServiceTier), result.UpstreamResponseServiceTier)
|
|
if resolution.Downgraded {
|
|
billing := resolution.Billing
|
|
result.ServiceTier = &billing
|
|
}
|
|
return resolution
|
|
}
|
|
|
|
// logServiceTierBillingDowngrade leaves an audit trail for every request billed
|
|
// below the tier it asked for; unchanged tiers are not logged.
|
|
func logServiceTierBillingDowngrade(component string, account *Account, requestID string, resolution ServiceTierBillingResolution) {
|
|
if !resolution.Downgraded {
|
|
return
|
|
}
|
|
attrs := []any{
|
|
"component", component,
|
|
"request_id", strings.TrimSpace(requestID),
|
|
"requested_tier", resolution.Requested,
|
|
"response_tier", resolution.Observed,
|
|
"billed_tier", resolution.Billing,
|
|
}
|
|
if account != nil {
|
|
attrs = append(attrs, "platform", account.Platform, "account_id", account.ID)
|
|
}
|
|
slog.Info("billing.service_tier_downgraded", attrs...)
|
|
}
|