chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-18 04:10:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(logging): clarify 429 rate-limit retries in Gemini executor

Browse Source
This commit is contained in:
hkfires
2025-10-29 19:18:40 +08:00
parent 5cb378256b
commit 1bbbd16df6
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/runtime/executor/gemini_cli_executor.go
View File

@@ -97,7 +97,7 @@ func (e *GeminiCLIExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth
var lastStatus int var lastStatus int
var lastBody []byte var lastBody []byte
for _, attemptModel := range models { for idx, attemptModel := range models {
payload := append([]byte(nil), basePayload...) payload := append([]byte(nil), basePayload...)
if action == "countTokens" { if action == "countTokens" {
payload = deleteJSONField(payload, "project") payload = deleteJSONField(payload, "project")
@@ -170,7 +170,11 @@ func (e *GeminiCLIExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth
lastBody = append([]byte(nil), data...) lastBody = append([]byte(nil), data...)
log.Debugf("request error, error status: %d, error body: %s", httpResp.StatusCode, string(data)) log.Debugf("request error, error status: %d, error body: %s", httpResp.StatusCode, string(data))
if httpResp.StatusCode == 429 { if httpResp.StatusCode == 429 {
log.Debugf("gemini cli executor: rate limited, retrying with next model") if idx+1 < len(models) {
log.Debugf("gemini cli executor: rate limited, retrying with next model: %s", models[idx+1])
} else {
log.Debug("gemini cli executor: rate limited, no additional fallback model")
}
continue continue
} }
@@ -228,7 +232,7 @@ func (e *GeminiCLIExecutor) ExecuteStream(ctx context.Context, auth *cliproxyaut
var lastStatus int var lastStatus int
var lastBody []byte var lastBody []byte
for _, attemptModel := range models { for idx, attemptModel := range models {
payload := append([]byte(nil), basePayload...) payload := append([]byte(nil), basePayload...)
payload = setJSONField(payload, "project", projectID) payload = setJSONField(payload, "project", projectID)
payload = setJSONField(payload, "model", attemptModel) payload = setJSONField(payload, "model", attemptModel)
@@ -290,7 +294,11 @@ func (e *GeminiCLIExecutor) ExecuteStream(ctx context.Context, auth *cliproxyaut
lastBody = append([]byte(nil), data...) lastBody = append([]byte(nil), data...)
log.Debugf("request error, error status: %d, error body: %s", httpResp.StatusCode, string(data)) log.Debugf("request error, error status: %d, error body: %s", httpResp.StatusCode, string(data))
if httpResp.StatusCode == 429 { if httpResp.StatusCode == 429 {
log.Debugf("gemini cli executor: rate limited, retrying with next model") if idx+1 < len(models) {
log.Debugf("gemini cli executor: rate limited, retrying with next model: %s", models[idx+1])
} else {
log.Debug("gemini cli executor: rate limited, no additional fallback model")
}
continue continue
} }
err = statusErr{code: httpResp.StatusCode, msg: string(data)} err = statusErr{code: httpResp.StatusCode, msg: string(data)}