xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-24 10:56:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改错误提示

Browse Source
This commit is contained in:
CaIon 2023-12-01 01:29:13 +08:00
parent cddcf9caaa
commit 6e744bd1a3
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/constants.go
View File

@ -217,4 +217,5 @@ var ChannelBaseURLs = []string{
"https://api.aiproxy.io", // 21
"https://fastgpt.run/api/openapi", // 22
"https://hunyuan.cloud.tencent.com", //23
"", //24
}

2
controller/billing.go
View File

@ -71,7 +71,7 @@ func GetUsage(c *gin.Context) {
if err != nil {
openAIError := OpenAIError{
Message: err.Error(),
Type: "one_api_error",
Type: "new_api_error",
}
c.JSON(200, gin.H{
"error": openAIError,

3
controller/relay-image.go
View File

@ -56,6 +56,9 @@ func relayImageHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode
if imageRequest.Size != "" && imageRequest.Size != "1024x1024" && imageRequest.Size != "1024x1792" && imageRequest.Size != "1792x1024" {
return errorWrapper(errors.New("size must be one of 256x256, 512x512, or 1024x1024, dall-e-3 1024x1792 or 1792x1024"), "invalid_field_value", http.StatusBadRequest)
}
if imageRequest.N != 1 {
return errorWrapper(errors.New("n must be 1"), "invalid_field_value", http.StatusBadRequest)
}
}
// N should between 1 and 10

10
controller/relay-utils.go
View File

@ -70,7 +70,7 @@ func getTokenNum(tokenEncoder *tiktoken.Tiktoken, text string) int {
return len(tokenEncoder.Encode(text, nil, nil))
}
func getImageToken(imageUrl MessageImageUrl) (int, error) {
func getImageToken(imageUrl *MessageImageUrl) (int, error) {
if imageUrl.Detail == "low" {
return 85, nil
}
@ -90,8 +90,11 @@ func getImageToken(imageUrl MessageImageUrl) (int, error) {
if config.Width == 0 || config.Height == 0 {
return 0, errors.New(fmt.Sprintf("fail to decode image config: %s", imageUrl.Url))
}
// TODO: 适配官方auto计费
if config.Width < 512 && config.Height < 512 {
if imageUrl.Detail == "auto" || imageUrl.Detail == "" {
// 如果图片尺寸小于512，强制使用low
imageUrl.Detail = "low"
return 85, nil
}
}
@ -157,7 +160,7 @@ func countTokenMessages(messages []Message, model string) (int, error) {
} else {
for _, m := range arrayContent {
if m.Type == "image_url" {
imageTokenNum, err := getImageToken(m.ImageUrl)
imageTokenNum, err := getImageToken(&m.ImageUrl)
if err != nil {
return 0, err
}
@ -204,13 +207,14 @@ func errorWrapper(err error, code string, statusCode int) *OpenAIErrorWithStatus
text := err.Error()
// 定义一个正则表达式匹配URL
if strings.Contains(text, "Post") {
common.SysLog(fmt.Sprintf("error: %s", text))
text = "请求上游地址失败"
}
//避免暴露内部错误
openAIError := OpenAIError{
Message: text,
Type: "one_api_error",
Type: "new_api_error",
Code: code,
}
return &OpenAIErrorWithStatusCode{

2
controller/relay.go
View File

@ -331,7 +331,7 @@ func RelayMidjourney(c *gin.Context) {
func RelayNotImplemented(c *gin.Context) {
err := OpenAIError{
Message: "API not implemented",
Type: "one_api_error",
Type: "new_api_error",
Param: "",
Code: "api_not_implemented",
}

2
middleware/utils.go
View File

@ -9,7 +9,7 @@ func abortWithMessage(c *gin.Context, statusCode int, message string) {
c.JSON(statusCode, gin.H{
"error": gin.H{
"message": common.MessageWithRequestId(message, c.GetString(common.RequestIdKey)),
"type": "one_api_error",
"type": "new_api_error",
},
})
c.Abort()