superman2003andCursor
3ed2873f14
The Codex models manifest path returned upstream 401s straight to the client without feeding them into the account state machinery. A revoked or invalidated OAuth account therefore stayed active and schedulable, kept being selected for subsequent /models requests, and produced repeated 502s until an admin ran a manual connection test (#4544). - Route ChatGPT-backend manifest 401s through the shared upstream-error handling: token cache invalidation, temp-unschedulable cooldown for refreshable OAuth accounts, permanent disable for token_revoked/token_invalidated, plus the runtime scheduling block. - Treat ChatGPT-backend manifest 401s as failover-eligible so the current /models request can switch to a healthy account instead of returning 502. Custom API key upstream 401s keep the existing no-failover, no-disable behavior since their /models auth is not authoritative for the account. - Skip Agent Identity accounts: their 401s can be task-scoped and have a dedicated recovery flow. - Attach the selected account to the ops error-log context so /models failures record the account_id. Fixes #4544 Co-authored-by: Cursor <cursoragent@cursor.com>
88 lines
2.8 KiB
Go
88 lines
2.8 KiB
Go
package handler
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
|
infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors"
|
|
middleware2 "github.com/Wei-Shaw/sub2api/internal/server/middleware"
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
)
|
|
|
|
// CodexModels serves the Codex models manifest for Codex clients.
|
|
//
|
|
// Codex CLI and the Codex desktop app refresh their model picker from
|
|
// GET {base_url}/models?client_version=... (custom provider mode) or
|
|
// GET /backend-api/codex/models (chatgpt_base_url mode). Both routes land
|
|
// here. The manifest is proxied verbatim from the selected account's ChatGPT
|
|
// backend or custom API key upstream. API key manifests use a short-lived,
|
|
// asynchronously revalidated cache to tolerate canceled client requests.
|
|
func (h *OpenAIGatewayHandler) CodexModels(c *gin.Context) {
|
|
if c.Request.Context().Err() != nil {
|
|
return
|
|
}
|
|
apiKey, ok := middleware2.GetAPIKeyFromContext(c)
|
|
if !ok || apiKey.Group == nil {
|
|
h.errorResponse(c, http.StatusUnauthorized, "invalid_request_error", "API key group is required")
|
|
return
|
|
}
|
|
if apiKey.Group.Platform != service.PlatformOpenAI {
|
|
h.errorResponse(c, http.StatusNotFound, "not_found_error", "Codex models manifest is only available for OpenAI groups")
|
|
return
|
|
}
|
|
|
|
maxAccountSwitches := h.maxAccountSwitches
|
|
if maxAccountSwitches <= 0 {
|
|
maxAccountSwitches = 3
|
|
}
|
|
failedAccountIDs := make(map[int64]struct{})
|
|
switchCount := 0
|
|
var lastUpstreamErr error
|
|
|
|
for {
|
|
account, err := h.gatewayService.SelectAccountForModelWithExclusions(c.Request.Context(), apiKey.GroupID, "", "", failedAccountIDs)
|
|
if err != nil {
|
|
if c.Request.Context().Err() != nil {
|
|
return
|
|
}
|
|
if lastUpstreamErr != nil {
|
|
h.errorResponse(c, infraerrors.Code(lastUpstreamErr), "upstream_error", infraerrors.Message(lastUpstreamErr))
|
|
return
|
|
}
|
|
h.errorResponse(c, http.StatusServiceUnavailable, "upstream_error", "No available OpenAI accounts")
|
|
return
|
|
}
|
|
// 让 ops 错误日志携带实际选中的上游账号，便于定位失效账号（#4544）。
|
|
setOpsSelectedAccount(c, account.ID, account.Platform)
|
|
|
|
manifest, err := h.gatewayService.FetchCodexModelsManifest(c.Request.Context(), account, c.Query("client_version"), c.GetHeader("If-None-Match"))
|
|
if err != nil {
|
|
if c.Request.Context().Err() != nil {
|
|
return
|
|
}
|
|
if service.IsRetryableCodexModelsManifestError(err) && switchCount < maxAccountSwitches {
|
|
failedAccountIDs[account.ID] = struct{}{}
|
|
switchCount++
|
|
lastUpstreamErr = err
|
|
continue
|
|
}
|
|
h.errorResponse(c, infraerrors.Code(err), "upstream_error", infraerrors.Message(err))
|
|
return
|
|
}
|
|
if c.Request.Context().Err() != nil {
|
|
return
|
|
}
|
|
|
|
if manifest.ETag != "" {
|
|
c.Header("ETag", manifest.ETag)
|
|
}
|
|
if manifest.NotModified {
|
|
c.Status(http.StatusNotModified)
|
|
return
|
|
}
|
|
c.Data(http.StatusOK, "application/json", manifest.Body)
|
|
return
|
|
}
|
|
}
|