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

fix(relay): improve error handling for unsupported MIME types by sanitizing URLs

Browse Source
This commit is contained in:
CaIon
2025-06-17 22:40:41 +08:00
parent edd9049100
commit 0199896d9a
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,7 +324,10 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest, info *relaycommon
// 校验 MimeType 是否在 Gemini 支持的白名单中 // 校验 MimeType 是否在 Gemini 支持的白名单中
if _, ok := geminiSupportedMimeTypes[strings.ToLower(fileData.MimeType)]; !ok { if _, ok := geminiSupportedMimeTypes[strings.ToLower(fileData.MimeType)]; !ok {
return nil, fmt.Errorf("MIME type '%s' from URL '%s' is not supported by Gemini. Supported types are: %v", fileData.MimeType, part.GetImageMedia().Url, getSupportedMimeTypesList()) url := part.GetImageMedia().Url
url = strings.TrimPrefix(url, "http://")
url = strings.TrimPrefix(url, "https://")
return nil, fmt.Errorf("MIME type '%s' from URL '%s' is not supported by Gemini. Supported types are: %v", fileData.MimeType, url, getSupportedMimeTypesList())
} }
parts = append(parts, GeminiPart{ parts = append(parts, GeminiPart{

16
service/error.go
View File

@@ -29,9 +29,11 @@ func MidjourneyErrorWithStatusCodeWrapper(code int, desc string, statusCode int)
func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode { func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
text := err.Error() text := err.Error()
lowerText := strings.ToLower(text) lowerText := strings.ToLower(text)
if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") { if !strings.HasPrefix(lowerText, "get file base64 from url") {
common.SysLog(fmt.Sprintf("error: %s", text)) if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
text = "请求上游地址失败" common.SysLog(fmt.Sprintf("error: %s", text))
text = "请求上游地址失败"
}
} }
openAIError := dto.OpenAIError{ openAIError := dto.OpenAIError{
Message: text, Message: text,
@@ -53,9 +55,11 @@ func OpenAIErrorWrapperLocal(err error, code string, statusCode int) *dto.OpenAI
func ClaudeErrorWrapper(err error, code string, statusCode int) *dto.ClaudeErrorWithStatusCode { func ClaudeErrorWrapper(err error, code string, statusCode int) *dto.ClaudeErrorWithStatusCode {
text := err.Error() text := err.Error()
lowerText := strings.ToLower(text) lowerText := strings.ToLower(text)
if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") { if !strings.HasPrefix(lowerText, "get file base64 from url") {
common.SysLog(fmt.Sprintf("error: %s", text)) if strings.Contains(lowerText, "post") || strings.Contains(lowerText, "dial") || strings.Contains(lowerText, "http") {
text = "请求上游地址失败" common.SysLog(fmt.Sprintf("error: %s", text))
text = "请求上游地址失败"
}
} }
claudeError := dto.ClaudeError{ claudeError := dto.ClaudeError{
Message: text, Message: text,

4
service/file_decoder.go
View File

@@ -33,6 +33,10 @@ func GetFileBase64FromUrl(url string) (*dto.LocalFileData, error) {
base64Data := base64.StdEncoding.EncodeToString(fileBytes) base64Data := base64.StdEncoding.EncodeToString(fileBytes)
mimeType := resp.Header.Get("Content-Type") mimeType := resp.Header.Get("Content-Type")
if len(strings.Split(mimeType, ";")) > 1 {
// If Content-Type has parameters, take the first part
mimeType = strings.Split(mimeType, ";")[0]
}
if mimeType == "application/octet-stream" { if mimeType == "application/octet-stream" {
if common.DebugEnabled { if common.DebugEnabled {
println("MIME type is application/octet-stream, trying to guess from URL or filename") println("MIME type is application/octet-stream, trying to guess from URL or filename")