mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-03-10 00:50:11 +01:00
Add WI inclusion groups
This commit is contained in:
parent
e804f27368
commit
c84b6a5101
@ -4122,7 +4122,8 @@
|
|||||||
<div class="world_entry_thin_controls commentContainer">
|
<div class="world_entry_thin_controls commentContainer">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-container flexFlowColumn flexNoGap wide100p">
|
<div class="flex-container wide100p flexGap10">
|
||||||
|
<div class="flex1 flex-container flexFlowColumn flexNoGap">
|
||||||
<div class="flex-container justifySpaceBetween">
|
<div class="flex-container justifySpaceBetween">
|
||||||
<label for="characterFilter" class="">
|
<label for="characterFilter" class="">
|
||||||
<small data-i18n="Filter to Character(s)">Filter to Character(s)</small>
|
<small data-i18n="Filter to Character(s)">Filter to Character(s)</small>
|
||||||
@ -4142,6 +4143,13 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex1 flex-container flexFlowColumn flexNoGap">
|
||||||
|
<label for="group">
|
||||||
|
<small data-i18n="">Inclusion Group</small>
|
||||||
|
</label>
|
||||||
|
<input type="text" class="text_pole" name="group" rows="1" data-i18n="[placeholder]Only one entry with the same label will be activated" placeholder="Only one entry with the same label will be activated">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div name="WIEntryBottomControls" class="flex-container flex1 justifySpaceBetween world_entry_form_horizontal">
|
<div name="WIEntryBottomControls" class="flex-container flex1 justifySpaceBetween world_entry_form_horizontal">
|
||||||
<div class="flex-container flexFlowColumn flexNoGap wi-enter-footer-text ">
|
<div class="flex-container flexFlowColumn flexNoGap wi-enter-footer-text ">
|
||||||
<label class="checkbox flex-container">
|
<label class="checkbox flex-container">
|
||||||
|
@ -1102,6 +1102,19 @@ function getWorldEntry(name, data, entry) {
|
|||||||
orderInput.val(entry.order).trigger('input');
|
orderInput.val(entry.order).trigger('input');
|
||||||
orderInput.css('width', 'calc(3em + 15px)');
|
orderInput.css('width', 'calc(3em + 15px)');
|
||||||
|
|
||||||
|
// group
|
||||||
|
const groupInput = template.find('input[name="group"]');
|
||||||
|
groupInput.data('uid', entry.uid);
|
||||||
|
groupInput.on('input', function () {
|
||||||
|
const uid = $(this).data('uid');
|
||||||
|
const value = String($(this).val()).trim();
|
||||||
|
|
||||||
|
data.entries[uid].group = value;
|
||||||
|
setOriginalDataValue(data, uid, 'extensions.group', data.entries[uid].group);
|
||||||
|
saveWorldInfo(name, data);
|
||||||
|
});
|
||||||
|
groupInput.val(entry.group ?? '').trigger('input');
|
||||||
|
|
||||||
// probability
|
// probability
|
||||||
if (entry.probability === undefined) {
|
if (entry.probability === undefined) {
|
||||||
entry.probability = null;
|
entry.probability = null;
|
||||||
@ -1810,8 +1823,8 @@ async function checkWorldInfo(chat, maxContext) {
|
|||||||
console.debug(`(NOT ANY Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`);
|
console.debug(`(NOT ANY Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`);
|
||||||
activatedNow.add(entry);
|
activatedNow.add(entry);
|
||||||
}
|
}
|
||||||
// Handle cases where secondary is empty
|
|
||||||
} else {
|
} else {
|
||||||
|
// Handle cases where secondary is empty
|
||||||
console.debug(`WI UID ${entry.uid}: Activated without filter logic.`);
|
console.debug(`WI UID ${entry.uid}: Activated without filter logic.`);
|
||||||
activatedNow.add(entry);
|
activatedNow.add(entry);
|
||||||
break primary;
|
break primary;
|
||||||
@ -1827,11 +1840,13 @@ async function checkWorldInfo(chat, maxContext) {
|
|||||||
let newContent = '';
|
let newContent = '';
|
||||||
const textToScanTokens = getTokenCount(allActivatedText);
|
const textToScanTokens = getTokenCount(allActivatedText);
|
||||||
const probabilityChecksBefore = failedProbabilityChecks.size;
|
const probabilityChecksBefore = failedProbabilityChecks.size;
|
||||||
|
|
||||||
|
filterByInclusionGroups(newEntries, allActivatedEntries);
|
||||||
|
|
||||||
console.debug('-- PROBABILITY CHECKS BEGIN --');
|
console.debug('-- PROBABILITY CHECKS BEGIN --');
|
||||||
for (const entry of newEntries) {
|
for (const entry of newEntries) {
|
||||||
const rollValue = Math.random() * 100;
|
const rollValue = Math.random() * 100;
|
||||||
|
|
||||||
|
|
||||||
if (entry.useProbability && rollValue > entry.probability) {
|
if (entry.useProbability && rollValue > entry.probability) {
|
||||||
console.debug(`WI entry ${entry.uid} ${entry.key} failed probability check, skipping`);
|
console.debug(`WI entry ${entry.uid} ${entry.key} failed probability check, skipping`);
|
||||||
failedProbabilityChecks.add(entry);
|
failedProbabilityChecks.add(entry);
|
||||||
@ -1939,6 +1954,72 @@ async function checkWorldInfo(chat, maxContext) {
|
|||||||
return { worldInfoBefore, worldInfoAfter, WIDepthEntries };
|
return { worldInfoBefore, worldInfoAfter, WIDepthEntries };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filters entries by inclusion groups.
|
||||||
|
* @param {object[]} newEntries Entries activated on current recursion level
|
||||||
|
* @param {Set<object>} allActivatedEntries Set of all activated entries
|
||||||
|
*/
|
||||||
|
function filterByInclusionGroups(newEntries, allActivatedEntries) {
|
||||||
|
console.debug('-- INCLUSION GROUP CHECKS BEGIN --');
|
||||||
|
const grouped = newEntries.filter(x => x.group).reduce((acc, item) => {
|
||||||
|
if (!acc[item.group]) {
|
||||||
|
acc[item.group] = [];
|
||||||
|
}
|
||||||
|
acc[item.group].push(item);
|
||||||
|
return acc;
|
||||||
|
}, {});
|
||||||
|
|
||||||
|
if (Object.keys(grouped).length === 0) {
|
||||||
|
console.debug('No inclusion groups found');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [key, group] of Object.entries(grouped)) {
|
||||||
|
console.debug(`Checking inclusion group '${key}' with ${group.length} entries`, group);
|
||||||
|
|
||||||
|
if (!Array.isArray(group) || group.length <= 1) {
|
||||||
|
console.debug('Skipping inclusion group check, only one entry');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Array.from(allActivatedEntries).some(x => x.group === key)) {
|
||||||
|
console.debug(`Skipping inclusion group check, group already activated '${key}'`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Do weighted random using probability of entry as weight
|
||||||
|
const totalWeight = group.reduce((acc, item) => acc + item.probability, 0);
|
||||||
|
const rollValue = Math.random() * totalWeight;
|
||||||
|
let currentWeight = 0;
|
||||||
|
let winner = null;
|
||||||
|
|
||||||
|
for (const entry of group) {
|
||||||
|
currentWeight += entry.probability;
|
||||||
|
|
||||||
|
if (rollValue <= currentWeight) {
|
||||||
|
console.debug(`Activated inclusion group '${key}' with entry '${entry.uid}'`, entry);
|
||||||
|
winner = entry;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!winner) {
|
||||||
|
console.debug(`Failed to activate inclusion group '${key}', no winner found`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove every group item from newEntries but the winner
|
||||||
|
for (const entry of group) {
|
||||||
|
if (entry === winner) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.debug(`Removing loser from inclusion group '${key}' entry '${entry.uid}'`, entry);
|
||||||
|
newEntries.splice(newEntries.indexOf(entry), 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function matchKeys(haystack, needle) {
|
function matchKeys(haystack, needle) {
|
||||||
const transformedString = transformString(needle);
|
const transformedString = transformString(needle);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user