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
23ec88d6
authored
Aug 19, 2023
by
glzjin
Committed by
GitHub
Aug 19, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix baidu & ali's quota calculation (#444)
* 修复阿里计费问题 * 修复百度计费问题
parent
92e34fa0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
controller/relay-ali.go
+5
-3
controller/relay-baidu.go
+5
-3
No files found.
controller/relay-ali.go
View file @
23ec88d6
...
...
@@ -177,9 +177,11 @@ func aliStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStat
common
.
SysError
(
"error unmarshalling stream response: "
+
err
.
Error
())
return
true
}
usage
.
PromptTokens
+=
aliResponse
.
Usage
.
InputTokens
usage
.
CompletionTokens
+=
aliResponse
.
Usage
.
OutputTokens
usage
.
TotalTokens
+=
aliResponse
.
Usage
.
InputTokens
+
aliResponse
.
Usage
.
OutputTokens
if
aliResponse
.
Usage
.
OutputTokens
!=
0
{
usage
.
PromptTokens
=
aliResponse
.
Usage
.
InputTokens
usage
.
CompletionTokens
=
aliResponse
.
Usage
.
OutputTokens
usage
.
TotalTokens
=
aliResponse
.
Usage
.
InputTokens
+
aliResponse
.
Usage
.
OutputTokens
}
response
:=
streamResponseAli2OpenAI
(
&
aliResponse
)
response
.
Choices
[
0
]
.
Delta
.
Content
=
strings
.
TrimPrefix
(
response
.
Choices
[
0
]
.
Delta
.
Content
,
lastResponseText
)
lastResponseText
=
aliResponse
.
Output
.
Text
...
...
controller/relay-baidu.go
View file @
23ec88d6
...
...
@@ -215,9 +215,11 @@ func baiduStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithSt
common
.
SysError
(
"error unmarshalling stream response: "
+
err
.
Error
())
return
true
}
usage
.
PromptTokens
+=
baiduResponse
.
Usage
.
PromptTokens
usage
.
CompletionTokens
+=
baiduResponse
.
Usage
.
CompletionTokens
usage
.
TotalTokens
+=
baiduResponse
.
Usage
.
TotalTokens
if
baiduResponse
.
Usage
.
TotalTokens
!=
0
{
usage
.
TotalTokens
=
baiduResponse
.
Usage
.
TotalTokens
usage
.
PromptTokens
=
baiduResponse
.
Usage
.
PromptTokens
usage
.
CompletionTokens
=
baiduResponse
.
Usage
.
TotalTokens
-
baiduResponse
.
Usage
.
PromptTokens
}
response
:=
streamResponseBaidu2OpenAI
(
&
baiduResponse
)
jsonResponse
,
err
:=
json
.
Marshal
(
response
)
if
err
!=
nil
{
...
...
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