Merge pull request #3187 from InspectorCaracal/fix-double-prefix Fix example messages being double-prefixed for group chats

5c1a9a300313f662f4a24a0a33e2078a5c4204dc

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

Signed

public/scripts/instruct-mode.js+5 -4 Viewed

         return mesExamplesArray.map(x => x.replace(/<START>\n/i, blockHeading));
+    }
     const includeNames = power_user.instruct.names_behavior === names_behavior_types.ALWAYS || (!!selected_group && power_user.instruct.names_behavior === names_behavior_types.FORCE);
 +    const includeGroupNames = selected_group && [names_behavior_types.ALWAYS, names_behavior_types.FORCE].includes(power_user.instruct.names_behavior);
     let inputPrefix = power_user.instruct.input_sequence || '';
     let outputPrefix = power_user.instruct.output_sequence || '';

     for (const item of mesExamplesArray) {
         const cleanedItem = item.replace(/<START>/i, '{Example Dialogue:}').replace(/\r/gm, '');
         const blockExamples = parseExampleIntoIndividual(cleanedItem, includeGroupNames);
         if (blockExamples.length === 0) {
             continue;

+        }
         for (const example of blockExamples) {
 +            // If group names were already included, we don't want to add an additional prefix
             // If force group/persona names is set, we should override the include names for the user placeholder
             const includeThisName = (includeNames && !includeGroupNames) || (power_user.instruct.names_behavior === names_behavior_types.FORCE && example.name == 'example_user');
             const prefix = example.name == 'example_user' ? inputPrefix : outputPrefix;
             const suffix = example.name == 'example_user' ? inputSuffix : outputSuffix;

@@ -489,7 +491,6 @@ export function formatInstructModeExamples(mesExamplesArray, name1, name2) {
489	491	if (formattedExamples.length === 0) {
490	492	return mesExamplesArray.map(x => x.replace(/<START>\n/i, blockHeading));
491	493	}
492		-
493	494	return formattedExamples;
494	495	}
495	496