mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-10-15 23:22:59 +08:00
转发: - 平台清单与 provider profile 新增 command_code:按模型分流,Chat Completions / Responses 基址 https://api.commandcode.ai/provider/v1, Anthropic 基址 https://api.commandcode.ai/provider;内置规则 claude-* → Anthropic、gpt-* → Responses(也支持 Chat Completions)。 - 原生 Anthropic 端点的版本感知拼接改按分流方式判断,转发与连接测试共用 (Anthropic 基址带 /v1 时连接测试不再误报为配置错误)。 按模型的协议集合(模型支持入站协议时直通,免去协议转换): - 分流规则可带协议集合 protocols(首项为首选协议):入站协议在集合中时同 协议直通,否则走首选协议;只有一个协议时与原规则相同,OpenCode 行为不变。 - profile 新增 model_catalog:Command Code 的 /models 为每个模型给出 supported_endpoints。官方默认地址的目录按地址全进程共享,自定义上游按账号 隔离;目录请求的 UA 收敛与账号请求头覆写与转发一致。目录缓存 30 分钟、后台 刷新,失败退避 5 分钟;从未加载成功时首批请求最多等 2 秒,冷启动也按目录 分流。账号规则未命中的模型按目录取协议集合;目录不可用时回落内置规则(账号 未配置规则时)或 Chat Completions。 - 三个入站入口共用的 resolveUpstreamProtocol 增加目录参数。 - 前端分流规则编辑器可为每条规则勾选"也支持"的协议;提供模型目录的平台, 兜底行改为说明按上游模型列表选协议。 连接测试: - 按模型分流的平台共用一条测试路径(协议与网关同一判定,含模型目录;默认 测试模型取自 profile),不再落入 Claude 测试路径。 - 首个分支由"国产厂商"改为"按入站协议分流";adaptive 测试跳过 profile 未 提供的 Anthropic 端点。现有国产厂商行为不变。 - 连接测试是 OpenCode 专属分流入口的最后一个调用方,改走统一判定后删除 ResolveOpenCodeGoUpstreamProtocol、openCodeGoNativeProtocol,以及此前就只剩 测试使用的 OpenCodeGoModelProtocol;路由矩阵的旧行为基准改为测试内独立复述。 额度与余额(/alpha/whoami、billing/credits、billing/subscriptions、 usage/summary): - 额度探测写入 5 小时 / 每周窗口(限额套餐)与还原出的月度窗口,同时写入 积分余额;余额探测只取积分。仅对官方主机上的 API Key 账号生效。 - 订阅周期或本周期用量取数失败时保留上一次的月度快照,不当作没有月度窗口 清掉;窗口尚未开始(没有重置时间)时清掉上一个窗口的重置时间。 - whoami 取不到时探测整体失败,不按个人账户继续(组织账号会查到成员的个人 钱包,并据此按余额停调)。 - 阈值停调与定时检测纳入 Command Code;有充值积分时上游跳过窗口检查,窗口 快照不参与停调与冷却;积分低于余额阈值时临时停调。 - 上游计费探测的官方域名加入 commandcode.ai,不把 Key 发往官方主机上并不 存在的中转计费接口。 上游错误(依据 commandcode.ai/docs/troubleshooting/errors,按文案分类, 402 / 403 / 429 同样处理): - 5 小时 / 每周窗口用满:带原因的临时停调,到文案中的 "Resets in …",解析 不出时回落额度快照;充值积分不受窗口限制,额度 / 余额探测发现充值积分后 只解除这一类停调。 - 积分耗尽(含 usage_exceeded):可恢复的临时停调,积分恢复后由周期检测 解除,不再永久置为 error。 - 组织花费上限:文案指明模型("set for <模型>")且请求模型已知时只写模型级 限流;成员总额度或作用域不明时整个账号冷却,最长一小时。 - 普通频率限制走默认 429 逻辑,不再冷却到窗口重置点。 前端: - 账号列表显示额度窗口与积分余额,阈值设置增加 command_code。单元格可见性 改为按账号判定,与后端一致:只对官方主机上的 API Key 账号显示,自定义中转 显示占位符,不再每次打开列表都探测出一行报错。 - 使用官网的官方标志(圆角方块内镂空 ⌘);配色为中性灰(品牌黑色已由 Grok 使用)。 测试基准中原先用作"仅服务端登记"示例的 command_code 改为虚构的 acme_router; 新增的前端测试加入 CI 前端关键测试列表。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
232 lines
8.6 KiB
Go
232 lines
8.6 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/ctxkey"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type compositeOwnershipAccountRepo struct {
|
|
AccountRepository
|
|
accounts []Account
|
|
}
|
|
|
|
func (r *compositeOwnershipAccountRepo) ListSchedulableByGroupID(context.Context, int64) ([]Account, error) {
|
|
return r.accounts, nil
|
|
}
|
|
|
|
// Scenario: 唯一平台的精确别名可路由
|
|
func TestResolveCompositeModelOwnershipKeepsProviderAccountsIsolated(t *testing.T) {
|
|
groupID := int64(7)
|
|
repo := &compositeOwnershipAccountRepo{
|
|
accounts: []Account{
|
|
{
|
|
ID: 1,
|
|
Platform: PlatformOpenAI,
|
|
Credentials: map[string]any{
|
|
"model_mapping": map[string]any{"gpt-public": "gpt-5"},
|
|
},
|
|
},
|
|
{
|
|
ID: 2,
|
|
Platform: PlatformDeepseek,
|
|
Credentials: map[string]any{
|
|
"model_mapping": map[string]any{"reasoning-alias": "deepseek-v4-pro"},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
svc := &GatewayService{accountRepo: repo}
|
|
|
|
deepSeekOwnership, err := svc.resolveCompositeModelOwnership(context.Background(), groupID, "reasoning-alias")
|
|
require.NoError(t, err)
|
|
require.Equal(t, CompositeModelOwnership{TargetPlatform: PlatformDeepseek, Matched: true}, deepSeekOwnership)
|
|
|
|
openAIOwnership, err := svc.resolveCompositeModelOwnership(context.Background(), groupID, "gpt-public")
|
|
require.NoError(t, err)
|
|
require.Equal(t, CompositeModelOwnership{TargetPlatform: PlatformOpenAI, Matched: true}, openAIOwnership)
|
|
}
|
|
|
|
// Scenario: 通配符和空映射不声明所有权
|
|
func TestResolveCompositeModelOwnershipRequiresNonEmptyExactMappings(t *testing.T) {
|
|
groupID := int64(7)
|
|
repo := &compositeOwnershipAccountRepo{
|
|
accounts: []Account{
|
|
{
|
|
ID: 1,
|
|
Platform: PlatformOpenAI,
|
|
Credentials: map[string]any{
|
|
"model_mapping": map[string]any{"*": "gpt-5", "gpt-*": "gpt-5", "empty-alias": ""},
|
|
},
|
|
},
|
|
{
|
|
ID: 2,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"model_mapping": map[string]any{"grok-public": "grok-4"},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
svc := &GatewayService{accountRepo: repo}
|
|
|
|
for _, model := range []string{"gpt-5", "empty-alias", "unknown-alias"} {
|
|
ownership, err := svc.resolveCompositeModelOwnership(context.Background(), groupID, model)
|
|
require.NoError(t, err)
|
|
require.Equal(t, CompositeModelOwnership{}, ownership, "model=%s", model)
|
|
}
|
|
|
|
ownership, err := svc.resolveCompositeModelOwnership(context.Background(), groupID, "grok-public")
|
|
require.NoError(t, err)
|
|
require.Equal(t, CompositeModelOwnership{TargetPlatform: PlatformGrok, Matched: true}, ownership)
|
|
}
|
|
|
|
func TestResolveCompositeModelOwnershipAllowsSamePlatformAndRejectsCrossPlatformAliases(t *testing.T) {
|
|
groupID := int64(7)
|
|
repo := &compositeOwnershipAccountRepo{
|
|
accounts: []Account{
|
|
{ID: 1, Platform: PlatformOpenAI, Credentials: map[string]any{"model_mapping": map[string]any{"shared-openai": "gpt-5", "ambiguous": "gpt-5"}}},
|
|
{ID: 2, Platform: PlatformOpenAI, Credentials: map[string]any{"model_mapping": map[string]any{"shared-openai": "gpt-5.1"}}},
|
|
{ID: 3, Platform: PlatformDeepseek, Credentials: map[string]any{"model_mapping": map[string]any{"ambiguous": "deepseek-v4-pro"}}},
|
|
},
|
|
}
|
|
svc := &GatewayService{accountRepo: repo}
|
|
|
|
samePlatform, err := svc.resolveCompositeModelOwnership(context.Background(), groupID, "shared-openai")
|
|
require.NoError(t, err)
|
|
require.Equal(t, CompositeModelOwnership{TargetPlatform: PlatformOpenAI, Matched: true}, samePlatform)
|
|
|
|
ambiguous, err := svc.resolveCompositeModelOwnership(context.Background(), groupID, "ambiguous")
|
|
require.NoError(t, err)
|
|
require.Equal(t, CompositeModelOwnership{Ambiguous: true}, ambiguous)
|
|
}
|
|
|
|
func TestNewGatewayServiceWiresCompositeModelOwnershipResolver(t *testing.T) {
|
|
groupID := int64(7)
|
|
repo := &compositeOwnershipAccountRepo{
|
|
accounts: []Account{{
|
|
ID: 1,
|
|
Platform: PlatformDeepseek,
|
|
Credentials: map[string]any{"model_mapping": map[string]any{"reasoning-alias": "deepseek-v4-pro"}},
|
|
}},
|
|
}
|
|
resolver := NewCompositeRouteResolver(nil)
|
|
svc := NewGatewayService(
|
|
repo,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
resolver,
|
|
nil,
|
|
nil,
|
|
)
|
|
require.Same(t, resolver, svc.compositeResolver)
|
|
|
|
decision, err := resolver.Resolve(context.Background(), groupID, "reasoning-alias", CompositeRouteEndpointResponses)
|
|
require.NoError(t, err)
|
|
require.True(t, decision.Matched)
|
|
require.Equal(t, CompositeRouteSourceAccount, decision.Source)
|
|
require.Equal(t, PlatformDeepseek, decision.TargetPlatform)
|
|
}
|
|
|
|
func TestDetectModelPlatform(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
model string
|
|
platform string
|
|
ok bool
|
|
}{
|
|
{name: "claude", model: "claude-sonnet-4-5", platform: PlatformAnthropic, ok: true},
|
|
{name: "anthropic prefix", model: "anthropic/claude-opus-4-5", platform: PlatformAnthropic, ok: true},
|
|
{name: "gpt", model: "gpt-5.1", platform: PlatformOpenAI, ok: true},
|
|
{name: "o series", model: "o3-mini", platform: PlatformOpenAI, ok: true},
|
|
{name: "embedding", model: "text-embedding-3-large", platform: PlatformOpenAI, ok: true},
|
|
{name: "gemini", model: "gemini-3-pro", platform: PlatformGemini, ok: true},
|
|
{name: "gemini models prefix", model: "models/gemini-2.5-flash", platform: PlatformGemini, ok: true},
|
|
{name: "learnlm", model: "learnlm-2.0-flash-experimental", platform: PlatformGemini, ok: true},
|
|
{name: "grok", model: "grok-4", platform: PlatformGrok, ok: true},
|
|
{name: "xai prefix", model: "xai/grok-4", platform: PlatformGrok, ok: true},
|
|
{name: "kimi", model: "kimi-k2-thinking", platform: PlatformKimi, ok: true},
|
|
{name: "kimi code bare k3", model: "K3", platform: PlatformKimi, ok: true},
|
|
{name: "kimi code bare k3 256k", model: "k3-256k", platform: PlatformKimi, ok: true},
|
|
{name: "kimi code provider prefix", model: "kimi-code/k3", platform: PlatformKimi, ok: true},
|
|
{name: "moonshot prefix", model: "moonshot/moonshot-v1-32k", platform: PlatformKimi, ok: true},
|
|
{name: "zhipu", model: "glm-5.2", platform: PlatformZhipu, ok: true},
|
|
{name: "deepseek", model: "deepseek-v4-pro", platform: PlatformDeepseek, ok: true},
|
|
{name: "minimax", model: "MiniMax-M3", platform: PlatformMiniMax, ok: true},
|
|
{name: "minimax prefix", model: "minimax/MiniMax-M2.5", platform: PlatformMiniMax, ok: true},
|
|
{name: "abab legacy", model: "abab6.5-chat", platform: PlatformMiniMax, ok: true},
|
|
{name: "abab7 legacy", model: "abab7-chat-preview", platform: PlatformMiniMax, ok: true},
|
|
{name: "jev", model: "jev-latest", platform: PlatformTypeSafe, ok: true},
|
|
{name: "typesafe prefix", model: "typesafe/jev-latest", platform: PlatformTypeSafe, ok: true},
|
|
{name: "abab unrelated namespace", model: "abab-other", ok: false},
|
|
{name: "unknown k3 alias", model: "k3-preview", ok: false},
|
|
{name: "unknown", model: "llama-4-maverick", ok: false},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
platform, ok := DetectModelPlatform(tt.model)
|
|
require.Equal(t, tt.ok, ok)
|
|
require.Equal(t, tt.platform, platform)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestQuotaPlatformCompositeUsesResolvedOrForceOnly(t *testing.T) {
|
|
apiKey := &APIKey{Group: &Group{Platform: PlatformComposite}}
|
|
|
|
require.Equal(t, "", QuotaPlatform(context.Background(), apiKey))
|
|
require.Equal(t, PlatformGemini, QuotaPlatform(WithResolvedTargetPlatform(context.Background(), PlatformGemini), apiKey))
|
|
require.Equal(t, PlatformAntigravity, QuotaPlatform(context.WithValue(context.Background(), ctxkey.ForcePlatform, PlatformAntigravity), apiKey))
|
|
|
|
ctx := WithResolvedTargetPlatform(context.Background(), PlatformAnthropic)
|
|
ctx = context.WithValue(ctx, ctxkey.ForcePlatform, PlatformAntigravity)
|
|
require.Equal(t, PlatformAntigravity, QuotaPlatform(ctx, apiKey))
|
|
}
|
|
|
|
func TestCompositeGroupSchedulerHasAllCanonicalPlatformBuckets(t *testing.T) {
|
|
seen := make(map[string]struct{})
|
|
for _, bucket := range schedulerCanonicalBuckets(99) {
|
|
seen[bucket.Platform] = struct{}{}
|
|
}
|
|
platforms := make([]string, 0, len(seen))
|
|
for platform := range seen {
|
|
platforms = append(platforms, platform)
|
|
}
|
|
require.ElementsMatch(t,
|
|
[]string{PlatformAnthropic, PlatformGemini, PlatformOpenAI, PlatformAntigravity, PlatformGrok, PlatformKimi, PlatformZhipu, PlatformDeepseek, PlatformMiniMax, PlatformOpenCodeGo, PlatformTypeSafe, PlatformCommandCode},
|
|
platforms,
|
|
)
|
|
}
|
|
|
|
func TestCompositeConcretePlatformsIncludeCNProviders(t *testing.T) {
|
|
for _, platform := range []string{PlatformKimi, PlatformZhipu, PlatformDeepseek, PlatformMiniMax, PlatformOpenCodeGo, PlatformTypeSafe, PlatformCommandCode} {
|
|
require.True(t, isConcreteRequestPlatform(platform))
|
|
require.True(t, canCopyAccountsFromGroupPlatform(PlatformComposite, platform))
|
|
}
|
|
}
|