lywsvip/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-09-03 06:35:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): prioritize rate-limit status over error body

Browse Source
This commit is contained in:
sususu
2026-08-10 14:50:40 +08:00
parent d0d77182ee
commit 9c8e4a07e6
3 changed files with 87 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/clienterror/client_error.go
View File

@@ -80,10 +80,10 @@ func IsRequestFault(status int, err error) bool {
status = statusErr.StatusCode()
}
}
// HTTP 402 is a credential payment or balance failure. Some upstreams,
// including DeepSeek, label it with the generic invalid_request_error code.
// The status is authoritative so the credential can cool down and rotate.
if status == http.StatusPaymentRequired {
// Payment and rate-limit statuses are authoritative even when an upstream
// pairs them with a generic invalid_request_error body. The credential must
// remain eligible for cooldown and rotation.
if status == http.StatusPaymentRequired || status == http.StatusTooManyRequests {
return false
}
// DeepSeek reports an invalid API key as 401 with the authentication_error

6
internal/clienterror/client_error_test.go
View File

@@ -203,6 +203,12 @@ func TestIsRequestFault(t *testing.T) {
err: errors.New(`{"error":{"message":"Insufficient Balance","type":"unknown_error","param":null,"code":"invalid_request_error"}}`),
want: false,
},
{
name: "rate limit status overrides generic request error code",
status: http.StatusTooManyRequests,
err: errors.New(`{"error":{"message":"Rate Limit Reached","type":"unknown_error","param":null,"code":"invalid_request_error"}}`),
want: false,
},
{name: "quota", status: http.StatusTooManyRequests, err: errors.New("quota")},
{name: "transport", status: http.StatusBadGateway, err: errors.New("unexpected EOF")},
{name: "invalid JSON body", status: http.StatusBadGateway, err: errors.New(`{"error":`)},

131
sdk/cliproxy/auth/conductor_overrides_test.go
View File

@@ -1447,67 +1447,90 @@ func TestManager_DeepSeekInsufficientBalanceRotatesCredentialAndRebindsSession(t
}
}
func TestManager_DeepSeekAuthenticationFailureRotatesCredential(t *testing.T) {
m := NewManager(nil, nil, nil)
m.SetRetryConfig(2, 30*time.Second, 0)
const provider = "openai-compatibility"
const model = "deepseek-v4-pro"
executor := &authFallbackExecutor{
id: provider,
executeErrors: map[string]error{
"aa-invalid-key": &Error{
HTTPStatus: http.StatusUnauthorized,
Message: `{"error":{"code":"invalid_request_error","message":"Authentication Fails, Your api key: ****heck is invalid","param":null,"type":"authentication_error"}}`,
},
func TestManager_DeepSeekCredentialFailuresRotateCredential(t *testing.T) {
tests := []struct {
name string
status int
message string
wantQuota bool
}{
{
name: "authentication failure",
status: http.StatusUnauthorized,
message: `{"error":{"code":"invalid_request_error","message":"Authentication Fails, Your api key: ****heck is invalid","param":null,"type":"authentication_error"}}`,
},
{
name: "rate limit with generic request error code",
status: http.StatusTooManyRequests,
message: `{"error":{"code":"invalid_request_error","message":"Rate Limit Reached","param":null,"type":"unknown_error"}}`,
wantQuota: true,
},
}
m.RegisterExecutor(executor)
invalidAuth := &Auth{ID: "aa-invalid-key", Provider: provider}
availableAuth := &Auth{ID: "bb-valid-key", Provider: provider}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
m := NewManager(nil, nil, nil)
m.SetRetryConfig(2, 30*time.Second, 0)
reg := registry.GetGlobalRegistry()
models := []*registry.ModelInfo{{ID: model}}
reg.RegisterClient(invalidAuth.ID, provider, models)
reg.RegisterClient(availableAuth.ID, provider, models)
t.Cleanup(func() {
reg.UnregisterClient(invalidAuth.ID)
reg.UnregisterClient(availableAuth.ID)
})
const provider = "openai-compatibility"
const model = "deepseek-v4-pro"
if _, errRegister := m.Register(context.Background(), invalidAuth); errRegister != nil {
t.Fatalf("register invalid auth: %v", errRegister)
}
if _, errRegister := m.Register(context.Background(), availableAuth); errRegister != nil {
t.Fatalf("register available auth: %v", errRegister)
}
executor := &authFallbackExecutor{
id: provider,
executeErrors: map[string]error{
"aa-failed-key": &Error{HTTPStatus: tc.status, Message: tc.message},
},
}
m.RegisterExecutor(executor)
resp, errExecute := m.Execute(
context.Background(),
[]string{provider},
cliproxyexecutor.Request{Model: model},
cliproxyexecutor.Options{},
)
if errExecute != nil {
t.Fatalf("expected fallback to the next credential, got error: %v", errExecute)
}
if got := string(resp.Payload); got != availableAuth.ID {
t.Fatalf("served by %q, want %q", got, availableAuth.ID)
}
wantCalls := []string{invalidAuth.ID, availableAuth.ID}
if calls := executor.ExecuteCalls(); !slices.Equal(calls, wantCalls) {
t.Fatalf("credential calls = %v, want %v", calls, wantCalls)
}
failedAuth := &Auth{ID: "aa-failed-key", Provider: provider}
availableAuth := &Auth{ID: "bb-valid-key", Provider: provider}
updatedInvalid, ok := m.GetByID(invalidAuth.ID)
if !ok || updatedInvalid == nil {
t.Fatal("expected invalid auth to remain registered")
}
state := updatedInvalid.ModelStates[model]
if state == nil || !state.Unavailable || state.NextRetryAfter.IsZero() {
t.Fatalf("invalid auth model state = %#v, want active cooldown", state)
reg := registry.GetGlobalRegistry()
models := []*registry.ModelInfo{{ID: model}}
reg.RegisterClient(failedAuth.ID, provider, models)
reg.RegisterClient(availableAuth.ID, provider, models)
t.Cleanup(func() {
reg.UnregisterClient(failedAuth.ID)
reg.UnregisterClient(availableAuth.ID)
})
if _, errRegister := m.Register(context.Background(), failedAuth); errRegister != nil {
t.Fatalf("register failed auth: %v", errRegister)
}
if _, errRegister := m.Register(context.Background(), availableAuth); errRegister != nil {
t.Fatalf("register available auth: %v", errRegister)
}
resp, errExecute := m.Execute(
context.Background(),
[]string{provider},
cliproxyexecutor.Request{Model: model},
cliproxyexecutor.Options{},
)
if errExecute != nil {
t.Fatalf("expected fallback to the next credential, got error: %v", errExecute)
}
if got := string(resp.Payload); got != availableAuth.ID {
t.Fatalf("served by %q, want %q", got, availableAuth.ID)
}
wantCalls := []string{failedAuth.ID, availableAuth.ID}
if calls := executor.ExecuteCalls(); !slices.Equal(calls, wantCalls) {
t.Fatalf("credential calls = %v, want %v", calls, wantCalls)
}
updatedFailed, ok := m.GetByID(failedAuth.ID)
if !ok || updatedFailed == nil {
t.Fatal("expected failed auth to remain registered")
}
state := updatedFailed.ModelStates[model]
if state == nil || !state.Unavailable || state.NextRetryAfter.IsZero() {
t.Fatalf("failed auth model state = %#v, want active cooldown", state)
}
if tc.wantQuota && (!state.Quota.Exceeded || state.Quota.Reason != "quota") {
t.Fatalf("failed auth quota state = %#v, want exceeded quota", state.Quota)
}
})
}
}