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

Enhance Gemini request handling for contents support and improve error logging

Browse Source 
- Added conditional logic to process `contents` in Gemini request templates, ensuring fallback behavior.
- Introduced detailed debug logs for quota errors and request issues.
- Updated handling of `rawJson` to construct templates more dynamically.
This commit is contained in:
Luis Pater
2025-08-04 02:51:00 +08:00
parent 3c4dc07980
commit 00f33f5f3a
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
internal/api/gemini-handlers.go
View File

@@ -152,10 +152,17 @@ outLoop:
return return
} }
template := `{"project":"","request":{},"model":""}` template := ""
template, _ = sjson.SetRaw(template, "request", string(rawJson)) parsed := gjson.Parse(string(rawJson))
template, _ = sjson.Set(template, "model", gjson.Get(template, "request.model").String()) contents := parsed.Get("request.contents")
template, _ = sjson.Delete(template, "request.model") if contents.Exists() {
template = string(rawJson)
} else {
template = `{"project":"","request":{},"model":""}`
template, _ = sjson.SetRaw(template, "request", string(rawJson))
template, _ = sjson.Set(template, "model", gjson.Get(template, "request.model").String())
template, _ = sjson.Delete(template, "request.model")
}
template, errFixCLIToolResponse := translator.FixCLIToolResponse(template) template, errFixCLIToolResponse := translator.FixCLIToolResponse(template)
if errFixCLIToolResponse != nil { if errFixCLIToolResponse != nil {
@@ -233,8 +240,10 @@ outLoop:
case err, okError := <-errChan: case err, okError := <-errChan:
if okError { if okError {
if err.StatusCode == 429 && h.cfg.QuotaExceeded.SwitchProject { if err.StatusCode == 429 && h.cfg.QuotaExceeded.SwitchProject {
log.Debugf("quota exceeded, switch client")
continue outLoop continue outLoop
} else { } else {
log.Debugf("error code :%d, error: %v", err.StatusCode, err.Error.Error())
c.Status(err.StatusCode) c.Status(err.StatusCode)
_, _ = fmt.Fprint(c.Writer, err.Error.Error()) _, _ = fmt.Fprint(c.Writer, err.Error.Error())
flusher.Flush() flusher.Flush()
@@ -342,10 +351,17 @@ func (h *APIHandlers) geminiGenerateContent(c *gin.Context, rawJson []byte) {
return return
} }
template := `{"project":"","request":{},"model":""}` template := ""
template, _ = sjson.SetRaw(template, "request", string(rawJson)) parsed := gjson.Parse(string(rawJson))
template, _ = sjson.Set(template, "model", gjson.Get(template, "request.model").String()) contents := parsed.Get("request.contents")
template, _ = sjson.Delete(template, "request.model") if contents.Exists() {
template = string(rawJson)
} else {
template = `{"project":"","request":{},"model":""}`
template, _ = sjson.SetRaw(template, "request", string(rawJson))
template, _ = sjson.Set(template, "model", gjson.Get(template, "request.model").String())
template, _ = sjson.Delete(template, "request.model")
}
template, errFixCLIToolResponse := translator.FixCLIToolResponse(template) template, errFixCLIToolResponse := translator.FixCLIToolResponse(template)
if errFixCLIToolResponse != nil { if errFixCLIToolResponse != nil {

1
internal/api/translator/request.go
View File

@@ -242,6 +242,7 @@ func FixCLIToolResponse(input string) (string, error) {
// Extract the contents array which contains the conversation messages // Extract the contents array which contains the conversation messages
contents := parsed.Get("request.contents") contents := parsed.Get("request.contents")
if !contents.Exists() { if !contents.Exists() {
// log.Debugf(input)
return input, fmt.Errorf("contents not found in input") return input, fmt.Errorf("contents not found in input")
} }