Add instruct last system sequence

default/content/presets/instruct/Adventure.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "Adventure"
-}
+}

default/content/presets/instruct/Alpaca-Roleplay.json

@@ -19,5 +19,6 @@
     "system_suffix": "\n\n",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "Alpaca-Roleplay"
 }

default/content/presets/instruct/Alpaca-Single-Turn.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "Alpaca-Single-Turn"
-}
+}

default/content/presets/instruct/Alpaca.json

@@ -19,5 +19,6 @@
     "system_suffix": "\n\n",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "Alpaca"
 }

default/content/presets/instruct/ChatML.json

@@ -19,5 +19,6 @@
     "system_suffix": "<|im_end|>\n",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "ChatML"
 }

default/content/presets/instruct/DreamGen Role-Play V1.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "DreamGen Role-Play V1"
-}
+}

default/content/presets/instruct/Koala.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Koala"
-}
+}

default/content/presets/instruct/Libra-32B.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "Libra-32B"
-}
+}

default/content/presets/instruct/Lightning 1.1.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Lightning 1.1"
-}
+}

default/content/presets/instruct/Llama 2 Chat.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "Let's get started. Please respond based on the information and instructions provided above.",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Llama 2 Chat"
 }

default/content/presets/instruct/Metharme.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Metharme"
-}
+}

default/content/presets/instruct/Mistral.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "Let's get started. Please respond based on the information and instructions provided above.",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Mistral"
 }

default/content/presets/instruct/OpenOrca-OpenChat.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "OpenOrca-OpenChat"
-}
+}

default/content/presets/instruct/Pygmalion.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Pygmalion"
-}
+}

default/content/presets/instruct/Story.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "Story"
-}
+}

default/content/presets/instruct/Synthia.json

@@ -19,5 +19,6 @@
     "system_suffix": "\n",
     "user_alignment_message": "Let's get started. Please respond based on the information and instructions provided above.",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "Synthia"
 }

default/content/presets/instruct/Vicuna 1.0.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Vicuna 1.0"
-}
+}

default/content/presets/instruct/Vicuna 1.1.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "Vicuna 1.1"
-}
+}

default/content/presets/instruct/WizardLM-13B.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
+    "last_system_sequence": "",
     "name": "WizardLM-13B"
-}
+}

default/content/presets/instruct/WizardLM.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "WizardLM"
-}
+}

default/content/presets/instruct/simple-proxy-for-tavern.json

@@ -19,5 +19,6 @@
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": false,
+    "last_system_sequence": "",
     "name": "simple-proxy-for-tavern"
-}
+}

public/index.html

@@ -3034,12 +3034,12 @@
                                         </div>
                                     </div>
                                     <div class="flex-container">
-                                        <div class="flex1" title="Will be inserted at the start of the chat history if it doesn't start with a User message.">
+                                        <div class="flex1" title="Will be inserted as a last prompt line when using system/neutral generation.">
-                                            <label for="instruct_user_alignment_message">
+                                            <label for="instruct_last_system_sequence">
-                                                <small data-i18n="User Filler Message">User Filler Message</small>
+                                                <small data-i18n="System Instruction Prefix">System Instruction Prefix</small>
                                             </label>
                                             <div>
-                                                <textarea id="instruct_user_alignment_message" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
+                                                <textarea id="instruct_last_system_sequence" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
                                             </div>
                                         </div>
                                         <div class="flex1" title="If a stop sequence is generated, everything past it will be removed from the output (inclusive).">
@@ -3051,6 +3051,16 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="flex-container">
+                                        <div class="flex1" title="Will be inserted at the start of the chat history if it doesn't start with a User message.">
+                                            <label for="instruct_user_alignment_message">
+                                                <small data-i18n="User Filler Message">User Filler Message</small>
+                                            </label>
+                                            <div>
+                                                <textarea id="instruct_user_alignment_message" class="text_pole textarea_compact autoSetHeight" maxlength="2000" placeholder="&mdash;" rows="1"></textarea>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>

