mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-12 04:07:25 +00:00
refactor(billing)!: 计费全部沉入插件,内核零 billing 代码;规则由插件自持
按维护者要求(issue #1 回复方向):内核不处理任何 billing 特有逻辑;插件有完整 OS 权限,自己保存配置文件。据此不再保留任何"内核 ↔ billing 插件"的专用对接。 ## 内核(删除) - `internal/billing`(Go 编译器 + 测试):删除; - `internal/core` 的 billing 接口/降级应用/规则加载:删除(含 `billingPath`); - `internal/gateway` 的 `/api/plugins/billing/rules` 端点与测试:删除; - `config` 的 `BillingDSL/Profile/Rule/Token/Peak/LongContext` 与校验、 `billing:`/`billing_file:` 配置段:删除。系统配置里不再有 billing 段。 内核只保留所有插件通用的能力:加载 .lua、插件状态持久化、插件目录 (`__llmsproxy_plugin_dir`)、`plugin.http` 路由、插件可用的 io/os。 ## 插件(billing.lua) - 规则文件移到**插件自己的目录**:`<plugin_dir>/billing.json`,由插件用 io 自己 读写(tmp + rename 原子替换);加载插件时自己读文件并编译; - 规则以**源名** `source` 为键(`url:"*"` 仅表示全局模型价目表):URL→源名映射 属于内核配置,插件不为它和内核对接;编辑页在浏览器里取 `/api/sources` 选源名; - 规则编辑 API 改为插件自己的 `/api/plugins/http/billing/rules` (GET/PUT/POST/DELETE,roles=admin),写盘也在插件内完成; - 计费账目仍在插件状态文件(内核通用持久化)`<plugin_dir>/.billing.state.json`; - `priceFor` 落地 profile 级 `default` 策略与显式 `mode=unpriced` 的优先级。 ## 迁移 生产已迁移:`config.yaml` 的 `billing:` 规则转为 `plugins/billing.json`(按源名 重写),并从系统配置中移除;规则文件与系统配置从此各自独立保存。 ## 判据 - `internal/lua/billing_rules_test.go`:插件自写 billing.json 并重启恢复、 free/subscription/token/通配符编译语义、1e6+1e6 token = 0.75 端到端、 非法规则被拒且不覆盖旧文件、reasoning/long_context/peak; - `internal/lua/billing_test.go`:profile default 策略三态 + 显式 unpriced 优先; - `internal/lua/billing_ui_test.go`:规则编辑页仍挂在 billing 页内、列宽/列数守卫。
This commit is contained in:
@ -1,402 +0,0 @@
|
||||
package lua
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// 规则 → 价格表的编译现在**在插件里**(GitCode issue #1 的建议方向:内核只提供
|
||||
// 钩子/接口,计费语义下沉到 Lua)。这些判据从原 internal/billing 的 Go 单测
|
||||
// 平移而来,并补上 issue #1 暴露的两个形状陷阱。
|
||||
//
|
||||
// 为什么必须保留这些判据:语义一旦分裂回两处,就会出现"源层零价覆盖模型价"
|
||||
// 这类静默归零 —— 账单加总正常、只是少报,且 unpriced_reqs 也不涨。
|
||||
func compilePricesForTest(t *testing.T, profile map[string]interface{}, sources interface{}, lenient bool) map[string]interface{} {
|
||||
t.Helper()
|
||||
ps, _ := billingVM(t)
|
||||
out, err := ps.Call("billing", "compile_prices", map[string]interface{}{
|
||||
"profile": profile, "sources": sources, "lenient": lenient,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("compile_prices: %v", err)
|
||||
}
|
||||
m, ok := out.(map[string]interface{})
|
||||
if !ok {
|
||||
t.Fatalf("compile_prices returned %T", out)
|
||||
}
|
||||
if e, hasErr := m["error"]; hasErr && fmt.Sprint(e) != "" {
|
||||
t.Fatalf("编译失败: %v", e)
|
||||
}
|
||||
if p, ok := m["prices"].(map[string]interface{}); ok {
|
||||
return p
|
||||
}
|
||||
t.Fatalf("no prices in %#v", m)
|
||||
return nil
|
||||
}
|
||||
|
||||
// 编译失败通过载荷里的 error 字段回传(内核桥的第二个返回值通道在插件导出上
|
||||
// 不可靠;{error=...} 是本仓库的通行约定)。返回错误文本供断言。
|
||||
func compilePricesErr(t *testing.T, profile map[string]interface{}, sources interface{}, lenient bool) string {
|
||||
t.Helper()
|
||||
ps, _ := billingVM(t)
|
||||
out, err := ps.Call("billing", "compile_prices", map[string]interface{}{
|
||||
"profile": profile, "sources": sources, "lenient": lenient,
|
||||
})
|
||||
if err != nil {
|
||||
return err.Error()
|
||||
}
|
||||
m, ok := out.(map[string]interface{})
|
||||
if !ok {
|
||||
t.Fatalf("compile_prices returned %T", out)
|
||||
}
|
||||
if e, hasErr := m["error"]; hasErr {
|
||||
if s := fmt.Sprint(e); s != "" && s != "<nil>" {
|
||||
return s
|
||||
}
|
||||
}
|
||||
t.Fatalf("预期编译失败,实得 %#v", m)
|
||||
return ""
|
||||
}
|
||||
|
||||
func srcList(base string) []map[string]interface{} {
|
||||
return []map[string]interface{}{{"name": "mine", "base_url": base}}
|
||||
}
|
||||
|
||||
// 通配符 token 规则**不能**给源写零价条目:源层覆盖模型层,会把该源所有未列
|
||||
// 价模型悄悄算成 0(原 Go 测试 TestWildcardTokenRuleDoesNotMarkPaidSources)。
|
||||
func TestBillingCompileWildcardTokenDoesNotMarkSources(t *testing.T) {
|
||||
sources := []map[string]interface{}{
|
||||
{"name": "paid1", "base_url": "https://paid1.example.com/v1"},
|
||||
{"name": "paid2", "base_url": "https://paid2.example.com/v1"},
|
||||
{"name": "free1", "base_url": "https://free.example.com/v1"},
|
||||
}
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{
|
||||
map[string]interface{}{"url": "https://free.example.com/v1", "mode": "free"},
|
||||
map[string]interface{}{"url": "*", "mode": "token", "models": map[string]interface{}{
|
||||
"only-catalogued-model": map[string]interface{}{"prompt": "1.0", "completion": "2.0"},
|
||||
}},
|
||||
},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, sources, false)
|
||||
srcs := prices["sources"].(map[string]interface{})
|
||||
if _, ok := srcs["free1"]; !ok {
|
||||
t.Error("显式 free 规则的源条目丢了(free 的 0 是语义)")
|
||||
}
|
||||
for _, name := range []string{"paid1", "paid2"} {
|
||||
if _, ok := srcs[name]; ok {
|
||||
t.Errorf("通配符 token 规则把 %q 标成已定价/0 价 —— 其未列价模型会算成 0 而不是进入 unpriced", name)
|
||||
}
|
||||
}
|
||||
models := prices["models"].(map[string]interface{})
|
||||
if _, ok := models["only-catalogued-model"]; !ok {
|
||||
t.Error("通配符规则没有发布模型价")
|
||||
}
|
||||
}
|
||||
|
||||
// token 规则**不得**产生源条目(PR #2 的结论,比 issue 正文的 per_request 标记更收口)。
|
||||
//
|
||||
// 只写 {per_request:0} 虽然不会清零模型价,但同源上未列入 rule.Models 的模型仍被
|
||||
// 视为"已定价"、静默计 0、unpriced 计数不涨 —— 仍是静默少报。统一收口后它们
|
||||
// 落到 unpriced 统计里(可见);真正"边际成本为零"用 free/subscription。
|
||||
func TestBillingCompileTokenRuleEmitsNoSourceEntry(t *testing.T) {
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{map[string]interface{}{
|
||||
"url": "https://mine.example.com/v1", "mode": "token",
|
||||
"models": map[string]interface{}{
|
||||
"m": map[string]interface{}{"prompt": "0.15", "completion": "0.60"},
|
||||
},
|
||||
}},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, srcList("https://mine.example.com/v1"), false)
|
||||
srcs := prices["sources"].(map[string]interface{})
|
||||
if entry, ok := srcs["mine"]; ok {
|
||||
t.Errorf("token 规则产生了源条目 %#v:源层会覆盖模型价 / 静默计 0", entry)
|
||||
}
|
||||
// per-million → per-token:0.15 USD/M = 1.5e-7
|
||||
m := prices["models"].(map[string]interface{})["m"].(map[string]interface{})
|
||||
if m["prompt"].(float64) != 1.5e-7 {
|
||||
t.Errorf("prompt = %v, want 1.5e-7(per-token)", m["prompt"])
|
||||
}
|
||||
if m["completion"].(float64) != 6e-7 {
|
||||
t.Errorf("completion = %v, want 6e-7", m["completion"])
|
||||
}
|
||||
}
|
||||
|
||||
// 根因直防:token 规则的源条目不得携带 token 价。
|
||||
// (free/subscription 是唯一合法的"有意零价",由下一个测试单独守住。)
|
||||
func TestBillingCompileNoSourceEntryEverCarriesTokenPrices(t *testing.T) {
|
||||
sources := []map[string]interface{}{
|
||||
{"name": "a", "base_url": "https://a.example/v1"},
|
||||
{"name": "b", "base_url": "https://b.example/v1"},
|
||||
{"name": "c", "base_url": "https://c.example/v1"},
|
||||
{"name": "d", "base_url": "https://d.example/v1"},
|
||||
}
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{
|
||||
map[string]interface{}{"url": "https://a.example/v1", "mode": "token",
|
||||
"models": map[string]interface{}{"m1": map[string]interface{}{"prompt": "1", "completion": "2"}}},
|
||||
map[string]interface{}{"url": "https://b.example/v1", "mode": "unpriced"},
|
||||
map[string]interface{}{"url": "*", "mode": "token",
|
||||
"models": map[string]interface{}{"m2": map[string]interface{}{"prompt": "3", "completion": "4"}}},
|
||||
},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, sources, false)
|
||||
for name, raw := range prices["sources"].(map[string]interface{}) {
|
||||
entry, ok := raw.(map[string]interface{})
|
||||
if !ok {
|
||||
t.Fatalf("源 %q 条目不是表: %#v", name, raw)
|
||||
}
|
||||
if _, bad := entry["prompt"]; bad {
|
||||
t.Errorf("源 %q 携带 prompt=%v:会覆盖该源所有模型价", name, entry["prompt"])
|
||||
}
|
||||
if _, bad := entry["completion"]; bad {
|
||||
t.Errorf("源 %q 携带 completion=%v:会覆盖该源所有模型价", name, entry["completion"])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// free / subscription 的零价是**语义**,必须保留 prompt/completion=0。
|
||||
func TestBillingCompileExplicitZeroModesKeepZeroTokenPrices(t *testing.T) {
|
||||
for _, mode := range []string{"free", "subscription"} {
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{map[string]interface{}{
|
||||
"url": "https://mine.example.com/v1", "mode": mode, "subscription": 10,
|
||||
}},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, srcList("https://mine.example.com/v1"), false)
|
||||
entry := prices["sources"].(map[string]interface{})["mine"].(map[string]interface{})
|
||||
for _, key := range []string{"prompt", "completion"} {
|
||||
if v, present := entry[key]; !present || v != 0.0 {
|
||||
t.Errorf("%s: entry[%s] = %v (present=%v), want 显式 0", mode, key, v, present)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// reasoning 未配置时必须**缺席**(不是 0)。写 0 等于"思考免费",会静默少报
|
||||
// 所有把 reasoning 按输出计价的 provider。
|
||||
func TestBillingCompileReasoningPriceOmittedUnlessSet(t *testing.T) {
|
||||
base := map[string]interface{}{"prompt": "1.0", "completion": "2.0"}
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{map[string]interface{}{
|
||||
"url": "https://mine.example.com/v1", "mode": "token",
|
||||
"models": map[string]interface{}{
|
||||
"plain": base,
|
||||
"reasoning": map[string]interface{}{"prompt": "1.0", "completion": "2.0", "reasoning": "3.0"},
|
||||
},
|
||||
}},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, srcList("https://mine.example.com/v1"), false)
|
||||
models := prices["models"].(map[string]interface{})
|
||||
if _, present := models["plain"].(map[string]interface{})["reasoning_price"]; present {
|
||||
t.Error("未配置 reasoning 的模型不应出现 reasoning_price(0 会被当成免费)")
|
||||
}
|
||||
rp := models["reasoning"].(map[string]interface{})["reasoning_price"].(float64)
|
||||
if rp != 3e-6 {
|
||||
t.Errorf("reasoning_price = %v, want 3e-6", rp)
|
||||
}
|
||||
_ = base
|
||||
}
|
||||
|
||||
// long_context:绝对值优先;只给倍数时按基础价的倍数;两者都缺要报错。
|
||||
func TestBillingCompileLongContextRates(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
lc map[string]interface{}
|
||||
want float64
|
||||
wantErr bool
|
||||
}{
|
||||
{"absolute", map[string]interface{}{"above": 128000, "prompt": "0.30"}, 3e-7, false},
|
||||
{"multiplier", map[string]interface{}{"above": 128000, "multiplier": 2}, 3e-7, false},
|
||||
{"both-absolute-wins", map[string]interface{}{"above": 128000, "prompt": "0.30", "multiplier": 5}, 3e-7, false},
|
||||
{"neither", map[string]interface{}{"above": 128000}, 0, true},
|
||||
{"above-zero", map[string]interface{}{"above": 0, "multiplier": 2}, 0, true},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{map[string]interface{}{
|
||||
"url": "https://mine.example.com/v1", "mode": "token",
|
||||
"models": map[string]interface{}{
|
||||
"m": map[string]interface{}{"prompt": "0.15", "completion": "0.6",
|
||||
"long_context": tc.lc},
|
||||
},
|
||||
}},
|
||||
}
|
||||
if tc.wantErr {
|
||||
compilePricesErr(t, profile, srcList("https://mine.example.com/v1"), false)
|
||||
continue
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, srcList("https://mine.example.com/v1"), false)
|
||||
lc := prices["models"].(map[string]interface{})["m"].(map[string]interface{})["long_context"].(map[string]interface{})
|
||||
if lc["prompt"].(float64) != tc.want {
|
||||
t.Errorf("%s: long_context.prompt = %v, want %v", tc.name, lc["prompt"], tc.want)
|
||||
}
|
||||
if lc["above"].(float64) != 128000 {
|
||||
t.Errorf("%s: above = %v", tc.name, lc["above"])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// peak 的形状是插件唯一读取的 {multiplier, windows=[{days,hours}]}。
|
||||
func TestBillingCompilePeakShape(t *testing.T) {
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{map[string]interface{}{
|
||||
"url": "https://mine.example.com/v1", "mode": "token",
|
||||
"models": map[string]interface{}{"m": map[string]interface{}{"prompt": "1", "completion": "1"}},
|
||||
"peak": map[string]interface{}{"multiplier": 2,
|
||||
"weekdays": []interface{}{1, 2}, "hours": []interface{}{[]interface{}{1, 4}}},
|
||||
}},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, srcList("https://mine.example.com/v1"), false)
|
||||
pk := prices["models"].(map[string]interface{})["m"].(map[string]interface{})["peak"].(map[string]interface{})
|
||||
if pk["multiplier"].(float64) != 2 {
|
||||
t.Errorf("multiplier = %v", pk["multiplier"])
|
||||
}
|
||||
wins, ok := pk["windows"].([]interface{})
|
||||
if !ok || len(wins) != 1 {
|
||||
t.Fatalf("windows = %#v", pk["windows"])
|
||||
}
|
||||
win := wins[0].(map[string]interface{})
|
||||
if len(win["days"].([]interface{})) != 2 || len(win["hours"].([]interface{})) != 1 {
|
||||
t.Errorf("window = %#v", win)
|
||||
}
|
||||
}
|
||||
|
||||
// URL 归一:尾斜杠与大小写不应影响匹配;首条命中优先。
|
||||
func TestBillingCompileURLMatchingAndFirstWins(t *testing.T) {
|
||||
sources := []map[string]interface{}{
|
||||
{"name": "mine", "base_url": "https://Mine.Example.com/v1"},
|
||||
}
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{
|
||||
map[string]interface{}{"url": "https://mine.example.com/v1/", "mode": "free"},
|
||||
map[string]interface{}{"url": "https://mine.example.com/v1", "mode": "token",
|
||||
"models": map[string]interface{}{"m": map[string]interface{}{"prompt": "1", "completion": "1"}}},
|
||||
},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, sources, false)
|
||||
entry := prices["sources"].(map[string]interface{})["mine"].(map[string]interface{})
|
||||
if entry["prompt"].(float64) != 0 {
|
||||
t.Errorf("首条规则(free)应优先,实得 %#v", entry)
|
||||
}
|
||||
if _, ok := prices["models"].(map[string]interface{})["m"]; ok {
|
||||
t.Error("第二条规则不应再被应用(首条命中优先,避免顺序歧义)")
|
||||
}
|
||||
}
|
||||
|
||||
// 严格模式:无源匹配的 URL 是硬错误;lenient 模式跳过并回报具体 URL。
|
||||
func TestBillingCompileUnmatchedRules(t *testing.T) {
|
||||
profile := map[string]interface{}{
|
||||
"id": "p",
|
||||
"rules": []interface{}{
|
||||
map[string]interface{}{"url": "https://mine.example.com/v1", "mode": "free"},
|
||||
map[string]interface{}{"url": "https://stale.example.com/v1", "mode": "free"},
|
||||
},
|
||||
}
|
||||
if msg := compilePricesErr(t, profile, srcList("https://mine.example.com/v1"), false); msg == "" {
|
||||
t.Fatal("严格模式必须报错")
|
||||
}
|
||||
ps, _ := billingVM(t)
|
||||
out, err := ps.Call("billing", "compile_prices", map[string]interface{}{
|
||||
"profile": profile, "sources": srcList("https://mine.example.com/v1"), "lenient": true,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("lenient: %v", err)
|
||||
}
|
||||
m := out.(map[string]interface{})
|
||||
rules := m["unmatched_rules"].([]interface{})
|
||||
if len(rules) != 1 || rules[0] != "https://stale.example.com/v1" {
|
||||
t.Errorf("unmatched_rules = %#v", rules)
|
||||
}
|
||||
prices := m["prices"].(map[string]interface{})
|
||||
if _, ok := prices["sources"].(map[string]interface{})["mine"]; !ok {
|
||||
t.Error("lenient 模式下有效规则仍须生效")
|
||||
}
|
||||
}
|
||||
|
||||
// 硬错误:未知 mode、token 无模型、负价、非数字、profile 不是表。
|
||||
func TestBillingCompileHardErrors(t *testing.T) {
|
||||
base := func(rule map[string]interface{}) map[string]interface{} {
|
||||
return map[string]interface{}{"id": "p", "rules": []interface{}{rule}}
|
||||
}
|
||||
url := "https://mine.example.com/v1"
|
||||
src := srcList(url)
|
||||
cases := []struct {
|
||||
name string
|
||||
profile map[string]interface{}
|
||||
wantSub string
|
||||
}{
|
||||
{"unknown mode", base(map[string]interface{}{"url": url, "mode": "wat"}), "unknown mode"},
|
||||
{"token no models", base(map[string]interface{}{"url": url, "mode": "token"}), "requires at least one model"},
|
||||
{"negative price", base(map[string]interface{}{"url": url, "mode": "token",
|
||||
"models": map[string]interface{}{"m": map[string]interface{}{"prompt": "-1", "completion": "1"}}}), "negative price"},
|
||||
{"not a number", base(map[string]interface{}{"url": url, "mode": "token",
|
||||
"models": map[string]interface{}{"m": map[string]interface{}{"prompt": "abc", "completion": "1"}}}), "not a number"},
|
||||
{"profile not table", nil, "no billing profile"},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
msg := compilePricesErr(t, tc.profile, src, false)
|
||||
if !strings.Contains(msg, tc.wantSub) {
|
||||
t.Errorf("%s: error = %q, want substring %q", tc.name, msg, tc.wantSub)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// profile.default 是"没有规则命中的源"的策略,以前被校验后写进无人读的
|
||||
// default_mode 键,运行时行为与 unpriced 完全一样(PR #2 修复)。
|
||||
func TestBillingCompileProfileDefault(t *testing.T) {
|
||||
sources := []map[string]interface{}{
|
||||
{"name": "listed", "base_url": "https://listed.example/v1"},
|
||||
{"name": "unlisted", "base_url": "https://unlisted.example/v1"},
|
||||
}
|
||||
tokenRule := map[string]interface{}{
|
||||
"url": "https://listed.example/v1", "mode": "token",
|
||||
"models": map[string]interface{}{"m": map[string]interface{}{"prompt": "1", "completion": "2"}},
|
||||
}
|
||||
|
||||
// default: free ⇒ 未匹配源写 {per_request:0}(只标记、不碰 token 价)
|
||||
profile := map[string]interface{}{
|
||||
"id": "p", "default": "free",
|
||||
"rules": []interface{}{tokenRule},
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, sources, false)
|
||||
srcs := prices["sources"].(map[string]interface{})
|
||||
un, ok := srcs["unlisted"].(map[string]interface{})
|
||||
if !ok {
|
||||
t.Fatalf("default: free 没有标记未匹配源: %#v", srcs)
|
||||
}
|
||||
if _, bad := un["prompt"]; bad {
|
||||
t.Errorf("default-free 标记携带 prompt=%v:会清零该源模型价", un["prompt"])
|
||||
}
|
||||
if _, ok := srcs["listed"]; ok {
|
||||
t.Error("default: free 不应标记已被规则命中的源")
|
||||
}
|
||||
if _, ok := prices["models"].(map[string]interface{})["m"]; !ok {
|
||||
t.Error("token 规则的模型价丢了")
|
||||
}
|
||||
|
||||
// default: unpriced / 缺省 ⇒ 不写任何标记(让 unpriced 计数看得见)
|
||||
for _, def := range []interface{}{"unpriced", nil} {
|
||||
profile := map[string]interface{}{"id": "p", "rules": []interface{}{}}
|
||||
if def != nil {
|
||||
profile["default"] = def
|
||||
}
|
||||
prices := compilePricesForTest(t, profile, sources, false)
|
||||
if n := len(prices["sources"].(map[string]interface{})); n != 0 {
|
||||
t.Errorf("default=%v 标记了 %d 个源;它们应保持未定价以便计数", def, n)
|
||||
}
|
||||
if _, present := prices["default_mode"]; present {
|
||||
t.Error("default_mode 是无人读取的死键,不应再写入")
|
||||
}
|
||||
}
|
||||
}
|
||||
227
internal/lua/billing_rules_test.go
Normal file
227
internal/lua/billing_rules_test.go
Normal file
@ -0,0 +1,227 @@
|
||||
package lua
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// billing 的规则**完全在插件内**:以源名为键、由插件自己编译、自己写
|
||||
// `<plugin_dir>/billing.json`。内核没有 billing 代码,也不提供 billing 端点;
|
||||
// 这些判据直接打插件的导出(对应插件自己的 /api/plugins/http/billing/rules)。
|
||||
func putRules(t *testing.T, ps *Plugins, rules map[string]interface{}) map[string]interface{} {
|
||||
t.Helper()
|
||||
out, err := ps.Call("billing", "rules_put", map[string]interface{}{"billing": rules})
|
||||
if err != nil {
|
||||
t.Fatalf("rules_put: %v", err)
|
||||
}
|
||||
m, _ := out.(map[string]interface{})
|
||||
return m
|
||||
}
|
||||
|
||||
func pricesOf(t *testing.T, ps *Plugins) map[string]interface{} {
|
||||
t.Helper()
|
||||
raw := ps.Prices("billing")
|
||||
p, ok := raw.(map[string]interface{})
|
||||
if !ok {
|
||||
t.Fatalf("billing has no prices: %#v", raw)
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
func oneProfile(rules []interface{}, def interface{}) map[string]interface{} {
|
||||
p := map[string]interface{}{"id": "p", "rules": rules}
|
||||
if def != nil {
|
||||
p["default"] = def
|
||||
}
|
||||
return map[string]interface{}{"active": "p", "profiles": []interface{}{p}}
|
||||
}
|
||||
|
||||
// 插件自己把规则写到 plugin_dir/billing.json,且读取回来一致。
|
||||
func TestBillingRulesPersistInPluginOwnedFile(t *testing.T) {
|
||||
ps, pdir := billingVM(t)
|
||||
rules := oneProfile([]interface{}{
|
||||
map[string]interface{}{"source": "localzen", "mode": "free"},
|
||||
}, "unpriced")
|
||||
if m := putRules(t, ps, rules); m["ok"] != true {
|
||||
t.Fatalf("rules_put 失败: %#v", m)
|
||||
}
|
||||
path := filepath.Join(pdir, "billing.json")
|
||||
raw, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
t.Fatalf("插件没有自己写规则文件 %s: %v", path, err)
|
||||
}
|
||||
var onDisk map[string]interface{}
|
||||
if err := json.Unmarshal(raw, &onDisk); err != nil {
|
||||
t.Fatalf("规则文件不是 JSON: %v\n%s", err, raw)
|
||||
}
|
||||
if !strings.Contains(string(raw), "localzen") {
|
||||
t.Fatalf("规则文件内容不对: %s", raw)
|
||||
}
|
||||
// 重新加载插件(模拟重启):规则应从文件恢复。
|
||||
ps2 := reloadBilling(t, pdir)
|
||||
got, err := ps2.Call("billing", "rules_get", map[string]interface{}{})
|
||||
if err != nil {
|
||||
t.Fatalf("rules_get: %v", err)
|
||||
}
|
||||
b, _ := json.Marshal(got)
|
||||
if !strings.Contains(string(b), "localzen") {
|
||||
t.Fatalf("重启后没有从 billing.json 恢复规则: %s", b)
|
||||
}
|
||||
// 编译结果也恢复了:free 源条目存在。
|
||||
if p := ps2.Prices("billing").(map[string]interface{}); p != nil {
|
||||
if _, ok := p["sources"].(map[string]interface{})["localzen"]; !ok {
|
||||
t.Errorf("恢复后价格表缺 localzen: %#v", p)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func reloadBilling(t *testing.T, pdir string) *Plugins {
|
||||
t.Helper()
|
||||
vm := NewVM(filepath.Join(t.TempDir(), "adapters"))
|
||||
if err := vm.Start(); err != nil {
|
||||
t.Fatalf("vm: %v", err)
|
||||
}
|
||||
t.Cleanup(vm.Stop)
|
||||
ps := NewPlugins(vm, pdir)
|
||||
if err := ps.LoadDir(); err != nil {
|
||||
t.Fatalf("load: %v", err)
|
||||
}
|
||||
return ps
|
||||
}
|
||||
|
||||
// 编译语义:free/subscription 写"有意零价",token 规则**不写源条目**(未列价
|
||||
// 的模型要可见地进入 unpriced),通配符只发布模型价。
|
||||
func TestBillingRulesCompileSemantics(t *testing.T) {
|
||||
ps, _ := billingVM(t)
|
||||
rules := oneProfile([]interface{}{
|
||||
map[string]interface{}{"source": "free-src", "mode": "free"},
|
||||
map[string]interface{}{"source": "sub-src", "mode": "subscription", "subscription": 20},
|
||||
map[string]interface{}{"source": "tok-src", "mode": "token", "models": map[string]interface{}{
|
||||
"m1": map[string]interface{}{"prompt": "0.15", "completion": "0.60"},
|
||||
}},
|
||||
map[string]interface{}{"url": "*", "mode": "token", "models": map[string]interface{}{
|
||||
"m2": map[string]interface{}{"prompt": "1", "completion": "2"},
|
||||
}},
|
||||
}, nil)
|
||||
if m := putRules(t, ps, rules); m["ok"] != true {
|
||||
t.Fatalf("rules_put: %#v", m)
|
||||
}
|
||||
p := pricesOf(t, ps)
|
||||
srcs := p["sources"].(map[string]interface{})
|
||||
for _, n := range []string{"free-src", "sub-src"} {
|
||||
e, ok := srcs[n].(map[string]interface{})
|
||||
if !ok || e["prompt"] != 0.0 || e["completion"] != 0.0 {
|
||||
t.Errorf("%s 应写有意零价: %#v", n, srcs[n])
|
||||
}
|
||||
}
|
||||
if _, ok := srcs["tok-src"]; ok {
|
||||
t.Errorf("token 规则不得产生源条目: %#v", srcs["tok-src"])
|
||||
}
|
||||
if subs, ok := p["subscriptions"].(map[string]interface{})["sub-src"].(map[string]interface{}); !ok || subs["monthly"] != 20.0 {
|
||||
t.Errorf("subscription 固定费丢失: %#v", p["subscriptions"])
|
||||
}
|
||||
models := p["models"].(map[string]interface{})
|
||||
if models["m1"].(map[string]interface{})["prompt"] != 1.5e-7 {
|
||||
t.Errorf("m1 prompt = %#v, want 1.5e-7", models["m1"])
|
||||
}
|
||||
if _, ok := models["m2"]; !ok {
|
||||
t.Error("通配符规则的模型价丢失")
|
||||
}
|
||||
}
|
||||
|
||||
// 端到端:token 规则 + 1e6/1e6 tokens @ 0.15/0.60 USD/M = 0.75,
|
||||
// 且 unpriced 计数不涨(模型本身被标价)。
|
||||
func TestBillingRulesTokenCostEndToEnd(t *testing.T) {
|
||||
ps, _ := billingVM(t)
|
||||
rules := oneProfile([]interface{}{
|
||||
map[string]interface{}{"source": "tok-src", "mode": "token", "models": map[string]interface{}{
|
||||
"m": map[string]interface{}{"prompt": "0.15", "completion": "0.60"},
|
||||
}},
|
||||
}, nil)
|
||||
if m := putRules(t, ps, rules); m["ok"] != true {
|
||||
t.Fatalf("rules_put: %#v", m)
|
||||
}
|
||||
ps.Fire(StageRequestEnd, map[string]interface{}{
|
||||
"model": "m", "source": "tok-src", "key": "***p", "ok": true,
|
||||
"prompt_tokens": 1000000.0, "completion_tokens": 1000000.0, "time": 1750000000000,
|
||||
})
|
||||
st := stateOf(t, ps)
|
||||
approx(t, "cost", st["total"].(map[string]interface{})["cost"].(float64), 0.75)
|
||||
if got := st["unpriced_reqs"].(float64); got != 0 {
|
||||
t.Errorf("unpriced_reqs = %v, want 0", got)
|
||||
}
|
||||
// 同源未列价的模型必须落入 unpriced(可见),而不是静默计 0。
|
||||
ps.Fire(StageRequestEnd, map[string]interface{}{
|
||||
"model": "unlisted", "source": "tok-src", "key": "***p", "ok": true,
|
||||
"prompt_tokens": 100.0, "completion_tokens": 1.0, "time": 1750000000000,
|
||||
})
|
||||
if got := stateOf(t, ps)["unpriced_reqs"].(float64); got != 1 {
|
||||
t.Errorf("未列价模型应计入 unpriced,got %v", got)
|
||||
}
|
||||
}
|
||||
|
||||
// 非法规则必须被拒绝,且**不覆盖**已有文件(保存失败不能丢旧配置)。
|
||||
func TestBillingRulesRejectInvalidWithoutClobberingFile(t *testing.T) {
|
||||
ps, pdir := billingVM(t)
|
||||
good := oneProfile([]interface{}{
|
||||
map[string]interface{}{"source": "s1", "mode": "free"},
|
||||
}, nil)
|
||||
if m := putRules(t, ps, good); m["ok"] != true {
|
||||
t.Fatalf("seed: %#v", m)
|
||||
}
|
||||
path := filepath.Join(pdir, "billing.json")
|
||||
before, _ := os.ReadFile(path)
|
||||
|
||||
bad := oneProfile([]interface{}{
|
||||
map[string]interface{}{"source": "s1", "mode": "nope"},
|
||||
}, nil)
|
||||
out, err := ps.Call("billing", "rules_put", map[string]interface{}{"billing": bad})
|
||||
if err != nil {
|
||||
t.Fatalf("call: %v", err)
|
||||
}
|
||||
m := out.(map[string]interface{})
|
||||
if m["error"] == nil {
|
||||
t.Fatalf("非法 mode 应被拒绝: %#v", m)
|
||||
}
|
||||
after, _ := os.ReadFile(path)
|
||||
if string(before) != string(after) {
|
||||
t.Errorf("被拒绝的保存改动了规则文件:\nbefore=%s\nafter=%s", before, after)
|
||||
}
|
||||
}
|
||||
|
||||
// reasoning 缺席 = 按输出价计;显式 long_context/peak 必须编译成插件读取的形状。
|
||||
func TestBillingRulesOptionalPricesCompile(t *testing.T) {
|
||||
ps, _ := billingVM(t)
|
||||
rules := oneProfile([]interface{}{
|
||||
map[string]interface{}{"source": "s1", "mode": "token",
|
||||
"models": map[string]interface{}{
|
||||
"plain": map[string]interface{}{"prompt": "1", "completion": "2"},
|
||||
"reasoning": map[string]interface{}{"prompt": "1", "completion": "2", "reasoning": "3"},
|
||||
"long": map[string]interface{}{"prompt": "1", "completion": "2",
|
||||
"long_context": map[string]interface{}{"above": 128000, "multiplier": 2}},
|
||||
},
|
||||
"peak": map[string]interface{}{"multiplier": 2, "hours": []interface{}{[]interface{}{1, 4}}},
|
||||
},
|
||||
}, nil)
|
||||
if m := putRules(t, ps, rules); m["ok"] != true {
|
||||
t.Fatalf("rules_put: %#v", m)
|
||||
}
|
||||
models := pricesOf(t, ps)["models"].(map[string]interface{})
|
||||
if _, present := models["plain"].(map[string]interface{})["reasoning_price"]; present {
|
||||
t.Error("未配置 reasoning 不应出现 reasoning_price(0 会被当成免费)")
|
||||
}
|
||||
if got := models["reasoning"].(map[string]interface{})["reasoning_price"]; got != 3e-6 {
|
||||
t.Errorf("reasoning_price = %v, want 3e-6", got)
|
||||
}
|
||||
lc := models["long"].(map[string]interface{})["long_context"].(map[string]interface{})
|
||||
if lc["above"] != 128000.0 || lc["prompt"] != 2e-6 {
|
||||
t.Errorf("long_context = %#v", lc)
|
||||
}
|
||||
pk := models["long"].(map[string]interface{})["peak"].(map[string]interface{})
|
||||
if pk["multiplier"] != 2.0 {
|
||||
t.Errorf("peak = %#v", pk)
|
||||
}
|
||||
}
|
||||
@ -340,7 +340,7 @@ func TestBillingRuleEditorLivesInsideTheBillingPage(t *testing.T) {
|
||||
for _, needle := range []string{
|
||||
`id="br-body"`,
|
||||
"data-act='save'", "data-act='export'", "data-act='newprofile'",
|
||||
".r-url", ".r-mode",
|
||||
".r-src", ".r-mode",
|
||||
} {
|
||||
if !strings.Contains(mount, needle) {
|
||||
t.Errorf("the rule editor is missing %s", needle)
|
||||
@ -1318,51 +1318,54 @@ func TestBillingSourceEntryStillMarksUnlistedModelPriced(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// profile 级 default 策略必须真的生效 —— 且它是**编译期**语义(PR #2):
|
||||
// `default: free` 由 compile_prices 给未匹配的源写 {per_request:0} 标记;
|
||||
// `unpriced`/缺省不写。旧实现把 default 写进没人读的 default_mode 键,
|
||||
// 两种取值运行时完全等价。
|
||||
func TestBillingProfileDefaultIsDecidedAtCompileTime(t *testing.T) {
|
||||
sources := []map[string]interface{}{
|
||||
{"name": "listed", "base_url": "https://listed.example/v1"},
|
||||
{"name": "unlisted", "base_url": "https://unlisted.example/v1"},
|
||||
}
|
||||
tokenRule := map[string]interface{}{
|
||||
"url": "https://listed.example/v1", "mode": "token",
|
||||
"models": map[string]interface{}{"m": map[string]interface{}{"prompt": "1", "completion": "2"}},
|
||||
}
|
||||
run := func(t *testing.T, profile map[string]interface{}) float64 {
|
||||
// profile 级 default 策略:规则以**源名**为键,编译在插件内完成;
|
||||
// `default: free` 表示"没有单独规则的源一律免费"(不进 unpriced 统计),
|
||||
// `unpriced`/缺省则让这些源保持可统计;显式 mode=unpriced 的源即使
|
||||
// default=free 也必须仍被统计。
|
||||
func TestBillingProfileDefaultPolicy(t *testing.T) {
|
||||
newVM := func(t *testing.T, rules map[string]interface{}) *Plugins {
|
||||
t.Helper()
|
||||
ps, _ := billingVM(t)
|
||||
out, err := ps.Call("billing", "compile_prices", map[string]interface{}{
|
||||
"profile": profile, "sources": sources, "lenient": false,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("compile_prices: %v", err)
|
||||
if _, err := ps.Call("billing", "rules_put", map[string]interface{}{"billing": rules}); err != nil {
|
||||
t.Fatalf("rules_put: %v", err)
|
||||
}
|
||||
m := out.(map[string]interface{})
|
||||
if e, bad := m["error"]; bad && fmt.Sprint(e) != "" {
|
||||
t.Fatalf("compile: %v", e)
|
||||
}
|
||||
_ = ps.SetState("billing", map[string]interface{}{"prices": m["prices"]})
|
||||
return ps
|
||||
}
|
||||
fire := func(t *testing.T, ps *Plugins, source string) float64 {
|
||||
t.Helper()
|
||||
ps.Fire(StageRequestEnd, map[string]interface{}{
|
||||
"model": "some-unlisted-model", "source": "unlisted", "key": "***p", "ok": true,
|
||||
"model": "some-unlisted-model", "source": source, "key": "***p", "ok": true,
|
||||
"prompt_tokens": 1000.0, "completion_tokens": 10.0, "time": 1750000000000,
|
||||
})
|
||||
return stateOf(t, ps)["unpriced_reqs"].(float64)
|
||||
}
|
||||
|
||||
free := map[string]interface{}{"id": "p", "default": "free", "rules": []interface{}{tokenRule}}
|
||||
if got := run(t, free); got != 0 {
|
||||
t.Errorf("default=free: unpriced_reqs = %v, want 0(刻意免费,不该计入债务)", got)
|
||||
}
|
||||
for _, def := range []interface{}{"unpriced", nil} {
|
||||
profile := map[string]interface{}{"id": "p", "rules": []interface{}{tokenRule}}
|
||||
base := func(def interface{}, rules []interface{}) map[string]interface{} {
|
||||
p := map[string]interface{}{"id": "p", "rules": rules}
|
||||
if def != nil {
|
||||
profile["default"] = def
|
||||
p["default"] = def
|
||||
}
|
||||
if got := run(t, profile); got != 1 {
|
||||
t.Errorf("default=%v: unpriced_reqs = %v, want 1(未匹配源必须可见)", def, got)
|
||||
return map[string]interface{}{"active": "p", "profiles": []interface{}{p}}
|
||||
}
|
||||
|
||||
// default=free:未列规则的源算"刻意免费"
|
||||
ps := newVM(t, base("free", []interface{}{
|
||||
map[string]interface{}{"source": "priced-src", "mode": "free"},
|
||||
}))
|
||||
if got := fire(t, ps, "unlisted-src"); got != 0 {
|
||||
t.Errorf("default=free: unpriced_reqs = %v, want 0", got)
|
||||
}
|
||||
// default=free 但显式 unpriced 的源仍要统计
|
||||
ps = newVM(t, base("free", []interface{}{
|
||||
map[string]interface{}{"source": "counted-src", "mode": "unpriced"},
|
||||
}))
|
||||
if got := fire(t, ps, "counted-src"); got != 1 {
|
||||
t.Errorf("显式 unpriced 在 default=free 下仍应统计,got %v", got)
|
||||
}
|
||||
// default 缺省/unpriced:未列规则的源计入 unpriced
|
||||
for _, def := range []interface{}{nil, "unpriced"} {
|
||||
ps := newVM(t, base(def, []interface{}{}))
|
||||
if got := fire(t, ps, "unlisted-src"); got != 1 {
|
||||
t.Errorf("default=%v: unpriced_reqs = %v, want 1", def, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -315,7 +315,7 @@ func TestBillingTableHeaderMatchesRowColumns(t *testing.T) {
|
||||
// headers were counted too and the check reported 17 vs 8 — a failure about
|
||||
// two unrelated tables. Stop at the rule editor's script.
|
||||
header := js[hStart:]
|
||||
if cut := strings.Index(header, "/api/plugins/billing/rules"); cut > 0 {
|
||||
if cut := strings.Index(header, "/api/plugins/http/billing/rules"); cut > 0 {
|
||||
header = header[:cut]
|
||||
}
|
||||
// Count <th> with OR without attributes: the name column now carries
|
||||
|
||||
@ -72,53 +72,31 @@ local DEFAULT_PRICES = {
|
||||
}
|
||||
plugin.prices = DEFAULT_PRICES
|
||||
|
||||
-- ===== 规则 → 价格表编译(Lua 侧,内核只给数据) ======================
|
||||
-- ===== 规则 → 价格表编译(全部在插件内) ==============================
|
||||
--
|
||||
-- 为什么编译在插件里(GitCode issue #1 的建议方向):
|
||||
-- 内核只负责把 config.yaml 解成结构体(YAML 解析 + schema 校验),并把
|
||||
-- profile 与源的 base_url 作为**数据**通过 plugin.compile_prices 传进插件;
|
||||
-- "规则如何变成价目表"(free/subscription/unpriced/token、URL 归一匹配、
|
||||
-- 首条命中优先、token 价的 per-million → per-token、peak 窗口、
|
||||
-- long_context 边际价、reasoning 可选价、未匹配规则/源)全部在这里。
|
||||
-- billing 没有任何内核逻辑(issue #1 的方向):规则文件、编译、计价、账目、
|
||||
-- 规则编辑页全部由本插件负责。内核既不知道 billing.json,也不知道
|
||||
-- free/token/subscription 这些语义 —— 它只做通用的"加载插件 / 持久化插件状态 /
|
||||
-- 提供通用 HTTP 与文件能力"。
|
||||
--
|
||||
-- 这样内核不需要认识任何计费语义,也不会再出现"两处各写一半、组合起来
|
||||
-- 静默归零"——issue #1 的真因正是 compile.go 与 priceFor() 各有一套覆盖语义。
|
||||
--
|
||||
-- 返回形态(供内核 SetState 注入 plugin.prices):
|
||||
-- { prices = <价目表>, unmatched_rules = {...}, unmatched_sources = {...} }
|
||||
-- 硬错误用 `return nil, "原因"`,内核据此拒绝保存/记录 ERROR。
|
||||
local function normalizeURL(u)
|
||||
u = tostring(u or ""):gsub("^%s+", ""):gsub("%s+$", "")
|
||||
u = u:gsub("/+$", "")
|
||||
return u:lower()
|
||||
end
|
||||
-- 规则以**源名**(`source`)为键,而不是 URL:URL→源名的映射属于内核配置,
|
||||
-- 插件不该为了它去和内核对接;而编辑页跑在浏览器里,可以直接取 /api/sources
|
||||
-- 让运营选源名。`url: "*"` 只保留为"全局模型价目表"(模型维度本来就不分源)。
|
||||
local VALID_MODES = { free = true, token = true, subscription = true, unpriced = true }
|
||||
|
||||
local function matchSources(pattern, sources)
|
||||
local out = {}
|
||||
if pattern == "*" then
|
||||
for _, s in ipairs(sources or {}) do out[#out + 1] = s.name end
|
||||
return out
|
||||
end
|
||||
local want = normalizeURL(pattern)
|
||||
for _, s in ipairs(sources or {}) do
|
||||
if normalizeURL(s.base_url) == want then out[#out + 1] = s.name end
|
||||
end
|
||||
return out
|
||||
end
|
||||
|
||||
-- USD per million → USD per token. 与内核校验用的是同一口径(/1e6),
|
||||
-- 数值范围与 Go 的 ParseFloatUSDPerM 一致(不允许负数/非数字)。
|
||||
local function usdPerM(v)
|
||||
local function trim(v)
|
||||
local s = tostring(v == nil and "" or v)
|
||||
s = s:gsub("^%s+", ""):gsub("%s+$", "")
|
||||
local n = tonumber(s)
|
||||
return (s:gsub("^%s+", ""):gsub("%s+$", ""))
|
||||
end
|
||||
|
||||
-- USD per million → USD per token.
|
||||
local function usdPerM(v)
|
||||
local n = tonumber(trim(v))
|
||||
if n == nil then return nil, "not a number: \"" .. tostring(v) .. "\"" end
|
||||
if n < 0 then return nil, "negative price: \"" .. tostring(v) .. "\"" end
|
||||
return n / 1e6, nil
|
||||
end
|
||||
|
||||
-- peak 窗口的**唯一**合法形状:{ multiplier, windows = { { days, hours } } }。
|
||||
-- 早期部署过的 {start,end,weekdays} 没有任何读取方(peak 静默按非高峰计价)。
|
||||
local function compilePeak(pk)
|
||||
local win = {}
|
||||
if type(pk.weekdays) == "table" and #pk.weekdays > 0 then
|
||||
@ -136,11 +114,8 @@ local function compilePeak(pk)
|
||||
return out
|
||||
end
|
||||
|
||||
-- long_context 的边际价:绝对值(USD/M 字符串)优先,其次倍数 × 基础价。
|
||||
-- 两者都缺 ⇒ 报错(一个"没有价格的阶梯"是静默 no-op,写它的人一定有意图)。
|
||||
local function longContextRate(lc, basePerToken)
|
||||
local prompt = tostring(lc.prompt == nil and "" or lc.prompt)
|
||||
prompt = prompt:gsub("^%s+", ""):gsub("%s+$", "")
|
||||
local prompt = trim(lc.prompt)
|
||||
local mult = tonumber(lc.multiplier) or 0
|
||||
if prompt ~= "" then
|
||||
local v, err = usdPerM(prompt)
|
||||
@ -151,29 +126,37 @@ local function longContextRate(lc, basePerToken)
|
||||
return nil, "needs either prompt or multiplier"
|
||||
end
|
||||
|
||||
-- 一条规则作用于哪个源。`source` 是正式写法;`url` 若不是 "*",仅在它恰好
|
||||
-- 等于源名时兼容(旧配置迁移用)。
|
||||
local function ruleSource(rule)
|
||||
local src = trim(rule.source)
|
||||
if src ~= "" then return src end
|
||||
local u = trim(rule.url)
|
||||
if u ~= "" and u ~= "*" then return u end
|
||||
return nil
|
||||
end
|
||||
|
||||
local function applyRule(prices, rule, srcName)
|
||||
local mode = rule.mode
|
||||
if mode == "free" or mode == "subscription" then
|
||||
-- 显式零价:这里 0 本身就是语义(不是"未定价")。
|
||||
prices.sources[srcName] = { prompt = 0, completion = 0, per_request = 0 }
|
||||
if mode == "subscription" then
|
||||
if prices.subscriptions == nil then prices.subscriptions = {} end
|
||||
local cur = tostring(rule.currency == nil and "" or rule.currency)
|
||||
local cur = trim(rule.currency)
|
||||
if cur == "" then cur = "USD" end
|
||||
prices.subscriptions[srcName] = {
|
||||
monthly = tonumber(rule.subscription) or 0, currency = cur,
|
||||
}
|
||||
prices.subscriptions[srcName] = { monthly = tonumber(rule.subscription) or 0, currency = cur }
|
||||
end
|
||||
return true
|
||||
end
|
||||
if mode == "unpriced" then
|
||||
-- 刻意不写源条目:让 unpriced_reqs/unpriced_models 抓住它。
|
||||
-- 刻意不写条目并显式记录:profile 的 default=free 也不能把它当"免费"。
|
||||
prices.explicit_unpriced[srcName] = true
|
||||
return true
|
||||
end
|
||||
if mode == "token" then
|
||||
if type(rule.models) ~= "table" or next(rule.models) == nil then
|
||||
return nil, string.format("rule for url %q: mode token requires at least one model",
|
||||
tostring(rule.url))
|
||||
return nil, string.format("token rule for %q requires at least one model",
|
||||
tostring(rule.source or rule.url))
|
||||
end
|
||||
for modelID, t in pairs(rule.models) do
|
||||
local prompt, perr = usdPerM(t.prompt)
|
||||
@ -182,12 +165,8 @@ local function applyRule(prices, rule, srcName)
|
||||
if not completion then return nil, string.format("model %q completion: %s", tostring(modelID), cerr) end
|
||||
local entry = { prompt = prompt, completion = completion }
|
||||
if t.cache_discount ~= nil then entry.cache_discount = tonumber(t.cache_discount) end
|
||||
-- reasoning 可选,且**缺席**而非 0:写 0 等于"思考免费",会静默少报
|
||||
-- 每一个把 reasoning 按输出计价的 provider。
|
||||
local reasoning = tostring(t.reasoning == nil and "" or t.reasoning)
|
||||
reasoning = reasoning:gsub("^%s+", ""):gsub("%s+$", "")
|
||||
if reasoning ~= "" then
|
||||
local rp, rerr = usdPerM(reasoning)
|
||||
if trim(t.reasoning) ~= "" then
|
||||
local rp, rerr = usdPerM(t.reasoning)
|
||||
if not rp then return nil, string.format("model %q reasoning: %s", tostring(modelID), rerr) end
|
||||
entry.reasoning_price = rp
|
||||
end
|
||||
@ -197,102 +176,289 @@ local function applyRule(prices, rule, srcName)
|
||||
return nil, string.format("model %q long_context: above must be > 0", tostring(modelID))
|
||||
end
|
||||
local rate, lerr = longContextRate(t.long_context, prompt)
|
||||
if not rate then
|
||||
return nil, string.format("model %q long_context: %s", tostring(modelID), lerr)
|
||||
end
|
||||
if not rate then return nil, string.format("model %q long_context: %s", tostring(modelID), lerr) end
|
||||
entry.long_context = { above = above, prompt = rate }
|
||||
end
|
||||
if type(rule.peak) == "table" then entry.peak = compilePeak(rule.peak) end
|
||||
prices.models[modelID] = entry
|
||||
end
|
||||
-- ★ token 规则**不写任何源条目**(模型维度只发布模型价)。
|
||||
--
|
||||
-- 此前写 `{per_request:0}` 或 `{prompt:0,completion:0}` 都是为了"标记该源
|
||||
-- 已定价",但 priceFor() 让源层**无条件覆盖**模型层的 prompt/completion:
|
||||
-- * `{prompt:0,completion:0}` ⇒ 规则刚发布的模型价被清零(issue #1 本体);
|
||||
-- * 只写 `{per_request:0}` ⇒ 模型价没被清零,但同源上**未列入 rule.Models**
|
||||
-- 的模型仍被评为"已定价"、静默计 0,unpriced 计数依旧不涨。
|
||||
-- 第二条仍然是"静默少报",只是窄一点。所以统一收口:token 规则不产生源条目,
|
||||
-- 未列价的模型落到 unpriced 统计里(可见)。真正"边际成本为零"用
|
||||
-- mode=free / mode=subscription —— 它们写的是有意为之的零价标记。
|
||||
-- token 规则**不写源条目**:未列价的模型进入 unpriced 统计(可见)。
|
||||
return true
|
||||
end
|
||||
return nil, string.format("unknown mode %q", tostring(mode))
|
||||
end
|
||||
|
||||
local function compilePrices(profile, sources, lenient)
|
||||
-- compileRules(profile) → { prices, warnings } 或 nil, err。
|
||||
-- 不接收源列表:规则以源名为键,编译器不需要知道网关上有哪些源。
|
||||
local function compileRules(profile)
|
||||
if type(profile) ~= "table" then return nil, "no billing profile" end
|
||||
sources = sources or {}
|
||||
local prices = {
|
||||
currency = "USD",
|
||||
default = { prompt = 0, completion = 0, per_request = 0 },
|
||||
sources = {}, models = {}, keys = {},
|
||||
sources = {}, models = {}, keys = {}, explicit_unpriced = {},
|
||||
}
|
||||
local rules = type(profile.rules) == "table" and profile.rules or {}
|
||||
-- currency 是 profile 级声明:第一条带 currency 的规则生效。
|
||||
for i = 1, #rules do
|
||||
local c = rules[i].currency
|
||||
if type(c) == "string" and c ~= "" then prices.currency = c break end
|
||||
if profile.default == "free" or profile.default == "unpriced" then
|
||||
prices.default_mode = profile.default
|
||||
end
|
||||
local matched = {}
|
||||
local unmatched_rules = {}
|
||||
local rules = type(profile.rules) == "table" and profile.rules or {}
|
||||
for i = 1, #rules do
|
||||
local c = trim(rules[i].currency)
|
||||
if c ~= "" then prices.currency = c break end
|
||||
end
|
||||
local warnings = {}
|
||||
for i = 1, #rules do
|
||||
local rule = rules[i]
|
||||
local url = tostring(rule.url == nil and "" or rule.url)
|
||||
local targets = matchSources(url, sources)
|
||||
if #targets == 0 and url ~= "*" then
|
||||
if lenient then
|
||||
unmatched_rules[#unmatched_rules + 1] = url
|
||||
else
|
||||
return nil, string.format("rule url %q matches no configured source base_url", url)
|
||||
end
|
||||
local url = trim(rule.url)
|
||||
local src = ruleSource(rule)
|
||||
if url == "*" then
|
||||
local ok, err = applyRule(prices, rule, nil)
|
||||
if not ok then return nil, err end
|
||||
elseif src == nil then
|
||||
warnings[#warnings + 1] = "rule " .. i .. " 既没有 source 也没有 url=\"*\""
|
||||
else
|
||||
for _, srcName in ipairs(targets) do
|
||||
-- 首条命中优先:两条规则匹配同一个源是歧义,后面的不能悄悄覆盖前面的。
|
||||
if not matched[srcName] then
|
||||
matched[srcName] = true
|
||||
local ok, err = applyRule(prices, rule, srcName)
|
||||
if not ok then return nil, err end
|
||||
end
|
||||
local ok, err = applyRule(prices, rule, src)
|
||||
if not ok then return nil, err end
|
||||
end
|
||||
end
|
||||
return { prices = prices, warnings = warnings }
|
||||
end
|
||||
|
||||
-- ===== 规则持久化:插件自己读写自己的配置文件 ========================
|
||||
--
|
||||
-- 规则文件放在**插件自己的目录**(内核通过通用的 __llmsproxy_plugin_dir 暴露,
|
||||
-- 任何插件都能用;内核不知道 billing 的存在):`<plugin_dir>/billing.json`。
|
||||
-- 用 JSON 因为插件沙箱只有 json 库;用独立文件因为"保存系统配置"绝不该改动
|
||||
-- 价目表,反之亦然。
|
||||
plugin.rules = { active = "", profiles = {} }
|
||||
plugin.rules_path = ""
|
||||
|
||||
local function defaultRulesPath()
|
||||
local dir = rawget(_G, "__llmsproxy_plugin_dir")
|
||||
if type(dir) ~= "string" or dir == "" then return "" end
|
||||
return dir .. "/billing.json"
|
||||
end
|
||||
|
||||
local function readRulesFile(path)
|
||||
if path == "" then return nil end
|
||||
local f = io.open(path, "r")
|
||||
if f == nil then return nil end
|
||||
local data = f:read("*a")
|
||||
f:close()
|
||||
if data == nil or data == "" then return nil end
|
||||
local ok, dec = pcall(json.decode, data)
|
||||
if not ok or type(dec) ~= "table" then
|
||||
return nil, "规则文件不是合法 JSON: " .. tostring(path)
|
||||
end
|
||||
return dec
|
||||
end
|
||||
|
||||
local function writeRulesFile(path, rules)
|
||||
if path == "" then return nil, "插件目录不可用,无法保存规则文件" end
|
||||
local ok, enc = pcall(json.encode, rules)
|
||||
if not ok then return nil, "规则无法序列化" end
|
||||
local tmp = path .. ".tmp"
|
||||
local f, err = io.open(tmp, "w")
|
||||
if f == nil then return nil, "无法写规则文件: " .. tostring(err) end
|
||||
local wok, werr = f:write(enc)
|
||||
f:close()
|
||||
if not wok then os.remove(tmp) return nil, "写规则文件失败: " .. tostring(werr) end
|
||||
local rok, rerr = os.rename(tmp, path)
|
||||
if not rok then
|
||||
os.remove(tmp)
|
||||
return nil, "替换规则文件失败: " .. tostring(rerr)
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
local function validateRulesShape(rules)
|
||||
if type(rules) ~= "table" then return nil, "规则必须是对象" end
|
||||
if rules.active ~= nil and type(rules.active) ~= "string" then return nil, "active 必须是字符串" end
|
||||
local profiles = rules.profiles
|
||||
if profiles == nil then profiles = {} rules.profiles = profiles end
|
||||
if type(profiles) ~= "table" then return nil, "profiles 必须是数组" end
|
||||
local seen = {}
|
||||
for i, p in ipairs(profiles) do
|
||||
if type(p) ~= "table" then return nil, "profiles[" .. i .. "] 必须是对象" end
|
||||
local id = trim(p.id)
|
||||
if id == "" then return nil, "profiles[" .. i .. "] 缺少 id" end
|
||||
if seen[id] then return nil, "profile id 重复: " .. id end
|
||||
seen[id] = true
|
||||
if p.default ~= nil and p.default ~= "free" and p.default ~= "unpriced" then
|
||||
return nil, "profile " .. id .. " 的 default 只能是 free 或 unpriced"
|
||||
end
|
||||
if p.rules ~= nil and type(p.rules) ~= "table" then
|
||||
return nil, "profile " .. id .. " 的 rules 必须是数组"
|
||||
end
|
||||
for j, r in ipairs(p.rules or {}) do
|
||||
if type(r) ~= "table" then return nil, "profile " .. id .. " 的 rules[" .. j .. "] 必须是对象" end
|
||||
local mode = trim(r.mode)
|
||||
if not VALID_MODES[mode] then
|
||||
return nil, "profile " .. id .. " 的 rules[" .. j .. "] 的 mode 非法: " .. mode
|
||||
end
|
||||
local wildcard = trim(r.url) == "*"
|
||||
if ruleSource(r) == nil and not wildcard then
|
||||
return nil, "profile " .. id .. " 的 rules[" .. j .. "] 必须有 source(或 url=\"*\" 作全局模型价目)"
|
||||
end
|
||||
if mode == "token" and (type(r.models) ~= "table" or next(r.models) == nil) then
|
||||
return nil, "profile " .. id .. " 的 token 规则缺少 models"
|
||||
end
|
||||
end
|
||||
end
|
||||
-- profile 的 default 策略:只影响**没有规则命中**的源。
|
||||
--
|
||||
-- `free` = 运营声明"其余源一律免费" ⇒ 必须被识别为已定价,否则它们会一直计入
|
||||
-- unpriced,告警变成噪音;标记用 `{per_request:0}`(只标记、不碰 token 价,
|
||||
-- 否则任何通配符价目表都会被它清零,等于同一个 bug 换个入口复现)。
|
||||
-- `unpriced`(或缺省)= 不写条目,让插件的 unpriced 计数看得见它们。
|
||||
--
|
||||
-- 这个策略以前只被校验、却被写进一个没人读的 `default_mode` 键 ⇒
|
||||
-- `default: free` 与 `default: unpriced` 运行时完全等价。
|
||||
if profile.default == "free" then
|
||||
for _, src in ipairs(sources) do
|
||||
if not matched[src.name] and prices.sources[src.name] == nil then
|
||||
prices.sources[src.name] = { per_request = 0 }
|
||||
end
|
||||
if rules.active ~= nil and rules.active ~= "" and not seen[rules.active] then
|
||||
return nil, "active 指向不存在的 profile: " .. rules.active
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
local function activeProfile(rules)
|
||||
local profile = nil
|
||||
for _, p in ipairs(rules.profiles or {}) do
|
||||
if rules.active ~= nil and rules.active ~= "" and p.id == rules.active then
|
||||
profile = p
|
||||
break
|
||||
end
|
||||
end
|
||||
local unmatched_sources = {}
|
||||
for _, src in ipairs(sources) do
|
||||
if not matched[src.name] then unmatched_sources[#unmatched_sources + 1] = src.name end
|
||||
if profile == nil then profile = (rules.profiles or {})[1] end
|
||||
return profile
|
||||
end
|
||||
|
||||
-- applyRules:用给定规则重编译并注入 plugin.prices。启动、保存、切方案都走它。
|
||||
local function applyRules(rules)
|
||||
local res, err = compileRules(activeProfile(rules) or {})
|
||||
if not res then return nil, tostring(err) end
|
||||
plugin.prices = res.prices
|
||||
return res
|
||||
end
|
||||
|
||||
-- 启动即加载:插件被内核加载时就自己读规则文件并编译 —— 内核不需要调用任何
|
||||
-- billing 专用接口,它只知道"加载插件"。
|
||||
plugin.rules_path = defaultRulesPath()
|
||||
do
|
||||
local loaded, lerr = readRulesFile(plugin.rules_path)
|
||||
if lerr then
|
||||
plugin.load_error = lerr
|
||||
elseif loaded ~= nil then
|
||||
plugin.rules = loaded
|
||||
end
|
||||
return { prices = prices, unmatched_rules = unmatched_rules, unmatched_sources = unmatched_sources }
|
||||
local res, err = applyRules(plugin.rules)
|
||||
if not res then plugin.load_error = tostring(err) end
|
||||
end
|
||||
|
||||
-- 内核入口:profile 与源的 base_url 都是**数据**,插件不认识 config.yaml。
|
||||
plugin.compile_prices = function(args)
|
||||
args = args or {}
|
||||
local out, err = compilePrices(args.profile, args.sources, args.lenient and true or false)
|
||||
-- 错误用**表里的 error 字段**回传,而不是第二个返回值:内核桥的
|
||||
-- `Call` 只把第一个返回值解码成数据(第二个返回值的错误通道在插件导出上
|
||||
-- 并不可靠),用 {error=...} 是本仓库其它插件导出一致的约定。
|
||||
if not out then return { error = tostring(err) } end
|
||||
return out
|
||||
-- ---- 规则编辑器的 HTTP 面(挂在插件自己的 /api/plugins/http/billing/ 下)----
|
||||
-- 规则属于插件,写盘也在插件内完成;内核没有 billing 端点。
|
||||
function plugin.__http_rules_get(req)
|
||||
local out = { billing = plugin.rules, warnings = {} }
|
||||
local profile = activeProfile(plugin.rules or {})
|
||||
if profile then out.active = profile.id end
|
||||
local res = profile and compileRules(profile)
|
||||
if res and res.warnings then out.warnings = res.warnings end
|
||||
if plugin.load_error then out.error = plugin.load_error end
|
||||
return { status = 200, json = out }
|
||||
end
|
||||
|
||||
plugin.exports = plugin.exports or {}
|
||||
plugin.exports[#plugin.exports + 1] = "compile_prices"
|
||||
function plugin.__http_rules_put(req)
|
||||
local body = (req and (req.json or req))
|
||||
if type(body) ~= "table" then
|
||||
return { status = 400, json = { error = "请求体必须是 JSON 对象" } }
|
||||
end
|
||||
local rules = body.billing or body
|
||||
local ok, verr = validateRulesShape(rules)
|
||||
if not ok then return { status = 400, json = { error = verr } } end
|
||||
local res, cerr = applyRules(rules)
|
||||
if not res then return { status = 400, json = { error = tostring(cerr) } } end
|
||||
local wok, werr = writeRulesFile(plugin.rules_path, rules)
|
||||
if not wok then return { status = 500, json = { error = werr } } end
|
||||
plugin.rules = rules
|
||||
return { status = 200, json = { ok = true, billing = rules, warnings = res.warnings } }
|
||||
end
|
||||
|
||||
function plugin.__http_rules_add(req)
|
||||
local body = (req and (req.json or req)) or {}
|
||||
local copy = json.decode(json.encode(plugin.rules or { active = "", profiles = {} }))
|
||||
local target = nil
|
||||
for _, p in ipairs(copy.profiles or {}) do
|
||||
if body.profile == nil or body.profile == "" or p.id == body.profile then target = p break end
|
||||
end
|
||||
if target == nil then
|
||||
return { status = 400, json = { error = "没有该方案: " .. tostring(body.profile) } }
|
||||
end
|
||||
local rule = body.rule
|
||||
if type(rule) ~= "table" then return { status = 400, json = { error = "缺少 rule" } } end
|
||||
local key = ruleSource(rule)
|
||||
if key == nil then return { status = 400, json = { error = "规则必须有 source" } } end
|
||||
target.rules = target.rules or {}
|
||||
local replaced = false
|
||||
for i, r in ipairs(target.rules) do
|
||||
if ruleSource(r) == key and trim(r.url) == trim(rule.url) then
|
||||
target.rules[i] = rule replaced = true break
|
||||
end
|
||||
end
|
||||
if not replaced then target.rules[#target.rules + 1] = rule end
|
||||
local ok, verr = validateRulesShape(copy)
|
||||
if not ok then return { status = 400, json = { error = verr } } end
|
||||
local res, cerr = applyRules(copy)
|
||||
if not res then return { status = 400, json = { error = tostring(cerr) } } end
|
||||
local wok, werr = writeRulesFile(plugin.rules_path, copy)
|
||||
if not wok then return { status = 500, json = { error = werr } } end
|
||||
plugin.rules = copy
|
||||
return { status = 200, json = { ok = true, billing = copy } }
|
||||
end
|
||||
|
||||
function plugin.__http_rules_delete(req)
|
||||
local body = (req and (req.json or req)) or {}
|
||||
local copy = json.decode(json.encode(plugin.rules or { active = "", profiles = {} }))
|
||||
local target = nil
|
||||
for _, p in ipairs(copy.profiles or {}) do
|
||||
if body.profile == nil or body.profile == "" or p.id == body.profile then target = p break end
|
||||
end
|
||||
if target == nil then
|
||||
return { status = 400, json = { error = "没有该方案: " .. tostring(body.profile) } }
|
||||
end
|
||||
local out = {}
|
||||
local found = false
|
||||
for _, r in ipairs(target.rules or {}) do
|
||||
if ruleSource(r) == body.source or trim(r.url) == trim(body.url) then
|
||||
found = true
|
||||
else
|
||||
out[#out + 1] = r
|
||||
end
|
||||
end
|
||||
if not found then return { status = 404, json = { error = "没有该规则" } } end
|
||||
target.rules = out
|
||||
local ok, verr = validateRulesShape(copy)
|
||||
if not ok then return { status = 400, json = { error = verr } } end
|
||||
local res, cerr = applyRules(copy)
|
||||
if not res then return { status = 400, json = { error = tostring(cerr) } } end
|
||||
local wok, werr = writeRulesFile(plugin.rules_path, copy)
|
||||
if not wok then return { status = 500, json = { error = werr } } end
|
||||
plugin.rules = copy
|
||||
return { status = 200, json = { ok = true, billing = copy } }
|
||||
end
|
||||
|
||||
-- 直调导出(/api/plugins/billing/call/<fn>):返回纯 JSON(不带 HTTP 状态壳),
|
||||
-- 便于运维/测试与插件自己的 HTTP 路由共用同一套实现。
|
||||
local function unwrap(res)
|
||||
if type(res) == "table" and res.json ~= nil then return res.json end
|
||||
return res
|
||||
end
|
||||
function plugin.rules_get(args) return unwrap(plugin.__http_rules_get({ json = args or {} })) end
|
||||
function plugin.rules_put(args) return unwrap(plugin.__http_rules_put({ json = args or {} })) end
|
||||
function plugin.rules_add(args) return unwrap(plugin.__http_rules_add({ json = args or {} })) end
|
||||
function plugin.rules_delete(args) return unwrap(plugin.__http_rules_delete({ json = args or {} })) end
|
||||
|
||||
plugin.http = {
|
||||
{ path = "billing/rules", method = "GET", handler = "__http_rules_get",
|
||||
roles = { "admin" }, description = "计费规则读取" },
|
||||
{ path = "billing/rules", method = "PUT", handler = "__http_rules_put",
|
||||
roles = { "admin" }, description = "替换整份计费规则(插件自己写盘)" },
|
||||
{ path = "billing/rules", method = "POST", handler = "__http_rules_add",
|
||||
roles = { "admin" }, description = "新增/替换一条计费规则" },
|
||||
{ path = "billing/rules", method = "DELETE", handler = "__http_rules_delete",
|
||||
roles = { "admin" }, description = "删除一条计费规则" },
|
||||
}
|
||||
|
||||
-- 测试/运维直调导出(/api/plugins/billing/call/...);不是内核接口。
|
||||
plugin.exports = { "rules_get", "rules_put", "rules_add", "rules_delete" }
|
||||
|
||||
-- Default prompt-cache discount. 0.1 = a cache read costs a tenth of a fresh
|
||||
-- token, which is what DeepSeek/Qwen/Kimi and most others charge. It can be
|
||||
@ -463,6 +629,15 @@ local function priceFor(payload)
|
||||
if kp.peak ~= nil then out.peak = kp.peak end
|
||||
end
|
||||
|
||||
-- profile 级 default 策略(编译期写入 prices.default_mode)在这里落地:
|
||||
-- `free` = 运营声明"没有单独规则的源一律免费" ⇒ 计为已定价(不进 unpriced 统计);
|
||||
-- 但显式 mode=unpriced 的源必须仍计入,否则"只统计不收费"的声明失效。
|
||||
if not out.priced and p.default_mode == "free" then
|
||||
local explicit = p.explicit_unpriced
|
||||
if not (type(explicit) == "table" and payload.source and explicit[payload.source]) then
|
||||
out.priced = true
|
||||
end
|
||||
end
|
||||
return out
|
||||
end
|
||||
|
||||
@ -1281,12 +1456,12 @@ plugin.ui = {
|
||||
})();
|
||||
|
||||
(function () {
|
||||
var API = "/api/plugins/billing/rules";
|
||||
var API = "/api/plugins/http/billing/rules";
|
||||
var STR = {
|
||||
en: {
|
||||
title: "Billing rules", profile: "Profile", newProfile: "New profile",
|
||||
addRule: "Add rule", delRule: "Delete", exportYaml: "Export YAML",
|
||||
url: "Source URL", mode: "Mode", prompt: "Prompt $/M",
|
||||
source: "Source", mode: "Mode", prompt: "Prompt $/M",
|
||||
completion: "Completion $/M", currency: "Currency",
|
||||
monthly: "Monthly fee", peakMult: "Peak multiplier",
|
||||
peakHours: "Peak hours (UTC)", peakDays: "Peak days (UTC 1=Mon)",
|
||||
@ -1298,11 +1473,11 @@ plugin.ui = {
|
||||
lcHint: "Long-context step: tokens PAST the threshold cost more. Leave all three blank for one flat rate.", reasoningHint: "Thinking tokens are billed as output unless you set a different rate here.", mFree: "free", mToken: "token", mSub: "subscription", mUnpriced: "unpriced",
|
||||
noProfile: "No profile yet — create one to start pricing.",
|
||||
noRules: "No rules in this profile",
|
||||
warnNoSource: "matches no configured source",
|
||||
warnNoSource: "no such source on this gateway",
|
||||
active: "ACTIVE", setActive: "Set active",
|
||||
saving: "saving…", saved: "Saved", rejected: "Rejected", save: "Save",
|
||||
newProfileId: "New profile id",
|
||||
needUrl: "a rule needs a URL", needPrices: "every model needs both prices",
|
||||
needUrl: "a rule needs a source name (or url '*' for a global model catalogue)", needPrices: "every model needs both prices",
|
||||
badPeakHours: "peak hours look like 1-4,6-10 (UTC, 0-23)",
|
||||
badPeakDays: "peak days are UTC weekday numbers 0-6",
|
||||
peakNeedsMult: "peak hours need a multiplier",
|
||||
@ -1312,7 +1487,7 @@ plugin.ui = {
|
||||
zh: {
|
||||
title: "计费规则", profile: "方案", newProfile: "新建方案",
|
||||
addRule: "新增规则", delRule: "删除", exportYaml: "导出 YAML",
|
||||
url: "源 URL", mode: "计费模式", prompt: "输入 $/M",
|
||||
source: "源(source 名)", mode: "计费模式", prompt: "输入 $/M",
|
||||
completion: "输出 $/M", currency: "币种",
|
||||
monthly: "月费", peakMult: "峰段倍数",
|
||||
peakHours: "峰段小时 (UTC)", peakDays: "峰段星期 (UTC 1=周一)",
|
||||
@ -1325,11 +1500,11 @@ plugin.ui = {
|
||||
mSub: "subscription 订阅", mUnpriced: "unpriced 只统计",
|
||||
noProfile: "还没有方案 —— 新建一个开始定价。",
|
||||
noRules: "该方案暂无规则",
|
||||
warnNoSource: "匹配不到已配置的源",
|
||||
warnNoSource: "网关上没有这个源",
|
||||
active: "生效中", setActive: "设为生效",
|
||||
saving: "保存中…", saved: "已保存", rejected: "被拒绝", save: "保存",
|
||||
newProfileId: "新方案 id",
|
||||
needUrl: "规则必须有 URL",
|
||||
needUrl: "规则必须有源名(或 url '*' 作全局模型价目)",
|
||||
needPrices: "每个模型都要填输入和输出价格",
|
||||
badPeakHours: "峰段小时应形如 1-4,6-10(UTC,0-23)",
|
||||
badPeakDays: "峰段星期应为 UTC 星期编号 0-6",
|
||||
@ -1447,7 +1622,8 @@ plugin.ui = {
|
||||
}
|
||||
|
||||
function ruleRow(rule, known, T) {
|
||||
var unknown = rule.url !== "*" && known.indexOf(rule.url) < 0;
|
||||
var src = rule.source || (rule.url !== "*" ? rule.url : "");
|
||||
var unknown = src !== "" && src !== "*" && known.indexOf(src) < 0;
|
||||
var opts = [["free", T.mFree], ["token", T.mToken], ["subscription", T.mSub], ["unpriced", T.mUnpriced]]
|
||||
.map(function (o) {
|
||||
return "<option value='" + o[0] + "'" + (rule.mode === o[0] ? " selected" : "") + ">" + esc(o[1]) + "</option>";
|
||||
@ -1457,8 +1633,8 @@ plugin.ui = {
|
||||
// 的固有宽度会把列撑开:实测表格 986px 挤在 954px 容器里,最右侧的
|
||||
// 「删除」列被切掉 32px,按钮点不到;r-cur/r-sub 这些只有 style='width:74px'
|
||||
// 的输入框实测只有 40px 可用,几乎不能输入。
|
||||
return "<tr class='br-rule' data-url='" + esc(rule.url || "") + "'>" +
|
||||
"<td style='min-width:200px'><input class='r-url' value='" + esc(rule.url || "") + "' list='br-urls' style='width:100%;box-sizing:border-box'>" +
|
||||
return "<tr class='br-rule' data-source='" + esc(src) + "'>" +
|
||||
"<td style='min-width:200px'><input class='r-src' value='" + esc(src) + "' list='br-srcs' placeholder='source 名,或 * = 全局模型价目' style='width:100%;box-sizing:border-box'>" +
|
||||
(unknown ? "<div style='color:#e0a33e;font-size:11px'>⚠ " + esc(T.warnNoSource) + "</div>" : "") +
|
||||
"</td>" +
|
||||
"<td style='width:88px'><select class='r-mode' style='width:100%;box-sizing:border-box;padding:2px;font-size:12px'>" + opts + "</select></td>" +
|
||||
@ -1475,10 +1651,11 @@ plugin.ui = {
|
||||
|
||||
// ---- collecting one rule back out of the DOM ----------------------------
|
||||
function collectRule(tr, T) {
|
||||
var url = tr.querySelector(".r-url").value.trim();
|
||||
if (!url) throw new Error(T.needUrl);
|
||||
var src = tr.querySelector(".r-src").value.trim();
|
||||
if (!src) throw new Error(T.needUrl);
|
||||
var mode = tr.querySelector(".r-mode").value;
|
||||
var out = { url: url, mode: mode };
|
||||
var out = { source: src, mode: mode };
|
||||
if (src === "*") { out.source = ""; out.url = "*"; }
|
||||
var cur = tr.querySelector(".r-cur").value.trim();
|
||||
if (cur) out.currency = cur;
|
||||
if (mode === "subscription") {
|
||||
@ -1628,7 +1805,8 @@ plugin.ui = {
|
||||
dsl.profiles.push({ id: id, rules: rules });
|
||||
});
|
||||
dsl.active = DATA && DATA.active ? DATA.active : (dsl.profiles[0] || {}).id;
|
||||
return "billing:\n" + yamlValue(dsl, 1) + "\n";
|
||||
// 规则现在是插件自持的 billing.json,导出就是同一个 JSON 结构。
|
||||
return JSON.stringify(dsl, null, 2) + "\n";
|
||||
}
|
||||
|
||||
// ---- render --------------------------------------------------------------
|
||||
@ -1646,7 +1824,7 @@ plugin.ui = {
|
||||
var dsl = (DATA && DATA.billing) || null;
|
||||
var profiles = (dsl && dsl.profiles) || [];
|
||||
var active = (DATA && DATA.active) || (profiles[0] && profiles[0].id) || "";
|
||||
var known = (DATA && DATA.urls) || [];
|
||||
var known = (DATA && DATA.sources) || [];
|
||||
|
||||
var warn = "";
|
||||
if (DATA && DATA.warnings && DATA.warnings.length) {
|
||||
@ -1662,7 +1840,7 @@ plugin.ui = {
|
||||
return;
|
||||
}
|
||||
|
||||
var html = warn + "<datalist id='br-urls'>" + dl + "</datalist>";
|
||||
var html = warn + "<datalist id='br-srcs'>" + dl + "</datalist>";
|
||||
profiles.forEach(function (p) {
|
||||
var rules = p.rules || [];
|
||||
html += "<div data-profile='" + esc(p.id) + "' style='margin:0 0 18px'>" +
|
||||
@ -1760,7 +1938,7 @@ plugin.ui = {
|
||||
}
|
||||
if (idx < 0) return;
|
||||
dsl.profiles[idx].rules = dsl.profiles[idx].rules.filter(function (r) {
|
||||
return r.url !== tr.dataset.url;
|
||||
return (r.source || r.url) !== tr.dataset.source;
|
||||
});
|
||||
save(dsl);
|
||||
};
|
||||
@ -1774,10 +1952,10 @@ plugin.ui = {
|
||||
if (dsl.profiles[i].id === b.dataset.pid) idx = i;
|
||||
}
|
||||
if (idx < 0) return;
|
||||
// Seed with the first configured URL: an empty url row would fail
|
||||
// Seed with the first configured source: an empty source row would fail
|
||||
// validation on save and the operator would not know why.
|
||||
var first = ((DATA && DATA.urls) || [])[0] || "";
|
||||
dsl.profiles[idx].rules.push({ url: first, mode: "free" });
|
||||
var first = ((DATA && DATA.sources) || [])[0] || "*";
|
||||
dsl.profiles[idx].rules.push({ source: first === "*" ? "" : first, url: first === "*" ? "*" : nil, mode: "free" });
|
||||
save(dsl);
|
||||
};
|
||||
});
|
||||
@ -1854,19 +2032,27 @@ plugin.ui = {
|
||||
p.innerHTML = "<button class='ghost small' id='br-dl'>" + esc(T.exportYaml) + " (.yaml)</button>";
|
||||
holder.appendChild(p);
|
||||
document.getElementById("br-dl").onclick = function () {
|
||||
var blob = new Blob([text], { type: "text/yaml" });
|
||||
var blob = new Blob([text], { type: "application/json" });
|
||||
var a = document.createElement("a");
|
||||
a.href = URL.createObjectURL(blob);
|
||||
a.download = "billing-rules.yaml";
|
||||
a.download = "billing.json";
|
||||
a.click();
|
||||
setTimeout(function () { URL.revokeObjectURL(a.href); }, 2000);
|
||||
};
|
||||
}
|
||||
|
||||
function load() {
|
||||
call("GET")
|
||||
.then(function (j) {
|
||||
DATA = { billing: j.billing || null, active: j.active, urls: j.urls || [], warnings: j.warnings || [] };
|
||||
Promise.all([
|
||||
call("GET"),
|
||||
// 源名列表来自网关自己的 /api/sources(浏览器带管理员会话),插件不需要
|
||||
// 为了它去和内核对接 —— 这正是"规则以源名为键"能做到零内核依赖的原因。
|
||||
fetch("/api/sources", { credentials: "same-origin" })
|
||||
.then(function (r) { return r.ok ? r.json() : { sources: [] }; })
|
||||
.catch(function () { return { sources: [] }; }),
|
||||
]).then(function (res) {
|
||||
var j = res[0], sj = res[1] || {};
|
||||
var names = (sj.sources || []).map(function (s) { return s.name; }).filter(Boolean);
|
||||
DATA = { billing: j.billing || null, active: j.active, sources: names, warnings: j.warnings || [] };
|
||||
render();
|
||||
})
|
||||
.catch(function (e) {
|
||||
|
||||
Reference in New Issue
Block a user