From 9df4c51b07614d51f48651d8eace2989d0b0a5dd Mon Sep 17 00:00:00 2001
From: Stefan Daniel Schwarz <github.com@wolfram.ravenwolf.de>
Date: Mon, 21 Aug 2023 22:32:58 +0200
Subject: [PATCH] Instruct Mode improvements

---
 default/settings.json                         | 17 ++++---
 public/context/Roleplay.json                  |  6 ---
 public/i18n.json                              |  8 ++--
 public/index.html                             | 44 ++++++++++---------
 .../{Roleplay.json => ! Roleplay.json}        |  2 +-
 5 files changed, 38 insertions(+), 39 deletions(-)
 delete mode 100644 public/context/Roleplay.json
 rename public/instruct/{Roleplay.json => ! Roleplay.json} (96%)

diff --git a/default/settings.json b/default/settings.json
index ad88f1088..5656445aa 100644
--- a/default/settings.json
+++ b/default/settings.json
@@ -124,16 +124,19 @@
         "trim_spaces": true,
         "instruct": {
             "enabled": false,
-            "wrap": true,
-            "names": false,
-            "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}. Write 1 reply only.",
+            "preset": "🧙 Roleplay",
+            "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.\n\nAvoid repetition, don't loop. Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.\n",
+            "input_sequence": "\n### Instruction:",
+            "output_sequence": "\n### Response:",
+            "last_output_sequence": "\n### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):",
             "system_sequence": "",
             "stop_sequence": "",
-            "input_sequence": "### Instruction:",
-            "output_sequence": "### Response:",
-            "preset": "Alpaca",
             "separator_sequence": "",
-            "macro": true
+            "wrap": true,
+            "macro": true,
+            "names": true,
+            "names_force_groups": true,
+            "activation_regex": ""
         },
         "personas": {},
         "default_persona": null,
diff --git a/public/context/Roleplay.json b/public/context/Roleplay.json
deleted file mode 100644
index 89c2ea94f..000000000
--- a/public/context/Roleplay.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "name": "Roleplay",
-    "story_string": "{{#if system}}{{system}}\n{{/if}}### Input:\n{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}",
-    "chat_start": "### New Roleplay:",
-    "example_separator": "### New Roleplay:"
-}
diff --git a/public/i18n.json b/public/i18n.json
index 421b92f86..1df6d2434 100644
--- a/public/i18n.json
+++ b/public/i18n.json
@@ -133,7 +133,7 @@
         "Disable example chats formatting": "禁用聊天格式示例",
         "Disable chat start formatting": "禁用聊天开始格式",
         "Custom Chat Separator": "自定义聊天分隔符",
-        "Instruct mode": "指示模式",
+        "Instruct Mode": "指示模式",
         "Enabled": "启用",
         "Wrap Sequences with Newline": "用换行符换行序列",
         "Include Names": "包括名称",
@@ -686,7 +686,7 @@
         "Disable example chats formatting": "チャットの例のフォーマットを無効にする",
         "Disable chat start formatting": "チャット開始フォーマットを無効にする",
         "Custom Chat Separator": "カスタムチャットセパレーター",
-        "Instruct mode": "インストラクトモード",
+        "Instruct Mode": "インストラクトモード",
         "Enabled": "有効",
         "Wrap Sequences with Newline": "シーケンスを改行でラップする",
         "Include Names": "名前を含める",
@@ -1241,7 +1241,7 @@
         "Disable example chats formatting": "채팅 예시 자동서식",
         "Disable chat start formatting": "인사말 자동서식",
         "Custom Chat Separator": "채팅 분리자 바꾸기",
-        "Instruct mode": "지시 모드",
+        "Instruct Mode": "지시 모드",
         "Enabled": "활성화",
         "Wrap Sequences with Newline": "배열 명령 양 끝에 줄바꿈 삽입",
         "Include Names": "이름 포함",
@@ -1800,7 +1800,7 @@
         "Disable example chats formatting": "Отключить форматирование примеров чата",
         "Disable chat start formatting": "Отключить форматирование начала чата",
         "Custom Chat Separator": "Пользовательское разделение чата",
-        "Instruct mode": "Режим Instruct",
+        "Instruct Mode": "Режим Instruct",
         "Enabled": "Включен",
         "Wrap Sequences with Newline": "Отделять последовательности красной строкой",
         "Include Names": "Показывать имена",
