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

Implement WI matching on global data

Browse Source
This commit is contained in:
Crow
2025-04-16 17:59:03 +01:00
parent aa75fe2877
commit d2ffefd24c
2 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/script.js
View File

@ -4143,7 +4143,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
// Make quiet prompt available for WIAN
setExtensionPrompt('QUIET_PROMPT', quiet_prompt || '', extension_prompt_types.IN_PROMPT, 0, true);
const chatForWI = coreChat.map(x => world_info_include_names ? `${x.name}: ${x.mes}` : x.mes).reverse();
const { worldInfoString, worldInfoBefore, worldInfoAfter, worldInfoExamples, worldInfoDepth } = await getWorldInfoPrompt(chatForWI, this_max_context, dryRun);
// TODO: Build globalScanData
const { worldInfoString, worldInfoBefore, worldInfoAfter, worldInfoExamples, worldInfoDepth } = await getWorldInfoPrompt(null, chatForWI, this_max_context, dryRun);
setExtensionPrompt('QUIET_PROMPT', '', extension_prompt_types.IN_PROMPT, 0, true);
// Add message example WI

51
public/scripts/world-info.js
View File

@ -155,6 +155,11 @@ class WorldInfoBuffer {
*/
static externalActivations = new Map();
/**
* @type {WIGlobalScanData} Chat independent data to be scanned, such as persona and character descriptions
*/
#globalScanDataBuffer = null;
/**
* @type {string[]} Array of messages sorted by ascending depth
*/
@ -182,10 +187,12 @@ class WorldInfoBuffer {
/**
* Initialize the buffer with the given messages.
* @param {WIGlobalScanData} globalScanData Chat independent context to be scanned
* @param {string[]} messages Array of messages to add to the buffer
*/
constructor(messages) {
constructor(globalScanData, messages) {
this.#initDepthBuffer(messages);
this.#globalScanDataBuffer = globalScanData;
}
/**
@ -242,6 +249,25 @@ class WorldInfoBuffer {
const JOINER = '\n' + MATCHER;
let result = MATCHER + this.#depthBuffer.slice(this.#startDepth, depth).join(JOINER);
if (entry.matchPersonaDescription) {
result += JOINER + this.#globalScanDataBuffer.personaDescription;
}
if (entry.matchCharacterDescription) {
result += JOINER + this.#globalScanDataBuffer.characterDescription;
}
if (entry.matchCharacterPersonality) {
result += JOINER + this.#globalScanDataBuffer.characterPersonality;
}
if (entry.matchCharacterNote) {
result += JOINER + this.#globalScanDataBuffer.characterNote;
}
if (entry.matchScenario) {
result += JOINER + this.#globalScanDataBuffer.scenario;
}
if (entry.matchCreatorNotes) {
result += JOINER + this.#globalScanDataBuffer.creatorNotes;
}
if (this.#injectBuffer.length > 0) {
result += JOINER + this.#injectBuffer.join(JOINER);
}
@ -770,6 +796,7 @@ export const worldInfoCache = new StructuredCloneMap({ cloneOnGet: true, cloneOn
/**
* Gets the world info based on chat messages.
* @param {WIGlobalScanData} globalScanData Chat independent context to be scanned
* @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.
@ -783,10 +810,10 @@ export const worldInfoCache = new StructuredCloneMap({ cloneOnGet: true, cloneOn
* @property {Array} anAfter - Array of entries after Author's Note
* @returns {Promise<WIPromptResult>} The world info string and depth.
*/
export async function getWorldInfoPrompt(chat, maxContext, isDryRun) {
export async function getWorldInfoPrompt(globalScanData, chat, maxContext, isDryRun) {
let worldInfoString = '', worldInfoBefore = '', worldInfoAfter = '';
const activatedWorldInfo = await checkWorldInfo(chat, maxContext, isDryRun);
const activatedWorldInfo = await checkWorldInfo(globalScanData, chat, maxContext, isDryRun);
worldInfoBefore = activatedWorldInfo.worldInfoBefore;
worldInfoAfter = activatedWorldInfo.worldInfoAfter;
worldInfoString = worldInfoBefore + worldInfoAfter;
@ -3333,17 +3360,17 @@ export async function getWorldEntry(name, data, entry) {
function handleOptionalSelect(name) {
const key = originalWIDataKeyMap[name];
const selectElem = template.find(`select[name="${name}"]`);
selectElem.data('uid', entry.uid);
selectElem.on('input', async function () {
const checkBoxElem = template.find(`input[type="checkbox"][name="${name}"]`);
checkBoxElem.data('uid', entry.uid);
checkBoxElem.on('change', async function () {
const uid = $(this).data('uid');
const value = $(this).val();
const isChecked = $(this).is(':checked');
data.entries[uid][name] = value === 'null' ? null : value === 'true';
data.entries[uid][name] = isChecked;
setWIOriginalDataValue(data, uid, key, data.entries[uid][name]);
await saveWorldInfo(name, data);
});
selectElem.val((entry[name] === null || entry[name] === undefined) ? 'null' : entry[name] ? 'true' : 'false').trigger('input');
checkBoxElem.prop('checked', !!entry[name]).trigger('change');
}
handleOptionalSelect("matchPersonaDescription");
@ -4020,7 +4047,7 @@ function parseDecorators(content) {
/**
* Performs a scan on the chat and returns the world info activated.
* @param {string[]} chat The chat messages to scan, in reverse order.
* @param {WIGlobalScanData} globalScanData Chat independent context to be scanned
* @param {number} maxContext The maximum context size of the generation.
* @param {boolean} isDryRun Whether to perform a dry run.
* @typedef {object} WIActivated
@ -4033,9 +4060,9 @@ function parseDecorators(content) {
* @property {Set<any>} allActivatedEntries All entries.
* @returns {Promise<WIActivated>} The world info activated.
*/
export async function checkWorldInfo(chat, maxContext, isDryRun) {
export async function checkWorldInfo(globalScanData, chat, maxContext, isDryRun) {
const context = getContext();
const buffer = new WorldInfoBuffer(chat);
const buffer = new WorldInfoBuffer(globalScanData, chat);
console.debug(`[WI] --- START WI SCAN (on ${chat.length} messages)${isDryRun ? ' (DRY RUN)' : ''} ---`);