Integrate killswitch into the block

8a4cf86b6560106026f28ba6ba0f8ca8d07ba306

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: a2a15b9978090925c9f52843cac3e77d26b8eca4

public/css/toggle-dependent.css+4 -0 Viewed

 #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);
 +}

public/index.html+9 -5 Viewed

                                     </div>
                                     <div data-tg-type-mode="except" data-tg-type="generic" id="banned_tokens_block_ooba" class="wide100p">
                                         <hr class="width100p">
                                         <h4div class="range-block-title justifyCentertitle_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>
 -                                            <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 id="banned_tokens_controls_ooba">
 -                                        </h4>
                                             <div class="textAlignCenter">
                                                 <small data-i18n="Global list">Global list</small>
                                             </div>

                                                 <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">
                                             <spanstrong data-i18n="Logit Bias">Logit Bias</spanstrong>
                                             <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>

public/scripts/preset-manager.js+1 -0 Viewed

             'generic_model',
             'include_reasoning',
             'global_banned_tokens',
 +            'send_banned_tokens',
         ];
         const settings = Object.assign({}, getSettingsByApiId(this.apiId));

public/scripts/textgen-settings.js+4 -5 Viewed

  * @returns {TokenBanResult} String with comma-separated banned token IDs
  */
 function getCustomTokenBans() {
     if (!settings.send_banned_tokens || (!settings.banned_tokens && !textgenerationwebui_banned_in_macros.length)) {
         return {
             banned_tokens: '',
             banned_strings: [],

+}
 jQuery(function () {
+-
 +    $('#send_banned_tokens_textgenerationwebui').on('change', function () {
 -    $('#bannedStringsKillSwitch_textgenerationwebui').on('change', function () {
 +        const checked = !!$(this).prop('checked');
 -        const checked = $(this).prop('checked');
         if (checked) {
             enableBannedStringsKillSwitch();
         } else {

@@ -966,7 +965,7 @@ function setSettingByName(setting, value, trigger) {
966	965	$(`#${setting}_textgenerationwebui`).prop('checked', val);
967	966
968	967	if ('send_banned_tokens' === setting) {
969	968	$('`#send_banned_tokens_textgenerationwebui'${setting}_textgenerationwebui`).trigger('change');
970	969	}
971	970	}
972	971	else if (isText) {

public/style.css+1 -1 Viewed

 #instruct_enabled_label .menu_button:not(.toggleEnabled),
 #sysprompt_enabled_label .menu_button:not(.toggleEnabled),
 #bannedStringsKillSwitch_labelsend_banned_tokens_label .menu_button:not(.toggleEnabled) {
     color: Red;
+}