DRY

48c3e81f429dbd3094b8c37c10029c9510f869d2

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

public/scripts/instruct-mode.js+7 -14 Viewed

  * @returns {import('./macros.js').Macro[]} Macro objects.
  */
 export function getInstructMacros(env) {
-    const syspromptMacros = {
-        'systemPrompt': (power_user.prefer_character_prompt && env.charPrompt ? env.charPrompt : power_user.sysprompt.content),
-        'defaultSystemPrompt|instructSystem|instructSystemPrompt': power_user.sysprompt.content,
-    };
     const instructMacros = {
+        // Instruct template macros
         'instructSystemPromptPrefix': power_user.instruct.system_sequence_prefix,
         'instructSystemPromptSuffix': power_user.instruct.system_sequence_suffix,
         'instructInput|instructUserPrefix': power_user.instruct.input_sequence,

         'instructSystemInstructionPrefix': power_user.instruct.last_system_sequence,
         'instructFirstInput|instructFirstUserPrefix': power_user.instruct.first_input_sequence || power_user.instruct.input_sequence,
         'instructLastInput|instructLastUserPrefix': power_user.instruct.last_input_sequence || power_user.instruct.input_sequence,
+        // System prompt macros
+        'systemPrompt': (power_user.prefer_character_prompt && env.charPrompt ? env.charPrompt : power_user.sysprompt.content),
+        'defaultSystemPrompt|instructSystem|instructSystemPrompt': power_user.sysprompt.content,
+        // Context template macros
+        'chatSeparator': power_user.context.example_separator,
+        'chatStart': power_user.context.chat_start,
     };
     const macros = [];

         macros.push({ regex, replace });
+    }
-    for (const [placeholder, value] of Object.entries(syspromptMacros)) {
-        const regex = new RegExp(`{{(${placeholder})}}`, 'gi');
-        const replace = () => power_user.sysprompt.enabled ? value : '';
-        macros.push({ regex, replace });
-    }
-    macros.push({ regex: /{{exampleSeparator}}/gi, replace: () => power_user.context.example_separator });
-    macros.push({ regex: /{{chatStart}}/gi, replace: () => power_user.context.chat_start });
     return macros;
+}