CaIon пре 2 година
родитељ
комит
79492584b9
1 измењених фајлова са 7 додато и 7 уклоњено
  1. 7 7
      controller/relay-text.go

+ 7 - 7
controller/relay-text.go

@@ -51,12 +51,12 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 	tokenId := c.GetInt("token_id")
 	tokenId := c.GetInt("token_id")
 	userId := c.GetInt("id")
 	userId := c.GetInt("id")
 	group := c.GetString("group")
 	group := c.GetString("group")
+	startTime := time.Now()
 	var textRequest GeneralOpenAIRequest
 	var textRequest GeneralOpenAIRequest
-	if channelType == common.ChannelTypeAzure || channelType == common.ChannelTypePaLM {
-		err := common.UnmarshalBodyReusable(c, &textRequest)
-		if err != nil {
-			return errorWrapper(err, "bind_request_body_failed", http.StatusBadRequest)
-		}
+
+	err := common.UnmarshalBodyReusable(c, &textRequest)
+	if err != nil {
+		return errorWrapper(err, "bind_request_body_failed", http.StatusBadRequest)
 	}
 	}
 	if relayMode == RelayModeModerations && textRequest.Model == "" {
 	if relayMode == RelayModeModerations && textRequest.Model == "" {
 		textRequest.Model = "text-moderation-latest"
 		textRequest.Model = "text-moderation-latest"
@@ -198,7 +198,6 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 	}
 	}
 	var promptTokens int
 	var promptTokens int
 	var completionTokens int
 	var completionTokens int
-	var err error
 	switch relayMode {
 	switch relayMode {
 	case RelayModeChatCompletions:
 	case RelayModeChatCompletions:
 		promptTokens, err = countTokenMessages(textRequest.Messages, textRequest.Model)
 		promptTokens, err = countTokenMessages(textRequest.Messages, textRequest.Model)
@@ -445,7 +444,8 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 				common.LogError(ctx, "error update user quota cache: "+err.Error())
 				common.LogError(ctx, "error update user quota cache: "+err.Error())
 			}
 			}
 			// record all the consume log even if quota is 0
 			// record all the consume log even if quota is 0
-			logContent := fmt.Sprintf("模型倍率 %.2f,分组倍率 %.2f", modelRatio, groupRatio)
+			useTimeSeconds := time.Now().Unix() - startTime.Unix()
+			logContent := fmt.Sprintf("模型倍率 %.2f,分组倍率 %.2f,用时 %d秒", modelRatio, groupRatio, useTimeSeconds)
 			model.RecordConsumeLog(ctx, userId, channelId, promptTokens, completionTokens, textRequest.Model, tokenName, quota, logContent, tokenId)
 			model.RecordConsumeLog(ctx, userId, channelId, promptTokens, completionTokens, textRequest.Model, tokenName, quota, logContent, tokenId)
 			model.UpdateUserUsedQuotaAndRequestCount(userId, quota)
 			model.UpdateUserUsedQuotaAndRequestCount(userId, quota)
 			model.UpdateChannelUsedQuota(channelId, quota)
 			model.UpdateChannelUsedQuota(channelId, quota)