diff --git a/common/image/image.go b/common/image/image.go index aff8cb31..92176c2f 100644 --- a/common/image/image.go +++ b/common/image/image.go @@ -111,8 +111,12 @@ func GetImageSizeFromBase64(encoded string) (width int, height int, err error) { } func GetImageSize(image string) (width int, height int, err error) { - if strings.HasPrefix(image, "data:image/") { + switch { + case strings.HasPrefix(image, "data:image/"): return GetImageSizeFromBase64(image) + case strings.HasPrefix(image, "http"): + return GetImageSizeFromUrl(image) + default: + return 0, 0, errors.New("invalid file type, Please view request interface!") } - return GetImageSizeFromUrl(image) } diff --git a/common/token.go b/common/token.go index 77ba8443..ec30f47e 100644 --- a/common/token.go +++ b/common/token.go @@ -118,7 +118,8 @@ func CountTokenMessages(messages []types.ChatCompletionMessage, model string) in } imageTokens, err := countImageTokens(url, detail) if err != nil { - SysError("error counting image tokens: " + err.Error()) + //Due to the excessive length of the error information, only extract and record the most critical part. + SysError("error counting image tokens: " + err.Error()) } else { tokenNum += imageTokens }