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 double count of chat injects for message fitting logic

Browse Source
This commit is contained in:
Cohee
2024-04-09 19:06:10 +03:00
parent fc1896dcff
commit 3fd40a33de
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/script.js
View File

@ -3467,7 +3467,6 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
// Add persona description to prompt // Add persona description to prompt
addPersonaDescriptionExtensionPrompt(); addPersonaDescriptionExtensionPrompt();
// Call combined AN into Generate // Call combined AN into Generate
let allAnchors = getAllExtensionPrompts();
const beforeScenarioAnchor = getExtensionPrompt(extension_prompt_types.BEFORE_PROMPT).trimStart(); const beforeScenarioAnchor = getExtensionPrompt(extension_prompt_types.BEFORE_PROMPT).trimStart();
const afterScenarioAnchor = getExtensionPrompt(extension_prompt_types.IN_PROMPT); const afterScenarioAnchor = getExtensionPrompt(extension_prompt_types.IN_PROMPT);
@ -3514,10 +3513,11 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
function getMessagesTokenCount() { function getMessagesTokenCount() {
const encodeString = [ const encodeString = [
beforeScenarioAnchor,
storyString, storyString,
afterScenarioAnchor,
examplesString, examplesString,
chatString, chatString,
allAnchors,
quiet_prompt, quiet_prompt,
cyclePrompt, cyclePrompt,
userAlignmentMessage, userAlignmentMessage,
@ -3785,12 +3785,13 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
console.debug('---checking Prompt size'); console.debug('---checking Prompt size');
setPromptString(); setPromptString();
const prompt = [ const prompt = [
beforeScenarioAnchor,
storyString, storyString,
afterScenarioAnchor,
mesExmString, mesExmString,
mesSend.map((e) => `${e.extensionPrompts.join('')}${e.message}`).join(''), mesSend.map((e) => `${e.extensionPrompts.join('')}${e.message}`).join(''),
'\n', '\n',
generatedPromptCache, generatedPromptCache,
allAnchors,
quiet_prompt, quiet_prompt,
].join('').replace(/\r/gm, ''); ].join('').replace(/\r/gm, '');
let thisPromptContextSize = getTokenCount(prompt, power_user.token_padding); let thisPromptContextSize = getTokenCount(prompt, power_user.token_padding);
@ -4026,7 +4027,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
...thisPromptBits[currentArrayEntry], ...thisPromptBits[currentArrayEntry],
rawPrompt: generate_data.prompt || generate_data.input, rawPrompt: generate_data.prompt || generate_data.input,
mesId: getNextMessageId(type), mesId: getNextMessageId(type),
allAnchors: allAnchors, allAnchors: '',
summarizeString: (extension_prompts['1_memory']?.value || ''), summarizeString: (extension_prompts['1_memory']?.value || ''),
authorsNoteString: (extension_prompts['2_floating_prompt']?.value || ''), authorsNoteString: (extension_prompts['2_floating_prompt']?.value || ''),
smartContextString: (extension_prompts['chromadb']?.value || ''), smartContextString: (extension_prompts['chromadb']?.value || ''),