From 8a4cf86b6560106026f28ba6ba0f8ca8d07ba306 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 15 Feb 2025 00:28:38 +0200
Subject: [PATCH] Integrate killswitch into the block

---
 public/css/toggle-dependent.css    |  4 ++++
 public/index.html                  | 34 +++++++++++++++++-------------
 public/scripts/preset-manager.js   |  1 +
 public/scripts/textgen-settings.js |  9 ++++----
 public/style.css                   |  2 +-
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/public/css/toggle-dependent.css b/public/css/toggle-dependent.css
index 967aa55e6..59c2e9a28 100644
--- a/public/css/toggle-dependent.css
+++ b/public/css/toggle-dependent.css
@@ -493,3 +493,7 @@ label[for="trim_spaces"]:not(:has(input:checked)) small {
 #mistralai_other_models:empty {
     display: none;
 }
+
+#banned_tokens_block_ooba:not(:has(#send_banned_tokens_textgenerationwebui:checked)) #banned_tokens_controls_ooba {
+    filter: brightness(0.5);
+}
diff --git a/public/index.html b/public/index.html
index d1a6db538..54a9c143f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1621,30 +1621,34 @@
                                     </div>
                                     <div data-tg-type-mode="except" data-tg-type="generic" id="banned_tokens_block_ooba" class="wide100p">
                                         <hr class="width100p">
-                                        <h4 class="range-block-title justifyCenter">
+                                        <div class="range-block-title title_restorable">
+                                            <div>
+                                                <strong data-i18n="Banned Tokens">Banned Tokens/Strings</strong>
+                                                <div class="margin5 fa-solid fa-circle-info opacity50p " data-i18n="[title]LLaMA / Mistral / Yi models only" title="Enter sequences you don't want to appear in the output.&#13;Unquoted text will be tokenized in the back end and banned as tokens.&#13;[token ids] will be banned as-is.&#13;Most tokens have a leading space. Use token counter (with the correct tokenizer selected first!) if you are unsure.&#13;Enclose text in double quotes to ban the entire string as a set.&#13;Quoted Strings and [Token ids] must be on their own line."></div>
+                                            </div>
                                             <label id="send_banned_tokens_label" for="send_banned_tokens_textgenerationwebui" class="checkbox_label">
                                                 <input id="send_banned_tokens_textgenerationwebui" type="checkbox" style="display:none;" />
                                                 <small><i class="fa-solid fa-power-off menu_button margin0"></i></small>
                                             </label>
-                                            <span data-i18n="Banned Tokens">Banned Tokens/Strings</span>
-                                            <div class="margin5 fa-solid fa-circle-info opacity50p " data-i18n="[title]LLaMA / Mistral / Yi models only" title="Enter sequences you don't want to appear in the output.&#13;Unquoted text will be tokenized in the back end and banned as tokens.&#13;[token ids] will be banned as-is.&#13;Most tokens have a leading space. Use token counter (with the correct tokenizer selected first!) if you are unsure.&#13;Enclose text in double quotes to ban the entire string as a set.&#13;Quoted Strings and [Token ids] must be on their own line."></div>
-                                        </h4>
-                                        <div class="textAlignCenter">
-                                            <small data-i18n="Global list">Global list</small>
                                         </div>