public/scripts/instruct-mode.js

@@ -26,6 +26,7 @@ const controls = [
     { id: 'instruct_output_suffix', property: 'output_suffix', isCheckbox: false },
     { id: 'instruct_system_sequence', property: 'system_sequence', isCheckbox: false },
     { id: 'instruct_system_suffix', property: 'system_suffix', isCheckbox: false },
+    { id: 'instruct_last_system_sequence', property: 'last_system_sequence', isCheckbox: false },
     { id: 'instruct_user_alignment_message', property: 'user_alignment_message', isCheckbox: false },
     { id: 'instruct_stop_sequence', property: 'stop_sequence', isCheckbox: false },
     { id: 'instruct_names', property: 'names', isCheckbox: true },
@@ -56,6 +57,7 @@ function migrateInstructModeSettings(settings) {
         system_sequence: '',
         system_suffix: '',
         user_alignment_message: '',
+        last_system_sequence: '',
         names_force_groups: true,
         skip_examples: false,
         system_same_as_user: false,
@@ -249,8 +251,9 @@ export function getInstructStoppingSequences() {
         const first_output_sequence = power_user.instruct.first_output_sequence?.replace(/{{name}}/gi, name2) || '';
         const last_output_sequence = power_user.instruct.last_output_sequence?.replace(/{{name}}/gi, name2) || '';
         const system_sequence = power_user.instruct.system_sequence?.replace(/{{name}}/gi, 'System') || '';
+        const last_system_sequence = power_user.instruct.last_system_sequence?.replace(/{{name}}/gi, 'System') || '';
 
-        const combined_sequence = `${stop_sequence}\n${input_sequence}\n${output_sequence}\n${first_output_sequence}\n${last_output_sequence}\n${system_sequence}`;
+        const combined_sequence = `${stop_sequence}\n${input_sequence}\n${output_sequence}\n${first_output_sequence}\n${last_output_sequence}\n${system_sequence}\n${last_system_sequence}`;
 
         combined_sequence.split('\n').filter((line, index, self) => self.indexOf(line) === index).forEach(addInstructSequence);
     }
@@ -452,9 +455,10 @@ export function formatInstructModePrompt(name, isImpersonate, promptBias, name1,
             return power_user.instruct.input_sequence;
         }
 
-        // Neutral / system prompt
+        // Neutral / system / quiet prompt
+        // Use a special quiet instruct sequence if defined, or assistant's output sequence otherwise
         if (isQuiet && !isQuietToLoud) {
-            return power_user.instruct.output_sequence;
+            return power_user.instruct.last_system_sequence || power_user.instruct.output_sequence;
         }
 
         // Quiet in-character prompt
@@ -517,20 +521,28 @@ export function replaceInstructMacros(input) {
     if (!input) {
         return '';
     }
+    const instructMacros = {
+        'instructSystem|instructSystemPrompt': power_user.instruct.system_prompt,
+        'instructSystemPromptPrefix': power_user.instruct.system_sequence_prefix,
+        'instructSystemPromptSuffix': power_user.instruct.system_sequence_suffix,
+        'instructInput|instructUserPrefix': power_user.instruct.input_sequence,
+        'instructUserSuffix': power_user.instruct.input_suffix,
+        'instructOutput|instructAssistantPrefix': power_user.instruct.output_sequence,
+        'instructSeparator|instructAssistantSuffix': power_user.instruct.output_suffix,
+        'instructSystemPrefix': power_user.instruct.system_sequence,
+        'instructSystemSuffix': power_user.instruct.system_suffix,
+        'instructFirstOutput|instructFirstAssistantPrefix': power_user.instruct.first_output_sequence || power_user.instruct.output_sequence,
+        'instructLastOutput|instructLastAssistantPrefix': power_user.instruct.last_output_sequence || power_user.instruct.output_sequence,
+        'instructStop': power_user.instruct.stop_sequence,
+        'instructUserFiller': power_user.instruct.user_alignment_message,
+        'instructSystemInstructionPrefix': power_user.instruct.last_system_sequence,
+    };
+
+    for (const [placeholder, value] of Object.entries(instructMacros)) {
+        const regex = new RegExp(`{{(${placeholder})}}`, 'gi');
+        input = input.replace(regex, power_user.instruct.enabled ? value : '');
+    }
 
-    input = input.replace(/{{(instructSystem|instructSystemPrompt)}}/gi, power_user.instruct.enabled ? power_user.instruct.system_prompt : '');
-    input = input.replace(/{{instructSystemPromptPrefix}}/gi, power_user.instruct.enabled ? power_user.instruct.system_sequence_prefix : '');
-    input = input.replace(/{{instructSystemPromptSuffix}}/gi, power_user.instruct.enabled ? power_user.instruct.system_sequence_suffix : '');
-    input = input.replace(/{{(instructInput|instructUserPrefix)}}/gi, power_user.instruct.enabled ? power_user.instruct.input_sequence : '');
-    input = input.replace(/{{instructUserSuffix}}/gi, power_user.instruct.enabled ? power_user.instruct.input_suffix : '');
-    input = input.replace(/{{(instructOutput|instructAssistantPrefix)}}/gi, power_user.instruct.enabled ? power_user.instruct.output_sequence : '');
-    input = input.replace(/{{(instructSeparator|instructAssistantSuffix)}}/gi, power_user.instruct.enabled ? power_user.instruct.output_suffix : '');
-    input = input.replace(/{{instructSystemPrefix}}/gi, power_user.instruct.enabled ? power_user.instruct.system_sequence : '');
-    input = input.replace(/{{instructSystemSuffix}}/gi, power_user.instruct.enabled ? power_user.instruct.system_suffix : '');
-    input = input.replace(/{{(instructFirstOutput|instructFirstAssistantPrefix)}}/gi, power_user.instruct.enabled ? (power_user.instruct.first_output_sequence || power_user.instruct.output_sequence) : '');
-    input = input.replace(/{{(instructLastOutput|instructLastAssistantPrefix)}}/gi, power_user.instruct.enabled ? (power_user.instruct.last_output_sequence || power_user.instruct.output_sequence) : '');
-    input = input.replace(/{{instructStop}}/gi, power_user.instruct.enabled ? power_user.instruct.stop_sequence : '');
-    input = input.replace(/{{instructUserFiller}}/gi, power_user.instruct.enabled ? power_user.instruct.user_alignment_message : '');
     input = input.replace(/{{exampleSeparator}}/gi, power_user.context.example_separator);
     input = input.replace(/{{chatStart}}/gi, power_user.context.chat_start);
 

public/scripts/power-user.js

@@ -204,6 +204,7 @@ let power_user = {
         output_suffix: '',
         system_sequence: '',
         system_suffix: '',
+        last_system_sequence: '',
         first_output_sequence: '',
         last_output_sequence: '',
         system_sequence_prefix: '',

public/scripts/templates/macros.html

@@ -60,6 +60,7 @@
     <li><tt>&lcub;&lcub;instructLastAssistantPrefix&rcub;&rcub;</tt> – instruct assistant last output sequence</li>
     <li><tt>&lcub;&lcub;instructSystemPrefix&rcub;&rcub;</tt> – instruct system message prefix sequence</li>
     <li><tt>&lcub;&lcub;instructSystemSuffix&rcub;&rcub;</tt> – instruct system message suffix sequence</li>
+    <li><tt>&lcub;&lcub;instructSystemInstructionPrefix&rcub;&rcub;</tt> – instruct system instruction prefix</li>
     <li><tt>&lcub;&lcub;instructUserFiller&rcub;&rcub;</tt> – instruct first user message filler</li>
     <li><tt>&lcub;&lcub;instructStop&rcub;&rcub;</tt> – instruct stop sequence</li>
 </ul>