rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add model hash to TC API tokenizer cache key

Browse Source
This commit is contained in:
Cohee
2025-01-02 23:49:22 +02:00
parent 40b05bb6b1
commit fc4fecf0fd
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/tokenizers.js
View File

@ -433,6 +433,7 @@ export async function getTokenCountAsync(str, padding = undefined) {
} }
let tokenizerType = power_user.tokenizer; let tokenizerType = power_user.tokenizer;
let modelHash = '';
if (main_api === 'openai') { if (main_api === 'openai') {
if (padding === power_user.token_padding) { if (padding === power_user.token_padding) {
@ -448,13 +449,17 @@ export async function getTokenCountAsync(str, padding = undefined) {
tokenizerType = getTokenizerBestMatch(main_api); tokenizerType = getTokenizerBestMatch(main_api);
} }
if (tokenizerType === tokenizers.API_TEXTGENERATIONWEBUI) {
modelHash = getStringHash(getTextGenModel() || online_status).toString();
}
if (padding === undefined) { if (padding === undefined) {
padding = 0; padding = 0;
} }
const cacheObject = getTokenCacheObject(); const cacheObject = getTokenCacheObject();
const hash = getStringHash(str); const hash = getStringHash(str);
const cacheKey = `${tokenizerType}-${hash}+${padding}`; const cacheKey = `${tokenizerType}-${hash}${modelHash}+${padding}`;
if (typeof cacheObject[cacheKey] === 'number') { if (typeof cacheObject[cacheKey] === 'number') {
return cacheObject[cacheKey]; return cacheObject[cacheKey];
@ -484,6 +489,7 @@ export function getTokenCount(str, padding = undefined) {
} }
let tokenizerType = power_user.tokenizer; let tokenizerType = power_user.tokenizer;
let modelHash = '';
if (main_api === 'openai') { if (main_api === 'openai') {
if (padding === power_user.token_padding) { if (padding === power_user.token_padding) {
@ -499,13 +505,17 @@ export function getTokenCount(str, padding = undefined) {
tokenizerType = getTokenizerBestMatch(main_api); tokenizerType = getTokenizerBestMatch(main_api);
} }
if (tokenizerType === tokenizers.API_TEXTGENERATIONWEBUI) {
modelHash = getStringHash(getTextGenModel() || online_status).toString();
}
if (padding === undefined) { if (padding === undefined) {
padding = 0; padding = 0;
} }
const cacheObject = getTokenCacheObject(); const cacheObject = getTokenCacheObject();
const hash = getStringHash(str); const hash = getStringHash(str);
const cacheKey = `${tokenizerType}-${hash}+${padding}`; const cacheKey = `${tokenizerType}-${hash}${modelHash}+${padding}`;
if (typeof cacheObject[cacheKey] === 'number') { if (typeof cacheObject[cacheKey] === 'number') {
return cacheObject[cacheKey]; return cacheObject[cacheKey];