0e41db61 · permissionBRICK/SillyTavern

public/scripts/instruct-mode.js+9 -6 Viewed

 /**
  * Formats instruct mode system prompt.
  * @param {string} systemPrompt System prompt string.
 + * @param {InstructSettings} customInstruct Custom instruct mode settings.
  * @returns {string} Formatted instruct mode system prompt.
  */
 export function formatInstructModeSystemPrompt(systemPrompt, customInstruct = null) {
     if (!systemPrompt) {
         return '';
+    }
 -    const separator = power_user.instruct.wrap ? '\n' : '';
 +    const instruct = customInstruct ?? power_user.instruct;
++
 +    const separator = instruct.wrap ? '\n' : '';
     if (power_user.instruct.system_sequence_prefix) {
         // TODO: Replace with a proper 'System' prompt entity name input
         const prefix = power_user.instruct.system_sequence_prefix.replace(/{{name}}/gi, 'System');
         systemPrompt = prefix + separator + systemPrompt;
+    }
     if (power_user.instruct.system_sequence_suffix) {
         systemPrompt = systemPrompt + separator + power_user.instruct.system_sequence_suffix;
+    }
     return systemPrompt;

public/scripts/openai.js+7 -5 Viewed

@@ -705,16 +705,18 @@ export function parseExampleIntoIndividual(messageExampleString, appendNamesForG
705	705	return result;
706	706	}
707	707
708		-function formatWorldInfo(value) {
	708	+export function formatWorldInfo(value, { wiFormat = null } = {}) {
709	709	if (!value) {
710	710	return '';
711	711	}
712	712
713		- if (!oai_settings.wi_format.trim()) {
	713	+ const format = wiFormat \|\| oai_settings.wi_format;
	714	+
	715	+ if (!format.trim()) {
714	716	return value;
715	717	}
716	718
717	719	return stringFormat(oai_settings.wi_formatformat, value);
718	720	}
719	721
720	722	/**

  * @param {number} position - Prompt position in the extensions object.
  * @returns {string|false} - The prompt position for prompt collection.
  */
 export function getPromptPosition(position) {
     if (position == extension_prompt_types.BEFORE_PROMPT) {
         return 'start';
+    }

  * @param {number} role Role of the prompt.
  * @returns {string} Mapped role.
  */
 export function getPromptRole(role) {
     switch (role) {
         case extension_prompt_roles.SYSTEM:
             return 'system';

public/scripts/power-user.js+10 -4 Viewed

 /**
  * Renders a story string template with the given parameters.
  * @param {object} params Template parameters.
 + * @param {object} [options] Additional options.
 + * @param {string} [options.customStoryString] Custom story string template.
 + * @param {InstructSettings} [options.customInstructSettings] Custom instruct settings.
  * @returns {string} The rendered story string.
  */
 -export function renderStoryString(params) {
 +export function renderStoryString(params, { customStoryString = null, customInstructSettings = null } = {}) {
     try {
 +        const storyString = customStoryString ?? power_user.context.story_string;
 +        const instructSettings = customInstructSettings ?? power_user.instruct;
++
         // Validate and log possible warnings/errors
         validateStoryString(power_user.context.story_stringstoryString, params);
         // compile the story string template into a function, with no HTML escaping
         const compiledTemplate = Handlebars.compile(power_user.context.story_stringstoryString, { noEscape: true });
         // render the story string template with the given params
         let output = compiledTemplate(params);

@@ -2006,7 +2012,7 @@ export function renderStoryString(params) {
2006	2012
2007	2013	// add a newline to the end of the story string if it doesn't have one
2008	2014	if (output.length > 0 && !output.endsWith('\n')) {
2009	2015	if (!power_user.instructinstructSettings.enabled \|\| power_user.instructinstructSettings.wrap) {
2010	2016	output += '\n';
2011	2017	}
2012	2018	}

public/scripts/st-context.js+4 -1 Viewed

     clearChat,
     unshallowCharacter,
     deleteLastMessage,
 +    getCharacterCardFields,
 } from '../script.js';
 import {
     extension_settings,

 import { accountStorage } from './util/AccountStorage.js';
 import { timestampToMoment, uuidv4 } from './utils.js';
 import { getGlobalVariable, getLocalVariable, setGlobalVariable, setLocalVariable } from './variables.js';
 import { convertCharacterBook, getWorldInfoPrompt, loadWorldInfo, saveWorldInfo, updateWorldInfoList } from './world-info.js';
 import { ChatCompletionService, TextCompletionService } from './custom-request.js';
 import { ConnectionManagerRequestService } from './extensions/shared.js';
 import { updateReasoningUI, parseReasoningFromString } from './reasoning.js';

         textCompletionSettings: textgenerationwebui_settings,
         powerUserSettings: power_user,
         getCharacters,
 +        getCharacterCardFields,
         uuidv4,
         humanizedDateTime,
         updateMessageBlock,

         saveWorldInfo,
         updateWorldInfoList,
         convertCharacterBook,
 +        getWorldInfoPrompt,
         CONNECT_API_MAP,
         getTextGenServer,
         extractMessageFromData,

public/scripts/world-info.js+6 -4 Viewed

  * @param {string[]} chat The chat messages to scan, in reverse order.
  * @param {number} maxContext The maximum context size of the generation.
  * @param {boolean} isDryRun If true, the function will not emit any events.
  * @typedef {{worldInfoString: string, worldInfoBefore: string, worldInfoAfter: string, worldInfoExamples: any[], worldInfoDepth: any[], anBefore: any[], anAfter: any[]}} WIPromptResult
  * @returns {Promise<WIPromptResult>} The world info string and depth.
  */
 export async function getWorldInfoPrompt(chat, maxContext, isDryRun) {

         worldInfoAfter,
         worldInfoExamples: activatedWorldInfo.EMEntries ?? [],
         worldInfoDepth: activatedWorldInfo.WIDepthEntries ?? [],
 +        anBefore: activatedWorldInfo.ANBeforeEntries ?? [],
 +        anAfter: activatedWorldInfo.ANAfterEntries ?? [],
     };
+}

  * @param {string[]} chat The chat messages to scan, in reverse order.
  * @param {number} maxContext The maximum context size of the generation.
  * @param {boolean} isDryRun Whether to perform a dry run.
  * @typedef {{ worldInfoBefore: string, worldInfoAfter: string, EMEntries: any[], WIDepthEntries: any[], ANBeforeEntries: any[], ANAfterEntries: any[], allActivatedEntries: Set<any> }} WIActivated
  * @returns {Promise<WIActivated>} The world info activated.
  */
 export async function checkWorldInfo(chat, maxContext, isDryRun) {

     timedEffects.checkTimedEffects();
     if (sortedEntries.length === 0) {
         return { worldInfoBefore: '', worldInfoAfter: '', WIDepthEntries: [], EMEntries: [], ANBeforeEntries: [], ANAfterEntries: [], allActivatedEntries: new Set() };
+    }
     /** @type {number[]} Represents the delay levels for entries that are delayed until recursion */

     console.log(`[WI] ${isDryRun ? 'Hypothetically adding' : 'Adding'} ${allActivatedEntries.size} entries to prompt`, Array.from(allActivatedEntries.values()));
     console.debug(`[WI] --- DONE${isDryRun ? ' (DRY RUN)' : ''} ---`);
     return { worldInfoBefore, worldInfoAfter, EMEntries, WIDepthEntries, ANBeforeEntries: ANTopEntries, ANAfterEntries: ANBottomEntries, allActivatedEntries: new Set(allActivatedEntries.values()) };
+}
 /**

New exports