From f633f620655a66a5003250d6af01493cea1477f8 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 03:36:04 +0300
Subject: [PATCH 01/13] Don't save null values to OpenAI logit bias

---
 public/scripts/openai.js | 103 ++++++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 46 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index aef41beb8..1b62a8336 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -165,6 +165,7 @@ const default_settings = {
     new_group_chat_prompt: default_new_group_chat_prompt,
     new_example_chat_prompt: default_new_example_chat_prompt,
     continue_nudge_prompt: default_continue_nudge_prompt,
+    nsfw_avoidance_prompt: default_nsfw_avoidance_prompt,
     bias_preset_selected: default_bias,
     bias_presets: default_bias_presets,
     wi_format: default_wi_format,
@@ -228,6 +229,7 @@ const oai_settings = {
     use_ai21_tokenizer: false,
     exclude_assistant: false,
     use_alt_scale: false,
+    nsfw_avoidance_prompt: default_nsfw_avoidance_prompt,
 };
 
 let openai_setting_names;
@@ -772,6 +774,7 @@ function preparePromptsForChatCompletion(Scenario, charPersonality, name2, world
  * @param {string} content.bias - The bias to be added in the conversation.
  * @param {string} content.type - The type of the chat, can be 'impersonate'.
  * @param {string} content.quietPrompt - The quiet prompt to be used in the conversation.
+ * @param {string} content.cyclePrompt - The last prompt used for chat message continuation.
  * @param {Array} content.extensionPrompts - An array of additional prompts.
  * @param dryRun - Whether this is a live call or not.
  * @returns {(*[]|boolean)[]} An array where the first element is the prepared chat and the second element is a boolean flag.
@@ -882,7 +885,7 @@ async function sendWindowAIRequest(openai_msgs_tosend, signal, stream) {
     let finished = false;
 
     const currentModel = await window.ai.getCurrentModel();
-    let temperature = parseFloat(oai_settings.temp_openai);
+    let temperature = Number(oai_settings.temp_openai);
 
     if ((currentModel.includes('claude') || currentModel.includes('palm-2')) && temperature > claude_max_temp) {
         console.warn(`Claude and PaLM models only supports temperature up to ${claude_max_temp}. Clamping ${temperature} to ${claude_max_temp}.`);
@@ -1014,7 +1017,7 @@ function saveModelList(data) {
         $('#model_openrouter_select').empty();
         $('#model_openrouter_select').append($('<option>', { value: openrouter_website_model, text: 'Use OpenRouter website setting' }));
         model_list.forEach((model) => {
-            let tokens_dollar = parseFloat(1 / (1000 * model.pricing.prompt));
+            let tokens_dollar = Number(1 / (1000 * model.pricing.prompt));
             let tokens_rounded = (Math.round(tokens_dollar * 1000) / 1000).toFixed(0);
             let model_description = `${model.id} | ${tokens_rounded}k t/$ | ${model.context_length} ctx`;
             $('#model_openrouter_select').append(
@@ -1067,9 +1070,9 @@ async function sendAltScaleRequest(openai_msgs_tosend, logit_bias, signal) {
     const generate_data = {
         sysprompt: joinedSysMsgs,
         prompt: openai_msgs_tosend,
-        temp: parseFloat(oai_settings.temp_openai),
-        top_p: parseFloat(oai_settings.top_p_openai),
-        max_tokens: parseFloat(oai_settings.openai_max_tokens),
+        temp: Number(oai_settings.temp_openai),
+        top_p: Number(oai_settings.top_p_openai),
+        max_tokens: Number(oai_settings.openai_max_tokens),
         logit_bias: logit_bias,
     }
 
@@ -1137,10 +1140,10 @@ async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
     const generate_data = {
         "messages": openai_msgs_tosend,
         "model": model,
-        "temperature": parseFloat(oai_settings.temp_openai),
-        "frequency_penalty": parseFloat(oai_settings.freq_pen_openai),
-        "presence_penalty": parseFloat(oai_settings.pres_pen_openai),
-        "top_p": parseFloat(oai_settings.top_p_openai),
+        "temperature": Number(oai_settings.temp_openai),
+        "frequency_penalty": Number(oai_settings.freq_pen_openai),
+        "presence_penalty": Number(oai_settings.pres_pen_openai),
+        "top_p": Number(oai_settings.top_p_openai),
         "max_tokens": oai_settings.openai_max_tokens,
         "stream": stream,
         "logit_bias": logit_bias,
@@ -1155,7 +1158,7 @@ async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
 
     if (isClaude) {
         generate_data['use_claude'] = true;
-        generate_data['top_k'] = parseFloat(oai_settings.top_k_openai);
+        generate_data['top_k'] = Number(oai_settings.top_k_openai);
         generate_data['exclude_assistant'] = oai_settings.exclude_assistant;
         // Don't add a prefill on quiet gens (summarization)
         if (!isQuiet && !oai_settings.exclude_assistant) {
@@ -1165,7 +1168,7 @@ async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
 
     if (isOpenRouter) {
         generate_data['use_openrouter'] = true;
-        generate_data['top_k'] = parseFloat(oai_settings.top_k_openai);
+        generate_data['top_k'] = Number(oai_settings.top_k_openai);
     }
 
     if (isScale) {
@@ -1175,8 +1178,8 @@ async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
 
     if (isAI21) {
         generate_data['use_ai21'] = true;
-        generate_data['top_k'] = parseFloat(oai_settings.top_k_openai);
-        generate_data['count_pen'] = parseFloat(oai_settings.count_pen);
+        generate_data['top_k'] = Number(oai_settings.top_k_openai);
+        generate_data['count_pen'] = Number(oai_settings.count_pen);
         generate_data['stop_tokens'] = [name1 + ':', oai_settings.new_chat_prompt, oai_settings.new_group_chat_prompt];
     }
 
@@ -1860,7 +1863,6 @@ function loadOpenAISettings(data, settings) {
     oai_settings.new_example_chat_prompt = settings.new_example_chat_prompt ?? default_settings.new_example_chat_prompt;
     oai_settings.continue_nudge_prompt = settings.continue_nudge_prompt ?? default_settings.continue_nudge_prompt;
 
-    if (settings.keep_example_dialogue !== undefined) oai_settings.keep_example_dialogue = !!settings.keep_example_dialogue;
     if (settings.wrap_in_quotes !== undefined) oai_settings.wrap_in_quotes = !!settings.wrap_in_quotes;
     if (settings.names_in_completion !== undefined) oai_settings.names_in_completion = !!settings.names_in_completion;
     if (settings.openai_model !== undefined) oai_settings.openai_model = settings.openai_model;
@@ -1886,11 +1888,8 @@ function loadOpenAISettings(data, settings) {
 
     $('#openai_max_tokens').val(oai_settings.openai_max_tokens);
 
-    $('#nsfw_toggle').prop('checked', oai_settings.nsfw_toggle);
-    $('#keep_example_dialogue').prop('checked', oai_settings.keep_example_dialogue);
     $('#wrap_in_quotes').prop('checked', oai_settings.wrap_in_quotes);
     $('#names_in_completion').prop('checked', oai_settings.names_in_completion);
-    $('#nsfw_first').prop('checked', oai_settings.nsfw_first);
     $('#jailbreak_system').prop('checked', oai_settings.jailbreak_system);
     $('#legacy_streaming').prop('checked', oai_settings.legacy_streaming);
     $('#openai_show_external_models').prop('checked', oai_settings.show_external_models);
@@ -2130,7 +2129,7 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
 }
 
 function onLogitBiasPresetChange() {
-    const value = $('#openai_logit_bias_preset').find(':selected').val();
+    const value = String($('#openai_logit_bias_preset').find(':selected').val());
     const preset = oai_settings.bias_presets[value];
 
     if (!Array.isArray(preset)) {
@@ -2164,20 +2163,33 @@ function createLogitBiasListItem(entry) {
     const template = $('#openai_logit_bias_template .openai_logit_bias_form').clone();
     template.data('id', id);
     template.find('.openai_logit_bias_text').val(entry.text).on('input', function () {
-        oai_settings.bias_presets[oai_settings.bias_preset_selected][id].text = $(this).val();
+        oai_settings.bias_presets[oai_settings.bias_preset_selected][id].text = String($(this).val());
         biasCache = undefined;
         saveSettingsDebounced();
     });
     template.find('.openai_logit_bias_value').val(entry.value).on('input', function () {
-        oai_settings.bias_presets[oai_settings.bias_preset_selected][id].value = Number($(this).val());
+        const min = Number($(this).attr('min'));
+        const max = Number($(this).attr('max'));
+        let value = Number($(this).val());
+
+        if (value < min) {
+            $(this).val(min);
+            value = min;
+        }
+
+        if (value > max) {
+            $(this).val(max);
+            value = max;
+        }
+
+        oai_settings.bias_presets[oai_settings.bias_preset_selected][id].value = value;
         biasCache = undefined;
         saveSettingsDebounced();
     });
     template.find('.openai_logit_bias_remove').on('click', function () {
         $(this).closest('.openai_logit_bias_form').remove();
-        oai_settings.bias_presets[oai_settings.bias_preset_selected][id] = undefined;
-        biasCache = undefined;
-        saveSettingsDebounced();
+        oai_settings.bias_presets[oai_settings.bias_preset_selected].splice(id, 1);
+        onLogitBiasPresetChange();
     });
     $('.openai_logit_bias_list').prepend(template);
 }
@@ -2496,7 +2508,6 @@ function getMaxContextOpenAI(value) {
     }
 }
 
-
 function getMaxContextWindowAI(value) {
     if (oai_settings.max_context_unlocked) {
         return unlocked_max;
@@ -2532,7 +2543,7 @@ function getMaxContextWindowAI(value) {
 }
 
 async function onModelChange() {
-    let value = $(this).val();
+    let value = String($(this).val());
 
     if ($(this).is('#model_claude_select')) {
         console.log('Claude model changed to', value);
@@ -2700,7 +2711,7 @@ async function onNewPresetClick() {
 }
 
 function onReverseProxyInput() {
-    oai_settings.reverse_proxy = $(this).val();
+    oai_settings.reverse_proxy = String($(this).val());
     $(".reverse_proxy_warning").toggle(oai_settings.reverse_proxy != '');
     saveSettingsDebounced();
 }
@@ -2716,7 +2727,7 @@ async function onConnectButtonClick(e) {
     }
 
     if (oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER) {
-        const api_key_openrouter = $('#api_key_openrouter').val().trim();
+        const api_key_openrouter = String($('#api_key_openrouter').val()).trim();
 
         if (api_key_openrouter.length) {
             await writeSecret(SECRET_KEYS.OPENROUTER, api_key_openrouter);
@@ -2729,8 +2740,8 @@ async function onConnectButtonClick(e) {
     }
 
     if (oai_settings.chat_completion_source == chat_completion_sources.SCALE) {
-        const api_key_scale = $('#api_key_scale').val().trim();
-        const scale_cookie = $('#scale_cookie').val().trim();
+        const api_key_scale = String($('#api_key_scale').val()).trim();
+        const scale_cookie = String($('#scale_cookie').val()).trim();
 
         if (api_key_scale.length) {
             await writeSecret(SECRET_KEYS.SCALE, api_key_scale);
@@ -2758,7 +2769,7 @@ async function onConnectButtonClick(e) {
     }
 
     if (oai_settings.chat_completion_source == chat_completion_sources.CLAUDE) {
-        const api_key_claude = $('#api_key_claude').val().trim();
+        const api_key_claude = String($('#api_key_claude').val()).trim();
 
         if (api_key_claude.length) {
             await writeSecret(SECRET_KEYS.CLAUDE, api_key_claude);
@@ -2771,7 +2782,7 @@ async function onConnectButtonClick(e) {
     }
 
     if (oai_settings.chat_completion_source == chat_completion_sources.OPENAI) {
-        const api_key_openai = $('#api_key_openai').val().trim();
+        const api_key_openai = String($('#api_key_openai').val()).trim();
 
         if (api_key_openai.length) {
             await writeSecret(SECRET_KEYS.OPENAI, api_key_openai);
@@ -2784,7 +2795,7 @@ async function onConnectButtonClick(e) {
     }
 
     if (oai_settings.chat_completion_source == chat_completion_sources.AI21) {
-        const api_key_ai21 = $('#api_key_ai21').val().trim();
+        const api_key_ai21 = String($('#api_key_ai21').val()).trim();
 
         if (api_key_ai21.length) {
             await writeSecret(SECRET_KEYS.AI21, api_key_ai21);
@@ -2924,14 +2935,14 @@ $(document).ready(async function () {
     });
 
     $(document).on('input', '#openai_max_context', function () {
-        oai_settings.openai_max_context = parseInt($(this).val());
+        oai_settings.openai_max_context = Number($(this).val());
         $('#openai_max_context_counter').text(`${$(this).val()}`);
         calculateOpenRouterCost();
         saveSettingsDebounced();
     });
 
     $(document).on('input', '#openai_max_tokens', function () {
-        oai_settings.openai_max_tokens = parseInt($(this).val());
+        oai_settings.openai_max_tokens = Number($(this).val());
         calculateOpenRouterCost();
         saveSettingsDebounced();
     });
@@ -2966,42 +2977,42 @@ $(document).ready(async function () {
     });
 
     $("#send_if_empty_textarea").on('input', function () {
-        oai_settings.send_if_empty = $('#send_if_empty_textarea').val();
+        oai_settings.send_if_empty = String($('#send_if_empty_textarea').val());
         saveSettingsDebounced();
     });
 
     $("#impersonation_prompt_textarea").on('input', function () {
-        oai_settings.impersonation_prompt = $('#impersonation_prompt_textarea').val();
+        oai_settings.impersonation_prompt = String($('#impersonation_prompt_textarea').val());
         saveSettingsDebounced();
     });
 
     $("#newchat_prompt_textarea").on('input', function () {
-        oai_settings.new_chat_prompt = $('#newchat_prompt_textarea').val();
+        oai_settings.new_chat_prompt = String($('#newchat_prompt_textarea').val());
         saveSettingsDebounced();
     });
 
     $("#newgroupchat_prompt_textarea").on('input', function () {
-        oai_settings.new_group_chat_prompt = $('#newgroupchat_prompt_textarea').val();
+        oai_settings.new_group_chat_prompt = String($('#newgroupchat_prompt_textarea').val());
         saveSettingsDebounced();
     });
 
     $("#newexamplechat_prompt_textarea").on('input', function () {
-        oai_settings.new_example_chat_prompt = $('#newexamplechat_prompt_textarea').val();
+        oai_settings.new_example_chat_prompt = String($('#newexamplechat_prompt_textarea').val());
         saveSettingsDebounced();
     });
 
     $("#continue_nudge_prompt_textarea").on('input', function () {
-        oai_settings.continue_nudge_prompt = $('#continue_nudge_prompt_textarea').val();
+        oai_settings.continue_nudge_prompt = String($('#continue_nudge_prompt_textarea').val());
         saveSettingsDebounced();
     });
 
     $("#nsfw_avoidance_prompt_textarea").on('input', function () {
-        oai_settings.nsfw_avoidance_prompt = $('#nsfw_avoidance_prompt_textarea').val();
+        oai_settings.nsfw_avoidance_prompt = String($('#nsfw_avoidance_prompt_textarea').val());
         saveSettingsDebounced();
     });
 
     $("#wi_format_textarea").on('input', function () {
-        oai_settings.wi_format = $('#wi_format_textarea').val();
+        oai_settings.wi_format = String($('#wi_format_textarea').val());
         saveSettingsDebounced();
     });
 
@@ -3082,7 +3093,7 @@ $(document).ready(async function () {
     });
 
     $('#chat_completion_source').on('change', function () {
-        oai_settings.chat_completion_source = $(this).find(":selected").val();
+        oai_settings.chat_completion_source = String($(this).find(":selected").val());
         toggleChatCompletionForms();
         saveSettingsDebounced();
 
@@ -3100,7 +3111,7 @@ $(document).ready(async function () {
     });
 
     $('#api_url_scale').on('input', function () {
-        oai_settings.api_url_scale = $(this).val();
+        oai_settings.api_url_scale = String($(this).val());
         saveSettingsDebounced();
     });
 
@@ -3111,12 +3122,12 @@ $(document).ready(async function () {
     });
 
     $('#openai_proxy_password').on('input', function () {
-        oai_settings.proxy_password = $(this).val();
+        oai_settings.proxy_password = String($(this).val());
         saveSettingsDebounced();
     });
 
     $('#claude_assistant_prefill').on('input', function () {
-        oai_settings.assistant_prefill = $(this).val();
+        oai_settings.assistant_prefill = String($(this).val());
         saveSettingsDebounced();
     });
 

From b385bd190ac3aaab6d969090dd041f65dabde156 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 03:41:58 +0300
Subject: [PATCH 02/13] Less strict rules for logit bias files import

---
 public/scripts/openai.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 1b62a8336..cb091880f 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -2324,18 +2324,17 @@ async function onLogitBiasPresetImportFileChange(e) {
         return;
     }
 
+    const validEntries = [];
+
     for (const entry of importedFile) {
-        if (typeof entry == 'object') {
+        if (typeof entry == 'object' && entry !== null) {
             if (entry.hasOwnProperty('text') && entry.hasOwnProperty('value')) {
-                continue;
+                validEntries.push(entry);
             }
         }
-
-        callPopup('Invalid logit bias preset file.', 'text');
-        return;
     }
 
-    oai_settings.bias_presets[name] = importedFile;
+    oai_settings.bias_presets[name] = validEntries;
     oai_settings.bias_preset_selected = name;
 
     addLogitBiasPresetOption(name);

From 5474f29f2dc85c0821e3b77783d1066d30088c35 Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:19:54 +0900
Subject: [PATCH 03/13] bottom bar 40px to 30px

---
 public/scripts/RossAscends-mods.js |  2 +-
 public/style.css                   | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index 1f7cdcfe9..ea5b3d320 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -841,7 +841,7 @@ jQuery(async function () {
 
     //this makes the chat input text area resize vertically to match the text size (limited by CSS at 50% window height)
     $('#send_textarea').on('input', function () {
-        this.style.height = '40px';
+        this.style.height = '30px';
         this.style.height = (this.scrollHeight) + 'px';
     });
 
diff --git a/public/style.css b/public/style.css
index a69baa51d..736eddb09 100644
--- a/public/style.css
+++ b/public/style.css
@@ -509,19 +509,19 @@ hr {
 #send_but_sheld {
     padding: 0;
     border: 0;
-    height: 40px;
+    height: 30px;
     position: relative;
     background-position: center;
     display: flex;
     flex-direction: row;
     column-gap: 5px;
-    font-size: 30px;
+    font-size: 25px;
     overflow: hidden;
 }
 
 #send_but_sheld>div {
-    width: 40px;
-    height: 40px;
+    width: 30px;
+    height: 30px;
     margin: 0;
     outline: none;
     border: none;
@@ -549,8 +549,8 @@ hr {
 }
 
 #options_button {
-    width: 40px;
-    height: 40px;
+    width: 30px;
+    height: 30px;
     margin: 0;
     outline: none;
     border: none;
@@ -558,10 +558,10 @@ hr {
     opacity: 0.7;
     cursor: pointer;
     z-index: 2001;
-    padding-left: 10px;
-    padding-top: 0;
+    margin-left: 10px;
+    padding: 0;
     transition: 0.3s;
-    font-size: 30px;
+    font-size: 25px;
     display: flex;
     align-items: center;
 }
@@ -872,17 +872,17 @@ select {
 }
 
 #send_textarea {
-    min-height: 40px;
+    min-height: 30px;
     max-height: 50vh;
     max-height: 50svh;
     word-wrap: break-word;
-    height: 40px;
+    height: 30px;
     resize: vertical;
     display: block;
     background-color: rgba(255, 0, 0, 0);
     border: 0;
     box-shadow: none;
-    padding: 6px;
+    padding: 0;
     font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
     margin: 0;
     text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor);
@@ -3506,4 +3506,4 @@ a {
     z-index: 10;
     margin-left: 10px;
     /* Give some space between the button and search box */
-}
+}
\ No newline at end of file

From e77da62b852410ec5ac684d68c78352f991c8e54 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 10:32:48 +0300
Subject: [PATCH 04/13] Add padding to cache key. Fix Safari display issues.
 Fix 400 on empty translate. Reset bias cache on changing model.

---
 public/script.js                             | 27 ++++++++++----------
 public/scripts/extensions/translate/index.js |  4 +++
 public/scripts/nai-settings.js               |  2 +-
 public/scripts/openai.js                     |  6 +++++
 public/scripts/slash-commands.js             | 10 ++++----
 public/scripts/tokenizers.js                 |  2 +-
 public/style.css                             |  4 +++
 7 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/public/script.js b/public/script.js
index 3389cc096..052ee9cb6 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2991,8 +2991,6 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
                     return;
                 }
 
-                hideStopButton();
-                is_send_press = false;
                 if (!data.error) {
                     //const getData = await response.json();
                     let getMessage = extractMessageFromData(data);
@@ -3113,6 +3111,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
                         }
                         if (generatedTextFiltered(getMessage)) {
                             console.debug('swiping right automatically');
+                            is_send_press = false;
                             swipe_right();
                             return
                         }
@@ -3132,7 +3131,9 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
                 }
                 console.debug('/savechat called by /Generate');
 
-                saveChatConditional();
+                await saveChatConditional();
+                is_send_press = false;
+                hideStopButton();
                 activateSendButtons();
                 showSwipeButtons();
                 setGenerationProgress(0);
@@ -6113,7 +6114,7 @@ async function deleteMessageImage() {
     delete message.extra.inline_image;
     mesBlock.find('.mes_img_container').removeClass('img_extra');
     mesBlock.find('.mes_img').attr('src', '');
-    saveChatConditional();
+    await saveChatConditional();
 }
 
 function enlargeMessageImage() {
@@ -7908,7 +7909,7 @@ $(document).ready(function () {
     });
 
     //confirms message deletion with the "ok" button
-    $("#dialogue_del_mes_ok").click(function () {
+    $("#dialogue_del_mes_ok").click(async function () {
         $("#dialogue_del_mes").css("display", "none");
         $("#send_form").css("display", css_send_form_display);
         $(".del_checkbox").each(function () {
@@ -7924,7 +7925,7 @@ $(document).ready(function () {
             $(".mes[mesid='" + this_del_mes + "']").remove();
             chat.length = this_del_mes;
             count_view_mes = this_del_mes;
-            saveChatConditional();
+            await saveChatConditional();
             var $textchat = $("#chat");
             $textchat.scrollTop($textchat[0].scrollHeight);
             eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
@@ -8199,7 +8200,7 @@ $(document).ready(function () {
         this_edit_mes_id = undefined;
     });
 
-    $(document).on("click", ".mes_edit_up", function () {
+    $(document).on("click", ".mes_edit_up", async function () {
         if (is_send_press || this_edit_mes_id <= 0) {
             return;
         }
@@ -8224,11 +8225,11 @@ $(document).ready(function () {
 
         this_edit_mes_id = targetId;
         updateViewMessageIds();
-        saveChatConditional();
+        await saveChatConditional();
         showSwipeButtons();
     });
 
-    $(document).on("click", ".mes_edit_down", function () {
+    $(document).on("click", ".mes_edit_down", async function () {
         if (is_send_press || this_edit_mes_id >= chat.length - 1) {
             return;
         }
@@ -8253,7 +8254,7 @@ $(document).ready(function () {
 
         this_edit_mes_id = targetId;
         updateViewMessageIds();
-        saveChatConditional();
+        await saveChatConditional();
         showSwipeButtons();
     });
 
@@ -8277,14 +8278,14 @@ $(document).ready(function () {
         addOneMessage(clone, { insertAfter: this_edit_mes_id });
 
         updateViewMessageIds();
-        saveChatConditional();
+        await saveChatConditional();
         $('#chat')[0].scrollTop = oldScroll;
         showSwipeButtons();
     });
 
     $(document).on("click", ".mes_edit_delete", async function (event, customData) {
         const fromSlashCommand = customData?.fromSlashCommand || false;
-        const swipeExists = (!chat[this_edit_mes_id].swipes || chat[this_edit_mes_id].swipes.length <= 1 || chat.is_user || parseInt(this_edit_mes_id) !== chat.length - 1);
+        const swipeExists = (!Array.isArray(chat[this_edit_mes_id].swipes) || chat[this_edit_mes_id].swipes.length <= 1 || chat[this_edit_mes_id].is_user || parseInt(this_edit_mes_id) !== chat.length - 1);
         if (power_user.confirm_message_delete && fromSlashCommand !== true) {
             const confirmation = swipeExists ? await callPopup("Are you sure you want to delete this message?", 'confirm')
                 : await callPopup("<h3>Delete this...</h3> <select id='del_type'><option value='swipe'>Swipe</option><option value='message'>Message</option></select>", 'confirm')
@@ -8316,7 +8317,7 @@ $(document).ready(function () {
         this_edit_mes_id = undefined;
 
         updateViewMessageIds();
-        saveChatConditional();
+        await saveChatConditional();
 
         eventSource.emit(event_types.MESSAGE_DELETED, count_view_mes);
 
diff --git a/public/scripts/extensions/translate/index.js b/public/scripts/extensions/translate/index.js
index ac477ffe3..6a10b787d 100644
--- a/public/scripts/extensions/translate/index.js
+++ b/public/scripts/extensions/translate/index.js
@@ -217,6 +217,10 @@ async function translateProviderDeepl(text, lang) {
 
 async function translate(text, lang) {
     try {
+        if (text == '') {
+            return '';
+        }
+
         switch (extension_settings.translate.provider) {
             case 'google':
                 return await translateProviderGoogle(text, lang);
diff --git a/public/scripts/nai-settings.js b/public/scripts/nai-settings.js
index 41fc87791..2c7b99948 100644
--- a/public/scripts/nai-settings.js
+++ b/public/scripts/nai-settings.js
@@ -128,8 +128,8 @@ function loadNovelPreset(preset) {
 function loadNovelSettings(settings) {
     //load the rest of the Novel settings without any checks
     nai_settings.model_novel = settings.model_novel;
-    $(`#model_novel_select option[value=${nai_settings.model_novel}]`).attr("selected", true);
     $('#model_novel_select').val(nai_settings.model_novel);
+    $(`#model_novel_select option[value=${nai_settings.model_novel}]`).attr("selected", true);
 
     if (settings.nai_preamble !== undefined) {
         nai_settings.preamble = settings.nai_preamble;
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index cb091880f..e85506649 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -1647,6 +1647,11 @@ class ChatCompletion {
         const index = this.findMessageIndex(identifier);
         const message = this.messages.collection[index].collection.pop();
 
+        if (!message) {
+            this.log(`No message to remove from ${identifier}`);
+            return;
+        }
+
         this.increaseTokenBudgetBy(message.getTokens());
 
         this.log(`Removed ${message.identifier} from ${identifier}. Remaining tokens: ${this.tokenBudget}`);
@@ -2542,6 +2547,7 @@ function getMaxContextWindowAI(value) {
 }
 
 async function onModelChange() {
+    biasCache = undefined;
     let value = String($(this).val());
 
     if ($(this).is('#model_claude_select')) {
diff --git a/public/scripts/slash-commands.js b/public/scripts/slash-commands.js
index 294a61fb9..a23f10d8b 100644
--- a/public/scripts/slash-commands.js
+++ b/public/scripts/slash-commands.js
@@ -282,11 +282,11 @@ function setNameCallback(_, name) {
     setUserName(name); //this prevented quickReply usage
 }
 
-function setNarratorName(_, text) {
+async function setNarratorName(_, text) {
     const name = text || NARRATOR_NAME_DEFAULT;
     chat_metadata[NARRATOR_NAME_KEY] = name;
     toastr.info(`System narrator name set to ${name}`);
-    saveChatConditional();
+    await saveChatConditional();
 }
 
 async function sendMessageAs(_, text) {
@@ -341,7 +341,7 @@ async function sendMessageAs(_, text) {
     await eventSource.emit(event_types.MESSAGE_SENT, (chat.length - 1));
     addOneMessage(message);
     await eventSource.emit(event_types.USER_MESSAGE_RENDERED, (chat.length - 1));
-    saveChatConditional();
+    await saveChatConditional();
 }
 
 async function sendNarratorMessage(_, text) {
@@ -373,7 +373,7 @@ async function sendNarratorMessage(_, text) {
     await eventSource.emit(event_types.MESSAGE_SENT, (chat.length - 1));
     addOneMessage(message);
     await eventSource.emit(event_types.USER_MESSAGE_RENDERED, (chat.length - 1));
-    saveChatConditional();
+    await saveChatConditional();
 }
 
 async function sendCommentMessage(_, text) {
@@ -399,7 +399,7 @@ async function sendCommentMessage(_, text) {
     await eventSource.emit(event_types.MESSAGE_SENT, (chat.length - 1));
     addOneMessage(message);
     await eventSource.emit(event_types.USER_MESSAGE_RENDERED, (chat.length - 1));
-    saveChatConditional();
+    await saveChatConditional();
 }
 
 function helpCommandCallback(_, type) {
diff --git a/public/scripts/tokenizers.js b/public/scripts/tokenizers.js
index 2714c12ef..8f9b82405 100644
--- a/public/scripts/tokenizers.js
+++ b/public/scripts/tokenizers.js
@@ -134,7 +134,7 @@ export function getTokenCount(str, padding = undefined) {
 
     const cacheObject = getTokenCacheObject();
     const hash = getStringHash(str);
-    const cacheKey = `${tokenizerType}-${hash}`;
+    const cacheKey = `${tokenizerType}-${hash}+${padding}`;
 
     if (typeof cacheObject[cacheKey] === 'number') {
         return cacheObject[cacheKey];
diff --git a/public/style.css b/public/style.css
index a69baa51d..66ac381d8 100644
--- a/public/style.css
+++ b/public/style.css
@@ -202,6 +202,10 @@ table.responsiveTable {
     color: var(--white50a);
 }
 
+.mes[is_system="true"] .mes_text br {
+    display: none;
+}
+
 .mes_text table {
     border-spacing: 0;
     border-collapse: collapse;

From 02ce9ba5631c2eb3c7c7e8c5737a8f8e66612df3 Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:41:07 +0900
Subject: [PATCH 05/13] top bar 40px to 30px

---
 public/scripts/RossAscends-mods.js |  4 ++--
 public/style.css                   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index ea5b3d320..1afb36030 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -521,7 +521,7 @@ export function dragElement(elmnt) {
             }
 
             //prevent resizing from top left into the top bar
-            if (top < 40 && maxX >= topBarFirstX && left <= topBarFirstX
+            if (top < 35 && maxX >= topBarFirstX && left <= topBarFirstX
             ) {
                 console.debug('prevent topbar underlap resize')
                 elmnt.css('width', width - 1 + "px");
@@ -556,7 +556,7 @@ export function dragElement(elmnt) {
             }
 
             //prevent underlap with topbar div
-            if (top < 40
+            if (top < 35
                 && (maxX >= topBarFirstX && left <= topBarFirstX //elmnt is hitting topbar from left side
                     || left <= topBarLastX && maxX >= topBarLastX //elmnt is hitting topbar from right side
                     || left >= topBarFirstX && maxX <= topBarLastX) //elmnt hitting topbar in the middle
diff --git a/public/style.css b/public/style.css
index 736eddb09..c159704e0 100644
--- a/public/style.css
+++ b/public/style.css
@@ -373,7 +373,7 @@ hr {
     left: 0;
     right: 0;
     display: inline-block;
-    height: 40px;
+    height: 35px;
     position: absolute;
     border-bottom: 1px solid var(--grey30a);
     box-shadow: 0 2px 20px 0 var(--black70a);
@@ -386,14 +386,14 @@ hr {
 #sheld {
     display: grid;
     grid-template-rows: auto min-content;
-    height: calc(100vh - 42px);
-    height: calc(100svh - 42px);
+    height: calc(100vh - 36px);
+    height: calc(100svh - 36px);
     overflow-x: hidden;
     /* max-width: 50vw; */
     position: absolute;
     left: calc((100vw - var(--sheldWidth))/2);
     left: calc((100svw - var(--sheldWidth))/2);
-    top: 41px;
+    top: 36px;
     margin: 0 auto;
     left: 0;
     right: 0;
@@ -3016,8 +3016,8 @@ a {
 
 #top-settings-holder {
     margin: 0 auto;
-    padding-top: 5px;
-    height: 40px;
+    padding-top: 2px;
+    height: 30px;
     /* max-width: var(--sheldWidth); */
     justify-content: center;
     display: grid;
@@ -3039,7 +3039,7 @@ a {
 .drawer-icon {
     display: inline-block;
     cursor: pointer;
-    font-size: 1.8rem;
+    font-size: 25px;
 }
 
 .drawer-icon.openIcon {

From 080f9d242686d678069e12c55d2748cfc0fc46a1 Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:53:31 +0900
Subject: [PATCH 06/13] center chat bar input, fix mobile top bar.

---
 public/css/mobile-styles.css | 18 +++++++++---------
 public/style.css             |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/css/mobile-styles.css b/public/css/mobile-styles.css
index a53758a8f..0a720b00d 100644
--- a/public/css/mobile-styles.css
+++ b/public/css/mobile-styles.css
@@ -91,7 +91,7 @@
     #top-settings-holder,
     #top-bar {
         position: fixed;
-        padding-top: 8px;
+        padding-top: 3px;
         width: 100vw;
         width: 100svw;
     }
@@ -114,14 +114,14 @@
     /* ,
     #world_popup  */
         {
-        max-height: calc(100vh - 40px);
-        max-height: calc(100svh - 40px);
+        max-height: calc(100vh - 36px);
+        max-height: calc(100svh - 36px);
         width: 100% !important;
         margin: 0 auto;
         max-width: 100%;
         left: 0 !important;
         resize: none !important;
-        top: 40px;
+        top: 36px;
     }
 
     .wi-settings {
@@ -179,7 +179,7 @@
         border-right: 1px solid var(--grey30);
         border-bottom: 1px solid var(--grey30);
         border-radius: 0 0 20px 20px;
-        top: 40px !important;
+        top: 36px !important;
         left: 0 !important;
         backdrop-filter: blur(calc(var(--SmartThemeBlurStrength) * 2));
     }
@@ -354,8 +354,8 @@
         max-height: unset;
         width: 100vw;
         width: 100svw;
-        height: calc(100vh - 40px);
-        height: calc(100svh - 40px);
+        height: calc(100vh - 36px);
+        height: calc(100svh - 36px);
         padding-right: max(env(safe-area-inset-right), 0px);
         padding-left: max(env(safe-area-inset-left), 0px);
         padding-bottom: 0;
@@ -396,7 +396,7 @@
     #character_popup,
     #world_popup,
     .drawer-content {
-        margin-top: 40px;
+        margin-top: 36px;
     }
 
     .scrollableInner {
@@ -407,4 +407,4 @@
     #horde_model {
         height: unset;
     }
-}
+}
\ No newline at end of file
diff --git a/public/style.css b/public/style.css
index c9876f8c6..7d85a8139 100644
--- a/public/style.css
+++ b/public/style.css
@@ -886,7 +886,7 @@ select {
     background-color: rgba(255, 0, 0, 0);
     border: 0;
     box-shadow: none;
-    padding: 0;
+    padding-top: 6px;
     font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
     margin: 0;
     text-shadow: 0px 0px calc(var(--shadowWidth) * 1px) var(--SmartThemeShadowColor);

From 3c48e8ccd9da261c598b120a29a84dc0f42d03cf Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 11:02:49 +0300
Subject: [PATCH 07/13] Increase toggle desc. font size

---
 public/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/style.css b/public/style.css
index 7d85a8139..3218ed806 100644
--- a/public/style.css
+++ b/public/style.css
@@ -2165,7 +2165,7 @@ input[type='checkbox']:not(#nav-toggle):not(#rm_button_panel_pin):not(#lm_button
     width: max-content;
     margin-left: 5px;
     margin-right: 15px;
-    font-size: calc(var(--mainFontSize) * 0.8);
+    font-size: calc(var(--mainFontSize) * 0.85);
     color: var(--SmartThemeEmColor);
     text-align: center;
 }
@@ -3510,4 +3510,4 @@ a {
     z-index: 10;
     margin-left: 10px;
     /* Give some space between the button and search box */
-}
\ No newline at end of file
+}

From c32c080126443e055b825a74df3a708ee476b69d Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 15:53:05 +0300
Subject: [PATCH 08/13] More comfy font sizes

---
 public/css/st-tailwind.css | 4 ++--
 public/style.css           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/css/st-tailwind.css b/public/css/st-tailwind.css
index 5a0c1c52d..b505fccd6 100644
--- a/public/css/st-tailwind.css
+++ b/public/css/st-tailwind.css
@@ -349,7 +349,7 @@
 }
 
 .textarea_compact {
-    font-size: calc(var(--mainFontSize) * 0.9);
+    font-size: calc(var(--mainFontSize) * 0.95);
     line-height: 1.2;
 }
 
@@ -416,4 +416,4 @@
 
 .opacity1 {
     opacity: 1 !important;
-}
\ No newline at end of file
+}
diff --git a/public/style.css b/public/style.css
index 3218ed806..88b8f0f16 100644
--- a/public/style.css
+++ b/public/style.css
@@ -3168,7 +3168,7 @@ a {
 
 .drawer-content select {
     width: 100%;
-    font-size: calc(var(--mainFontSize) * 0.9);
+    font-size: calc(var(--mainFontSize) * 0.95);
 }
 
 .settingsSectionWrap {

From b7516433644c7f5d9ce128b09ee2d24e5232188a Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:48:44 +0300
Subject: [PATCH 09/13] Save pagination state on return to list from card

---
 public/script.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/script.js b/public/script.js
index 052ee9cb6..add7da3d5 100644
--- a/public/script.js
+++ b/public/script.js
@@ -322,6 +322,7 @@ let generatedPromtCache = "";
 let generation_started = new Date();
 let characters = [];
 let this_chid;
+let saveCharactersPage = 0;
 let backgrounds = [];
 const default_avatar = "img/ai4.png";
 export const system_avatar = "img/five.png";
@@ -893,6 +894,7 @@ async function printCharacters(fullRefresh = false) {
         pageSize: Number(localStorage.getItem(storageKey)) || 50,
         sizeChangerOptions: [10, 25, 50, 100, 250, 500, 1000],
         pageRange: 1,
+        pageNumber: saveCharactersPage || 1,
         position: 'top',
         showPageNumbers: false,
         showSizeChanger: true,
@@ -913,10 +915,14 @@ async function printCharacters(fullRefresh = false) {
         },
         afterSizeSelectorChange: function (e) {
             localStorage.setItem(storageKey, e.target.value);
-        }
+        },
+        afterPaging: function (e) {
+            saveCharactersPage = e;
+        },
     });
 
     favsToHotswap();
+    saveCharactersPage = 0;
 
     if (fullRefresh) {
         printTagFilters(tag_filter_types.character);

From fad6c164cbc252760ef2e6febbe8a763d0cded51 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 17:44:38 +0300
Subject: [PATCH 10/13] Don't set negative prompt from CFG extension to ooba at
 guidance scale 1.0

---
 public/scripts/textgen-settings.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index ca551b068..b78347bab 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -233,9 +233,13 @@ async function generateTextGenWithStreaming(generate_data, signal) {
     }
 }
 
-export function getTextGenGenerationData(finalPromt, this_amount_gen, isImpersonate, cfgValues) {
+export function getTextGenGenerationData(finalPrompt, this_amount_gen, isImpersonate, cfgValues) {
+    if (cfgValues?.guidanceScale?.value === 1) {
+        cfgValues = null;
+    }
+
     return {
-        'prompt': finalPromt,
+        'prompt': finalPrompt,
         'max_new_tokens': this_amount_gen,
         'do_sample': textgenerationwebui_settings.do_sample,
         'temperature': textgenerationwebui_settings.temp,

From 2c2a68ef76f6c11b33d4a6247b24cb0698083bf5 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 18:04:22 +0300
Subject: [PATCH 11/13] Fix instruct system sequence missing + {{original}}

---
 public/script.js                |  2 ++
 public/scripts/instruct-mode.js | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/public/script.js b/public/script.js
index add7da3d5..27ce9a3ba 100644
--- a/public/script.js
+++ b/public/script.js
@@ -165,6 +165,7 @@ import {
     formatInstructModeExamples,
     getInstructStoppingSequences,
     autoSelectInstructPreset,
+    formatInstructModeSystemPrompt,
 } from "./scripts/instruct-mode.js";
 import { applyLocale } from "./scripts/i18n.js";
 import { getTokenCount, getTokenizerModel, saveTokenCache } from "./scripts/tokenizers.js";
@@ -2360,6 +2361,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
 
         if (isInstruct) {
             systemPrompt = power_user.prefer_character_prompt && systemPrompt ? systemPrompt : baseChatReplace(power_user.instruct.system_prompt, name1, name2);
+            systemPrompt = formatInstructModeSystemPrompt(substituteParams(systemPrompt, name1, name2, power_user.instruct.system_prompt));
         }
 
         // Parse example messages
diff --git a/public/scripts/instruct-mode.js b/public/scripts/instruct-mode.js
index bc75e266d..d15274d2f 100644
--- a/public/scripts/instruct-mode.js
+++ b/public/scripts/instruct-mode.js
@@ -189,6 +189,20 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
     return text;
 }
 
+/**
+ * Formats instruct mode system prompt.
+ * @param {string} systemPrompt System prompt string.
+ * @returns {string} Formatted instruct mode system prompt.
+ */
+export function formatInstructModeSystemPrompt(systemPrompt){
+    if (power_user.instruct.system_sequence) {
+        const separator = power_user.instruct.wrap ? '\n' : '';
+        return power_user.instruct.system_sequence + separator + systemPrompt;
+    }
+
+    return systemPrompt;
+}
+
 /**
  * Formats example messages according to instruct mode settings.
  * @param {string} mesExamples Example messages string.

From f48cc0db31b102a23ba8edeaed2efa2762bb24f8 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 23 Aug 2023 18:26:56 +0300
Subject: [PATCH 12/13] Unify cfgValues parsing between ooba/Novel

---
 public/script.js                   |  7 ++---
 public/scripts/nai-settings.js     | 41 +++++++++++++++---------------
 public/scripts/textgen-settings.js |  4 ---
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/public/script.js b/public/script.js
index 27ce9a3ba..e5ed2df03 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2817,12 +2817,9 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
             let finalPromt = getCombinedPrompt(false);
 
             // Include the entire guidance scale object
-            const cfgValues = {
-                guidanceScale: cfgGuidanceScale,
-                negativePrompt: negativePrompt
-            };
+            const cfgValues = cfgGuidanceScale && cfgGuidanceScale?.value !== 1 ? ({guidanceScale: cfgGuidanceScale, negativePrompt: negativePrompt }) : null;
 
-            let this_amount_gen = parseInt(amount_gen); // how many tokens the AI will be requested to generate
+            let this_amount_gen = Number(amount_gen); // how many tokens the AI will be requested to generate
             let this_settings = koboldai_settings[koboldai_setting_names[preset_settings]];
 
             if (isMultigenEnabled() && type !== 'quiet') {
diff --git a/public/scripts/nai-settings.js b/public/scripts/nai-settings.js
index 2c7b99948..3ebc435e9 100644
--- a/public/scripts/nai-settings.js
+++ b/public/scripts/nai-settings.js
@@ -396,7 +396,7 @@ function getBadWordPermutations(text) {
 }
 
 export function getNovelGenerationData(finalPrompt, this_settings, this_amount_gen, isImpersonate, cfgValues) {
-    if (cfgValues.guidanceScale && cfgValues.guidanceScale?.value !== 1) {
+    if (cfgValues && cfgValues.guidanceScale && cfgValues.guidanceScale?.value !== 1) {
         cfgValues.negativePrompt = (getCfgPrompt(cfgValues.guidanceScale, true))?.value;
     }
 
@@ -425,22 +425,22 @@ export function getNovelGenerationData(finalPrompt, this_settings, this_amount_g
         "input": finalPrompt,
         "model": nai_settings.model_novel,
         "use_string": true,
-        "temperature": parseFloat(nai_settings.temperature),
+        "temperature": Number(nai_settings.temperature),
         "max_length": this_amount_gen < maximum_output_length ? this_amount_gen : maximum_output_length,
-        "min_length": parseInt(nai_settings.min_length),
-        "tail_free_sampling": parseFloat(nai_settings.tail_free_sampling),
-        "repetition_penalty": parseFloat(nai_settings.repetition_penalty),
-        "repetition_penalty_range": parseInt(nai_settings.repetition_penalty_range),
-        "repetition_penalty_slope": parseFloat(nai_settings.repetition_penalty_slope),
-        "repetition_penalty_frequency": parseFloat(nai_settings.repetition_penalty_frequency),
-        "repetition_penalty_presence": parseFloat(nai_settings.repetition_penalty_presence),
-        "top_a": parseFloat(nai_settings.top_a),
-        "top_p": parseFloat(nai_settings.top_p),
-        "top_k": parseInt(nai_settings.top_k),
-        "typical_p": parseFloat(nai_settings.typical_p),
-        "mirostat_lr": parseFloat(nai_settings.mirostat_lr),
-        "mirostat_tau": parseFloat(nai_settings.mirostat_tau),
-        "cfg_scale": cfgValues?.guidanceScale?.value ?? parseFloat(nai_settings.cfg_scale),
+        "min_length": Number(nai_settings.min_length),
+        "tail_free_sampling": Number(nai_settings.tail_free_sampling),
+        "repetition_penalty": Number(nai_settings.repetition_penalty),
+        "repetition_penalty_range": Number(nai_settings.repetition_penalty_range),
+        "repetition_penalty_slope": Number(nai_settings.repetition_penalty_slope),
+        "repetition_penalty_frequency": Number(nai_settings.repetition_penalty_frequency),
+        "repetition_penalty_presence": Number(nai_settings.repetition_penalty_presence),
+        "top_a": Number(nai_settings.top_a),
+        "top_p": Number(nai_settings.top_p),
+        "top_k": Number(nai_settings.top_k),
+        "typical_p": Number(nai_settings.typical_p),
+        "mirostat_lr": Number(nai_settings.mirostat_lr),
+        "mirostat_tau": Number(nai_settings.mirostat_tau),
+        "cfg_scale": cfgValues?.guidanceScale?.value ?? Number(nai_settings.cfg_scale),
         "cfg_uc": cfgValues?.negativePrompt ?? nai_settings.cfg_uc ?? "",
         "phrase_rep_pen": nai_settings.phrase_rep_pen,
         "stop_sequences": stopSequences,
@@ -448,7 +448,6 @@ export function getNovelGenerationData(finalPrompt, this_settings, this_amount_g
         "logit_bias_exp": logitBias,
         "generate_until_sentence": true,
         "use_cache": false,
-        "use_string": true,
         "return_full_text": false,
         "prefix": prefix,
         "order": nai_settings.order || this_settings.order || default_order,
@@ -640,7 +639,7 @@ export async function generateNovelWithStreaming(generate_data, signal) {
 }
 
 $("#nai_preamble_textarea").on('input', function () {
-    nai_settings.preamble = $('#nai_preamble_textarea').val();
+    nai_settings.preamble = String($('#nai_preamble_textarea').val());
     saveSettingsDebounced();
 });
 
@@ -668,7 +667,7 @@ jQuery(function () {
     });
 
     $("#model_novel_select").change(function () {
-        nai_settings.model_novel = $("#model_novel_select").find(":selected").val();
+        nai_settings.model_novel = String($("#model_novel_select").find(":selected").val());
         saveSettingsDebounced();
 
         // Update the selected preset to something appropriate
@@ -679,12 +678,12 @@ jQuery(function () {
     });
 
     $("#nai_prefix").on('change', function () {
-        nai_settings.prefix = $("#nai_prefix").find(":selected").val();
+        nai_settings.prefix = String($("#nai_prefix").find(":selected").val());
         saveSettingsDebounced();
     });
 
     $("#phrase_rep_pen_novel").on('change', function () {
-        nai_settings.phrase_rep_pen = $("#phrase_rep_pen_novel").find(":selected").val();
+        nai_settings.phrase_rep_pen = String($("#phrase_rep_pen_novel").find(":selected").val());
         saveSettingsDebounced();
     });
 
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index b78347bab..9a921d316 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -234,10 +234,6 @@ async function generateTextGenWithStreaming(generate_data, signal) {
 }
 
 export function getTextGenGenerationData(finalPrompt, this_amount_gen, isImpersonate, cfgValues) {
-    if (cfgValues?.guidanceScale?.value === 1) {
-        cfgValues = null;
-    }
-
     return {
         'prompt': finalPrompt,
         'max_new_tokens': this_amount_gen,

From 046037564789c6a045c8b598ed5435ec55c04482 Mon Sep 17 00:00:00 2001
From: kingbri <bdashore3@proton.me>
Date: Wed, 23 Aug 2023 11:27:58 -0400
Subject: [PATCH 13/13] CFG: Don't inject anything when guidance scale doesn't
 exist

If the guidance scale is 1, completely disable sending CFG and creating
a negative prompt.

Signed-off-by: kingbri <bdashore3@proton.me>
---
 public/script.js                       |  8 +++++++-
 public/scripts/extensions/cfg/index.js |  2 +-
 public/scripts/extensions/cfg/util.js  | 10 ++++++----
 public/scripts/textgen-settings.js     |  4 ----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/public/script.js b/public/script.js
index 27ce9a3ba..51d68ecb1 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2741,6 +2741,12 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
             // Fetches the combined prompt for both negative and positive prompts
             const cfgGuidanceScale = getGuidanceScale();
             function getCombinedPrompt(isNegative) {
+                // Only return if the guidance scale doesn't exist or the value is 1
+                // Also don't return if constructing the neutral prompt
+                if (isNegative && (!cfgGuidanceScale || cfgGuidanceScale?.value === 1)) {
+                    return;
+                }
+
                 let finalMesSend = [...mesSend];
                 let cfgPrompt = {};
                 if (cfgGuidanceScale && cfgGuidanceScale?.value !== 1) {
@@ -2754,7 +2760,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
                                 ? cfgPrompt.value
                                 : ` ${cfgPrompt.value}`;
                     } else {
-                        // TODO: Switch from splice method to insertion depth method
+                        // TODO: Make all extension prompts use an array/splice method
                         finalMesSend.splice(mesSend.length - cfgPrompt.depth, 0, `${cfgPrompt.value}\n`);
                     }
                 }
diff --git a/public/scripts/extensions/cfg/index.js b/public/scripts/extensions/cfg/index.js
index c850ca6d6..f572d2c63 100644
--- a/public/scripts/extensions/cfg/index.js
+++ b/public/scripts/extensions/cfg/index.js
@@ -348,7 +348,7 @@ jQuery(async () => {
             .filter(":checked")
             .map(function() { return parseInt($(this).val()) })
             .get()
-            .filter((e) => e !== NaN) || [];
+            .filter((e) => !Number.isNaN(e)) || [];
 
         chat_metadata[metadataKeys.prompt_combine] = values;
         saveMetadataDebounced();
diff --git a/public/scripts/extensions/cfg/util.js b/public/scripts/extensions/cfg/util.js
index 850978884..6e156d5d9 100644
--- a/public/scripts/extensions/cfg/util.js
+++ b/public/scripts/extensions/cfg/util.js
@@ -39,10 +39,12 @@ export function getGuidanceScale() {
         };
     }
 
-    return {
-        type: cfgType.global,
-        value: extension_settings.cfg.global.guidance_scale
-    };
+    if (extension_settings.cfg.global && extension_settings.cfg.global?.guidance_scale !== 1) {
+        return {
+            type: cfgType.global,
+            value: extension_settings.cfg.global.guidance_scale
+        };
+    }
 }
 
 // Gets the CFG prompt
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index b78347bab..9a921d316 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -234,10 +234,6 @@ async function generateTextGenWithStreaming(generate_data, signal) {
 }
 
 export function getTextGenGenerationData(finalPrompt, this_amount_gen, isImpersonate, cfgValues) {
-    if (cfgValues?.guidanceScale?.value === 1) {
-        cfgValues = null;
-    }
-
     return {
         'prompt': finalPrompt,
         'max_new_tokens': this_amount_gen,