-                                        <div class="wide100p marginBot10">
-                                            <textarea id="global_banned_tokens_textgenerationwebui" class="text_pole textarea_compact" name="global_banned_tokens_textgenerationwebui" rows="3" data-i18n="[placeholder]Example: some text [42, 69, 1337]" placeholder='some text as tokens&#10;[420, 69, 1337]&#10;"Some verbatim string"'></textarea>
-                                        </div>
-                                        <div class="textAlignCenter">
-                                            <small data-i18n="Preset-specific list">Preset-specific list</small>
-                                        </div>
-                                        <div class="wide100p">
-                                            <textarea id="banned_tokens_textgenerationwebui" class="text_pole textarea_compact" name="banned_tokens_textgenerationwebui" rows="3" data-i18n="[placeholder]Example: some text [42, 69, 1337]" placeholder='some text as tokens&#10;[420, 69, 1337]&#10;"Some verbatim string"'></textarea>
+                                        <div id="banned_tokens_controls_ooba">
+                                            <div class="textAlignCenter">
+                                                <small data-i18n="Global list">Global list</small>
+                                            </div>
+                                            <div class="wide100p marginBot10">
+                                                <textarea id="global_banned_tokens_textgenerationwebui" class="text_pole textarea_compact" name="global_banned_tokens_textgenerationwebui" rows="3" data-i18n="[placeholder]Example: some text [42, 69, 1337]" placeholder='some text as tokens&#10;[420, 69, 1337]&#10;"Some verbatim string"'></textarea>
+                                            </div>
+                                            <div class="textAlignCenter">
+                                                <small data-i18n="Preset-specific list">Preset-specific list</small>
+                                            </div>
+                                            <div class="wide100p">
+                                                <textarea id="banned_tokens_textgenerationwebui" class="text_pole textarea_compact" name="banned_tokens_textgenerationwebui" rows="3" data-i18n="[placeholder]Example: some text [42, 69, 1337]" placeholder='some text as tokens&#10;[420, 69, 1337]&#10;"Some verbatim string"'></textarea>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="range-block wide100p">
                                         <div id="logit_bias_textgenerationwebui" class="range-block-title title_restorable">
-                                            <span data-i18n="Logit Bias">Logit Bias</span>
+                                            <strong data-i18n="Logit Bias">Logit Bias</strong>
                                             <div id="textgen_logit_bias_new_entry" class="menu_button menu_button_icon">
                                                 <i class="fa-xs fa-solid fa-plus"></i>
                                                 <small data-i18n="Add">Add</small>
diff --git a/public/scripts/preset-manager.js b/public/scripts/preset-manager.js
index 4a21efa9e..14991900f 100644
--- a/public/scripts/preset-manager.js
+++ b/public/scripts/preset-manager.js
@@ -588,6 +588,7 @@ class PresetManager {
             'generic_model',
             'include_reasoning',
             'global_banned_tokens',
+            'send_banned_tokens',
         ];
         const settings = Object.assign({}, getSettingsByApiId(this.apiId));
 
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 027fca9fb..828a9b03e 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -399,7 +399,7 @@ function getTokenizerForTokenIds() {
  * @returns {TokenBanResult} String with comma-separated banned token IDs
  */
 function getCustomTokenBans() {
-    if (!settings.banned_tokens && !textgenerationwebui_banned_in_macros.length) {
+    if (!settings.send_banned_tokens || (!settings.banned_tokens && !textgenerationwebui_banned_in_macros.length)) {
         return {
             banned_tokens: '',
             banned_strings: [],
@@ -616,9 +616,8 @@ function sortAphroditeItemsByOrder(orderArray) {
 }
 
 jQuery(function () {
-
-    $('#bannedStringsKillSwitch_textgenerationwebui').on('change', function () {
-        const checked = $(this).prop('checked');
+    $('#send_banned_tokens_textgenerationwebui').on('change', function () {
+        const checked = !!$(this).prop('checked');
         if (checked) {
             enableBannedStringsKillSwitch();
         } else {
@@ -966,7 +965,7 @@ function setSettingByName(setting, value, trigger) {
         $(`#${setting}_textgenerationwebui`).prop('checked', val);
 
         if ('send_banned_tokens' === setting) {
-            $('#send_banned_tokens_textgenerationwebui').trigger('change');
+            $(`#${setting}_textgenerationwebui`).trigger('change');
         }
     }
     else if (isText) {
diff --git a/public/style.css b/public/style.css
index 1aac652f2..5ae78dc1c 100644
--- a/public/style.css
+++ b/public/style.css
@@ -2876,7 +2876,7 @@ select option:not(:checked) {
 
 #instruct_enabled_label .menu_button:not(.toggleEnabled),
 #sysprompt_enabled_label .menu_button:not(.toggleEnabled),
-#bannedStringsKillSwitch_label .menu_button:not(.toggleEnabled) {
+#send_banned_tokens_label .menu_button:not(.toggleEnabled) {
     color: Red;
 }