fix: retry prompt tokens

Calcium-Ion · Jan 2, 2025 · ef4c1a2 · ef4c1a2
1 parent ba1aad8
commit ef4c1a2
Show file tree

Hide file tree

Showing 3 changed files with 2,310 additions and 2,738 deletions.
diff --git a/relay/relay-text.go b/relay/relay-text.go
@@ -112,6 +112,7 @@ func TextHelper(c *gin.Context) (openaiErr *dto.OpenAIErrorWithStatusCode) {
 	var promptTokens int
 	if value, exists := c.Get("prompt_tokens"); exists {
 		promptTokens = value.(int)
+		relayInfo.PromptTokens = promptTokens
 	} else {
 		promptTokens, err = getPromptTokens(textRequest, relayInfo)
 		// count messages token error 计算promptTokens错误

diff --git a/service/token_counter.go b/service/token_counter.go
@@ -92,13 +92,6 @@ func getImageToken(info *relaycommon.RelayInfo, imageUrl *dto.MessageImageUrl, m
 	if !constant.GetMediaTokenNotStream && !stream {
 		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的图片计费逻辑
 	if imageUrl.Detail == "auto" || imageUrl.Detail == "" {
 		imageUrl.Detail = "high"
@@ -109,6 +102,13 @@ func getImageToken(info *relaycommon.RelayInfo, imageUrl *dto.MessageImageUrl, m
 		tileTokens = 5667
 		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 err error
 	var format string