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
7dc7805c
authored
Jun 10, 2025
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔧
fix(token_counter): enhance token encoder caching and concurrency handling
parent
1abd77c1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
0 deletions
+30
-0
service/token_counter.go
+30
-0
No files found.
service/token_counter.go
View file @
7dc7805c
...
...
@@ -14,12 +14,19 @@ import (
"one-api/dto"
relaycommon
"one-api/relay/common"
"strings"
"sync"
"unicode/utf8"
)
// tokenEncoderMap won't grow after initialization
var
defaultTokenEncoder
tokenizer
.
Codec
// tokenEncoderMap is used to store token encoders for different models
var
tokenEncoderMap
=
make
(
map
[
string
]
tokenizer
.
Codec
)
// tokenEncoderMutex protects tokenEncoderMap for concurrent access
var
tokenEncoderMutex
sync
.
RWMutex
func
InitTokenEncoders
()
{
common
.
SysLog
(
"initializing token encoders"
)
defaultTokenEncoder
=
codec
.
NewCl100kBase
()
...
...
@@ -27,10 +34,33 @@ func InitTokenEncoders() {
}
func
getTokenEncoder
(
model
string
)
tokenizer
.
Codec
{
// First, try to get the encoder from cache with read lock
tokenEncoderMutex
.
RLock
()
if
encoder
,
exists
:=
tokenEncoderMap
[
model
];
exists
{
tokenEncoderMutex
.
RUnlock
()
return
encoder
}
tokenEncoderMutex
.
RUnlock
()
// If not in cache, create new encoder with write lock
tokenEncoderMutex
.
Lock
()
defer
tokenEncoderMutex
.
Unlock
()
// Double-check if another goroutine already created the encoder
if
encoder
,
exists
:=
tokenEncoderMap
[
model
];
exists
{
return
encoder
}
// Create new encoder
modelCodec
,
err
:=
tokenizer
.
ForModel
(
tokenizer
.
Model
(
model
))
if
err
!=
nil
{
// Cache the default encoder for this model to avoid repeated failures
tokenEncoderMap
[
model
]
=
defaultTokenEncoder
return
defaultTokenEncoder
}
// Cache the new encoder
tokenEncoderMap
[
model
]
=
modelCodec
return
modelCodec
}
...
...
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