fix: retry prompt tokens
This commit is contained in:
@@ -112,6 +112,7 @@ func TextHelper(c *gin.Context) (openaiErr *dto.OpenAIErrorWithStatusCode) {
|
|||||||
var promptTokens int
|
var promptTokens int
|
||||||
if value, exists := c.Get("prompt_tokens"); exists {
|
if value, exists := c.Get("prompt_tokens"); exists {
|
||||||
promptTokens = value.(int)
|
promptTokens = value.(int)
|
||||||
|
relayInfo.PromptTokens = promptTokens
|
||||||
} else {
|
} else {
|
||||||
promptTokens, err = getPromptTokens(textRequest, relayInfo)
|
promptTokens, err = getPromptTokens(textRequest, relayInfo)
|
||||||
// count messages token error 计算promptTokens错误
|
// count messages token error 计算promptTokens错误
|
||||||
|
|||||||
@@ -92,13 +92,6 @@ func getImageToken(info *relaycommon.RelayInfo, imageUrl *dto.MessageImageUrl, m
|
|||||||
if !constant.GetMediaTokenNotStream && !stream {
|
if !constant.GetMediaTokenNotStream && !stream {
|
||||||
return 256, nil
|
return 256, nil
|
||||||
}
|
}
|
||||||
// 是否统计图片token
|
|
||||||
if !constant.GetMediaToken {
|
|
||||||
return 256, nil
|
|
||||||
}
|
|
||||||
if info.ChannelType == common.ChannelTypeGemini || info.ChannelType == common.ChannelTypeVertexAi || info.ChannelType == common.ChannelTypeAnthropic {
|
|
||||||
return 256, nil
|
|
||||||
}
|
|
||||||
// 同步One API的图片计费逻辑
|
// 同步One API的图片计费逻辑
|
||||||
if imageUrl.Detail == "auto" || imageUrl.Detail == "" {
|
if imageUrl.Detail == "auto" || imageUrl.Detail == "" {
|
||||||
imageUrl.Detail = "high"
|
imageUrl.Detail = "high"
|
||||||
@@ -109,6 +102,13 @@ func getImageToken(info *relaycommon.RelayInfo, imageUrl *dto.MessageImageUrl, m
|
|||||||
tileTokens = 5667
|
tileTokens = 5667
|
||||||
baseTokens = 2833
|
baseTokens = 2833
|
||||||
}
|
}
|
||||||
|
// 是否统计图片token
|
||||||
|
if !constant.GetMediaToken {
|
||||||
|
return 3 * baseTokens, nil
|
||||||
|
}
|
||||||
|
if info.ChannelType == common.ChannelTypeGemini || info.ChannelType == common.ChannelTypeVertexAi || info.ChannelType == common.ChannelTypeAnthropic {
|
||||||
|
return 3 * baseTokens, nil
|
||||||
|
}
|
||||||
var config image.Config
|
var config image.Config
|
||||||
var err error
|
var err error
|
||||||
var format string
|
var format string
|
||||||
|
|||||||
5127
web/pnpm-lock.yaml
generated
5127
web/pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user