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
16b6ace0
authored
Jul 04, 2023
by
JustSong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: able to approximate token (close #207)
parent
2c91f73a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
6 deletions
+23
-6
common/constants.go
+1
-0
controller/relay-utils.go
+11
-5
model/option.go
+3
-0
web/src/components/OperationSetting.js
+8
-1
No files found.
common/constants.go
View file @
16b6ace0
...
...
@@ -67,6 +67,7 @@ var ChannelDisableThreshold = 5.0
var
AutomaticDisableChannelEnabled
=
false
var
QuotaRemindThreshold
=
1000
var
PreConsumedQuota
=
500
var
ApproximateTokenEnabled
=
false
var
RootUserEmail
=
""
...
...
controller/relay-utils.go
View file @
16b6ace0
...
...
@@ -24,6 +24,13 @@ func getTokenEncoder(model string) *tiktoken.Tiktoken {
return
tokenEncoder
}
func
getTokenNum
(
tokenEncoder
*
tiktoken
.
Tiktoken
,
text
string
)
int
{
if
common
.
ApproximateTokenEnabled
{
return
int
(
float64
(
len
(
text
))
*
0.38
)
}
return
len
(
tokenEncoder
.
Encode
(
text
,
nil
,
nil
))
}
func
countTokenMessages
(
messages
[]
Message
,
model
string
)
int
{
tokenEncoder
:=
getTokenEncoder
(
model
)
// Reference:
...
...
@@ -43,11 +50,11 @@ func countTokenMessages(messages []Message, model string) int {
tokenNum
:=
0
for
_
,
message
:=
range
messages
{
tokenNum
+=
tokensPerMessage
tokenNum
+=
len
(
tokenEncoder
.
Encode
(
message
.
Content
,
nil
,
nil
)
)
tokenNum
+=
len
(
tokenEncoder
.
Encode
(
message
.
Role
,
nil
,
nil
)
)
tokenNum
+=
getTokenNum
(
tokenEncoder
,
message
.
Content
)
tokenNum
+=
getTokenNum
(
tokenEncoder
,
message
.
Role
)
if
message
.
Name
!=
nil
{
tokenNum
+=
tokensPerName
tokenNum
+=
len
(
tokenEncoder
.
Encode
(
*
message
.
Name
,
nil
,
nil
)
)
tokenNum
+=
getTokenNum
(
tokenEncoder
,
*
message
.
Name
)
}
}
tokenNum
+=
3
// Every reply is primed with <|start|>assistant<|message|>
...
...
@@ -70,8 +77,7 @@ func countTokenInput(input any, model string) int {
func
countTokenText
(
text
string
,
model
string
)
int
{
tokenEncoder
:=
getTokenEncoder
(
model
)
token
:=
tokenEncoder
.
Encode
(
text
,
nil
,
nil
)
return
len
(
token
)
return
getTokenNum
(
tokenEncoder
,
text
)
}
func
errorWrapper
(
err
error
,
code
string
,
statusCode
int
)
*
OpenAIErrorWithStatusCode
{
...
...
model/option.go
View file @
16b6ace0
...
...
@@ -34,6 +34,7 @@ func InitOptionMap() {
common
.
OptionMap
[
"TurnstileCheckEnabled"
]
=
strconv
.
FormatBool
(
common
.
TurnstileCheckEnabled
)
common
.
OptionMap
[
"RegisterEnabled"
]
=
strconv
.
FormatBool
(
common
.
RegisterEnabled
)
common
.
OptionMap
[
"AutomaticDisableChannelEnabled"
]
=
strconv
.
FormatBool
(
common
.
AutomaticDisableChannelEnabled
)
common
.
OptionMap
[
"ApproximateTokenEnabled"
]
=
strconv
.
FormatBool
(
common
.
ApproximateTokenEnabled
)
common
.
OptionMap
[
"LogConsumeEnabled"
]
=
strconv
.
FormatBool
(
common
.
LogConsumeEnabled
)
common
.
OptionMap
[
"DisplayInCurrencyEnabled"
]
=
strconv
.
FormatBool
(
common
.
DisplayInCurrencyEnabled
)
common
.
OptionMap
[
"DisplayTokenStatEnabled"
]
=
strconv
.
FormatBool
(
common
.
DisplayTokenStatEnabled
)
...
...
@@ -141,6 +142,8 @@ func updateOptionMap(key string, value string) (err error) {
common
.
RegisterEnabled
=
boolValue
case
"AutomaticDisableChannelEnabled"
:
common
.
AutomaticDisableChannelEnabled
=
boolValue
case
"ApproximateTokenEnabled"
:
common
.
ApproximateTokenEnabled
=
boolValue
case
"LogConsumeEnabled"
:
common
.
LogConsumeEnabled
=
boolValue
case
"DisplayInCurrencyEnabled"
:
...
...
web/src/components/OperationSetting.js
View file @
16b6ace0
...
...
@@ -18,7 +18,8 @@ const OperationSetting = () => {
ChannelDisableThreshold
:
0
,
LogConsumeEnabled
:
''
,
DisplayInCurrencyEnabled
:
''
,
DisplayTokenStatEnabled
:
''
DisplayTokenStatEnabled
:
''
,
ApproximateTokenEnabled
:
''
,
});
const
[
originInputs
,
setOriginInputs
]
=
useState
({});
let
[
loading
,
setLoading
]
=
useState
(
false
);
...
...
@@ -181,6 +182,12 @@ const OperationSetting = () => {
name
=
'DisplayTokenStatEnabled'
onChange
=
{
handleInputChange
}
/
>
<
Form
.
Checkbox
checked
=
{
inputs
.
ApproximateTokenEnabled
===
'true'
}
label
=
'使用近似的方式估算 token 数以减少计算量'
name
=
'ApproximateTokenEnabled'
onChange
=
{
handleInputChange
}
/
>
<
/Form.Group
>
<
Form
.
Button
onClick
=
{()
=>
{
submitConfig
(
'general'
).
then
();
...
...
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