feat: publish sanitized custom.97 source
This commit is contained in:
1022 files changed
+69903
-19207
No files matched your search
+92
-94
@@ -7,6 +7,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/QuantumNous/new-api/common"
|
||||
"github.com/QuantumNous/new-api/i18n"
|
||||
"github.com/QuantumNous/new-api/logger"
|
||||
"github.com/QuantumNous/new-api/model"
|
||||
"github.com/QuantumNous/new-api/pkg/billingexpr"
|
||||
@@ -135,12 +136,12 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
logger.LogInfo(ctx, "realtime streaming consume quota success, quota: "+fmt.Sprintf("%d", quota))
|
||||
logger.LogInfo(ctx, common.LogText("realtime streaming consume quota success, quota: %d", quota))
|
||||
return nil
|
||||
}
|
||||
|
||||
func PostWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, modelName string,
|
||||
usage *dto.RealtimeUsage, extraContent string) {
|
||||
usage *dto.RealtimeUsage, extraContent []*common.Message) {
|
||||
|
||||
var tieredResult *billingexpr.TieredResult
|
||||
tieredOk, tieredQuota, tieredRes := TryTieredSettle(relayInfo, billingexpr.TokenParams{
|
||||
@@ -191,12 +192,20 @@ func PostWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, mod
|
||||
}
|
||||
|
||||
totalTokens := usage.TotalTokens
|
||||
var logContent string
|
||||
var logContent []*common.Message
|
||||
if !usePrice {
|
||||
logContent = fmt.Sprintf("模型倍率 %.2f，补全倍率 %.2f，音频倍率 %.2f，音频补全倍率 %.2f，分组倍率 %.2f",
|
||||
modelRatio, completionRatio.InexactFloat64(), audioRatio.InexactFloat64(), audioCompletionRatio.InexactFloat64(), groupRatio)
|
||||
logContent = append(logContent, common.NewMessage("Model ratio {{model_ratio}}, completion ratio {{completion_ratio}}, audio ratio {{audio_ratio}}, audio completion ratio {{audio_completion_ratio}}, group ratio {{group_ratio}}", map[string]any{
|
||||
"model_ratio": fmt.Sprintf("%.2f", modelRatio),
|
||||
"completion_ratio": fmt.Sprintf("%.2f", completionRatio.InexactFloat64()),
|
||||
"audio_ratio": fmt.Sprintf("%.2f", audioRatio.InexactFloat64()),
|
||||
"audio_completion_ratio": fmt.Sprintf("%.2f", audioCompletionRatio.InexactFloat64()),
|
||||
"group_ratio": fmt.Sprintf("%.2f", groupRatio),
|
||||
}))
|
||||
} else {
|
||||
logContent = fmt.Sprintf("模型价格 %.2f，分组倍率 %.2f", modelPrice, groupRatio)
|
||||
logContent = append(logContent, common.NewMessage("Model price {{model_price}}, group ratio {{group_ratio}}", map[string]any{
|
||||
"model_price": fmt.Sprintf("%.2f", modelPrice),
|
||||
"group_ratio": fmt.Sprintf("%.2f", groupRatio),
|
||||
}))
|
||||
}
|
||||
|
||||
// record all the consume log even if quota is 0
|
||||
@@ -204,22 +213,20 @@ func PostWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, mod
|
||||
// in this case, must be some error happened
|
||||
// we cannot just return, because we may have to return the pre-consumed quota
|
||||
quota = 0
|
||||
logContent += "（可能是上游超时）"
|
||||
logger.LogError(ctx, fmt.Sprintf("total tokens is 0, cannot consume quota, userId %d, channelId %d, "+
|
||||
"tokenId %d, model %s， pre-consumed quota %d", relayInfo.UserId, relayInfo.ChannelId, relayInfo.TokenId, modelName, relayInfo.FinalPreConsumedQuota))
|
||||
logContent = append(logContent, common.NewMessage("Possibly an upstream timeout"))
|
||||
logger.LogError(ctx, common.LogText("total tokens is 0, cannot consume quota, userId %d, channelId %d, tokenId %d, model %s， pre-consumed quota %d",
|
||||
relayInfo.UserId, relayInfo.ChannelId, relayInfo.TokenId, modelName, relayInfo.FinalPreConsumedQuota))
|
||||
} else {
|
||||
model.UpdateUserUsedQuotaAndRequestCount(relayInfo.UserId, quota)
|
||||
model.UpdateChannelUsedQuota(relayInfo.ChannelId, quota)
|
||||
}
|
||||
|
||||
if err := SettleBilling(ctx, relayInfo, quota); err != nil {
|
||||
logger.LogError(ctx, "error settling billing: "+err.Error())
|
||||
logger.LogError(ctx, common.LogText("error settling billing: %s", err.Error()))
|
||||
}
|
||||
|
||||
logModel := modelName
|
||||
if extraContent != "" {
|
||||
logContent += ", " + extraContent
|
||||
}
|
||||
logContent = append(logContent, extraContent...)
|
||||
other := GenerateWssOtherInfo(ctx, relayInfo, usage, modelRatio, groupRatio,
|
||||
completionRatio.InexactFloat64(), audioRatio.InexactFloat64(), audioCompletionRatio.InexactFloat64(), modelPrice, relayInfo.PriceData.GroupRatioInfo.GroupSpecialRatio)
|
||||
if tieredResult != nil {
|
||||
@@ -268,7 +275,7 @@ func CalcOpenRouterCacheCreateTokens(usage dto.Usage, priceData types.PriceData)
|
||||
return quota
|
||||
}
|
||||
|
||||
func PostAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usage *dto.Usage, extraContent string) {
|
||||
func PostAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usage *dto.Usage, extraContent []*common.Message) {
|
||||
if usage == nil {
|
||||
usage = &dto.Usage{PromptTokens: relayInfo.GetEstimatePromptTokens(), TotalTokens: relayInfo.GetEstimatePromptTokens()}
|
||||
}
|
||||
@@ -324,12 +331,20 @@ func PostAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, u
|
||||
}
|
||||
|
||||
totalTokens := usage.TotalTokens
|
||||
var logContent string
|
||||
var logContent []*common.Message
|
||||
if !usePrice {
|
||||
logContent = fmt.Sprintf("模型倍率 %.2f，补全倍率 %.2f，音频倍率 %.2f，音频补全倍率 %.2f，分组倍率 %.2f",
|
||||
modelRatio, completionRatio.InexactFloat64(), audioRatio.InexactFloat64(), audioCompletionRatio.InexactFloat64(), groupRatio)
|
||||
logContent = append(logContent, common.NewMessage("Model ratio {{model_ratio}}, completion ratio {{completion_ratio}}, audio ratio {{audio_ratio}}, audio completion ratio {{audio_completion_ratio}}, group ratio {{group_ratio}}", map[string]any{
|
||||
"model_ratio": fmt.Sprintf("%.2f", modelRatio),
|
||||
"completion_ratio": fmt.Sprintf("%.2f", completionRatio.InexactFloat64()),
|
||||
"audio_ratio": fmt.Sprintf("%.2f", audioRatio.InexactFloat64()),
|
||||
"audio_completion_ratio": fmt.Sprintf("%.2f", audioCompletionRatio.InexactFloat64()),
|
||||
"group_ratio": fmt.Sprintf("%.2f", groupRatio),
|
||||
}))
|
||||
} else {
|
||||
logContent = fmt.Sprintf("模型价格 %.2f，分组倍率 %.2f", modelPrice, groupRatio)
|
||||
logContent = append(logContent, common.NewMessage("Model price {{model_price}}, group ratio {{group_ratio}}", map[string]any{
|
||||
"model_price": fmt.Sprintf("%.2f", modelPrice),
|
||||
"group_ratio": fmt.Sprintf("%.2f", groupRatio),
|
||||
}))
|
||||
}
|
||||
|
||||
// record all the consume log even if quota is 0
|
||||
@@ -337,22 +352,20 @@ func PostAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, u
|
||||
// in this case, must be some error happened
|
||||
// we cannot just return, because we may have to return the pre-consumed quota
|
||||
quota = 0
|
||||
logContent += "（可能是上游超时）"
|
||||
logger.LogError(ctx, fmt.Sprintf("total tokens is 0, cannot consume quota, userId %d, channelId %d, "+
|
||||
"tokenId %d, model %s， pre-consumed quota %d", relayInfo.UserId, relayInfo.ChannelId, relayInfo.TokenId, billingModelName, relayInfo.FinalPreConsumedQuota))
|
||||
logContent = append(logContent, common.NewMessage("Possibly an upstream timeout"))
|
||||
logger.LogError(ctx, common.LogText("total tokens is 0, cannot consume quota, userId %d, channelId %d, tokenId %d, model %s， pre-consumed quota %d",
|
||||
relayInfo.UserId, relayInfo.ChannelId, relayInfo.TokenId, billingModelName, relayInfo.FinalPreConsumedQuota))
|
||||
} else {
|
||||
model.UpdateUserUsedQuotaAndRequestCount(relayInfo.UserId, quota)
|
||||
model.UpdateChannelUsedQuota(relayInfo.ChannelId, quota)
|
||||
}
|
||||
|
||||
if err := SettleBilling(ctx, relayInfo, quota); err != nil {
|
||||
logger.LogError(ctx, "error settling billing: "+err.Error())
|
||||
logger.LogError(ctx, common.LogText("error settling billing: %s", err.Error()))
|
||||
}
|
||||
|
||||
logModel := billingModelName
|
||||
if extraContent != "" {
|
||||
logContent += ", " + extraContent
|
||||
}
|
||||
logContent = append(logContent, extraContent...)
|
||||
other := GenerateAudioOtherInfo(ctx, relayInfo, usage, modelRatio, groupRatio,
|
||||
completionRatio.InexactFloat64(), audioRatio.InexactFloat64(), audioCompletionRatio.InexactFloat64(), modelPrice, relayInfo.PriceData.GroupRatioInfo.GroupSpecialRatio)
|
||||
if tieredResult != nil {
|
||||
@@ -378,7 +391,7 @@ func PostAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, u
|
||||
|
||||
func PreConsumeTokenQuota(relayInfo *relaycommon.RelayInfo, quota int) error {
|
||||
if quota < 0 {
|
||||
return errors.New("quota 不能为负数！")
|
||||
return errors.New("quota cannot be negative")
|
||||
}
|
||||
if relayInfo.IsPlayground {
|
||||
return nil
|
||||
@@ -459,47 +472,18 @@ func postConsumeQuotaWithResult(relayInfo *relaycommon.RelayInfo, quota int, pre
|
||||
func checkAndSendQuotaNotify(relayInfo *relaycommon.RelayInfo, quota int, preConsumedQuota int) {
|
||||
gopool.Go(func() {
|
||||
userSetting := relayInfo.UserSetting
|
||||
threshold := common.QuotaRemindThreshold
|
||||
if userSetting.QuotaWarningThreshold != 0 {
|
||||
threshold = int(userSetting.QuotaWarningThreshold)
|
||||
// UserQuota is the balance before this request; quota plus
|
||||
// preConsumedQuota is what the request finally cost.
|
||||
balanceAfter := relayInfo.UserQuota - (quota + preConsumedQuota)
|
||||
if !quotaReminderDue(userSetting, int64(relayInfo.UserQuota), int64(balanceAfter)) {
|
||||
return
|
||||
}
|
||||
|
||||
//noMoreQuota := userCache.Quota-(quota+preConsumedQuota) <= 0
|
||||
quotaTooLow := false
|
||||
consumeQuota := quota + preConsumedQuota
|
||||
if relayInfo.UserQuota-consumeQuota < threshold {
|
||||
quotaTooLow = true
|
||||
}
|
||||
if quotaTooLow {
|
||||
prompt := "您的额度即将用尽"
|
||||
topUpLink := PaymentReturnURL("/wallet")
|
||||
|
||||
// 根据通知方式生成不同的内容格式
|
||||
var content string
|
||||
var values []any
|
||||
|
||||
notifyType := userSetting.NotifyType
|
||||
if notifyType == "" {
|
||||
notifyType = dto.NotifyTypeEmail
|
||||
}
|
||||
|
||||
if notifyType == dto.NotifyTypeBark {
|
||||
// Bark推送使用简短文本，不支持HTML
|
||||
content = "{{value}}，剩余额度：{{value}}，请及时充值"
|
||||
values = []any{prompt, logger.FormatQuota(relayInfo.UserQuota)}
|
||||
} else if notifyType == dto.NotifyTypeGotify {
|
||||
content = "{{value}}，当前剩余额度为 {{value}}，请及时充值。"
|
||||
values = []any{prompt, logger.FormatQuota(relayInfo.UserQuota)}
|
||||
} else {
|
||||
// 默认内容格式，适用于Email和Webhook（支持HTML）
|
||||
content = "{{value}}，当前剩余额度为 {{value}}，为了不影响您的使用，请及时充值。<br/>充值链接：<a href='{{value}}'>{{value}}</a>"
|
||||
values = []any{prompt, logger.FormatQuota(relayInfo.UserQuota), topUpLink, topUpLink}
|
||||
}
|
||||
|
||||
err := NotifyUser(relayInfo.UserId, relayInfo.UserEmail, relayInfo.UserSetting, dto.NewNotify(dto.NotifyTypeQuotaExceed, prompt, content, values))
|
||||
if err != nil {
|
||||
common.SysError(fmt.Sprintf("failed to send quota notify to user %d: %s", relayInfo.UserId, err.Error()))
|
||||
}
|
||||
lang := userSetting.Language
|
||||
prompt := i18n.Translate(lang, i18n.MsgNotifyQuotaLowTitle)
|
||||
content, values := quotaNotifyContent(lang, userSetting.NotifyType, prompt, logger.FormatQuota(balanceAfter))
|
||||
err := NotifyUser(relayInfo.UserId, relayInfo.UserEmail, relayInfo.UserSetting, dto.NewNotify(dto.NotifyTypeQuotaExceed, prompt, content, values))
|
||||
if err != nil {
|
||||
common.SysError(common.LogText("failed to send quota notify to user %d: %s", relayInfo.UserId, err.Error()))
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -514,40 +498,54 @@ func checkAndSendSubscriptionQuotaNotify(relayInfo *relaycommon.RelayInfo) {
|
||||
}
|
||||
|
||||
userSetting := relayInfo.UserSetting
|
||||
threshold := common.QuotaRemindThreshold
|
||||
if userSetting.QuotaWarningThreshold != 0 {
|
||||
threshold = int(userSetting.QuotaWarningThreshold)
|
||||
}
|
||||
|
||||
usedBefore := relayInfo.SubscriptionAmountUsedAfterPreConsume - relayInfo.SubscriptionPreConsumed
|
||||
usedAfter := relayInfo.SubscriptionAmountUsedAfterPreConsume + relayInfo.SubscriptionPostDelta
|
||||
remaining := relayInfo.SubscriptionAmountTotal - usedAfter
|
||||
if remaining >= int64(threshold) {
|
||||
if !quotaReminderDue(userSetting, relayInfo.SubscriptionAmountTotal-usedBefore, remaining) {
|
||||
return
|
||||
}
|
||||
|
||||
prompt := "您的订阅额度即将用尽"
|
||||
topUpLink := PaymentReturnURL("/wallet")
|
||||
|
||||
var content string
|
||||
var values []any
|
||||
notifyType := userSetting.NotifyType
|
||||
if notifyType == "" {
|
||||
notifyType = dto.NotifyTypeEmail
|
||||
}
|
||||
|
||||
if notifyType == dto.NotifyTypeBark {
|
||||
content = "{{value}}，剩余额度：{{value}}，请及时充值"
|
||||
values = []any{prompt, logger.FormatQuota(int(remaining))}
|
||||
} else if notifyType == dto.NotifyTypeGotify {
|
||||
content = "{{value}}，当前剩余额度为 {{value}}，请及时充值。"
|
||||
values = []any{prompt, logger.FormatQuota(int(remaining))}
|
||||
} else {
|
||||
content = "{{value}}，当前剩余额度为 {{value}}，为了不影响您的使用，请及时充值。<br/>充值链接：<a href='{{value}}'>{{value}}</a>"
|
||||
values = []any{prompt, logger.FormatQuota(int(remaining)), topUpLink, topUpLink}
|
||||
}
|
||||
|
||||
lang := userSetting.Language
|
||||
prompt := i18n.Translate(lang, i18n.MsgNotifySubscriptionQuotaLowTitle)
|
||||
content, values := quotaNotifyContent(lang, userSetting.NotifyType, prompt, logger.FormatQuota(int(remaining)))
|
||||
if err := NotifyUser(relayInfo.UserId, relayInfo.UserEmail, relayInfo.UserSetting, dto.NewNotify(dto.NotifyTypeQuotaExceed, prompt, content, values)); err != nil {
|
||||
common.SysError(fmt.Sprintf("failed to send subscription quota notify to user %d: %s", relayInfo.UserId, err.Error()))
|
||||
common.SysError(common.LogText("failed to send subscription quota notify to user %d: %s", relayInfo.UserId, err.Error()))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// quotaReminderDue reports whether a charge that moved a balance (wallet or
|
||||
// subscription) from before to after earns a low-balance reminder. The site
|
||||
// and the user must both have reminders on, and the charge must cross the
|
||||
// user's threshold, or the site default when the user set none. A balance
|
||||
// already below the threshold earns nothing more until a top-up lifts it back
|
||||
// above, so a user gets one reminder per drop.
|
||||
func quotaReminderDue(userSetting dto.UserSetting, before int64, after int64) bool {
|
||||
if !common.QuotaRemindEnabled {
|
||||
return false
|
||||
}
|
||||
if userSetting.QuotaWarningEnabled != nil && !*userSetting.QuotaWarningEnabled {
|
||||
return false
|
||||
}
|
||||
threshold := float64(common.QuotaRemindThreshold)
|
||||
if userSetting.QuotaWarningThreshold != 0 {
|
||||
threshold = userSetting.QuotaWarningThreshold
|
||||
}
|
||||
return float64(before) >= threshold && float64(after) < threshold
|
||||
}
|
||||
|
||||
// quotaNotifyContent renders a low-quota notice in the user's saved language.
|
||||
// Bark and Gotify get plain text; email and webhook get HTML with the top-up
|
||||
// link. values stay in the notify payload for webhook receivers.
|
||||
func quotaNotifyContent(lang string, notifyType string, prompt string, remaining string) (string, []any) {
|
||||
switch notifyType {
|
||||
case dto.NotifyTypeBark:
|
||||
// Bark推送使用简短文本，不支持HTML
|
||||
return i18n.Translate(lang, i18n.MsgNotifyQuotaLowBark, map[string]any{"Prompt": prompt, "Quota": remaining}), []any{prompt, remaining}
|
||||
case dto.NotifyTypeGotify:
|
||||
return i18n.Translate(lang, i18n.MsgNotifyQuotaLowGotify, map[string]any{"Prompt": prompt, "Quota": remaining}), []any{prompt, remaining}
|
||||
default:
|
||||
topUpLink := PaymentReturnURL("/wallet")
|
||||
return i18n.Translate(lang, i18n.MsgNotifyQuotaLowEmail, map[string]any{"Prompt": prompt, "Quota": remaining, "Link": topUpLink}), []any{prompt, remaining, topUpLink, topUpLink}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user