Merge branch 'main' of https://github.com/Calcium-Ion/new-api

jenboy · Dec 27, 2024 · ef3df49 · ef3df49
2 parents 87dd686 + 62ae46b
commit ef3df49
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/common/model-ratio.go b/common/model-ratio.go
@@ -356,7 +356,7 @@ func GetCompletionRatio(name string) float64 {
 		}
 		return 2
 	}
-	if strings.HasPrefix(name, "o1-") {
+	if strings.HasPrefix(name, "o1") {
 		return 4
 	}
 	if name == "chatgpt-4o-latest" {

diff --git a/relay/channel/gemini/relay-gemini.go b/relay/channel/gemini/relay-gemini.go
@@ -245,12 +245,12 @@ func removeAdditionalPropertiesWithDepth(schema interface{}, depth int) interfac
 	if !ok || len(v) == 0 {
 		return schema
 	}
-
+	// 删除所有的title字段
+	delete(v, "title")
 	// 如果type不为object和array，则直接返回
 	if typeVal, exists := v["type"]; !exists || (typeVal != "object" && typeVal != "array") {
 		return schema
 	}
-	delete(v, "title")
 	switch v["type"] {
 	case "object":
 		delete(v, "additionalProperties")

diff --git a/relay/channel/openai/adaptor.go b/relay/channel/openai/adaptor.go
@@ -106,7 +106,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, info *relaycommon.RelayInfo, re
 	if request == nil {
 		return nil, errors.New("request is nil")
 	}
-	if info.ChannelType != common.ChannelTypeOpenAI {
+	if info.ChannelType != common.ChannelTypeOpenAI && info.ChannelType != common.ChannelTypeAzure {
 		request.StreamOptions = nil
 	}
 	if strings.HasPrefix(request.Model, "o1") {

diff --git a/relay/common/relay_info.go b/relay/common/relay_info.go
@@ -109,7 +109,7 @@ func GenRelayInfo(c *gin.Context) *RelayInfo {
 	}
 	if info.ChannelType == common.ChannelTypeOpenAI || info.ChannelType == common.ChannelTypeAnthropic ||
 		info.ChannelType == common.ChannelTypeAws || info.ChannelType == common.ChannelTypeGemini ||
-		info.ChannelType == common.ChannelCloudflare {
+		info.ChannelType == common.ChannelCloudflare || info.ChannelType == common.ChannelTypeAzure {
 		info.SupportStreamOptions = true
 	}
 	return info

diff --git a/relay/relay-text.go b/relay/relay-text.go
@@ -108,10 +108,17 @@ func TextHelper(c *gin.Context) (openaiErr *dto.OpenAIErrorWithStatusCode) {
 		}
 	}
 
-	promptTokens, err := getPromptTokens(textRequest, relayInfo)
-	// count messages token error 计算promptTokens错误
-	if err != nil {
-		return service.OpenAIErrorWrapper(err, "count_token_messages_failed", http.StatusInternalServerError)
+	// 获取 promptTokens，如果上下文中已经存在，则直接使用
+	var promptTokens int
+	if value, exists := c.Get("prompt_tokens"); exists {
+		promptTokens = value.(int)
+	} else {
+		promptTokens, err = getPromptTokens(textRequest, relayInfo)
+		// count messages token error 计算promptTokens错误
+		if err != nil {
+			return service.OpenAIErrorWrapper(err, "count_token_messages_failed", http.StatusInternalServerError)
+		}
+		c.Set("prompt_tokens", promptTokens)
 	}
 
 	if !getModelPriceSuccess {

diff --git a/service/token_counter.go b/service/token_counter.go
@@ -92,11 +92,11 @@ func getImageToken(imageUrl *dto.MessageImageUrl, model string, stream bool) (in
 	}
 	// TODO: 非流模式下不计算图片token数量
 	if !constant.GetMediaTokenNotStream && !stream {
-		return 1000, nil
+		return 256, nil
 	}
 	// 是否统计图片token
 	if !constant.GetMediaToken {
-		return 1000, nil
+		return 256, nil
 	}
 	// 同步One API的图片计费逻辑
 	if imageUrl.Detail == "auto" || imageUrl.Detail == "" {

diff --git a/web/src/pages/Detail/index.js b/web/src/pages/Detail/index.js
@@ -143,7 +143,7 @@ const Detail = (props) => {
         content: [
           {
             key: (datum) => datum['Model'],
-            value: (datum) => renderQuotaNumberWithDigit(datum['rawQuota'] || 0, 4),
+            value: (datum) => renderQuota(datum['rawQuota'] || 0, 4),
           },
         ],
       },