huangzhenpc/new-api-hunter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: gemini image correct generationConfig

Browse Source
This commit is contained in:
feitianbubu
2025-11-26 15:34:32 +08:00
parent 67fd3ad94f
commit 156229ce92
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
relay/channel/gemini/adaptor.go
View File

@@ -86,12 +86,25 @@ func getImageSizeMapping() QualityMapping {
func getSizeMappings() map[string]SizeMapping { func getSizeMappings() map[string]SizeMapping {
return map[string]SizeMapping{ return map[string]SizeMapping{
// Gemini 2.5 Flash Image - default 1K resolutions
"1024x1024": {AspectRatio: "1:1", ImageSize: ""},
"832x1248": {AspectRatio: "2:3", ImageSize: ""},
"1248x832": {AspectRatio: "3:2", ImageSize: ""},
"864x1184": {AspectRatio: "3:4", ImageSize: ""},
"1184x864": {AspectRatio: "4:3", ImageSize: ""},
"896x1152": {AspectRatio: "4:5", ImageSize: ""},
"1152x896": {AspectRatio: "5:4", ImageSize: ""},
"768x1344": {AspectRatio: "9:16", ImageSize: ""},
"1344x768": {AspectRatio: "16:9", ImageSize: ""},
"1536x672": {AspectRatio: "21:9", ImageSize: ""},
// Gemini 3 Pro Image Preview resolutions
"1536x1024": {AspectRatio: "3:2", ImageSize: ""}, "1536x1024": {AspectRatio: "3:2", ImageSize: ""},
"1024x1536": {AspectRatio: "2:3", ImageSize: ""}, "1024x1536": {AspectRatio: "2:3", ImageSize: ""},
"1024x1792": {AspectRatio: "9:16", ImageSize: ""}, "1024x1792": {AspectRatio: "9:16", ImageSize: ""},
"1792x1024": {AspectRatio: "16:9", ImageSize: ""}, "1792x1024": {AspectRatio: "16:9", ImageSize: ""},
"2048x2048": {AspectRatio: "", ImageSize: "2K"}, "2048x2048": {AspectRatio: "1:1", ImageSize: "2K"},
"4096x4096": {AspectRatio: "", ImageSize: "4K"}, "4096x4096": {AspectRatio: "1:1", ImageSize: "4K"},
} }
} }
@@ -140,13 +153,13 @@ func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInf
config := processSizeParameters(strings.TrimSpace(request.Size), request.Quality) config := processSizeParameters(strings.TrimSpace(request.Size), request.Quality)
googleGenerationConfig := map[string]interface{}{ googleGenerationConfig := map[string]interface{}{
"response_modalities": []string{"TEXT", "IMAGE"}, "responseModalities": []string{"TEXT", "IMAGE"},
"image_config": config, "imageConfig": config,
} }
extraBody := map[string]interface{}{ extraBody := map[string]interface{}{
"google": map[string]interface{}{ "google": map[string]interface{}{
"generation_config": googleGenerationConfig, "generationConfig": googleGenerationConfig,
}, },
} }
chatRequest.ExtraBody, _ = json.Marshal(extraBody) chatRequest.ExtraBody, _ = json.Marshal(extraBody)

10
relay/channel/gemini/relay-gemini.go
View File

@@ -239,6 +239,16 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i
} }
} }
} }
if generationConfig, ok := googleBody["generationConfig"].(map[string]any); ok {
generationConfigBytes, err := json.Marshal(generationConfig)
if err != nil {
return nil, fmt.Errorf("failed to marshal generationConfig: %w", err)
}
if err := json.Unmarshal(generationConfigBytes, &geminiRequest.GenerationConfig); err != nil {
return nil, fmt.Errorf("failed to unmarshal generationConfig: %w", err)
}
}
} }
} }
} }