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

Fix not counting chat separator and preamble toward token limit

Browse Source
This commit is contained in:
Cohee
2024-08-29 23:36:07 +03:00
parent 2b904bb170
commit b21ba850c0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@@ -3760,7 +3760,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
} }
let examplesString = ''; let examplesString = '';
let chatString = ''; let chatString = addChatsPreamble(addChatsSeparator(''));
let cyclePrompt = ''; let cyclePrompt = '';
async function getMessagesTokenCount() { async function getMessagesTokenCount() {
@@ -4028,12 +4028,13 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
async function checkPromptSize() { async function checkPromptSize() {
console.debug('---checking Prompt size'); console.debug('---checking Prompt size');
setPromptString(); setPromptString();
const jointMessages = mesSend.map((e) => `${e.extensionPrompts.join('')}${e.message}`).join('');
const prompt = [ const prompt = [
beforeScenarioAnchor, beforeScenarioAnchor,
storyString, storyString,
afterScenarioAnchor, afterScenarioAnchor,
mesExmString, mesExmString,
mesSend.map((e) => `${e.extensionPrompts.join('')}${e.message}`).join(''), addChatsPreamble(addChatsSeparator(jointMessages)),
'\n', '\n',
generatedPromptCache, generatedPromptCache,
quiet_prompt, quiet_prompt,