feat: update relay-text to conditionally include usage based on StreamOptions #696

relay/relay-text.go

@@ -140,10 +140,10 @@ func TextHelper(c *gin.Context) (newAPIError *types.NewAPIError) {
 			returnPreConsumedQuota(c, relayInfo, userQuota, preConsumedQuota)
 			returnPreConsumedQuota(c, relayInfo, userQuota, preConsumedQuota)
 		}
 		}
 	}()
 	}()
-	includeUsage := false
+	includeUsage := true
 	// 判断用户是否需要返回使用情况
 	// 判断用户是否需要返回使用情况
-	if textRequest.StreamOptions != nil && textRequest.StreamOptions.IncludeUsage {
-		includeUsage = true
+	if textRequest.StreamOptions != nil {
+		includeUsage = textRequest.StreamOptions.IncludeUsage
 	}
 	}
 
 
 	// 如果不支持StreamOptions，将StreamOptions设置为nil
 	// 如果不支持StreamOptions，将StreamOptions设置为nil
@@ -158,9 +158,7 @@ func TextHelper(c *gin.Context) (newAPIError *types.NewAPIError) {
 		}
 		}
 	}
 	}
 
 
-	if includeUsage {
-		relayInfo.ShouldIncludeUsage = true
-	}
+	relayInfo.ShouldIncludeUsage = includeUsage
 
 
 	adaptor := GetAdaptor(relayInfo.ApiType)
 	adaptor := GetAdaptor(relayInfo.ApiType)
 	if adaptor == nil {
 	if adaptor == nil {