airkjw/CLIProxyAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(auth): add shouldReturnLastErrorOnPickFailure helper and improve error handling in home mode

Browse Source 
- Introduced `shouldReturnLastErrorOnPickFailure` to streamline error return logic during provider selection.
- Added `isHomeRequestRetryExceededError` for better home-specific error classification.
- Updated fallback conditions to enhance error handling clarity in `pickNextMixed`.
This commit is contained in:
Luis Pater
2026-05-10 02:09:53 +08:00
parent 66c3dae06b
commit 67fb4eb98e
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk/cliproxy/auth/conductor.go
+25 -4
View File
@@ -1335,7 +1335,7 @@ func (m *Manager) executeMixedOnce(ctx context.Context, providers []string, req
} }
auth, executor, provider, errPick := m.pickNextMixed(ctx, providers, routeModel, pickOpts, tried) auth, executor, provider, errPick := m.pickNextMixed(ctx, providers, routeModel, pickOpts, tried)
if errPick != nil { if errPick != nil {
if lastErr != nil && !homeMode { if shouldReturnLastErrorOnPickFailure(homeMode, lastErr, errPick) {
return cliproxyexecutor.Response{}, lastErr return cliproxyexecutor.Response{}, lastErr
} }
return cliproxyexecutor.Response{}, errPick return cliproxyexecutor.Response{}, errPick
@@ -1423,7 +1423,7 @@ func (m *Manager) executeCountMixedOnce(ctx context.Context, providers []string,
} }
auth, executor, provider, errPick := m.pickNextMixed(ctx, providers, routeModel, pickOpts, tried) auth, executor, provider, errPick := m.pickNextMixed(ctx, providers, routeModel, pickOpts, tried)
if errPick != nil { if errPick != nil {
if lastErr != nil && !homeMode { if shouldReturnLastErrorOnPickFailure(homeMode, lastErr, errPick) {
return cliproxyexecutor.Response{}, lastErr return cliproxyexecutor.Response{}, lastErr
} }
return cliproxyexecutor.Response{}, errPick return cliproxyexecutor.Response{}, errPick
@@ -1511,7 +1511,7 @@ func (m *Manager) executeStreamMixedOnce(ctx context.Context, providers []string
} }
auth, executor, provider, errPick := m.pickNextMixed(ctx, providers, routeModel, pickOpts, tried) auth, executor, provider, errPick := m.pickNextMixed(ctx, providers, routeModel, pickOpts, tried)
if errPick != nil { if errPick != nil {
if lastErr != nil && !homeMode { if shouldReturnLastErrorOnPickFailure(homeMode, lastErr, errPick) {
return nil, lastErr return nil, lastErr
} }
return nil, errPick return nil, errPick
@@ -3125,7 +3125,28 @@ type homeErrorDetail struct {
Code string `json:"code,omitempty"` Code string `json:"code,omitempty"`
} }
const homeUpstreamModelAttributeKey = "home_upstream_model" const (
homeUpstreamModelAttributeKey = "home_upstream_model"
homeRequestRetryExceededErrorCode = "request_retry_exceeded"
)
func isHomeRequestRetryExceededError(err error) bool {
var authErr *Error
if !errors.As(err, &authErr) || authErr == nil {
return false
}
return strings.EqualFold(strings.TrimSpace(authErr.Code), homeRequestRetryExceededErrorCode)
}
func shouldReturnLastErrorOnPickFailure(homeMode bool, lastErr error, errPick error) bool {
if lastErr == nil {
return false
}
if !homeMode {
return true
}
return isHomeRequestRetryExceededError(errPick)
}
type homeAuthDispatchResponse struct { type homeAuthDispatchResponse struct {
Model string `json:"model"` Model string `json:"model"`