Merge pull request #3720 from bmen25124/group_wrapper_events Added group wrapper events

c1697dc3b3cb24ce9030f44620fdab6a2237b3b5

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

Signed

public/script.js+10 -3 Viewed

     GENERATE_AFTER_COMBINE_PROMPTS: 'generate_after_combine_prompts',
     GENERATE_AFTER_DATA: 'generate_after_data',
     GROUP_MEMBER_DRAFTED: 'group_member_drafted',
 +    GROUP_WRAPPER_STARTED: 'group_wrapper_started',
 +    GROUP_WRAPPER_FINISHED: 'group_wrapper_finished',
     WORLD_INFO_ACTIVATED: 'world_info_activated',
     TEXT_COMPLETION_SETTINGS_READY: 'text_completion_settings_ready',
     CHAT_COMPLETION_SETTINGS_READY: 'chat_completion_settings_ready',

 /**
  * Returns the character card fields for the current character.
 + * @param {object} [options]
 + * @param {number} [options.chid] Optional character index
 + *
  * @typedef {object} CharacterCardFields
  * @property {string} system System prompt
  * @property {string} mesExamples Message examples

  * @property {string} charDepthPrompt Character depth note
  * @returns {CharacterCardFields} Character card fields
  */
 export function getCharacterCardFields({ chid = null } = {}) {
 +    const currentChid = chid ?? this_chid;
++
     const result = {
         system: '',
         mesExamples: '',

     };
     result.persona = baseChatReplace(power_user.persona_description?.trim(), name1, name2);
     const character = characters[this_chidcurrentChid];
     if (!character) {
         return result;

     result.charDepthPrompt = baseChatReplace(character.data?.extensions?.depth_prompt?.prompt?.trim(), name1, name2);
     if (selected_group) {
         const groupCards = getGroupCharacterCards(selected_group, Number(this_chidcurrentChid));
         if (groupCards) {
             result.description = groupCards.description;

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

@@ -904,6 +904,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
904	904	groupChatQueueOrder.set(characters[activatedMembers[i]].avatar, i + 1);
905	905	}
906	906	}
	907	+ await eventSource.emit(event_types.GROUP_WRAPPER_STARTED, { selected_group, type });
907	908	// now the real generation begins: cycle through every activated character
908	909	for (const chId of activatedMembers) {
909	910	throwIfAborted();

         setCharacterName('');
         activateSendButtons();
         showSwipeButtons();
 +        await eventSource.emit(event_types.GROUP_WRAPPER_FINISHED,  { selected_group, type });
+    }
     return Promise.resolve(textResult);