From dc79f678c36082f0efa98ed1f373c5a9a0590caf Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Thu, 23 Mar 2023 02:08:38 +0900
Subject: [PATCH] moved location of some AI config toggles moved various API
 presets into the sliders tab  -so we can see what the presets are doing in
 real time.

---
 public/index.html | 105 +++++++++++++++++++++++++---------------------
 public/script.js  |   5 +++
 2 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/public/index.html b/public/index.html
index 1564d77c6..00c1febd7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -107,16 +107,6 @@
                             <div id="online_status_text2">Not connected</div>
                         </div>
                     </form>
-                    <div id="kobold_api-presets">
-                        <h3>Kobold Presets
-                            <a href="/notes/4" class="notes-link" target="_blank">
-                                <span class="note-link-span">?</span>
-                            </a>
-                        </h3>
-                        <select id="settings_perset">
-                            <option value="gui">GUI KoboldAI Settings</option>
-                        </select>
-                    </div>
                 </div>
                 <div id="novel_api" style="display: none;position: relative;"> <!-- shows the novel settings -->
                     <form action="javascript:void(null);" method="post" enctype="multipart/form-data">
@@ -144,15 +134,7 @@
                         <option value="euterpe-v2">Euterpe</option>
                         <option value="krake-v2">Krake</option>
                     </select>
-                    <h4>
-                        Preset settings
-                        <a href="/notes/7" class="notes-link" target="_blank">
-                            <span class="note-link-span">?</span>
-                        </a>
-                    </h4>
-                    <select id="settings_perset_novel" class="option_select_right_menu">
-                        <option value="gui">Default</option>
-                    </select>
+
                 </div>
                 <div id="textgenerationwebui_api" style="display: none;position: relative;">
                     <div class="oobabooga_logo">
@@ -240,21 +222,13 @@
                 <div id="power-user-options-block">
                     <h3>Power User Options</h3>
                     <div id="power-user-option-checkboxes">
-                        <label class="checkbox_label" for="pin-examples-checkbox"><input id="pin-examples-checkbox" type="checkbox" />
-                            Pin message examples
-                        </label>
                         <label for="auto-connect-checkbox"><input id="auto-connect-checkbox" type="checkbox" />
                             Auto-connect to Last Server
                         </label>
                         <label for="auto-load-chat-checkbox"><input id="auto-load-chat-checkbox" type="checkbox" />
                             Auto-load Last Chat
                         </label>
-                        <label for="collapse-newlines-checkbox"><input id="collapse-newlines-checkbox" type="checkbox" />
-                            Collapse Newlines in Output
-                        </label>
-                        <label for="force-pygmalion-formatting-checkbox"><input id="force-pygmalion-formatting-checkbox" type="checkbox" />
-                            Pygmalion Formatting for All Models
-                        </label>
+
                         <label for="swipes-checkbox"><input id="swipes-checkbox" type="checkbox" />
                             Swipes
                         </label>
@@ -270,6 +244,31 @@
             <div class="drawer-content closedDrawer widthFreeExpand">
                 <div class="flex-container">
                     <div id="ai-settings-flex-col1" class="flexWide50p">
+                        <div id="respective-presets-block">
+                            <div id="kobold_api-presets">
+                                <h3>Kobold Presets
+                                    <a href="/notes/4" class="notes-link" target="_blank">
+                                        <span class="note-link-span">?</span>
+                                    </a>
+                                </h3>
+
+                                <select id="settings_perset">
+                                    <option value="gui">GUI KoboldAI Settings</option>
+                                </select>
+                            </div>
+                            <div id="novel_api-presets">
+                                <h4>
+                                    NovelAI Presets
+                                    <a href="/notes/7" class="notes-link" target="_blank">
+                                        <span class="note-link-span">?</span>
+                                    </a>
+                                </h4>
+                                <select id="settings_perset_novel" class="option_select_right_menu">
+                                    <option value="gui">Default</option>
+                                </select>
+                            </div>
+                        </div>
+                        <hr>
                         <div id="common-gen-settings-block">
                             <div id="pro-settings-block">
                                 <div id="amount_gen_block" class="range-block">
