Merge pull request #2338 from QuantumNous/revert-2321-pr/gemini-image-edit

Revert "Gemini Image系列支持图像编辑"
This commit is contained in:
Calcium-Ion
2025-11-30 18:48:01 +08:00
committed by GitHub
5 changed files with 5 additions and 81 deletions

View File

@@ -130,29 +130,11 @@ func processSizeParameters(size, quality string) ImageConfig {
}
func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) {
if model_setting.IsGeminiModelSupportImagine(info.UpstreamModelName) {
var content any
if base64Data, err := relaycommon.GetImageBase64sFromForm(c); err == nil {
content = []any{
dto.MediaContent{
Type: dto.ContentTypeText,
Text: request.Prompt,
},
dto.MediaContent{
Type: dto.ContentTypeFile,
File: &dto.MessageFile{
FileData: base64Data.String(),
},
},
}
} else {
content = request.Prompt
}
if strings.HasPrefix(info.UpstreamModelName, "gemini-3-pro-image") {
chatRequest := dto.GeneralOpenAIRequest{
Model: request.Model,
Messages: []dto.Message{
{Role: "user", Content: content},
{Role: "user", Content: request.Prompt},
},
N: int(request.N),
}