diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte index 7a032272..19036350 100644 --- a/src/lib/Setting/Pages/BotSettings.svelte +++ b/src/lib/Setting/Pages/BotSettings.svelte @@ -5,7 +5,7 @@ import { DataBase } from "src/ts/storage/database"; import { customProviderStore, getCurrentPluginMax } from "src/ts/plugins/plugins"; import { getModelMaxContext, isTauri } from "src/ts/storage/globalApi"; - import { tokenize } from "src/ts/tokenizer"; + import { tokenize, tokenizeAccurate } from "src/ts/tokenizer"; import ModelList from "src/lib/UI/ModelList.svelte"; import DropList from "src/lib/SideBars/DropList.svelte"; import { PlusIcon, TrashIcon } from "lucide-svelte"; @@ -40,10 +40,10 @@ export let goPromptTemplate = () => {} async function loadTokenize(){ - tokens.mainPrompt = await tokenize($DataBase.mainPrompt) - tokens.jailbreak = await tokenize($DataBase.jailbreak) - tokens.globalNote = await tokenize($DataBase.globalNote) - tokens.autoSuggest = await tokenize($DataBase.autoSuggestPrompt) + tokens.mainPrompt = await tokenizeAccurate($DataBase.mainPrompt) + tokens.jailbreak = await tokenizeAccurate($DataBase.jailbreak) + tokens.globalNote = await tokenizeAccurate($DataBase.globalNote) + tokens.autoSuggest = await tokenizeAccurate($DataBase.autoSuggestPrompt) } let advancedBotSettings = false diff --git a/src/lib/Setting/Pages/PromptSettings.svelte b/src/lib/Setting/Pages/PromptSettings.svelte index ae5a723f..e41e9c3f 100644 --- a/src/lib/Setting/Pages/PromptSettings.svelte +++ b/src/lib/Setting/Pages/PromptSettings.svelte @@ -2,7 +2,7 @@ import { ArrowLeft, PlusIcon } from "lucide-svelte"; import { language } from "src/lang"; import ProomptItem from "src/lib/UI/ProomptItem.svelte"; - import type { Proompt } from "src/ts/process/proompt"; + import { tokenizePreset, type Proompt } from "src/ts/process/proompt"; import { templateCheck } from "src/ts/process/templates/templateCheck"; import { DataBase } from "src/ts/storage/database"; @@ -10,8 +10,15 @@ let opened = 0 let warns: string[] = [] export let onGoBack: () => void = () => {} + let tokens = 0 + executeTokenize($DataBase.promptTemplate) + + async function executeTokenize(prest: Proompt[]){ + tokens = await tokenizePreset(prest) + } $: warns = templateCheck($DataBase) + $: executeTokenize($DataBase.promptTemplate)

@@ -71,4 +78,6 @@ type2: 'normal' }) $DataBase.promptTemplate = value -}}> \ No newline at end of file +}}> + +{tokens} {language.tokens} diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte index 971bb746..0f7fbcab 100644 --- a/src/lib/SideBars/CharConfig.svelte +++ b/src/lib/SideBars/CharConfig.svelte @@ -1,6 +1,6 @@