@@ -447,25 +446,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div id="anchors-block">
-                            Anchors Order
-                            <a href="/notes/9" class="notes-link" target="_blank">
-                                <span class="note-link-span">?</span>
-                            </a>
-                            <br>
-                            <select id="anchor_order">
-                                <option value="0">Character then Style</option>
-                                <option value="1">Style then Character</option>
-                            </select>
-                            <div id="anchor_checkbox">
-                                <label for="character_anchor"><input id="character_anchor" type="checkbox" />
-                                    Character Anchor
-                                </label>
-                                <label for="style_anchor"><input id="style_anchor" type="checkbox" />
-                                    Style Anchor
-                                </label>
-                            </div>
-                        </div>
+
                     </div>
                     <div id="ai-settings-flex-col2" class="flexWide50p">
                         <div id="advanced-ai-config-block">
@@ -744,10 +725,40 @@
                     <input id="disable-personality-formatting-checkbox" type="checkbox" />
                     Disable personality formatting
                 </label>
+                <hr>
                 <label class="checkbox_label" for="always-force-name2-checkbox">
                     <input id="always-force-name2-checkbox" type="checkbox" />
                     Always add character's name to prompt
                 </label>
+                <label class="checkbox_label" for="force-pygmalion-formatting-checkbox"><input id="force-pygmalion-formatting-checkbox" type="checkbox" />
+                    Pygmalion Formatting for All Models
+                </label>
+                <label class="checkbox_label" for="pin-examples-checkbox"><input id="pin-examples-checkbox" type="checkbox" />
+                    Keep Example Messages in Prompt
+                </label>
+                <label class="checkbox_label" for="collapse-newlines-checkbox"><input id="collapse-newlines-checkbox" type="checkbox" />
+                    Remove Empty New Lines from Output
+                </label>
+                <hr>
+                <div id="anchors-block">
+                    Anchors Order
+                    <a href="/notes/9" class="notes-link" target="_blank">
+                        <span class="note-link-span">?</span>
+                    </a>
+                    <br>
+                    <select id="anchor_order">
+                        <option value="0">Character then Style</option>
+                        <option value="1">Style then Character</option>
+                    </select>
+                    <div id="anchor_checkbox">
+                        <label for="character_anchor"><input id="character_anchor" type="checkbox" />
+                            Character Anchor
+                        </label>
+                        <label for="style_anchor"><input id="style_anchor" type="checkbox" />
+                            Style Anchor
+                        </label>
+                    </div>
+                </div>
             </div>
         </div>
 
diff --git a/public/script.js b/public/script.js
index 5be90563e..548875ecf 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1819,6 +1819,7 @@ function changeMainAPI() {
         "kobold": {
             apiSettings: $("#kobold_api-settings"),
             apiConnector: $("#kobold_api"),
+            apiPresets: $('#kobold_api-presets'),
             apiRanges: $("#range_block"),
             maxContextElem: $("#max_context_block"),
             amountGenElem: $("#amount_gen_block"),
@@ -1827,6 +1828,7 @@ function changeMainAPI() {
         "textgenerationwebui": {
             apiSettings: $("#textgenerationwebui_api-settings"),
             apiConnector: $("#textgenerationwebui_api"),
+            apiPresets: $('#textgenerationwebui_api-presets'),
             apiRanges: $("#range_block_textgenerationwebui"),
             maxContextElem: $("#max_context_block"),
             amountGenElem: $("#amount_gen_block"),
@@ -1835,6 +1837,7 @@ function changeMainAPI() {
         "novel": {
             apiSettings: $("#novel_api-settings"),
             apiConnector: $("#novel_api"),
+            apiPresets: $('#novel_api-presets'),
             apiRanges: $("#range_block_novel"),
             maxContextElem: $("#max_context_block"),
             amountGenElem: $("#amount_gen_block"),
@@ -1843,6 +1846,7 @@ function changeMainAPI() {
         "openai": {
             apiSettings: $("#openai_settings"),
             apiConnector: $("#openai_api"),
+            apiPresets: $('#openai_api-presets'),
             apiRanges: $("#range_block_openai"),
             maxContextElem: $("#max_context_block"),
             amountGenElem: $("#amount_gen_block"),
@@ -1859,6 +1863,7 @@ function changeMainAPI() {
         apiObj.apiSettings.css("display", isCurrentApi ? "block" : "none");
         apiObj.apiConnector.css("display", isCurrentApi ? "block" : "none");
         apiObj.apiRanges.css("display", isCurrentApi ? "block" : "none");
+        apiObj.apiPresets.css("display", isCurrentApi ? "block" : "none");
 
         if (isCurrentApi && apiName === "kobold") {
             console.log("enabling SP for kobold");