diff --git a/public/index.html b/public/index.html
index 3d1cbc751..7e531c48d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2098,7 +2098,7 @@
                                             <small data-i18n="Example Separator">Example Separator</small>
                                         </label>
                                         <div>
-                                            <textarea id="context_example_separator" class="text_pole textarea_compact" maxlength="500" rows="1"></textarea>
+                                            <textarea id="context_example_separator" class="text_pole textarea_compact" maxlength="500" rows="2"></textarea>
                                         </div>
                                     </div>
                                     <div class="flex1">
@@ -2106,14 +2106,14 @@
                                             <small data-i18n="Chat Start">Chat Start</small>
                                         </label>
                                         <div>
-                                            <textarea id="context_chat_start" class="text_pole textarea_compact" maxlength="500" rows="1"></textarea>
+                                            <textarea id="context_chat_start" class="text_pole textarea_compact" maxlength="500" rows="2"></textarea>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <div>
-                            <h4 data-i18n="Instruct mode">Instruct mode
+                            <h4 data-i18n="Instruct Mode">Instruct Mode
                                 <a href="https://docs.sillytavern.app/usage/core-concepts/instructmode/" class="notes-link" target="_blank">
                                     <span class="note-link-span">?</span>
                                 </a>
@@ -2123,22 +2123,7 @@
                                     <input id="instruct_enabled" type="checkbox" />
                                     <span data-i18n="Enabled">Enabled</span>
                                 </label>
-                                <label for="instruct_wrap" class="checkbox_label">
-                                    <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 in Sequences">Replace Macro in Sequences</span>
-                                </label>
-                                <label for="instruct_names" class="checkbox_label">
-                                    <input id="instruct_names" type="checkbox" />
-                                    <span data-i18n="Include Names">Include Names</span>
-                                </label>
-                                <label for="instruct_names_force_groups" class="checkbox_label indent20p">
-                                    <input id="instruct_names_force_groups" type="checkbox" />
-                                    <span data-i18n="Force for Groups and Personas">Force for Groups and Personas</span>
-                                </label>
+                            </div>
                             </div>
                             <label for="instruct_presets">
                                 <span data-i18n="Presets">Presets</span>
@@ -2161,6 +2146,23 @@
                             <div>
                                 <textarea id="instruct_activation_regex" class="text_pole textarea_compact" maxlength="5000" rows="1"></textarea>
                             </div>
+                            <div>
+                                <label for="instruct_wrap" class="checkbox_label">
+                                    <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 in Sequences">Replace Macro in Sequences</span>
+                                </label>
+                                <label for="instruct_names" class="checkbox_label">
+                                    <input id="instruct_names" type="checkbox" />
+                                    <span data-i18n="Include Names">Include Names</span>
+                                </label>
+                                <label for="instruct_names_force_groups" class="checkbox_label indent20p">
+                                    <input id="instruct_names_force_groups" type="checkbox" />
+                                    <span data-i18n="Force for Groups and Personas">Force for Groups and Personas</span>
+                                </label>
                             <label>
                                 <small data-i18n="System Prompt">System Prompt</small>
                             </label>
@@ -3399,8 +3401,8 @@
 
         <div class="inline-drawer">
             <div class="inline-drawer-toggle inline-drawer-header">
-                <h4 data-i18n="Prompt Overrides (For OpenAI/Claude/Scale APIs, Window/OpenRouter, and Instruct mode)">
-                    Prompt Overrides <small>(For OpenAI/Claude/Scale APIs, Window/OpenRouter, and Instruct mode)</small>
+                <h4 data-i18n="Prompt Overrides (For OpenAI/Claude/Scale APIs, Window/OpenRouter, and Instruct Mode)">
+                    Prompt Overrides <small>(For OpenAI/Claude/Scale APIs, Window/OpenRouter, and Instruct Mode)</small>
                 </h4>
 
 
diff --git a/public/instruct/Roleplay.json b/public/instruct/! Roleplay.json
similarity index 96%
rename from public/instruct/Roleplay.json
rename to public/instruct/! Roleplay.json
index c63ec13af..5852e40ab 100644
--- a/public/instruct/Roleplay.json
+++ b/public/instruct/! Roleplay.json	
@@ -1,5 +1,5 @@
 {
-    "name": "Roleplay",
+    "name": "🧙 Roleplay",
     "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.\n\nAvoid repetition, don't loop. Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.\n",
     "input_sequence": "\n### Instruction:",
     "output_sequence": "\n### Response:",