Merge pull request #3660 from SillyTavern/group-pooled-order Add group pooled order

ebe30dceac64e88939ce2561cd9858f503581e75

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 137927bb43d3aa35e298b7706f487e06dce53e15 370bd9a3a88efa13604f178689f1ea74eda15821

public/index.html+1 -0 Viewed

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

public/scripts/group-chats.js+46 -0 Viewed

     NATURAL: 0,
     LIST: 1,
     MANUAL: 2,
 +    POOLED: 3,
 };
 export const group_generation_mode = {

@@ -880,6 +881,9 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
880	881	else if (activationStrategy === group_activation_strategy.LIST) {
881	882	activatedMembers = activateListOrder(enabledMembers);
882	883	}
	884	+ else if (activationStrategy === group_activation_strategy.POOLED) {
	885	+ activatedMembers = activatePooledOrder(enabledMembers, lastMessage);
	886	+ }
883	887	else if (activationStrategy === group_activation_strategy.MANUAL && !isUserInput) {
884	888	activatedMembers = shuffle(enabledMembers).slice(0, 1).map(x => characters.findIndex(y => y.avatar === x)).filter(x => x !== -1);
885	889	}

     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) {
 +    /** @type {string} */
 +    let activatedMember = null;
 +    /** @type {string[]} */
 +    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) {
 +        activatedMember = haveNotSpoken[Math.floor(Math.random() * haveNotSpoken.length)];
 +    }
++
 +    if (activatedMember === null) {
 +        const lastMessageAvatar = members.length > 1 && lastMessage && !lastMessage.is_user && lastMessage.original_avatar;
 +        const randomPool = lastMessageAvatar ? members.filter(x => x !== lastMessage.original_avatar) : members;
 +        activatedMember = randomPool[Math.floor(Math.random() * randomPool.length)];
 +    }
++
 +    const memberId = characters.findIndex(y => y.avatar === activatedMember);
 +    return memberId !== -1 ? [memberId] : [];
 +}
++
 function activateNaturalOrder(members, input, lastMessage, allowSelfResponses, isUserInput) {
     let activatedMembers = [];