diff --git a/common/init.go b/common/init.go index cf62f408e..6d2c3572b 100644 --- a/common/init.go +++ b/common/init.go @@ -137,7 +137,6 @@ func initConstantEnv() { constant.GetMediaTokenNotStream = GetEnvOrDefaultBool("GET_MEDIA_TOKEN_NOT_STREAM", false) constant.UpdateTask = GetEnvOrDefaultBool("UPDATE_TASK", true) constant.AzureDefaultAPIVersion = GetEnvOrDefaultString("AZURE_DEFAULT_API_VERSION", "2025-04-01-preview") - constant.GeminiVisionMaxImageNum = GetEnvOrDefault("GEMINI_VISION_MAX_IMAGE_NUM", 16) constant.NotifyLimitCount = GetEnvOrDefault("NOTIFY_LIMIT_COUNT", 2) constant.NotificationLimitDurationMinute = GetEnvOrDefault("NOTIFICATION_LIMIT_DURATION_MINUTE", 10) // GenerateDefaultToken 是否生成初始令牌,默认关闭。 diff --git a/constant/env.go b/constant/env.go index 873427a7c..957f68669 100644 --- a/constant/env.go +++ b/constant/env.go @@ -11,7 +11,6 @@ var GetMediaTokenNotStream bool var UpdateTask bool var MaxRequestBodyMB int var AzureDefaultAPIVersion string -var GeminiVisionMaxImageNum int var NotifyLimitCount int var NotificationLimitDurationMinute int var GenerateDefaultToken bool diff --git a/relay/channel/gemini/relay-gemini.go b/relay/channel/gemini/relay-gemini.go index f4a5be1af..715371c29 100644 --- a/relay/channel/gemini/relay-gemini.go +++ b/relay/channel/gemini/relay-gemini.go @@ -466,7 +466,6 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i } openaiContent := message.ParseContent() - imageNum := 0 for _, part := range openaiContent { if part.Type == dto.ContentTypeText { if part.Text == "" { @@ -507,10 +506,6 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i } // 提取 data URL (从 "](" 后面开始,到 ")" 之前) dataUrl := text[bracketIdx+2 : closeIdx] - imageNum += 1 - if constant.GeminiVisionMaxImageNum != -1 && imageNum > constant.GeminiVisionMaxImageNum { - return nil, fmt.Errorf("too many images in the message, max allowed is %d", constant.GeminiVisionMaxImageNum) - } format, base64String, err := service.DecodeBase64FileData(dataUrl) if err != nil { return nil, fmt.Errorf("decode markdown base64 image data failed: %s", err.Error()) @@ -535,11 +530,6 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i }) } } else if part.Type == dto.ContentTypeImageURL { - imageNum += 1 - - if constant.GeminiVisionMaxImageNum != -1 && imageNum > constant.GeminiVisionMaxImageNum { - return nil, fmt.Errorf("too many images in the message, max allowed is %d", constant.GeminiVisionMaxImageNum) - } // 使用统一的文件服务获取图片数据 var source *types.FileSource imageUrl := part.GetImageMedia().Url