Merge pull request #3629 from kingbri1/staging Make mesExamples macros consistent

b813bcad8aae925e408487e4d0cfca206ee6d98c

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

Signed

public/script.js+34 -26 Viewed

         environment.personality = fields.personality || '';
         environment.scenario = fields.scenario || '';
         environment.persona = fields.persona || '';
         environment.mesExamples = fields.mesExamples() ||=> '';{
 +            const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
 +            const mesExamplesArray = parseMesExamples(fields.mesExamples, isInstruct);
 +            if (isInstruct) {
 +                const instructExamples = formatInstructModeExamples(mesExamplesArray, name1, name2);
 +                return instructExamples.join('');
 +            }
 +            return mesExamplesArray.join('');
 +        };
 +        environment.mesExamplesRaw = fields.mesExamples || '';
         environment.charVersion = fields.version || '';
         environment.char_version = fields.version || '';
+    }

     return result;
+}
 +/**
 + * Parses an examples string.
 + * @param {string} examplesStr
 + * @returns {string[]} Examples array with block heading
 + */
 +export function parseMesExamples(examplesStr, isInstruct) {
 +    if (!examplesStr || examplesStr.length === 0 || examplesStr === '<START>') {
 +        return [];
 +    }
++
 +    if (!examplesStr.startsWith('<START>')) {
 +        examplesStr = '<START>\n' + examplesStr.trim();
 +    }
++
 +    const exampleSeparator = power_user.context.example_separator ? `${substituteParams(power_user.context.example_separator)}\n` : '';
 +    const blockHeading = main_api === 'openai' ? '<START>\n' : (exampleSeparator || (isInstruct ? '<START>\n' : ''));
 +    const splitExamples = examplesStr.split(/<START>/gi).slice(1).map(block => `${blockHeading}${block.trim()}\n`);
++
 +    return splitExamples;
 +}
++
 export function isStreamingEnabled() {
     const noStreamSources = [chat_completion_sources.SCALE];
     return (

                     'send_date': chat[messageId]['send_date'],
                     'gen_started': chat[messageId]['gen_started'],
                     'gen_finished': chat[messageId]['gen_finished'],
                     'extra': JSON.parse(JSON.stringify(chat[messageId]['extra'])),
                 };
+            }

         force_name2 = false;
+    }
 -    // TODO (kingbri): Migrate to a utility function
 +    let mesExamplesArray = parseMesExamples(mesExamples, isInstruct);
 -    /**
 -     * Parses an examples string.
 -     * @param {string} examplesStr
 -     * @returns {string[]} Examples array with block heading
 -     */
 -    function parseMesExamples(examplesStr) {
 -        if (!examplesStr || examplesStr.length === 0 || examplesStr === '<START>') {
 -            return [];
 -        }
+-
 -        if (!examplesStr.startsWith('<START>')) {
 -            examplesStr = '<START>\n' + examplesStr.trim();
 -        }
+-
 -        const exampleSeparator = power_user.context.example_separator ? `${substituteParams(power_user.context.example_separator)}\n` : '';
 -        const blockHeading = main_api === 'openai' ? '<START>\n' : (exampleSeparator || (isInstruct ? '<START>\n' : ''));
 -        const splitExamples = examplesStr.split(/<START>/gi).slice(1).map(block => `${blockHeading}${block.trim()}\n`);
+-
 -        return splitExamples;
 -    }
+-
 -    let mesExamplesArray = parseMesExamples(mesExamples);
     //////////////////////////////////
     // Extension added strings

+        }
         const formattedExample = baseChatReplace(exampleMessage, name1, name2);
         const cleanedExample = parseMesExamples(formattedExample, isInstruct);
         // Insert depending on before or after position
         if (example.position === wi_anchor_position.before) {

public/scripts/templates/macros.html+1 -1 Viewed

     <li><tt>&lcub;&lcub;scenario&rcub;&rcub;</tt> – <span data-i18n="help_macros_11">the Character's Scenario</span></li>
     <li><tt>&lcub;&lcub;persona&rcub;&rcub;</tt> – <span data-i18n="help_macros_12">your current Persona Description</span></li>
     <li><tt>&lcub;&lcub;mesExamples&rcub;&rcub;</tt> – <span data-i18n="help_macros_13">the Character's Dialogue Examples</span></li>
     <li><tt>&lcub;&lcub;mesExamplesRaw&rcub;&rcub;</tt> – <span data-i18n="help_macros_14">unformatted Dialogue Examples </span><b data-i18n="(only for Story String)">(only for Story String)</b></li>
     <li><tt>&lcub;&lcub;summary&rcub;&rcub;</tt> – <span data-i18n="help_macros_summary">the latest chat summary generated by the "Summarize" extension (if available).</span></li>
     <li><tt>&lcub;&lcub;user&rcub;&rcub;</tt> – <span data-i18n="help_macros_15">your current Persona username</span></li>
     <li><tt>&lcub;&lcub;char&rcub;&rcub;</tt> – <span data-i18n="help_macros_16">the Character's name</span></li>