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

Add group pooled order

Browse Source 
Closes #3650
This commit is contained in:
Cohee
2025-03-11 01:24:46 +02:00
parent 68b5be063f
commit ad225138b4
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/index.html
View File

@ -5382,6 +5382,7 @@
<option value="2" data-i18n="Manual">Manual</option> <option value="2" data-i18n="Manual">Manual</option>
<option value="0" data-i18n="Natural order">Natural order</option> <option value="0" data-i18n="Natural order">Natural order</option>
<option value="1" data-i18n="List order">List order</option> <option value="1" data-i18n="List order">List order</option>
<option value="3" data-i18n="Pooled order">Pooled order</option>
</select> </select>
</div> </div>
<div class="flex1 flexGap5"> <div class="flex1 flexGap5">

46
public/scripts/group-chats.js
View File

@ -114,6 +114,7 @@ export const group_activation_strategy = {
NATURAL: 0, NATURAL: 0,
LIST: 1, LIST: 1,
MANUAL: 2, MANUAL: 2,
POOLED: 3,
}; };
export const group_generation_mode = { export const group_generation_mode = {
@ -880,6 +881,9 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
else if (activationStrategy === group_activation_strategy.LIST) { else if (activationStrategy === group_activation_strategy.LIST) {
activatedMembers = activateListOrder(enabledMembers); activatedMembers = activateListOrder(enabledMembers);
} }
else if (activationStrategy === group_activation_strategy.POOLED) {
activatedMembers = activatePooledOrder(enabledMembers, lastMessage);
}
else if (activationStrategy === group_activation_strategy.MANUAL && !isUserInput) { else if (activationStrategy === group_activation_strategy.MANUAL && !isUserInput) {
activatedMembers = shuffle(enabledMembers).slice(0, 1).map(x => characters.findIndex(y => y.avatar === x)).filter(x => x !== -1); activatedMembers = shuffle(enabledMembers).slice(0, 1).map(x => characters.findIndex(y => y.avatar === x)).filter(x => x !== -1);
} }
@ -1020,6 +1024,48 @@ function activateListOrder(members) {
return memberIds; return memberIds;
} }
/**
* Activate group members based on the last message.
* @param {string[]} members List of member avatars
* @param {Object} lastMessage Last message
* @returns {number[]} List of character ids
*/
function activatePooledOrder(members, lastMessage) {
const activatedMembers = [];
const spokenSinceUser = [];
for (const message of chat.slice().reverse()) {
if (message.is_user) {
break;
}
if (message.is_system || message.extra?.type === system_message_types.NARRATOR) {
continue;
}
if (message.original_avatar) {
spokenSinceUser.push(message.original_avatar);
}
}
const haveNotSpoken = members.filter(x => !spokenSinceUser.includes(x));
if (haveNotSpoken.length) {
activatedMembers.push(haveNotSpoken[Math.floor(Math.random() * haveNotSpoken.length)]);
}
if (activatedMembers.length === 0) {
const lastMessageAvatar = members.length > 1 && lastMessage && !lastMessage.is_user && lastMessage.original_avatar;
const randomPool = lastMessageAvatar ? members.filter(x => x !== lastMessage.original_avatar) : members;
activatedMembers.push(randomPool[Math.floor(Math.random() * randomPool.length)]);
}
const memberIds = activatedMembers
.map((x) => characters.findIndex((y) => y.avatar === x))
.filter((x) => x !== -1);
return memberIds;
}
function activateNaturalOrder(members, input, lastMessage, allowSelfResponses, isUserInput) { function activateNaturalOrder(members, input, lastMessage, allowSelfResponses, isUserInput) {
let activatedMembers = []; let activatedMembers = [];