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

toggle to skip WI&AN insertion in Summary's prompt

Browse Source
This commit is contained in:
RossAscends
2023-10-11 19:44:22 +09:00
parent 7be3718a36
commit 6b5aa9d06e
3 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
public/script.js
View File

@ -1906,15 +1906,18 @@ function getStoppingStrings(isImpersonate) {
/** /**
* Background generation based on the provided prompt. * Background generation based on the provided prompt.
* @param {string} quiet_prompt Instruction prompt for the AI * @param {string} quiet_prompt Instruction prompt for the AI
* @param {boolean} quietToLoud Whether a message should be sent in a foreground (loud) or background (quiet) mode * @param {boolean} quietToLoud Whether the message should be sent in a foreground (loud) or background (quiet) mode
* @param {boolean} skipWIAN whether to skip addition of World Info and Author's Note into the prompt
* @returns * @returns
*/ */
export async function generateQuietPrompt(quiet_prompt, quietToLoud) { export async function generateQuietPrompt(quiet_prompt, quietToLoud, skipWIAN) {
console.log('got into genQuietPrompt')
const skipWIANvalue = skipWIAN
return await new Promise( return await new Promise(
async function promptPromise(resolve, reject) { async function promptPromise(resolve, reject) {
if (quietToLoud === true) { if (quietToLoud === true) {
try { try {
await Generate('quiet', { resolve, reject, quiet_prompt, quietToLoud: true, force_name2: true, }); await Generate('quiet', { resolve, reject, quiet_prompt, quietToLoud: true, skipWIAN: skipWIAN, force_name2: true, });
} }
catch { catch {
reject(); reject();
@ -1922,7 +1925,8 @@ export async function generateQuietPrompt(quiet_prompt, quietToLoud) {
} }
else { else {
try { try {
await Generate('quiet', { resolve, reject, quiet_prompt, quietToLoud: false, force_name2: true, }); console.log('going to generate non-QuietToLoud')
await Generate('quiet', { resolve, reject, quiet_prompt, quietToLoud: false, skipWIAN: skipWIAN, force_name2: true, });
} }
catch { catch {
reject(); reject();
@ -2346,8 +2350,8 @@ class StreamingProcessor {
} }
} }
async function Generate(type, { automatic_trigger, force_name2, resolve, reject, quiet_prompt, quietToLoud, force_chid, signal } = {}, dryRun = false) { async function Generate(type, { automatic_trigger, force_name2, resolve, reject, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal } = {}, dryRun = false) {
//console.log('Generate entered'); console.log('Generate entered');
setGenerationProgress(0); setGenerationProgress(0);
generation_started = new Date(); generation_started = new Date();
@ -2623,14 +2627,20 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// Set non-WI AN // Set non-WI AN
setFloatingPrompt(); setFloatingPrompt();
// Add WI to prompt (and also inject WI to AN value via hijack) // Add WI to prompt (and also inject WI to AN value via hijack)
let { worldInfoString, worldInfoBefore, worldInfoAfter, worldInfoDepth } = await getWorldInfoPrompt(chat2, this_max_context); let { worldInfoString, worldInfoBefore, worldInfoAfter, worldInfoDepth } = await getWorldInfoPrompt(chat2, this_max_context);
// Add all depth WI entries to prompt if (skipWIAN !== true) {
if (Array.isArray(worldInfoDepth)) { console.log('skipWIAN not active, adding WIAN')
worldInfoDepth.forEach((e) => { // Add all depth WI entries to prompt
const joinedEntries = e.entries.join("\n"); if (Array.isArray(worldInfoDepth)) {
setExtensionPrompt(`customDepthWI-${e.depth}`, joinedEntries, extension_prompt_types.IN_CHAT, e.depth) worldInfoDepth.forEach((e) => {
}); const joinedEntries = e.entries.join("\n");
setExtensionPrompt(`customDepthWI-${e.depth}`, joinedEntries, extension_prompt_types.IN_CHAT, e.depth)
});
}
} else {
console.log('skipping WIAN')
} }
// Add persona description to prompt // Add persona description to prompt
@ -2967,7 +2977,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// TODO: Move zero-depth anchor append to work like CFG and bias appends // TODO: Move zero-depth anchor append to work like CFG and bias appends
if (zeroDepthAnchor?.length && !isContinue) { if (zeroDepthAnchor?.length && !isContinue) {
console.log(/\s/.test(finalMesSend[finalMesSend.length - 1].message.slice(-1))) console.debug(/\s/.test(finalMesSend[finalMesSend.length - 1].message.slice(-1)))
finalMesSend[finalMesSend.length - 1].message += finalMesSend[finalMesSend.length - 1].message +=
/\s/.test(finalMesSend[finalMesSend.length - 1].message.slice(-1)) /\s/.test(finalMesSend[finalMesSend.length - 1].message.slice(-1))
? zeroDepthAnchor ? zeroDepthAnchor
@ -3268,7 +3278,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// regenerate with character speech reenforced // regenerate with character speech reenforced
// to make sure we leave on swipe type while also adding the name2 appendage // to make sure we leave on swipe type while also adding the name2 appendage
setTimeout(() => { setTimeout(() => {
Generate(type, { automatic_trigger, force_name2: true, resolve, reject, quiet_prompt, force_chid }); Generate(type, { automatic_trigger, force_name2: true, resolve, reject, quiet_prompt, skipWIAN, force_chid });
}, generate_loop_counter * 1000); }, generate_loop_counter * 1000);
} }

30
public/scripts/extensions/memory/index.js
View File

@ -63,6 +63,7 @@ const defaultSettings = {
maxLengthPenalty: 4, maxLengthPenalty: 4,
lengthPenaltyStep: 0.1, lengthPenaltyStep: 0.1,
memoryFrozen: false, memoryFrozen: false,
SkipWIAN: false,
source: summary_sources.extras, source: summary_sources.extras,
prompt: defaultPrompt, prompt: defaultPrompt,
template: defaultTemplate, template: defaultTemplate,
@ -100,6 +101,7 @@ function loadSettings() {
$('#memory_temperature').val(extension_settings.memory.temperature).trigger('input'); $('#memory_temperature').val(extension_settings.memory.temperature).trigger('input');
$('#memory_length_penalty').val(extension_settings.memory.lengthPenalty).trigger('input'); $('#memory_length_penalty').val(extension_settings.memory.lengthPenalty).trigger('input');
$('#memory_frozen').prop('checked', extension_settings.memory.memoryFrozen).trigger('input'); $('#memory_frozen').prop('checked', extension_settings.memory.memoryFrozen).trigger('input');
$('#memory_skipWIAN').prop('checked', extension_settings.memory.SkipWIAN).trigger('input');
$('#memory_prompt').val(extension_settings.memory.prompt).trigger('input'); $('#memory_prompt').val(extension_settings.memory.prompt).trigger('input');
$('#memory_prompt_words').val(extension_settings.memory.promptWords).trigger('input'); $('#memory_prompt_words').val(extension_settings.memory.promptWords).trigger('input');
$('#memory_prompt_interval').val(extension_settings.memory.promptInterval).trigger('input'); $('#memory_prompt_interval').val(extension_settings.memory.promptInterval).trigger('input');
@ -170,6 +172,12 @@ function onMemoryFrozenInput() {
saveSettingsDebounced(); saveSettingsDebounced();
} }
function onMemorySkipWIANInput() {
const value = Boolean($(this).prop('checked'));
extension_settings.memory.SkipWIAN = value;
saveSettingsDebounced();
}
function onMemoryPromptWordsInput() { function onMemoryPromptWordsInput() {
const value = $(this).val(); const value = $(this).val();
extension_settings.memory.promptWords = Number(value); extension_settings.memory.promptWords = Number(value);
@ -311,13 +319,15 @@ async function onChatEvent() {
async function forceSummarizeChat() { async function forceSummarizeChat() {
const context = getContext(); const context = getContext();
const skipWIAN = extension_settings.memory.SkipWIAN
console.log(`Skipping WIAN? ${skipWIAN}`)
if (!context.chatId) { if (!context.chatId) {
toastr.warning('No chat selected'); toastr.warning('No chat selected');
return; return;
} }
toastr.info('Summarizing chat...', 'Please wait'); toastr.info('Summarizing chat...', 'Please wait');
const value = await summarizeChatMain(context, true); const value = await summarizeChatMain(context, true, skipWIAN);
if (!value) { if (!value) {
toastr.warning('Failed to summarize chat'); toastr.warning('Failed to summarize chat');
@ -326,19 +336,21 @@ async function forceSummarizeChat() {
} }
async function summarizeChat(context) { async function summarizeChat(context) {
const skipWIAN = extension_settings.memory.SkipWIAN
switch (extension_settings.memory.source) { switch (extension_settings.memory.source) {
case summary_sources.extras: case summary_sources.extras:
await summarizeChatExtras(context); await summarizeChatExtras(context);
break; break;
case summary_sources.main: case summary_sources.main:
await summarizeChatMain(context, false); await summarizeChatMain(context, false, skipWIAN);
break; break;
default: default:
break; break;
} }
} }
async function summarizeChatMain(context, force) { async function summarizeChatMain(context, force, skipWIAN) {
if (extension_settings.memory.promptInterval === 0 && !force) { if (extension_settings.memory.promptInterval === 0 && !force) {
console.debug('Prompt interval is set to 0, skipping summarization'); console.debug('Prompt interval is set to 0, skipping summarization');
return; return;
@ -397,8 +409,8 @@ async function summarizeChatMain(context, force) {
console.debug('Summarization prompt is empty. Skipping summarization.'); console.debug('Summarization prompt is empty. Skipping summarization.');
return; return;
} }
console.log('sending summary prompt')
const summary = await generateQuietPrompt(prompt, false); const summary = await generateQuietPrompt(prompt, false, skipWIAN);
const newContext = getContext(); const newContext = getContext();
// something changed during summarization request // something changed during summarization request
@ -606,6 +618,7 @@ function setupListeners() {
$('#memory_temperature').off('click').on('input', onMemoryTemperatureInput); $('#memory_temperature').off('click').on('input', onMemoryTemperatureInput);
$('#memory_length_penalty').off('click').on('input', onMemoryLengthPenaltyInput); $('#memory_length_penalty').off('click').on('input', onMemoryLengthPenaltyInput);
$('#memory_frozen').off('click').on('input', onMemoryFrozenInput); $('#memory_frozen').off('click').on('input', onMemoryFrozenInput);
$('#memory_skipWIAN').off('click').on('input', onMemorySkipWIANInput);
$('#summary_source').off('click').on('change', onSummarySourceChange); $('#summary_source').off('click').on('change', onSummarySourceChange);
$('#memory_prompt_words').off('click').on('input', onMemoryPromptWordsInput); $('#memory_prompt_words').off('click').on('input', onMemoryPromptWordsInput);
$('#memory_prompt_interval').off('click').on('input', onMemoryPromptIntervalInput); $('#memory_prompt_interval').off('click').on('input', onMemoryPromptIntervalInput);
@ -648,10 +661,11 @@ jQuery(function () {
<textarea id="memory_contents" class="text_pole textarea_compact" rows="6" placeholder="Summary will be generated here..."></textarea> <textarea id="memory_contents" class="text_pole textarea_compact" rows="6" placeholder="Summary will be generated here..."></textarea>
<div class="memory_contents_controls"> <div class="memory_contents_controls">
<div id="memory_force_summarize" class="menu_button menu_button_icon"> <div id="memory_force_summarize" class="menu_button menu_button_icon">
<i class="fa-solid fa-database"></i> <i class="fa-solid fa-database"></i>
<span>Summarize now</span> <span>Summarize now</span>
</div> </div>
<label for="memory_frozen"><input id="memory_frozen" type="checkbox" />Pause</label> <label for="memory_frozen"><input id="memory_frozen" type="checkbox" />Pause</label>
<label for="memory_skipWIAN"><input id="memory_skipWIAN" type="checkbox" />No WI/AN</label>
</div> </div>
<div class="memory_contents_controls"> <div class="memory_contents_controls">
<div id="summarySettingsBlockToggle" class="menu_button">Settings</div> <div id="summarySettingsBlockToggle" class="menu_button">Settings</div>

5
public/scripts/extensions/memory/style.css
View File

@ -8,7 +8,8 @@
line-height: 1.2; line-height: 1.2;
} }
label[for="memory_frozen"] { label[for="memory_frozen"],
label[for="memory_skipWIAN"] {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 0 !important; margin: 0 !important;
@ -23,4 +24,4 @@ label[for="memory_frozen"] input {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }