From 8d6e6de200464f4ba708686584c9a4ce87d6ca55 Mon Sep 17 00:00:00 2001
From: Cohee <titan0599@gmail.com>
Date: Wed, 21 Jun 2023 14:54:36 +0300
Subject: [PATCH] [Feature Request] Make "Instruct i/o sequence macro
 replacing" optional SillyTavern/SillyTavern#546

---
 public/index.html            |  4 ++++
 public/scripts/power-user.js | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/public/index.html b/public/index.html
index de97f1706..c9cb47e35 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1654,6 +1654,10 @@
                                     <input id="instruct_wrap" type="checkbox" />
                                     <span data-i18n="Wrap Sequences with Newline">Wrap Sequences with Newline</span>
                                 </label>
+                                <label for="instruct_macro" class="checkbox_label">
+                                    <input id="instruct_macro" type="checkbox" />
+                                    <span data-i18n="Replace Macro is Sequences">Replace Macro is Sequences</span>
+                                </label>
                                 <label for="instruct_names" class="checkbox_label">
                                     <input id="instruct_names" type="checkbox" />
                                     <span data-i18n="Include Names">Include Names</span>
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index d5fbff84e..c8f59c340 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -12,7 +12,6 @@ import {
     eventSource,
     event_types,
     getCurrentChatId,
-    is_send_press,
 } from "../script.js";
 import { favsToHotswap } from "./RossAscends-mods.js";
 import {
@@ -97,7 +96,7 @@ let power_user = {
     avatar_style: avatar_styles.ROUND,
     chat_display: chat_styles.DEFAULT,
     sheld_width: sheld_width.DEFAULT,
-	never_resize_avatars: false,
+    never_resize_avatars: false,
     play_message_sound: false,
     play_sound_unfocused: true,
     auto_save_msg_edits: false,
@@ -151,6 +150,7 @@ let power_user = {
         output_sequence: '### Response:',
         preset: 'Alpaca',
         separator_sequence: '',
+        macro: false,
     },
 
     personas: {},
@@ -649,6 +649,7 @@ function loadInstructMode() {
         { id: "instruct_output_sequence", property: "output_sequence", isCheckbox: false },
         { id: "instruct_stop_sequence", property: "stop_sequence", isCheckbox: false },
         { id: "instruct_names", property: "names", isCheckbox: true },
+        { id: "instruct_macro", property: "macro", isCheckbox: true },
     ];
 
     controls.forEach(control => {
@@ -701,11 +702,11 @@ function loadInstructMode() {
 
 export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvatar, name1, name2) {
     const includeNames = isNarrator ? false : (power_user.instruct.names || !!selected_group || !!forceAvatar);
-    const sequence = substituteParams(
-        (isUser || isNarrator) ? power_user.instruct.input_sequence : power_user.instruct.output_sequence,
-        name1,
-        name2
-    );
+    let sequence = (isUser || isNarrator) ? power_user.instruct.input_sequence : power_user.instruct.output_sequence;
+
+    if (power_user.instruct.macro) {
+        sequence = substituteParams(sequence, name1, name2);
+    }
 
     const separator = power_user.instruct.wrap ? '\n' : '';
     const separatorSequence = power_user.instruct.separator_sequence && !isUser
@@ -729,11 +730,11 @@ export function formatInstructStoryString(story, systemPrompt) {
 
 export function formatInstructModePrompt(name, isImpersonate, promptBias, name1, name2) {
     const includeNames = power_user.instruct.names || !!selected_group;
-    const sequence = substituteParams(
-        isImpersonate ? power_user.instruct.input_sequence : power_user.instruct.output_sequence,
-        name1,
-        name2
-    );
+    let sequence = isImpersonate ? power_user.instruct.input_sequence : power_user.instruct.output_sequence;
+
+    if (power_user.instruct.macro) {
+        sequence = substituteParams(sequence, name1, name2);
+    }
 
     const separator = power_user.instruct.wrap ? '\n' : '';
     let text = includeNames ? (separator + sequence + separator + `${name}:`) : (separator + sequence);