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

Merge branch 'staging' into inject-filter

Browse Source
This commit is contained in:
Cohee
2024-12-12 23:35:23 +02:00
parent d6f34f7b2c 5c82ccf435
commit 47dea8159e
52 changed files with 3519 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3548,6 +3548,11 @@ async function getCharacterLore() {
continue;
}
if (power_user.persona_description_lorebook === worldName) {
console.debug(`[WI] Character ${name}'s world ${worldName} is already activated in persona lore! Skipping...`);
continue;
}
const data = await loadWorldInfo(worldName);
const newEntries = data ? Object.keys(data.entries).map((x) => data.entries[x]).map(({ uid, ...rest }) => ({ uid, world: worldName, ...rest })) : [];
entries = entries.concat(newEntries);
@@ -3598,11 +3603,45 @@ async function getChatLore() {
return entries;
}
async function getPersonaLore() {
const chatWorld = chat_metadata[METADATA_KEY];
const personaWorld = power_user.persona_description_lorebook;
if (!personaWorld) {
return [];
}
if (chatWorld === personaWorld) {
console.debug(`[WI] Persona world ${personaWorld} is already activated in chat world! Skipping...`);
return [];
}
if (selected_world_info.includes(personaWorld)) {
console.debug(`[WI] Persona world ${personaWorld} is already activated in global world info! Skipping...`);
return [];
}
const data = await loadWorldInfo(personaWorld);
const entries = data ? Object.keys(data.entries).map((x) => data.entries[x]).map(({ uid, ...rest }) => ({ uid, world: personaWorld, ...rest })) : [];
console.debug(`[WI] Persona lore has ${entries.length} entries`, [personaWorld]);
return entries;
}
export async function getSortedEntries() {
try {
const globalLore = await getGlobalLore();
const characterLore = await getCharacterLore();
const chatLore = await getChatLore();
const [
globalLore,
characterLore,
chatLore,
personaLore,
] = await Promise.all([
getGlobalLore(),
getCharacterLore(),
getChatLore(),
getPersonaLore(),
]);
let entries;
@@ -3622,8 +3661,8 @@ export async function getSortedEntries() {
break;
}
// Chat lore always goes first
entries = [...chatLore.sort(sortFn), ...entries];
// Chat lore always goes first, then persona lore, then the rest
entries = [...chatLore.sort(sortFn), ...personaLore.sort(sortFn), ...entries];
// Calculate hash and parse decorators. Split maps to preserve old hashes.
entries = entries.map((entry) => {
@@ -4816,9 +4855,33 @@ export async function importWorldInfo(file) {
});
}
export function assignLorebookToChat() {
/**
* Forces the world info editor to open on a specific world.
* @param {string} worldName The name of the world to open
*/
export function openWorldInfoEditor(worldName) {
console.log(`Opening lorebook for ${worldName}`);
if (!$('#WorldInfo').is(':visible')) {
$('#WIDrawerIcon').trigger('click');
}
const index = world_names.indexOf(worldName);
$('#world_editor_select').val(index).trigger('change');
}
/**
* Assigns a lorebook to the current chat.
* @param {PointerEvent} event Pointer event
* @returns {Promise<void>}
*/
export async function assignLorebookToChat(event) {
const selectedName = chat_metadata[METADATA_KEY];
const template = $('#chat_world_template .chat_world').clone();
if (selectedName && event.altKey) {
openWorldInfoEditor(selectedName);
return;
}
const template = $(await renderTemplateAsync('chatLorebook'));
const worldSelect = template.find('select');
const chatName = template.find('.chat_name');
@@ -4846,7 +4909,7 @@ export function assignLorebookToChat() {
saveMetadata();
});
callPopup(template, 'text');
return callGenericPopup(template, POPUP_TYPE.TEXT);
}
jQuery(() => {
@@ -4997,11 +5060,7 @@ jQuery(() => {
const worldName = characters[chid]?.data?.extensions?.world;
const hasEmbed = checkEmbeddedWorld(chid);
if (worldName && world_names.includes(worldName) && !event.shiftKey) {
if (!$('#WorldInfo').is(':visible')) {
$('#WIDrawerIcon').trigger('click');
}
const index = world_names.indexOf(worldName);
$('#world_editor_select').val(index).trigger('change');
openWorldInfoEditor(worldName);
} else if (hasEmbed && !event.shiftKey) {
await importEmbeddedWorldInfo();
saveCharacterDebounced();