Fixes to group join examples parsing

2d66b7204ad0352ceadde05a75d98fc37c068cd3

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

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

      * @param {string} value Value to replace
      * @param {string} characterName Name of the character
      * @param {string} fieldName Name of the field
 +     * @param {function(string): string} [preprocess] Preprocess function
      * @returns {string} Prepared text
      * */
     function replaceAndPrepareForJoin(value, characterName, fieldName, preprocess = null) {
         value = value.trim();
         if (!value) {
             return '';
+        }
 +        // Run preprocess function
 +        if (typeof preprocess === 'function') {
 +            value = preprocess(value);
 +        }
++
         // Prepare and replace prefixes
         const prefix = customBaseChatReplace(group.generation_mode_join_prefix, fieldName, characterName);
         const suffix = customBaseChatReplace(group.generation_mode_join_suffix, fieldName, characterName);

         descriptions.push(replaceAndPrepareForJoin(character.description, character.name, 'Description'));
         personalities.push(replaceAndPrepareForJoin(character.personality, character.name, 'Personality'));
         scenarios.push(replaceAndPrepareForJoin(character.scenario, character.name, 'Scenario'));
         mesExamplesArray.push(replaceAndPrepareForJoin(character.mes_example, character.name, 'Example Messages', (x) => !x.startsWith('<START>') ? `<START>\n${x}` : x));
+    }
     const description = descriptions.filter(x => x.length).join('\n');

public/scripts/openai.js+15 -4 Viewed

     system_message_types,
     this_chid,
 } from '../script.js';
 import { groups, selected_group } from './group-chats.js';
 import {
     chatCompletionDefaultPrompts,

  * @returns {Message[]} Array of message objects
  */
 export function parseExampleIntoIndividual(messageExampleString, appendNamesForGroup = true) {
 +    const groupMembers = selected_group ? groups.find(x => x.id == selected_group)?.members : null;
 +    const groupBotNames = Array.isArray(groupMembers)
 +        ? groupMembers.map(x => characters.find(y => y.avatar === x)?.name).filter(x => x).map(x => `${x}:`)
 +        : [];
++
     let result = []; // array of msgs
     let tmp = messageExampleString.split('\n');
     let cur_msg_lines = [];
     let in_user = false;
     let in_bot = false;
 +    let botName = name2;
++
     // DRY my cock and balls :)
     function add_msg(name, role, system_name) {
         // join different newlines (we split them by \n and join by \n)

             in_user = true;
             // we were in the bot mode previously, add the message
             if (in_bot) {
                 add_msg(name2botName, 'system', 'example_assistant');
+            }
             in_bot = false;
         } else if (cur_str.startsWith(name2 + ':') || groupBotNames.some(n => cur_str.startsWith(n))) {
 +            if (!cur_str.startsWith(name2 + ':') && groupBotNames.length) {
 +                botName = cur_str.split(':')[0];
 +            }
++
             in_bot = true;
             // we were in the user mode previously, add the message
             if (in_user) {

@@ -589,7 +600,7 @@ export function parseExampleIntoIndividual(messageExampleString, appendNamesForG
589	600	if (in_user) {
590	601	add_msg(name1, 'system', 'example_user');
591	602	} else if (in_bot) {
592	603	add_msg(name2botName, 'system', 'example_assistant');
593	604	}
594	605	return result;
595	606	}