From 2a3dcb499f0e86ec3b495b17fec01e350dab6361 Mon Sep 17 00:00:00 2001 From: li Date: Tue, 7 Jul 2026 14:06:21 +0800 Subject: [PATCH] =?UTF-8?q?fix(scheduler):=20=E7=A9=BA=20model=5Fmapping?= =?UTF-8?q?=20=E7=9A=84=20OpenAI=20OAuth=20=E8=B4=A6=E5=8F=B7=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=90=B8=E6=94=B6=E5=85=A8=E9=83=A8=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 空映射此前一律视为「允许所有」，导致混合部署下请求非 OpenAI 模型 别名（deepseek-v4 等）时，OAuth 账号可能被调度选中；转发阶段对未知 模型原样透传，Codex 上游返回不可重试的 400，请求无法 failover 到 真正支持该模型的 API Key 账号。 IsModelSupported 对空映射的 OpenAI OAuth（未开透传）账号改为与转发 归一化对齐的判定 isOpenAIOAuthServableModel：可归一到已知 Codex 模型 集合（含 gpt-image-*、推理后缀、别名拼写）或 claude-* dispatch 系列 才视为可服务。API Key/显式映射/透传/其他平台语义不变。 Fixes #3662 --- backend/internal/service/account.go | 11 +- .../internal/service/openai_model_mapping.go | 28 +++++ .../openai_oauth_model_support_test.go | 103 ++++++++++++++++++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 backend/internal/service/openai_oauth_model_support_test.go diff --git a/backend/internal/service/account.go b/backend/internal/service/account.go index ae25bf387d..bed15d9c8d 100644 --- a/backend/internal/service/account.go +++ b/backend/internal/service/account.go @@ -750,10 +750,19 @@ func resolveRequestedModelInMapping(mapping map[string]string, requestedModel st } // IsModelSupported 检查模型是否在 model_mapping 中（支持通配符） -// 如果未配置 mapping，返回 true（允许所有模型） +// 如果未配置 mapping，返回 true（允许所有模型）。 +// +// 例外：OpenAI OAuth 账号（Codex 上游）的空映射不再视为「允许所有」—— +// 转发阶段 normalizeOpenAIModelForUpstream 会把未知模型原样透传，Codex 上游 +// 对 deepseek-*/glm-* 等第三方模型别名必然返回不可重试的 400，导致请求 +// 卡死在该账号上、无法 failover 到真正支持该模型的 API Key 账号（#3662）。 +// 此处的可服务判定与转发阶段的归一化行为对齐，见 isOpenAIOAuthServableModel。 func (a *Account) IsModelSupported(requestedModel string) bool { mapping := a.GetModelMapping() if len(mapping) == 0 { + if a.IsOpenAIOAuth() && !a.IsOpenAIPassthroughEnabled() { + return isOpenAIOAuthServableModel(requestedModel) + } return true // 无映射 = 允许所有 } if mappingSupportsRequestedModel(mapping, requestedModel) { diff --git a/backend/internal/service/openai_model_mapping.go b/backend/internal/service/openai_model_mapping.go index 7cec521221..196ecbc86d 100644 --- a/backend/internal/service/openai_model_mapping.go +++ b/backend/internal/service/openai_model_mapping.go @@ -20,6 +20,34 @@ func resolveOpenAIForwardModel(account *Account, requestedModel, defaultMappedMo return mappedModel } +// isOpenAIOAuthServableModel 判断「空 model_mapping 的 OpenAI OAuth 账号」能否 +// 服务请求模型。与转发阶段 normalizeOpenAIModelForUpstream → normalizeCodexModel +// 的行为对齐：只有会被归一到已知 Codex 模型集合的请求（含 gpt-image-* 与 +// 推理后缀变体），或 /v1/messages 调度下有默认映射兜底的 claude-* 系列， +// 才视为可服务。其余模型（deepseek-*/glm-* 等第三方别名）原样透传必然被 +// Codex 上游以不可重试的 400 拒绝，应在调度阶段就跳过该账号（#3662）。 +func isOpenAIOAuthServableModel(requestedModel string) bool { + model := strings.TrimSpace(requestedModel) + if model == "" { + return true // 空模型交由上层必填校验处理 + } + // /v1/messages 调度：claude-* 系列由分组/全局默认映射兜底，见 resolveOpenAIForwardModel。 + if claudeMessagesDispatchFamily(model) != "" { + return true + } + if _, ok := normalizeKnownCodexModel(model); ok { + return true + } + // 兜底剥离 -low/-high 等推理后缀（gpt-5.4-high → gpt-5.4）后再试一次， + // 与 /v1/messages 入站的 routingModel 归一化保持一致。 + if normalized := NormalizeOpenAICompatRequestedModel(model); normalized != model { + if _, ok := normalizeKnownCodexModel(normalized); ok { + return true + } + } + return false +} + // resolveOpenAICompactForwardModel determines the compact-only upstream model // for /responses/compact requests. It never affects normal /responses traffic. // When no compact-specific mapping matches, the input model is returned as-is. diff --git a/backend/internal/service/openai_oauth_model_support_test.go b/backend/internal/service/openai_oauth_model_support_test.go new file mode 100644 index 0000000000..550eb298c7 --- /dev/null +++ b/backend/internal/service/openai_oauth_model_support_test.go @@ -0,0 +1,103 @@ +//go:build unit + +package service + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func newOpenAIOAuthAccountForModelTest() *Account { + return &Account{ + ID: 1, + Platform: PlatformOpenAI, + Type: AccountTypeOAuth, + } +} + +func TestIsModelSupported_OpenAIOAuthEmptyMapping_ServableModels(t *testing.T) { + account := newOpenAIOAuthAccountForModelTest() + + servable := []string{ + "", // 空模型交由上层必填校验 + "gpt-5.4", + "gpt-5.4-high", // 推理后缀变体 + "gpt-5.3-codex", + "gpt-5.3-codex-xhigh", + "gpt-5.1-codex-mini", + "gpt-5", + "codex-mini-latest", + "gpt5.3codexspark", // 别名拼写归一化 + "gpt-image-1", // 图像生成模型 + "claude-sonnet-4-6", // /v1/messages 调度默认映射兜底 + "claude-3-opus-20240229", + } + for _, model := range servable { + require.True(t, account.IsModelSupported(model), "expected %q to be servable by empty-mapping OpenAI OAuth account", model) + } +} + +func TestIsModelSupported_OpenAIOAuthEmptyMapping_RejectsForeignModels(t *testing.T) { + account := newOpenAIOAuthAccountForModelTest() + + // Codex 上游必然以不可重试的 400 拒绝这些模型；调度阶段就应跳过该账号， + // 让显式声明支持的 API Key 账号接手（#3662）。 + foreign := []string{ + "deepseek-v4", + "deepseek-chat", + "glm-4.7", + "kimi-k2", + "gemini-3.0-pro", + "grok-4", + "qwen3-max", + } + for _, model := range foreign { + require.False(t, account.IsModelSupported(model), "expected %q to be rejected by empty-mapping OpenAI OAuth account", model) + } +} + +func TestIsModelSupported_OpenAIOAuthExplicitMappingUnchanged(t *testing.T) { + account := newOpenAIOAuthAccountForModelTest() + account.Credentials = map[string]any{ + "model_mapping": map[string]any{"deepseek-v4": "gpt-5.4"}, + } + + // 显式映射沿用原有语义：命中映射即支持，未命中即不支持。 + require.True(t, account.IsModelSupported("deepseek-v4")) + require.False(t, account.IsModelSupported("glm-4.7")) +} + +func TestIsModelSupported_OpenAIOAuthPassthroughAllowsAll(t *testing.T) { + account := newOpenAIOAuthAccountForModelTest() + account.Extra = map[string]any{"openai_passthrough": true} + + // 透传模式仅替换认证，模型语义由上游决定，保持"允许所有"。 + require.True(t, account.IsModelSupported("deepseek-v4")) +} + +func TestIsModelSupported_OpenAIAPIKeyEmptyMappingAllowsAll(t *testing.T) { + account := &Account{ + ID: 2, + Platform: PlatformOpenAI, + Type: AccountTypeAPIKey, + } + + // API Key 账号（第三方 OpenAI 兼容上游）可服务任意别名，语义不变。 + require.True(t, account.IsModelSupported("deepseek-v4")) + require.True(t, account.IsModelSupported("gpt-5.4")) +} + +func TestIsModelSupported_NonOpenAIPlatformsUnchanged(t *testing.T) { + anthropic := &Account{ID: 3, Platform: PlatformAnthropic, Type: AccountTypeOAuth} + require.True(t, anthropic.IsModelSupported("claude-sonnet-4-6")) + require.True(t, anthropic.IsModelSupported("deepseek-v4")) +} + +func TestIsOpenAIOAuthServableModel(t *testing.T) { + require.True(t, isOpenAIOAuthServableModel("gpt-5.4-high")) + require.True(t, isOpenAIOAuthServableModel(" gpt-5.3-codex ")) + require.True(t, isOpenAIOAuthServableModel("claude-3-5-haiku-20241022")) + require.False(t, isOpenAIOAuthServableModel("claude-unknown-family")) // 无 opus/sonnet/haiku 关键字，无默认映射兜底 + require.False(t, isOpenAIOAuthServableModel("deepseek-v4")) +}