Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d5835294
authored
Aug 09, 2024
by
CalciumIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 区分额度不足和预扣费失败提示
parent
356e8a50
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
relay/relay-audio.go
+1
-1
relay/relay-image.go
+1
-1
relay/relay-text.go
+4
-1
No files found.
relay/relay-audio.go
View file @
d5835294
...
@@ -75,7 +75,7 @@ func AudioHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode {
...
@@ -75,7 +75,7 @@ func AudioHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode {
return
service
.
OpenAIErrorWrapperLocal
(
err
,
"get_user_quota_failed"
,
http
.
StatusInternalServerError
)
return
service
.
OpenAIErrorWrapperLocal
(
err
,
"get_user_quota_failed"
,
http
.
StatusInternalServerError
)
}
}
if
userQuota
-
preConsumedQuota
<
0
{
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
)
err
=
model
.
CacheDecreaseUserQuota
(
relayInfo
.
UserId
,
preConsumedQuota
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
relay/relay-image.go
View file @
d5835294
...
@@ -125,7 +125,7 @@ func ImageHelper(c *gin.Context, relayMode int) *dto.OpenAIErrorWithStatusCode {
...
@@ -125,7 +125,7 @@ func ImageHelper(c *gin.Context, relayMode int) *dto.OpenAIErrorWithStatusCode {
quota
:=
int
(
imageRatio
*
groupRatio
*
common
.
QuotaPerUnit
)
quota
:=
int
(
imageRatio
*
groupRatio
*
common
.
QuotaPerUnit
)
if
userQuota
-
quota
<
0
{
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
)
adaptor
:=
GetAdaptor
(
relayInfo
.
ApiType
)
...
...
relay/relay-text.go
View file @
d5835294
...
@@ -238,9 +238,12 @@ func preConsumeQuota(c *gin.Context, preConsumedQuota int, relayInfo *relaycommo
...
@@ -238,9 +238,12 @@ func preConsumeQuota(c *gin.Context, preConsumedQuota int, relayInfo *relaycommo
if
err
!=
nil
{
if
err
!=
nil
{
return
0
,
0
,
service
.
OpenAIErrorWrapperLocal
(
err
,
"get_user_quota_failed"
,
http
.
StatusInternalServerError
)
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
)
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
)
err
=
model
.
CacheDecreaseUserQuota
(
relayInfo
.
UserId
,
preConsumedQuota
)
if
err
!=
nil
{
if
err
!=
nil
{
return
0
,
0
,
service
.
OpenAIErrorWrapperLocal
(
err
,
"decrease_user_quota_failed"
,
http
.
StatusInternalServerError
)
return
0
,
0
,
service
.
OpenAIErrorWrapperLocal
(
err
,
"decrease_user_quota_failed"
,
http
.
StatusInternalServerError
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment