mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore tokenizer caching with old-bug version

Browse Source
This commit is contained in:
sub-hub
2025-04-21 13:27:43 +09:00
committed by GitHub
parent 22a50904f8
commit 33d8ed4568
1 changed files with 97 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
src/ts/tokenizer.ts
View File

@@ -6,9 +6,27 @@ import { supportsInlayImage } from "./process/files/inlays";
import { risuChatParser } from "./parser.svelte"; import { risuChatParser } from "./parser.svelte";
import { tokenizeGGUFModel } from "./process/models/local"; import { tokenizeGGUFModel } from "./process/models/local";
import { globalFetch } from "./globalApi.svelte"; import { globalFetch } from "./globalApi.svelte";
import { getModelInfo, LLMTokenizer } from "./model/modellist"; import { getModelInfo, LLMTokenizer, type LLMModel } from "./model/modellist";
import { pluginV2 } from "./plugins/plugins"; import { pluginV2 } from "./plugins/plugins";
import type { GemmaTokenizer } from "@huggingface/transformers"; import type { GemmaTokenizer } from "@huggingface/transformers";
import { LRUMap } from 'mnemonist';
const MAX_CACHE_SIZE = 1500;
const encodeCache = new LRUMap<string, number[] | Uint32Array | Int32Array>(MAX_CACHE_SIZE);
function getHash(
data: string,
aiModel: string,
customTokenizer: string,
currentPluginProvider: string,
googleClaudeTokenizing: boolean,
modelInfo: LLMModel,
pluginTokenizer: string
): string {
const combined = `${data}::${aiModel}::${customTokenizer}::${currentPluginProvider}::${googleClaudeTokenizing ? '1' : '0'}::${modelInfo.tokenizer}::${pluginTokenizer}`;
return combined;
}
export const tokenizerList = [ export const tokenizerList = [
@@ -25,100 +43,114 @@ export const tokenizerList = [
] as const ] as const
export async function encode(data:string):Promise<(number[]|Uint32Array|Int32Array)>{ export async function encode(data:string):Promise<(number[]|Uint32Array|Int32Array)>{
let db = getDatabase() const db = getDatabase();
if(db.aiModel === 'openrouter' || db.aiModel === 'reverse_proxy'){ const modelInfo = getModelInfo(db.aiModel);
switch(db.customTokenizer){ const pluginTokenizer = pluginV2.providerOptions.get(db.currentPluginProvider)?.tokenizer ?? "none";
case 'mistral':
return await tokenizeWebTokenizers(data, 'mistral') let cacheKey = ''
case 'llama': if(db.useTokenizerCaching){
return await tokenizeWebTokenizers(data, 'llama') cacheKey = getHash(
case 'novelai': data,
return await tokenizeWebTokenizers(data, 'novelai') db.aiModel,
case 'claude': db.customTokenizer,
return await tokenizeWebTokenizers(data, 'claude') db.currentPluginProvider,
case 'novellist': db.googleClaudeTokenizing,
return await tokenizeWebTokenizers(data, 'novellist') modelInfo,
case 'llama3': pluginTokenizer
return await tokenizeWebTokenizers(data, 'llama') );
case 'gemma': const cachedResult = encodeCache.get(cacheKey);
return await gemmaTokenize(data) if (cachedResult !== undefined) {
case 'cohere': return cachedResult;
return await tokenizeWebTokenizers(data, 'cohere')
case 'deepseek':
return await tokenizeWebTokenizers(data, 'DeepSeek')
default:
return await tikJS(data, 'o200k_base')
} }
} }
const modelInfo = getModelInfo(db.aiModel) let result: number[] | Uint32Array | Int32Array;
if(db.aiModel === 'custom' && pluginV2.providerOptions.get(db.currentPluginProvider)?.tokenizer){ if(db.aiModel === 'openrouter' || db.aiModel === 'reverse_proxy'){
const tokenizer = pluginV2.providerOptions.get(db.currentPluginProvider)?.tokenizer switch(db.customTokenizer){
switch(tokenizer){
case 'mistral': case 'mistral':
return await tokenizeWebTokenizers(data, 'mistral') result = await tokenizeWebTokenizers(data, 'mistral'); break;
case 'llama': case 'llama':
return await tokenizeWebTokenizers(data, 'llama') result = await tokenizeWebTokenizers(data, 'llama'); break;
case 'novelai': case 'novelai':
return await tokenizeWebTokenizers(data, 'novelai') result = await tokenizeWebTokenizers(data, 'novelai'); break;
case 'claude': case 'claude':
return await tokenizeWebTokenizers(data, 'claude') result = await tokenizeWebTokenizers(data, 'claude'); break;
case 'novellist': case 'novellist':
return await tokenizeWebTokenizers(data, 'novellist') result = await tokenizeWebTokenizers(data, 'novellist'); break;
case 'llama3': case 'llama3':
return await tokenizeWebTokenizers(data, 'llama') result = await tokenizeWebTokenizers(data, 'llama'); break;
case 'gemma': case 'gemma':
return await gemmaTokenize(data) result = await gemmaTokenize(data); break;
case 'cohere': case 'cohere':
return await tokenizeWebTokenizers(data, 'cohere') result = await tokenizeWebTokenizers(data, 'cohere'); break;
case 'o200k_base': case 'deepseek':
return await tikJS(data, 'o200k_base') result = await tokenizeWebTokenizers(data, 'DeepSeek'); break;
case 'cl100k_base':
return await tikJS(data, 'cl100k_base')
case 'custom':
return await pluginV2.providerOptions.get(db.currentPluginProvider)?.tokenizerFunc?.(data) ?? [0]
default: default:
return await tikJS(data, 'o200k_base') result = await tikJS(data, 'o200k_base'); break;
}
}
if(db.aiModel === 'custom' && pluginTokenizer){
switch(pluginTokenizer){
case 'mistral':
result = await tokenizeWebTokenizers(data, 'mistral'); break;
case 'llama':
result = await tokenizeWebTokenizers(data, 'llama'); break;
case 'novelai':
result = await tokenizeWebTokenizers(data, 'novelai'); break;
case 'claude':
result = await tokenizeWebTokenizers(data, 'claude'); break;
case 'novellist':
result = await tokenizeWebTokenizers(data, 'novellist'); break;
case 'llama3':
result = await tokenizeWebTokenizers(data, 'llama'); break;
case 'gemma':
result = await gemmaTokenize(data); break;
case 'cohere':
result = await tokenizeWebTokenizers(data, 'cohere'); break;
case 'o200k_base':
result = await tikJS(data, 'o200k_base'); break;
case 'cl100k_base':
result = await tikJS(data, 'cl100k_base'); break;
case 'custom':
result = await pluginV2.providerOptions.get(db.currentPluginProvider)?.tokenizerFunc?.(data) ?? [0]; break;
default:
result = await tikJS(data, 'o200k_base'); break;
} }
} }
if(modelInfo.tokenizer === LLMTokenizer.NovelList){ if(modelInfo.tokenizer === LLMTokenizer.NovelList){
const nv= await tokenizeWebTokenizers(data, 'novellist') result = await tokenizeWebTokenizers(data, 'novellist');
return nv } else if(modelInfo.tokenizer === LLMTokenizer.Claude){
} result = await tokenizeWebTokenizers(data, 'claude');
if(modelInfo.tokenizer === LLMTokenizer.Claude){ } else if(modelInfo.tokenizer === LLMTokenizer.NovelAI){
return await tokenizeWebTokenizers(data, 'claude') result = await tokenizeWebTokenizers(data, 'novelai');
} } else if(modelInfo.tokenizer === LLMTokenizer.Mistral){
if(modelInfo.tokenizer === LLMTokenizer.NovelAI){ result = await tokenizeWebTokenizers(data, 'mistral');
return await tokenizeWebTokenizers(data, 'novelai') } else if(modelInfo.tokenizer === LLMTokenizer.Llama){
} result = await tokenizeWebTokenizers(data, 'llama');
if(modelInfo.tokenizer === LLMTokenizer.Mistral){ } else if(modelInfo.tokenizer === LLMTokenizer.Local){
return await tokenizeWebTokenizers(data, 'mistral') result = await tokenizeGGUFModel(data);
} } else if(modelInfo.tokenizer === LLMTokenizer.tiktokenO200Base){
if(modelInfo.tokenizer === LLMTokenizer.Llama){ result = await tikJS(data, 'o200k_base');
return await tokenizeWebTokenizers(data, 'llama') } else if(modelInfo.tokenizer === LLMTokenizer.GoogleCloud && db.googleClaudeTokenizing){
} result = await tokenizeGoogleCloud(data);
if(modelInfo.tokenizer === LLMTokenizer.Local){ } else if(modelInfo.tokenizer === LLMTokenizer.Gemma || modelInfo.tokenizer === LLMTokenizer.GoogleCloud){
return await tokenizeGGUFModel(data) result = await gemmaTokenize(data);
} } else if(modelInfo.tokenizer === LLMTokenizer.DeepSeek){
if(modelInfo.tokenizer === LLMTokenizer.tiktokenO200Base){ result = await tokenizeWebTokenizers(data, 'DeepSeek');
return await tikJS(data, 'o200k_base') } else if(modelInfo.tokenizer === LLMTokenizer.Cohere){
} result = await tokenizeWebTokenizers(data, 'cohere');
if(modelInfo.tokenizer === LLMTokenizer.GoogleCloud && db.googleClaudeTokenizing){ } else {
return await tokenizeGoogleCloud(data) result = await tikJS(data);
}
if(modelInfo.tokenizer === LLMTokenizer.Gemma || modelInfo.tokenizer === LLMTokenizer.GoogleCloud){
return await gemmaTokenize(data)
}
if(modelInfo.tokenizer === LLMTokenizer.DeepSeek){
return await tokenizeWebTokenizers(data, 'DeepSeek')
}
if(modelInfo.tokenizer === LLMTokenizer.Cohere){
return await tokenizeWebTokenizers(data, 'cohere')
} }
return await tikJS(data) if(db.useTokenizerCaching){
encodeCache.set(cacheKey, result);
}
return result;
} }
type tokenizerType = 'novellist'|'claude'|'novelai'|'llama'|'mistral'|'llama3'|'gemma'|'cohere'|'googleCloud'|'DeepSeek' type tokenizerType = 'novellist'|'claude'|'novelai'|'llama'|'mistral'|'llama3'|'gemma'|'cohere'|'googleCloud'|'DeepSeek'