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
b1329a3a
authored
Aug 06, 2023
by
glzjin
Committed by
GitHub
Aug 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: calculate usage if not given in non-stream mode (#352)
parent
7c3a1e90
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
controller/relay-openai.go
+13
-1
controller/relay-text.go
+1
-1
controller/relay.go
+3
-2
No files found.
controller/relay-openai.go
View file @
b1329a3a
...
...
@@ -92,7 +92,7 @@ func openaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*O
return
nil
,
responseText
}
func
openaiHandler
(
c
*
gin
.
Context
,
resp
*
http
.
Response
,
consumeQuota
bool
)
(
*
OpenAIErrorWithStatusCode
,
*
Usage
)
{
func
openaiHandler
(
c
*
gin
.
Context
,
resp
*
http
.
Response
,
consumeQuota
bool
,
promptTokens
int
,
model
string
)
(
*
OpenAIErrorWithStatusCode
,
*
Usage
)
{
var
textResponse
TextResponse
if
consumeQuota
{
responseBody
,
err
:=
io
.
ReadAll
(
resp
.
Body
)
...
...
@@ -132,5 +132,17 @@ func openaiHandler(c *gin.Context, resp *http.Response, consumeQuota bool) (*Ope
if
err
!=
nil
{
return
errorWrapper
(
err
,
"close_response_body_failed"
,
http
.
StatusInternalServerError
),
nil
}
if
textResponse
.
Usage
.
TotalTokens
==
0
{
completionTokens
:=
0
for
_
,
choice
:=
range
textResponse
.
Choices
{
completionTokens
+=
countTokenText
(
choice
.
Message
.
Content
,
model
)
}
textResponse
.
Usage
=
Usage
{
PromptTokens
:
promptTokens
,
CompletionTokens
:
completionTokens
,
TotalTokens
:
promptTokens
+
completionTokens
,
}
}
return
nil
,
&
textResponse
.
Usage
}
controller/relay-text.go
View file @
b1329a3a
...
...
@@ -362,7 +362,7 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
textResponse
.
Usage
.
CompletionTokens
=
countTokenText
(
responseText
,
textRequest
.
Model
)
return
nil
}
else
{
err
,
usage
:=
openaiHandler
(
c
,
resp
,
consumeQuota
)
err
,
usage
:=
openaiHandler
(
c
,
resp
,
consumeQuota
,
promptTokens
,
textRequest
.
Model
)
if
err
!=
nil
{
return
err
}
...
...
controller/relay.go
View file @
b1329a3a
...
...
@@ -81,8 +81,9 @@ type OpenAIErrorWithStatusCode struct {
}
type
TextResponse
struct
{
Usage
`json:"usage"`
Error
OpenAIError
`json:"error"`
Choices
[]
OpenAITextResponseChoice
`json:"choices"`
Usage
`json:"usage"`
Error
OpenAIError
`json:"error"`
}
type
OpenAITextResponseChoice
struct
{
...
...
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