feat: publish v1.0.0-rc.36-custom.1
Publish Docker image (Multi-arch) / Build & push (amd64) (push) Failing after 9m20s
Release (Linux, macOS, Windows) / Linux Release (push) Failing after 55m7s
Publish Docker image (Multi-arch) / Build & push (arm64) (push) Canceled after 0s
Release (Linux, macOS, Windows) / macOS Release (push) Canceled after 0s
Release (Linux, macOS, Windows) / Windows Release (push) Canceled after 0s
Publish Docker image (Multi-arch) / Create multi-arch manifests (push) Canceled after 0s
Publish Docker image (Multi-arch) / Build & push (amd64) (push) Failing after 9m20s
Release (Linux, macOS, Windows) / Linux Release (push) Failing after 55m7s
Publish Docker image (Multi-arch) / Build & push (arm64) (push) Canceled after 0s
Release (Linux, macOS, Windows) / macOS Release (push) Canceled after 0s
Release (Linux, macOS, Windows) / Windows Release (push) Canceled after 0s
Publish Docker image (Multi-arch) / Create multi-arch manifests (push) Canceled after 0s
This commit is contained in:
commit
bb7968b612
2381 files changed
+551494
No files matched your search
@@ -0,0 +1,309 @@
|
||||
package billing_setting
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"maps"
|
||||
"math"
|
||||
"sort"
|
||||
|
||||
"github.com/QuantumNous/new-api/common"
|
||||
"github.com/QuantumNous/new-api/pkg/billingexpr"
|
||||
"github.com/QuantumNous/new-api/pkg/jsplugin"
|
||||
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
||||
"github.com/QuantumNous/new-api/relaykit/dto"
|
||||
"github.com/QuantumNous/new-api/setting/config"
|
||||
"github.com/QuantumNous/new-api/setting/ratio_setting"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
const (
|
||||
BillingModeRatio = "ratio"
|
||||
BillingModeTieredExpr = "tiered_expr"
|
||||
BillingModeField = "billing_mode"
|
||||
BillingExprField = "billing_expr"
|
||||
maxTaskExprSmokeTests = 64
|
||||
)
|
||||
|
||||
// BillingSetting is managed by config.GlobalConfig.Register.
|
||||
// DB keys: billing_setting.billing_mode, billing_setting.billing_expr
|
||||
type BillingSetting struct {
|
||||
BillingMode map[string]string `json:"billing_mode"`
|
||||
BillingExpr map[string]string `json:"billing_expr"`
|
||||
GroupBillingExpr map[string]map[string]string `json:"group_billing_expr"`
|
||||
}
|
||||
|
||||
var billingSetting = BillingSetting{
|
||||
BillingMode: make(map[string]string),
|
||||
BillingExpr: make(map[string]string),
|
||||
GroupBillingExpr: make(map[string]map[string]string),
|
||||
}
|
||||
|
||||
func init() {
|
||||
config.GlobalConfig.Register("billing_setting", &billingSetting)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Read accessors (hot path, must be fast)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func GetBillingMode(model string) string {
|
||||
if mode, ok := billingSetting.BillingMode[model]; ok {
|
||||
return mode
|
||||
}
|
||||
if _, ok := builtinBillingExpr[model]; ok {
|
||||
// Existing administrator-configured legacy prices take precedence over
|
||||
// a newly introduced built-in expression unless a mode was explicit.
|
||||
if ratio_setting.HasConfiguredModelRatio(model) {
|
||||
return BillingModeRatio
|
||||
}
|
||||
if _, configured := ratio_setting.GetModelPrice(model, false); configured {
|
||||
return BillingModeRatio
|
||||
}
|
||||
return BillingModeTieredExpr
|
||||
}
|
||||
return BillingModeRatio
|
||||
}
|
||||
|
||||
func GetBillingExpr(model string) (string, bool) {
|
||||
if expr, ok := billingSetting.BillingExpr[model]; ok {
|
||||
return expr, true
|
||||
}
|
||||
if GetBillingMode(model) == BillingModeTieredExpr {
|
||||
expr, ok := builtinBillingExpr[model]
|
||||
return expr, ok
|
||||
}
|
||||
return "", false
|
||||
}
|
||||
|
||||
func GetBuiltinBillingExpr(model string) (string, bool) {
|
||||
expression, ok := builtinBillingExpr[model]
|
||||
return expression, ok
|
||||
}
|
||||
|
||||
func GetBuiltinBillingExprCopy() map[string]string {
|
||||
return lo.Assign(builtinBillingExpr)
|
||||
}
|
||||
|
||||
func GetGroupBillingExpr(group, model string) (string, bool) {
|
||||
expr, ok := billingSetting.GroupBillingExpr[group][model]
|
||||
return expr, ok
|
||||
}
|
||||
|
||||
func GetBillingExprForGroup(group, model string) (string, bool) {
|
||||
if expr, ok := GetGroupBillingExpr(group, model); ok {
|
||||
return expr, true
|
||||
}
|
||||
return GetBillingExpr(model)
|
||||
}
|
||||
|
||||
func GetBillingModeCopy() map[string]string {
|
||||
modes := lo.Assign(billingSetting.BillingMode)
|
||||
for model := range builtinBillingExpr {
|
||||
if _, configured := modes[model]; !configured && GetBillingMode(model) == BillingModeTieredExpr {
|
||||
modes[model] = BillingModeTieredExpr
|
||||
}
|
||||
}
|
||||
return modes
|
||||
}
|
||||
|
||||
func GetBillingExprCopy() map[string]string {
|
||||
expressions := lo.Assign(billingSetting.BillingExpr)
|
||||
for model := range builtinBillingExpr {
|
||||
if _, configured := expressions[model]; configured {
|
||||
continue
|
||||
}
|
||||
if expression, ok := GetBillingExpr(model); ok {
|
||||
expressions[model] = expression
|
||||
}
|
||||
}
|
||||
return expressions
|
||||
}
|
||||
|
||||
func GetPricingSyncData(base map[string]any) map[string]any {
|
||||
extra := make(map[string]any, 2)
|
||||
if modes := GetBillingModeCopy(); len(modes) > 0 {
|
||||
extra[BillingModeField] = modes
|
||||
}
|
||||
if exprs := GetBillingExprCopy(); len(exprs) > 0 {
|
||||
extra[BillingExprField] = exprs
|
||||
}
|
||||
return lo.Assign(base, extra)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Smoke test (called externally for validation before save)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func SmokeTestExpr(exprStr string) error {
|
||||
return smokeTestExpr(exprStr)
|
||||
}
|
||||
|
||||
func smokeTestExpr(exprStr string) error {
|
||||
if _, err := billingexpr.CompileFromCache(exprStr); err != nil {
|
||||
return err
|
||||
}
|
||||
usageKeys := billingexpr.UsedUsageKeys(exprStr)
|
||||
if len(usageKeys) > 0 {
|
||||
sortedKeys := make([]string, 0, len(usageKeys))
|
||||
for key := range usageKeys {
|
||||
sortedKeys = append(sortedKeys, key)
|
||||
}
|
||||
sort.Strings(sortedKeys)
|
||||
return fmt.Errorf("expression references usage keys %v but the model has no task plugin usage schema", sortedKeys)
|
||||
}
|
||||
|
||||
vectors := []billingexpr.TokenParams{
|
||||
{P: 0, C: 0, Len: 0},
|
||||
{P: 1000, C: 1000, Len: 1000},
|
||||
{P: 100000, C: 100000, Len: 100000},
|
||||
{P: 1000000, C: 1000000, Len: 1000000},
|
||||
}
|
||||
|
||||
for _, v := range vectors {
|
||||
for _, request := range billingExprSmokeRequests() {
|
||||
result, _, err := billingexpr.RunExprWithRequest(exprStr, v, request)
|
||||
if err != nil {
|
||||
return fmt.Errorf("vector {p=%g, c=%g}: run failed: %w", v.P, v.C, err)
|
||||
}
|
||||
if math.IsNaN(result) || math.IsInf(result, 0) || result < 0 {
|
||||
return fmt.Errorf("vector {p=%g, c=%g}: result must be finite and non-negative, got %f", v.P, v.C, result)
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// SmokeTestTaskExpr validates a task usage expression against the usage facts
|
||||
// declared by its plugin. Literal u() keys must be declared; dynamic calls are
|
||||
// still exercised by the generated runtime vectors when possible.
|
||||
func SmokeTestTaskExpr(exprStr string, schema map[string]jsplugin.UsageFieldSchema) error {
|
||||
if _, err := billingexpr.CompileFromCache(exprStr); err != nil {
|
||||
return err
|
||||
}
|
||||
for key := range billingexpr.UsedUsageKeys(exprStr) {
|
||||
if _, declared := schema[key]; !declared {
|
||||
return fmt.Errorf("usage key %q is not declared by the task plugin", key)
|
||||
}
|
||||
}
|
||||
|
||||
for _, usage := range taskUsageSmokeVectors(schema) {
|
||||
for _, request := range billingExprSmokeRequests() {
|
||||
request.Usage = usage
|
||||
result, _, err := billingexpr.RunExprWithRequest(exprStr, billingexpr.TokenParams{}, request)
|
||||
if err != nil {
|
||||
return fmt.Errorf("usage vector %v: run failed: %w", usage, err)
|
||||
}
|
||||
if math.IsNaN(result) || math.IsInf(result, 0) || result < 0 {
|
||||
return fmt.Errorf("usage vector %v: result must be finite and non-negative, got %f", usage, result)
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type usageSmokeDimension struct {
|
||||
name string
|
||||
values []any
|
||||
}
|
||||
|
||||
func taskUsageSmokeVectors(schema map[string]jsplugin.UsageFieldSchema) []map[string]any {
|
||||
names := make([]string, 0, len(schema))
|
||||
for name := range schema {
|
||||
names = append(names, name)
|
||||
}
|
||||
sort.Strings(names)
|
||||
|
||||
dimensions := make([]usageSmokeDimension, 0, len(names))
|
||||
for _, name := range names {
|
||||
field := schema[name]
|
||||
if len(field.Enum) > 0 {
|
||||
values := make([]any, len(field.Enum))
|
||||
for index, value := range field.Enum {
|
||||
values[index] = value
|
||||
}
|
||||
dimensions = append(dimensions, usageSmokeDimension{name: name, values: values})
|
||||
continue
|
||||
}
|
||||
if field.Type == "boolean" {
|
||||
dimensions = append(dimensions, usageSmokeDimension{name: name, values: []any{false, true}})
|
||||
continue
|
||||
}
|
||||
limit := relaycommon.MaxTaskDurationSeconds
|
||||
if field.Unit == "count" {
|
||||
limit = dto.MaxImageN
|
||||
}
|
||||
if field.Unit == "token" || field.Unit == "credit" {
|
||||
limit = common.MaxQuota
|
||||
}
|
||||
dimensions = append(dimensions, usageSmokeDimension{
|
||||
name: name,
|
||||
values: []any{float64(0), float64(1), float64(limit)},
|
||||
})
|
||||
}
|
||||
|
||||
if usageSmokeCombinationCount(dimensions, maxTaskExprSmokeTests) > maxTaskExprSmokeTests {
|
||||
for index := range dimensions {
|
||||
field := schema[dimensions[index].name]
|
||||
if len(field.Enum) <= 2 {
|
||||
continue
|
||||
}
|
||||
dimensions[index].values = []any{field.Enum[0], field.Enum[len(field.Enum)-1]}
|
||||
}
|
||||
}
|
||||
|
||||
vectors := make([]map[string]any, 0, maxTaskExprSmokeTests)
|
||||
var appendVectors func(int, map[string]any)
|
||||
appendVectors = func(index int, current map[string]any) {
|
||||
if len(vectors) >= maxTaskExprSmokeTests {
|
||||
return
|
||||
}
|
||||
if index == len(dimensions) {
|
||||
vector := make(map[string]any, len(current))
|
||||
maps.Copy(vector, current)
|
||||
vectors = append(vectors, vector)
|
||||
return
|
||||
}
|
||||
for _, value := range dimensions[index].values {
|
||||
current[dimensions[index].name] = value
|
||||
appendVectors(index+1, current)
|
||||
}
|
||||
delete(current, dimensions[index].name)
|
||||
}
|
||||
appendVectors(0, make(map[string]any, len(dimensions)))
|
||||
|
||||
combinationCount := usageSmokeCombinationCount(dimensions, maxTaskExprSmokeTests)
|
||||
if combinationCount > maxTaskExprSmokeTests && len(vectors) > 0 {
|
||||
last := make(map[string]any, len(dimensions))
|
||||
for _, dimension := range dimensions {
|
||||
last[dimension.name] = dimension.values[len(dimension.values)-1]
|
||||
}
|
||||
vectors[len(vectors)-1] = last
|
||||
}
|
||||
return vectors
|
||||
}
|
||||
|
||||
func usageSmokeCombinationCount(dimensions []usageSmokeDimension, stopAfter int) int {
|
||||
count := 1
|
||||
for _, dimension := range dimensions {
|
||||
if len(dimension.values) == 0 {
|
||||
return 0
|
||||
}
|
||||
if count > stopAfter/len(dimension.values) {
|
||||
return stopAfter + 1
|
||||
}
|
||||
count *= len(dimension.values)
|
||||
}
|
||||
return count
|
||||
}
|
||||
|
||||
func billingExprSmokeRequests() []billingexpr.RequestInput {
|
||||
return []billingexpr.RequestInput{
|
||||
{},
|
||||
{
|
||||
Headers: map[string]string{
|
||||
"anthropic-beta": "fast-mode-2026-02-01",
|
||||
},
|
||||
Body: []byte(`{"service_tier":"fast","stream_options":{"include_usage":true},"messages":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]}`),
|
||||
},
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user