diff --git a/backend/internal/service/account.go b/backend/internal/service/account.go index cd06ffa3..d488aa75 100644 --- a/backend/internal/service/account.go +++ b/backend/internal/service/account.go @@ -890,14 +890,90 @@ func parsePoolModeRetryCount(value any) int { return defaultPoolModeRetryCount } -// isPoolModeRetryableStatus 池模式下应触发同账号重试的状态码 +// defaultPoolModeRetryableStatusCodes 池模式下默认触发同账号重试的状态码。 +// 未在 Account.Credentials 中显式配置 pool_mode_retry_status_codes 时使用。 +var defaultPoolModeRetryableStatusCodes = []int{401, 403, 429} + +// isPoolModeRetryableStatus 池模式下应触发同账号重试的状态码(默认列表)。 func isPoolModeRetryableStatus(statusCode int) bool { - switch statusCode { - case 401, 403, 429: - return true - default: - return false + for _, c := range defaultPoolModeRetryableStatusCodes { + if c == statusCode { + return true + } } + return false +} + +// GetPoolModeRetryStatusCodes 返回账号自定义的池模式同账号重试状态码列表。 +// +// 返回值语义: +// - nil:未配置 → 调用方应回退到默认值 [401, 403, 429] +// - 长度为 0 的切片:管理员显式置空 → 关闭按状态码触发的同账号重试 +// - 非空切片:去重、过滤为合法 HTTP 状态码(100-599)后的覆盖列表 +func (a *Account) GetPoolModeRetryStatusCodes() []int { + if a == nil || a.Credentials == nil { + return nil + } + raw, ok := a.Credentials["pool_mode_retry_status_codes"] + if !ok || raw == nil { + return nil + } + arr, ok := raw.([]any) + if !ok { + return nil + } + seen := make(map[int]struct{}, len(arr)) + codes := make([]int, 0, len(arr)) + for _, v := range arr { + var code int + switch n := v.(type) { + case float64: + code = int(n) + case int: + code = n + case int64: + code = int(n) + case json.Number: + i, err := n.Int64() + if err != nil { + continue + } + code = int(i) + case string: + i, err := strconv.Atoi(strings.TrimSpace(n)) + if err != nil { + continue + } + code = i + default: + continue + } + if code < 100 || code > 599 { + continue + } + if _, exists := seen[code]; exists { + continue + } + seen[code] = struct{}{} + codes = append(codes, code) + } + sort.Ints(codes) + return codes +} + +// IsPoolModeRetryableStatus 在账号上下文中判断给定状态码是否应触发同账号重试。 +// 若账号未配置 pool_mode_retry_status_codes,则回退到默认列表。 +func (a *Account) IsPoolModeRetryableStatus(statusCode int) bool { + codes := a.GetPoolModeRetryStatusCodes() + if codes == nil { + return isPoolModeRetryableStatus(statusCode) + } + for _, c := range codes { + if c == statusCode { + return true + } + } + return false } func (a *Account) GetCustomErrorCodes() []int { diff --git a/backend/internal/service/account_pool_retry_status_codes_test.go b/backend/internal/service/account_pool_retry_status_codes_test.go new file mode 100644 index 00000000..c0b9d7ab --- /dev/null +++ b/backend/internal/service/account_pool_retry_status_codes_test.go @@ -0,0 +1,193 @@ +//go:build unit + +package service + +import ( + "encoding/json" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestGetPoolModeRetryStatusCodes(t *testing.T) { + tests := []struct { + name string + account *Account + expected []int + }{ + { + name: "nil_account_returns_nil", + account: nil, + expected: nil, + }, + { + name: "nil_credentials_returns_nil", + account: &Account{ + Type: AccountTypeAPIKey, + Platform: PlatformOpenAI, + }, + expected: nil, + }, + { + name: "missing_key_returns_nil", + account: &Account{ + Type: AccountTypeAPIKey, + Platform: PlatformOpenAI, + Credentials: map[string]any{"pool_mode": true}, + }, + expected: nil, + }, + { + name: "empty_slice_is_preserved", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{}, + }, + }, + expected: []int{}, + }, + { + name: "float64_values_from_json_are_normalized", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{float64(429), float64(401), float64(403)}, + }, + }, + expected: []int{401, 403, 429}, + }, + { + name: "json_number_values_supported", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{json.Number("502"), json.Number("503")}, + }, + }, + expected: []int{502, 503}, + }, + { + name: "string_values_supported", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{"520", "529"}, + }, + }, + expected: []int{520, 529}, + }, + { + name: "duplicates_are_deduped", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{float64(429), float64(429), float64(401)}, + }, + }, + expected: []int{401, 429}, + }, + { + name: "out_of_range_values_dropped", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{float64(99), float64(600), float64(429)}, + }, + }, + expected: []int{429}, + }, + { + name: "invalid_string_dropped", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{"oops", float64(429)}, + }, + }, + expected: []int{429}, + }, + { + name: "non_array_value_returns_nil", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": "not-an-array", + }, + }, + expected: nil, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + require.Equal(t, tt.expected, tt.account.GetPoolModeRetryStatusCodes()) + }) + } +} + +func TestIsPoolModeRetryableStatus_Account(t *testing.T) { + tests := []struct { + name string + account *Account + statusCode int + expected bool + }{ + { + name: "nil_account_falls_back_to_default_401", + account: nil, + statusCode: 401, + expected: true, + }, + { + name: "nil_account_falls_back_to_default_500", + account: nil, + statusCode: 500, + expected: false, + }, + { + name: "unconfigured_uses_default_403", + account: &Account{ + Credentials: map[string]any{"pool_mode": true}, + }, + statusCode: 403, + expected: true, + }, + { + name: "unconfigured_uses_default_502_false", + account: &Account{ + Credentials: map[string]any{"pool_mode": true}, + }, + statusCode: 502, + expected: false, + }, + { + name: "configured_list_overrides_default_401_dropped", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{float64(502), float64(503)}, + }, + }, + statusCode: 401, + expected: false, + }, + { + name: "configured_list_overrides_default_502_added", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{float64(502), float64(503)}, + }, + }, + statusCode: 502, + expected: true, + }, + { + name: "empty_list_disables_all_default_codes", + account: &Account{ + Credentials: map[string]any{ + "pool_mode_retry_status_codes": []any{}, + }, + }, + statusCode: 429, + expected: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + require.Equal(t, tt.expected, tt.account.IsPoolModeRetryableStatus(tt.statusCode)) + }) + } +} diff --git a/backend/internal/service/gateway_service.go b/backend/internal/service/gateway_service.go index c9be0d4d..4a8175a4 100644 --- a/backend/internal/service/gateway_service.go +++ b/backend/internal/service/gateway_service.go @@ -4854,7 +4854,7 @@ func (s *GatewayService) Forward(ctx context.Context, c *gin.Context, account *A return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } return s.handleRetryExhaustedError(ctx, resp, c, account) @@ -4888,7 +4888,7 @@ func (s *GatewayService) Forward(ctx context.Context, c *gin.Context, account *A return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } if resp.StatusCode >= 400 { @@ -5156,7 +5156,7 @@ func (s *GatewayService) forwardAnthropicAPIKeyPassthroughWithInput( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } return s.handleRetryExhaustedError(ctx, resp, c, account) @@ -5190,7 +5190,7 @@ func (s *GatewayService) forwardAnthropicAPIKeyPassthroughWithInput( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } @@ -5929,7 +5929,7 @@ func (s *GatewayService) handleBedrockUpstreamErrors( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } return s.handleRetryExhaustedError(ctx, resp, c, account) @@ -5953,7 +5953,7 @@ func (s *GatewayService) handleBedrockUpstreamErrors( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } diff --git a/backend/internal/service/openai_gateway_chat_completions.go b/backend/internal/service/openai_gateway_chat_completions.go index 87caf548..807ff43a 100644 --- a/backend/internal/service/openai_gateway_chat_completions.go +++ b/backend/internal/service/openai_gateway_chat_completions.go @@ -280,7 +280,7 @@ func (s *OpenAIGatewayService) ForwardAsChatCompletions( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && (isPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), + RetryableOnSameAccount: account.IsPoolMode() && (account.IsPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), } } return s.handleChatCompletionsErrorResponse(resp, c, account, billingModel) diff --git a/backend/internal/service/openai_gateway_chat_completions_raw.go b/backend/internal/service/openai_gateway_chat_completions_raw.go index 0647c4c8..e351fa75 100644 --- a/backend/internal/service/openai_gateway_chat_completions_raw.go +++ b/backend/internal/service/openai_gateway_chat_completions_raw.go @@ -212,7 +212,7 @@ func (s *OpenAIGatewayService) forwardAsRawChatCompletions( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && (isPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), + RetryableOnSameAccount: account.IsPoolMode() && (account.IsPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), } } return s.handleChatCompletionsErrorResponse(resp, c, account, billingModel) diff --git a/backend/internal/service/openai_gateway_messages.go b/backend/internal/service/openai_gateway_messages.go index e517ad2f..291c217e 100644 --- a/backend/internal/service/openai_gateway_messages.go +++ b/backend/internal/service/openai_gateway_messages.go @@ -342,7 +342,7 @@ func (s *OpenAIGatewayService) ForwardAsAnthropic( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && (isPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), + RetryableOnSameAccount: account.IsPoolMode() && (account.IsPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), } } // Non-failover error: return Anthropic-formatted error to client diff --git a/backend/internal/service/openai_gateway_responses_chat_fallback.go b/backend/internal/service/openai_gateway_responses_chat_fallback.go index 38cad85f..cfab389a 100644 --- a/backend/internal/service/openai_gateway_responses_chat_fallback.go +++ b/backend/internal/service/openai_gateway_responses_chat_fallback.go @@ -192,7 +192,7 @@ func (s *OpenAIGatewayService) forwardResponsesViaRawChatCompletions( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && (isPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), + RetryableOnSameAccount: account.IsPoolMode() && (account.IsPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), } } return s.handleErrorResponse(ctx, resp, c, account, chatBody, billingModel) diff --git a/backend/internal/service/openai_gateway_service.go b/backend/internal/service/openai_gateway_service.go index 2c9840fd..f93cc221 100644 --- a/backend/internal/service/openai_gateway_service.go +++ b/backend/internal/service/openai_gateway_service.go @@ -2860,7 +2860,7 @@ func (s *OpenAIGatewayService) Forward(ctx context.Context, c *gin.Context, acco return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && (isPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), + RetryableOnSameAccount: account.IsPoolMode() && (account.IsPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)), } } return s.handleErrorResponse(ctx, resp, c, account, body, billingModel) @@ -4170,7 +4170,7 @@ func (s *OpenAIGatewayService) handleErrorResponse( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: body, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } @@ -4309,7 +4309,7 @@ func (s *OpenAIGatewayService) handleCompatErrorResponse( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: body, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } diff --git a/backend/internal/service/openai_images.go b/backend/internal/service/openai_images.go index 8dbcb74a..1bcd947c 100644 --- a/backend/internal/service/openai_images.go +++ b/backend/internal/service/openai_images.go @@ -642,7 +642,7 @@ func (s *OpenAIGatewayService) forwardOpenAIImagesAPIKey( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } return s.handleErrorResponse(upstreamCtx, resp, c, account, forwardBody) diff --git a/backend/internal/service/openai_images_responses.go b/backend/internal/service/openai_images_responses.go index ceaa1092..849ad792 100644 --- a/backend/internal/service/openai_images_responses.go +++ b/backend/internal/service/openai_images_responses.go @@ -1192,7 +1192,7 @@ func (s *OpenAIGatewayService) forwardOpenAIImagesOAuth( return nil, &UpstreamFailoverError{ StatusCode: resp.StatusCode, ResponseBody: respBody, - RetryableOnSameAccount: account.IsPoolMode() && isPoolModeRetryableStatus(resp.StatusCode), + RetryableOnSameAccount: account.IsPoolMode() && account.IsPoolModeRetryableStatus(resp.StatusCode), } } return s.handleErrorResponse(upstreamCtx, resp, c, account, responsesBody) diff --git a/frontend/src/components/account/CreateAccountModal.vue b/frontend/src/components/account/CreateAccountModal.vue index 90d5e15a..331295f7 100644 --- a/frontend/src/components/account/CreateAccountModal.vue +++ b/frontend/src/components/account/CreateAccountModal.vue @@ -1290,6 +1290,18 @@ }}
++ {{ t('admin.accounts.poolModeRetryStatusCodesHint', { default: DEFAULT_POOL_MODE_RETRY_STATUS_CODES.join(', ') }) }} +
++ {{ t('admin.accounts.poolModeRetryStatusCodesHint', { default: DEFAULT_POOL_MODE_RETRY_STATUS_CODES.join(', ') }) }} +
++ {{ t('admin.accounts.poolModeRetryStatusCodesHint', { default: DEFAULT_POOL_MODE_RETRY_STATUS_CODES.join(', ') }) }} +
++ {{ t('admin.accounts.poolModeRetryStatusCodesHint', { default: DEFAULT_POOL_MODE_RETRY_STATUS_CODES.join(', ') }) }} +
+