Merge pull request #1606 from funnycups/patch-1

fix: prompt calculation

controller/relay.go

@@ -128,6 +128,8 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		return
 		return
 	}
 	}
 
 
+	relayInfo.SetPromptTokens(tokens)
+
 	priceData, err := helper.ModelPriceHelper(c, relayInfo, tokens, meta)
 	priceData, err := helper.ModelPriceHelper(c, relayInfo, tokens, meta)
 	if err != nil {
 	if err != nil {
 		newAPIError = types.NewError(err, types.ErrorCodeModelPriceError)
 		newAPIError = types.NewError(err, types.ErrorCodeModelPriceError)

relay/channel/openai/relay-openai.go

@@ -197,22 +197,26 @@ func OpenaiHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respo
 		forceFormat = true
 		forceFormat = true
 	}
 	}
 
 
-	if simpleResponse.Usage.TotalTokens == 0 || (simpleResponse.Usage.PromptTokens == 0 && simpleResponse.Usage.CompletionTokens == 0) {
-		completionTokens := 0
-		for _, choice := range simpleResponse.Choices {
-			ctkm := service.CountTextToken(choice.Message.StringContent()+choice.Message.ReasoningContent+choice.Message.Reasoning, info.UpstreamModelName)
-			completionTokens += ctkm
+	usageModified := false
+	if simpleResponse.Usage.PromptTokens == 0 {
+		completionTokens := simpleResponse.Usage.CompletionTokens
+		if completionTokens == 0 {
+			for _, choice := range simpleResponse.Choices {
+				ctkm := service.CountTextToken(choice.Message.StringContent()+choice.Message.ReasoningContent+choice.Message.Reasoning, info.UpstreamModelName)
+				completionTokens += ctkm
+			}
 		}
 		}
 		simpleResponse.Usage = dto.Usage{
 		simpleResponse.Usage = dto.Usage{
 			PromptTokens:     info.PromptTokens,
 			PromptTokens:     info.PromptTokens,
 			CompletionTokens: completionTokens,
 			CompletionTokens: completionTokens,
 			TotalTokens:      info.PromptTokens + completionTokens,
 			TotalTokens:      info.PromptTokens + completionTokens,
 		}
 		}
+		usageModified = true
 	}
 	}
 
 
 	switch info.RelayFormat {
 	switch info.RelayFormat {
 	case types.RelayFormatOpenAI:
 	case types.RelayFormatOpenAI:
-		if forceFormat {
+		if forceFormat || usageModified {
 			responseBody, err = common.Marshal(simpleResponse)
 			responseBody, err = common.Marshal(simpleResponse)
 			if err != nil {
 			if err != nil {
 				return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
 				return nil, types.NewError(err, types.ErrorCodeBadResponseBody)