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
d9c7e981
authored
Oct 07, 2024
by
1808837298@qq.com
Committed by
CalciumIon
Nov 05, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: realtime pre consume
(cherry picked from commit 273d154e1640bae26b7caedddf1685e9ff21ab74)
parent
e052d7d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
relay/channel/openai/relay-openai.go
+0
-3
service/quota.go
+11
-1
No files found.
relay/channel/openai/relay-openai.go
View file @
d9c7e981
...
@@ -576,8 +576,5 @@ func preConsumeUsage(ctx *gin.Context, info *relaycommon.RelayInfo, usage *dto.R
...
@@ -576,8 +576,5 @@ func preConsumeUsage(ctx *gin.Context, info *relaycommon.RelayInfo, usage *dto.R
totalUsage
.
OutputTokenDetails
.
AudioTokens
+=
usage
.
OutputTokenDetails
.
AudioTokens
totalUsage
.
OutputTokenDetails
.
AudioTokens
+=
usage
.
OutputTokenDetails
.
AudioTokens
// clear usage
// clear usage
err
:=
service
.
PreWssConsumeQuota
(
ctx
,
info
,
usage
)
err
:=
service
.
PreWssConsumeQuota
(
ctx
,
info
,
usage
)
if
err
==
nil
{
common
.
LogInfo
(
ctx
,
"realtime streaming consume usage success"
)
}
return
err
return
err
}
}
service/quota.go
View file @
d9c7e981
package
service
package
service
import
(
import
(
"errors"
"fmt"
"fmt"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin"
"math"
"math"
...
@@ -16,6 +17,10 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag
...
@@ -16,6 +17,10 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag
if
relayInfo
.
UsePrice
{
if
relayInfo
.
UsePrice
{
return
nil
return
nil
}
}
userQuota
,
err
:=
model
.
GetUserQuota
(
relayInfo
.
UserId
)
if
err
!=
nil
{
return
err
}
modelName
:=
relayInfo
.
UpstreamModelName
modelName
:=
relayInfo
.
UpstreamModelName
textInputTokens
:=
usage
.
InputTokenDetails
.
TextTokens
textInputTokens
:=
usage
.
InputTokenDetails
.
TextTokens
textOutTokens
:=
usage
.
OutputTokenDetails
.
TextTokens
textOutTokens
:=
usage
.
OutputTokenDetails
.
TextTokens
...
@@ -38,10 +43,15 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag
...
@@ -38,10 +43,15 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag
quota
=
1
quota
=
1
}
}
err
:=
model
.
PostConsumeTokenQuota
(
relayInfo
,
0
,
quota
,
0
,
false
)
if
userQuota
<
quota
{
return
errors
.
New
(
fmt
.
Sprintf
(
"用户额度不足,剩余额度为 %d"
,
userQuota
))
}
err
=
model
.
PostConsumeTokenQuota
(
relayInfo
,
0
,
quota
,
0
,
false
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
common
.
LogInfo
(
ctx
,
"realtime streaming consume quota success, quota: "
+
fmt
.
Sprintf
(
"%d"
,
quota
))
err
=
model
.
CacheUpdateUserQuota
(
relayInfo
.
UserId
)
err
=
model
.
CacheUpdateUserQuota
(
relayInfo
.
UserId
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
...
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