From 6eab0cc370dee4481aaf9c422a71d961c6ea66cc Mon Sep 17 00:00:00 2001 From: CalciumIon <1808837298@qq.com> Date: Fri, 9 Aug 2024 18:34:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8C=BA=E5=88=86=E9=A2=9D=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E8=B6=B3=E5=92=8C=E9=A2=84=E6=89=A3=E8=B4=B9=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relay/relay-audio.go | 2 +- relay/relay-image.go | 2 +- relay/relay-text.go | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/relay/relay-audio.go b/relay/relay-audio.go index b2fadcc3..437c1dd9 100644 --- a/relay/relay-audio.go +++ b/relay/relay-audio.go @@ -75,7 +75,7 @@ func AudioHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode { return service.OpenAIErrorWrapperLocal(err, "get_user_quota_failed", http.StatusInternalServerError) } if userQuota-preConsumedQuota < 0 { - return service.OpenAIErrorWrapperLocal(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden) + return service.OpenAIErrorWrapperLocal(errors.New("pre-consumed quota is more than user quota"), "insufficient_user_quota", http.StatusForbidden) } err = model.CacheDecreaseUserQuota(relayInfo.UserId, preConsumedQuota) if err != nil { diff --git a/relay/relay-image.go b/relay/relay-image.go index 83c75380..430d28f2 100644 --- a/relay/relay-image.go +++ b/relay/relay-image.go @@ -125,7 +125,7 @@ func ImageHelper(c *gin.Context, relayMode int) *dto.OpenAIErrorWithStatusCode { quota := int(imageRatio * groupRatio * common.QuotaPerUnit) if userQuota-quota < 0 { - return service.OpenAIErrorWrapperLocal(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden) + return service.OpenAIErrorWrapperLocal(errors.New("pre-consumed quota is more than user quota"), "insufficient_user_quota", http.StatusForbidden) } adaptor := GetAdaptor(relayInfo.ApiType) diff --git a/relay/relay-text.go b/relay/relay-text.go index e7c53884..a6a7b948 100644 --- a/relay/relay-text.go +++ b/relay/relay-text.go @@ -238,9 +238,12 @@ func preConsumeQuota(c *gin.Context, preConsumedQuota int, relayInfo *relaycommo if err != nil { return 0, 0, service.OpenAIErrorWrapperLocal(err, "get_user_quota_failed", http.StatusInternalServerError) } - if userQuota <= 0 || userQuota-preConsumedQuota < 0 { + if userQuota <= 0 { return 0, 0, service.OpenAIErrorWrapperLocal(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden) } + if userQuota-preConsumedQuota < 0 { + return 0, 0, service.OpenAIErrorWrapperLocal(errors.New("pre-consumed quota is more than user quota"), "insufficient_user_quota", http.StatusForbidden) + } err = model.CacheDecreaseUserQuota(relayInfo.UserId, preConsumedQuota) if err != nil { return 0, 0, service.OpenAIErrorWrapperLocal(err, "decrease_user_quota_failed", http.StatusInternalServerError)