From 3202ca9f3e2a5337e75b1bd0b4f467e8487e9a00 Mon Sep 17 00:00:00 2001
From: CaIon <1808837298@qq.com>
Date: Sun, 12 Nov 2023 18:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=99=E9=A2=9D=E4=B8=8D?=
=?UTF-8?q?=E8=B6=B3=E9=82=AE=E4=BB=B6=E6=8F=90=E9=86=92bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
controller/relay-audio.go | 4 +--
controller/relay-image.go | 2 +-
controller/relay-mj.go | 2 +-
controller/relay-text.go | 6 ++--
model/token.go | 65 ++++++++++++++++++++-------------------
5 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/controller/relay-audio.go b/controller/relay-audio.go
index bf6a0df..fe91dbc 100644
--- a/controller/relay-audio.go
+++ b/controller/relay-audio.go
@@ -44,7 +44,7 @@ func relayAudioHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode
preConsumedQuota = 0
}
if preConsumedQuota > 0 {
- err := model.PreConsumeTokenQuota(tokenId, preConsumedQuota)
+ userQuota, err = model.PreConsumeTokenQuota(tokenId, preConsumedQuota)
if err != nil {
return errorWrapper(err, "pre_consume_token_quota_failed", http.StatusForbidden)
}
@@ -99,7 +99,7 @@ func relayAudioHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode
go func() {
quota := countTokenText(audioResponse.Text, audioModel)
quotaDelta := quota - preConsumedQuota
- err := model.PostConsumeTokenQuota(tokenId, quotaDelta)
+ err := model.PostConsumeTokenQuota(tokenId, userQuota, quotaDelta, preConsumedQuota)
if err != nil {
common.SysError("error consuming token remain quota: " + err.Error())
}
diff --git a/controller/relay-image.go b/controller/relay-image.go
index 89dc821..5cebcdb 100644
--- a/controller/relay-image.go
+++ b/controller/relay-image.go
@@ -147,7 +147,7 @@ func relayImageHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode
var textResponse ImageResponse
defer func(ctx context.Context) {
if consumeQuota {
- err := model.PostConsumeTokenQuota(tokenId, quota)
+ err := model.PostConsumeTokenQuota(tokenId, userId, quota, 0)
if err != nil {
common.SysError("error consuming token remain quota: " + err.Error())
}
diff --git a/controller/relay-mj.go b/controller/relay-mj.go
index 4f85234..948c57c 100644
--- a/controller/relay-mj.go
+++ b/controller/relay-mj.go
@@ -359,7 +359,7 @@ func relayMidjourneySubmit(c *gin.Context, relayMode int) *MidjourneyResponse {
defer func(ctx context.Context) {
if consumeQuota {
- err := model.PostConsumeTokenQuota(tokenId, quota)
+ err := model.PostConsumeTokenQuota(tokenId, userQuota, quota, 0)
if err != nil {
common.SysError("error consuming token remain quota: " + err.Error())
}
diff --git a/controller/relay-text.go b/controller/relay-text.go
index 84dc582..6f56be8 100644
--- a/controller/relay-text.go
+++ b/controller/relay-text.go
@@ -233,7 +233,7 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
//common.LogInfo(c.Request.Context(), fmt.Sprintf("user %d has enough quota %d, trusted and no need to pre-consume", userId, userQuota))
}
if consumeQuota && preConsumedQuota > 0 {
- err := model.PreConsumeTokenQuota(tokenId, preConsumedQuota)
+ userQuota, err = model.PreConsumeTokenQuota(tokenId, preConsumedQuota)
if err != nil {
return errorWrapper(err, "pre_consume_token_quota_failed", http.StatusForbidden)
}
@@ -400,7 +400,7 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
if preConsumedQuota != 0 {
go func(ctx context.Context) {
// return pre-consumed quota
- err := model.PostConsumeTokenQuota(tokenId, -preConsumedQuota)
+ err := model.PostConsumeTokenQuota(tokenId, userQuota, -preConsumedQuota, 0)
if err != nil {
common.LogError(ctx, "error return pre-consumed quota: "+err.Error())
}
@@ -434,7 +434,7 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
quota = 0
}
quotaDelta := quota - preConsumedQuota
- err := model.PostConsumeTokenQuota(tokenId, quotaDelta)
+ err := model.PostConsumeTokenQuota(tokenId, userQuota, quotaDelta, preConsumedQuota)
if err != nil {
common.LogError(ctx, "error consuming token remain quota: "+err.Error())
}
diff --git a/model/token.go b/model/token.go
index 41746d9..06b9775 100644
--- a/model/token.go
+++ b/model/token.go
@@ -178,59 +178,60 @@ func decreaseTokenQuota(id int, quota int) (err error) {
return err
}
-func PreConsumeTokenQuota(tokenId int, quota int) (err error) {
+func PreConsumeTokenQuota(tokenId int, quota int) (userQuota int, err error) {
if quota < 0 {
- return errors.New("quota 不能为负数！")
+ return 0, errors.New("quota 不能为负数！")
}
token, err := GetTokenById(tokenId)
if err != nil {
- return err
+ return 0, err
}
if !token.UnlimitedQuota && token.RemainQuota < quota {
- return errors.New("令牌额度不足")
+ return 0, errors.New("令牌额度不足")
}
- userQuota, err := GetUserQuota(token.UserId)
+ userQuota, err = GetUserQuota(token.UserId)
if err != nil {
- return err
+ return 0, err
}
if userQuota < quota {
- return errors.New("用户额度不足")
- }
- quotaTooLow := userQuota >= common.QuotaRemindThreshold && userQuota-quota < common.QuotaRemindThreshold
- noMoreQuota := userQuota-quota <= 0
- if quotaTooLow || noMoreQuota {
- go func() {
- email, err := GetUserEmail(token.UserId)
- if err != nil {
- common.SysError("failed to fetch user email: " + err.Error())
- }
- prompt := "您的额度即将用尽"
- if noMoreQuota {
- prompt = "您的额度已用尽"
- }
- if email != "" {
- topUpLink := fmt.Sprintf("%s/topup", common.ServerAddress)
- err = common.SendEmail(prompt, email,
- fmt.Sprintf("%s，当前剩余额度为 %d，为了不影响您的使用，请及时充值。
充值链接：%s", prompt, userQuota, topUpLink, topUpLink))
- if err != nil {
- common.SysError("failed to send email" + err.Error())
- }
- }
- }()
+ return userQuota, errors.New(fmt.Sprintf("用户额度不足，剩余额度为 %d", userQuota))
}
if !token.UnlimitedQuota {
err = DecreaseTokenQuota(tokenId, quota)
if err != nil {
- return err
+ return userQuota, err
}
}
err = DecreaseUserQuota(token.UserId, quota)
- return err
+ return userQuota, err
}
-func PostConsumeTokenQuota(tokenId int, quota int) (err error) {
+func PostConsumeTokenQuota(tokenId int, userQuota int, quota int, preConsumedQuota int) (err error) {
token, err := GetTokenById(tokenId)
+
if quota > 0 {
+ quotaTooLow := userQuota >= common.QuotaRemindThreshold && userQuota-(quota+preConsumedQuota) < common.QuotaRemindThreshold
+ noMoreQuota := userQuota-(quota+preConsumedQuota) <= 0
+ if quotaTooLow || noMoreQuota {
+ go func() {
+ email, err := GetUserEmail(token.UserId)
+ if err != nil {
+ common.SysError("failed to fetch user email: " + err.Error())
+ }
+ prompt := "您的额度即将用尽"
+ if noMoreQuota {
+ prompt = "您的额度已用尽"
+ }
+ if email != "" {
+ topUpLink := fmt.Sprintf("%s/topup", common.ServerAddress)
+ err = common.SendEmail(prompt, email,
+ fmt.Sprintf("%s，当前剩余额度为 %d，为了不影响您的使用，请及时充值。
充值链接：%s", prompt, userQuota, topUpLink, topUpLink))
+ if err != nil {
+ common.SysError("failed to send email" + err.Error())
+ }
+ }
+ }()
+ }
err = DecreaseUserQuota(token.UserId, quota)
} else {
err = IncreaseUserQuota(token.UserId, -quota)