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
4a64fede
authored
May 16, 2023
by
JustSong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: support max_tokens now (#52)
parent
e54906ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
9 deletions
+15
-9
controller/relay.go
+15
-9
No files found.
controller/relay.go
View file @
4a64fede
...
...
@@ -26,9 +26,10 @@ type ChatRequest struct {
}
type
TextRequest
struct
{
Model
string
`json:"model"`
Messages
[]
Message
`json:"messages"`
Prompt
string
`json:"prompt"`
Model
string
`json:"model"`
Messages
[]
Message
`json:"messages"`
Prompt
string
`json:"prompt"`
MaxTokens
int
`json:"max_tokens"`
//Stream bool `json:"stream"`
}
...
...
@@ -128,8 +129,17 @@ func relayHelper(c *gin.Context) error {
model_
=
strings
.
TrimSuffix
(
model_
,
"-0314"
)
fullRequestURL
=
fmt
.
Sprintf
(
"%s/openai/deployments/%s/%s"
,
baseURL
,
model_
,
task
)
}
var
promptText
string
for
_
,
message
:=
range
textRequest
.
Messages
{
promptText
+=
fmt
.
Sprintf
(
"%s: %s
\n
"
,
message
.
Role
,
message
.
Content
)
}
promptTokens
:=
countToken
(
promptText
)
+
3
preConsumedTokens
:=
common
.
PreConsumedQuota
if
textRequest
.
MaxTokens
!=
0
{
preConsumedTokens
=
promptTokens
+
textRequest
.
MaxTokens
}
ratio
:=
common
.
GetModelRatio
(
textRequest
.
Model
)
preConsumedQuota
:=
int
(
float64
(
common
.
PreConsumedQuota
)
*
ratio
)
preConsumedQuota
:=
int
(
float64
(
preConsumedTokens
)
*
ratio
)
if
consumeQuota
{
err
:=
model
.
PreConsumeTokenQuota
(
tokenId
,
preConsumedQuota
)
if
err
!=
nil
{
...
...
@@ -176,12 +186,8 @@ func relayHelper(c *gin.Context) error {
completionRatio
=
2
}
if
isStream
{
var
promptText
string
for
_
,
message
:=
range
textRequest
.
Messages
{
promptText
+=
fmt
.
Sprintf
(
"%s: %s
\n
"
,
message
.
Role
,
message
.
Content
)
}
completionText
:=
fmt
.
Sprintf
(
"%s: %s
\n
"
,
"assistant"
,
streamResponseText
)
quota
=
countToken
(
promptText
)
+
countToken
(
completionText
)
*
completionRatio
+
3
quota
=
promptTokens
+
countToken
(
completionText
)
*
completionRatio
}
else
{
quota
=
textResponse
.
Usage
.
PromptTokens
+
textResponse
.
Usage
.
CompletionTokens
*
completionRatio
}
...
...
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