4dbed095 · permissionBRICK/SillyTavern

.github/readme.md+1 -2 Viewed

 ##### Additional Settings
-- [TimeZone] - The timezone your instance should use. This is useful for making logs match your local time for easier troubleshooting. Use your TZ Identifier. (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)
 - [DockerNet] - The docker network that the container should be created with a connection to. If you don't know what it is, see the [official Docker documentation](https://docs.docker.com/reference/cli/docker/network/).
 - [version] - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" and "release" tags that point to the nightly images of the respective branches, but this may not be appropriate, if you are utilizing extensions that could be broken, and may need time to update.

 . Open your Command Line
 . Run the following command
-`docker create --name='sillytavern' --net='[DockerNet]' -e TZ="[TimeZone]" -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
+`docker create --name='sillytavern' --net='[DockerNet]' -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
 > Note that 8000 is a default listening port. Don't forget to use an appropriate port if you change it in the config.

Dockerfile+1 -1 Viewed

-FROM node:lts-alpine3.18
+FROM node:lts-alpine3.19
 # Arguments
 ARG APP_HOME=/home/node/app

default/config.yaml+4 -2 Viewed

 ##   headers:
 ##     User-Agent: "Googlebot/2.1 (+http://www.google.com/bot.html)"
 requestOverrides: []
-# -- PLUGIN CONFIGURATION --
+# -- EXTENSIONS CONFIGURATION --
 # Enable UI extensions
 enableExtensions: true
+# Automatically update extensions when a release version changes
+enableExtensionsAutoUpdate: true
 # Extension settings
 extras:
   # Disables automatic model download from HuggingFace

   # Controls how long the model will stay loaded into memory following the request
   # * -1: Keep the model loaded indefinitely
   # * 0: Unload the model immediately after the request
-  # * 5m: Keep the model loaded for 5 minutes after the request. Accepts duration strings (e.g. 5h30m40s)
+  # * N (any positive number): Keep the model loaded for N seconds after the request.
   keepAlive: -1
 # -- ANTHROPIC CLAUDE API CONFIGURATION --
 claude:

default/content/presets/openai/Default.json+1 -4 Viewed

     "openrouter_force_instruct": false,
     "openrouter_group_models": false,
     "openrouter_sort_models": "alphabetically",
-    "ai21_model": "j2-ultra",
+    "ai21_model": "jamba-1.5-large",
     "mistralai_model": "mistral-large-latest",
     "custom_model": "",
     "custom_url": "",

     "temperature": 1,
     "frequency_penalty": 0,
     "presence_penalty": 0,
-    "count_penalty": 0,
     "top_p": 1,
     "top_k": 0,
     "top_a": 0,

     "assistant_prefill": "",
     "assistant_impersonation": "",
     "human_sysprompt_message": "Let's get started. Please generate your response based on the information and instructions provided above.",
-    "use_ai21_tokenizer": false,
-    "use_google_tokenizer": false,
     "claude_use_sysprompt": false,
     "use_alt_scale": false,
     "squash_system_messages": false,

default/content/settings.json+12 -5 Viewed

         "timestamps_enabled": true,
         "timestamp_model_icon": true,
         "mesIDDisplay_enabled": false,
+        "hideChatAvatars_enabled": false,
         "max_context_unlocked": false,
         "prefer_character_prompt": true,
         "prefer_character_jailbreak": true,

         "enableLabMode": false,
         "enableZenSliders": false,
         "ui_mode": 1,
-        "forbid_external_media": true
+        "forbid_external_media": true,
+        "stscript": {
+            "parser": {
+                "flags": {
+                    "1": true,
+                    "2": true
+                }
+            }
+        }
     },
     "extension_settings": {
         "apiUrl": "http://localhost:5100",

         "temp_openai": 1.0,
         "freq_pen_openai": 0,
         "pres_pen_openai": 0,
-        "count_pen": 0,
         "top_p_openai": 1,
         "top_k_openai": 0,
         "stream_openai": true,

         "wi_format": "{0}",
         "openai_model": "gpt-4-turbo",
         "claude_model": "claude-3-5-sonnet-20240620",
-        "ai21_model": "j2-ultra",
+        "ai21_model": "jamba-1.5-large",
         "windowai_model": "",
         "openrouter_model": "OR_Website",
         "jailbreak_system": true,

@@ -624,7 +632,6 @@
624	"show_external_models": false,	632	"show_external_models": false,
625	"proxy_password": "",	633	"proxy_password": "",
626	"assistant_prefill": "",	634	"assistant_prefill": "",
627	"assistant_impersonation": "",	635	"assistant_impersonation": ""
628	"use_ai21_tokenizer": false
629	}	636	}
630	}	637	}

default/content/themes/Azure.json+1 -0 Viewed

     "timestamps_enabled": true,
     "timestamp_model_icon": false,
     "mesIDDisplay_enabled": true,
+    "hideChatAvatars_enabled": false,
     "message_token_count_enabled": false,
     "expand_message_actions": false,
     "enableZenSliders": false,

default/content/themes/Cappuccino.json+1 -0 Viewed

     "timestamps_enabled": true,
     "timestamp_model_icon": true,
     "mesIDDisplay_enabled": true,
+    "hideChatAvatars_enabled": false,
     "message_token_count_enabled": false,
     "expand_message_actions": false,
     "enableZenSliders": false,

default/content/themes/Dark Lite.json+1 -0 Viewed

     "timestamps_enabled": true,
     "timestamp_model_icon": true,
     "mesIDDisplay_enabled": false,
+    "hideChatAvatars_enabled": false,
     "message_token_count_enabled": false,
     "expand_message_actions": false,
     "enableZenSliders": "",

default/content/themes/Dark V 1.0.json+0 -0 Viewed

default/content/user-default.png+0 -0 Viewed

Binary file

package-lock.json+2 -2 Viewed

+{
     "name": "sillytavern",
-    "version": "1.12.4",
+    "version": "1.12.5",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
-            "version": "1.12.4",
+            "version": "1.12.5",
             "hasInstallScript": true,
             "license": "AGPL-3.0",
             "dependencies": {

package.json+1 -1 Viewed

         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.12.4",
+    "version": "1.12.5",
     "scripts": {
         "start": "node server.js",
         "start:no-csrf": "node server.js --disableCsrf",

public/img/ai4.png+0 -0 Viewed

Binary file

public/index.html+39 -46 Viewed

     <title>SillyTavern</title>
     <base href="/">
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, viewport-fit=cover, initial-scale=1, maximum-scale=1.0, user-scalable=no">
+    <meta name="viewport" content="width=device-width, viewport-fit=cover, initial-scale=1, maximum-scale=1.0, user-scalable=no, interactive-widget=resizes-content">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="darkreader-lock">
     <meta name="robots" content="noindex, nofollow" />

                                         </div>
                                     </div>
                                 </div>
-                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,ai21,custom,cohere,perplexity,groq">
+                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,custom,cohere,perplexity,groq">
                                     <div class="range-block-title" data-i18n="Frequency Penalty">
                                         Frequency Penalty
                                     </div>

                                         </div>
                                     </div>
                                 </div>
-                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,ai21,custom,cohere,perplexity,groq">
+                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,custom,cohere,perplexity,groq">
                                     <div class="range-block-title" data-i18n="Presence Penalty">
                                         Presence Penalty
                                     </div>

                                         </div>
                                     </div>
                                 </div>
-                                <div data-newbie-hidden class="range-block" data-source="ai21">
+                                <div data-newbie-hidden class="range-block" data-source="claude,openrouter,makersuite,cohere,perplexity">
-                                    <div class="range-block-title" data-i18n="Count Penalty">
-                                        Count Penalty
-                                    </div>
-                                    <div class="range-block-range-and-counter">
-                                        <div class="range-block-range">
-                                            <input type="range" id="count_pen" name="volume" min="0" max="1" step="0.01">
-                                        </div>
-                                        <div class="range-block-counter">
-                                            <input type="number" min="0" max="1" step="0.01" data-for="count_pen" id="count_pen_counter">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div data-newbie-hidden class="range-block" data-source="claude,openrouter,ai21,makersuite,cohere,perplexity">
                                     <div class="range-block-title" data-i18n="Top K">
                                         Top K
                                     </div>

                                             </select>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="ai21">
-                                        <label for="use_ai21_tokenizer" title="Use AI21 Tokenizer" data-i18n="[title]Use AI21 Tokenizer" class="checkbox_label widthFreeExpand">
-                                            <input id="use_ai21_tokenizer" type="checkbox" /><span data-i18n="Use AI21 Tokenizer">Use AI21 Tokenizer</span>
-                                        </label>
-                                        <div class="toggle-description justifyLeft">
-                                            <span data-i18n="Use the appropriate tokenizer for Jurassic models, which is more efficient than GPT's.">Use the appropriate tokenizer for Jurassic models, which is more efficient than GPT's.</span>
-                                        </div>
-                                    </div>
-                                    <div class="range-block" data-source="makersuite">
-                                        <label for="use_google_tokenizer" title="Use Google Tokenizer" data-i18n="[title]Use Google Tokenizer" class="checkbox_label widthFreeExpand">
-                                            <input id="use_google_tokenizer" type="checkbox" /><span data-i18n="Use Google Tokenizer">Use Google Tokenizer</span>
-                                        </label>
-                                        <div class="toggle-description justifyLeft">
-                                            <span data-i18n="Use the appropriate tokenizer for Google models via their API. Slower prompt processing, but offers much more accurate token counting.">Use the appropriate tokenizer for Google models via their API. Slower prompt processing, but offers much more accurate token counting.</span>
-                                        </div>
-                                    </div>
                                     <div class="range-block" data-source="makersuite">
                                         <label for="use_makersuite_sysprompt" class="checkbox_label widthFreeExpand">
                                             <input id="use_makersuite_sysprompt" type="checkbox" />

                                                     <div class="fa-solid fa-clock-rotate-left"></div>
                                                 </div>
                                             </div>
-                                            <textarea id="claude_human_sysprompt_textarea" class="text_pole textarea_compact" rows="4" maxlength="10000" data-i18n="[placeholder]Human message" placeholder="Human message, instruction, etc.&#10;Adds nothing when empty, i.e. requires a new prompt with the role 'user'."></textarea>
+                                            <textarea id="claude_human_sysprompt_textarea" class="text_pole textarea_compact" rows="4" data-i18n="[placeholder]Human message" placeholder="Human message, instruction, etc.&#10;Adds nothing when empty, i.e. requires a new prompt with the role 'user'."></textarea>
                                         </div>
                                     </div>
                                 </div>

                                 <option value="claude">Claude</option>
                                 <option value="cohere">Cohere</option>
                                 <option value="groq">Groq</option>
-                                <option value="makersuite">Google MakerSuite</option>
+                                <option value="makersuite">Google AI Studio</option>
                                 <option value="mistralai">MistralAI</option>
                                 <option value="openrouter">OpenRouter</option>
                                 <option value="perplexity">Perplexity</option>

                             <div>
                                 <h4 data-i18n="AI21 Model">AI21 Model</h4>
                                 <select id="model_ai21_select">
-                                    <optgroup label="Latest">
+                                    <optgroup label="Jamba 1.5">
-                                        <option value="j2-ultra">j2-ultra</option>
+                                        <option value="jamba-1.5-mini">jamba-1.5-mini</option>
-                                        <option value="j2-mid">j2-mid</option>
+                                        <option value="jamba-1.5-large">jamba-1.5-large</option>
-                                        <option value="j2-light">j2-light</option>
+                                    </optgroup>
+                                    <optgroup label="Jamba-Instruct (Deprecated)">
+                                        <option value="jamba-instruct-preview">jamba-instruct-preview</option>
                                     </optgroup>
                                 </select>
                             </div>
                         </form>
                         <form id="makersuite_form" data-source="makersuite" action="javascript:void(null);" method="post" enctype="multipart/form-data">
-                            <h4 data-i18n="MakerSuite API Key">MakerSuite API Key</h4>
+                            <h4 data-i18n="Google AI Studio API Key">Google AI Studio API Key</h4>
                             <div class="flex-container">
                                 <input id="api_key_makersuite" name="api_key_makersuite" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
                                 <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_makersuite"></div>

                                     </optgroup>
                                     <optgroup label="Subversions">
                                         <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
+                                        <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
                                         <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
                                         <option value="gemini-1.5-pro-001">Gemini 1.5 Pro [001]</option>
+                                        <option value="gemini-1.5-flash-exp-0827">Gemini 1.5 Flash Experiment 2024-08-27</option>
+                                        <option value="gemini-1.5-flash-8b-exp-0827">Gemini 1.5 Flash 8B Experiment 2024-08-27</option>
                                         <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash [latest]</option>
                                         <option value="gemini-1.5-flash-001">Gemini 1.5 Flash [001]</option>
                                         <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro [latest]</option>

                                         <option value="command">command</option>
                                         <option value="command-r">command-r</option>
                                         <option value="command-r-plus">command-r-plus</option>
+                                        <option value="command-r-08-2024">command-r-08-2024</option>
+                                        <option value="command-r-plus-08-2024">command-r-plus-08-2024</option>
                                     </optgroup>
                                     <optgroup label="Nightly">
                                         <option value="command-light-nightly">command-light-nightly</option>

                                 <option value="3">Llama 1/2</option>
                                 <option value="12">Llama 3</option>
                                 <option value="13">Gemma / Gemini</option>
+                                <option value="14">Jamba</option>
                                 <option value="4">NerdStash (NovelAI Clio)</option>
                                 <option value="5">NerdStash v2 (NovelAI Kayra)</option>
                                 <option value="7">Mistral</option>

                                             <div class="alignitemscenter flex-container flexFlowColumn flexGrow flexShrink gap0 flexBasis48p" title="Scan chronologically until reached min entries or token budget." data-i18n="[title]Scan chronologically until reached min entries or token budget.">
                                                 <small>
                                                     <span data-i18n="Min Activations">Min Activations</span>
+                                                    <div class="fa-solid fa-triangle-exclamation opacity50p" data-i18n="[title](disabled when max recursion steps are used)" title="(disabled when max recursion steps are used)"></div>
                                                 </small>
                                                 <input class="neo-range-slider" type="range" id="world_info_min_activations" name="world_info_min_activations" min="0" max="100" step="1">
                                                 <input class="neo-range-input" type="number" min="0" max="100" step="1" data-for="world_info_min_activations" id="world_info_min_activations_counter">

                                                 <input class="neo-range-slider" type="range" id="world_info_min_activations_depth_max" name="volume" min="0" max="100" step="1">
                                                 <input class="neo-range-input" type="number" min="0" max="100" step="1" data-for="world_info_min_activations_depth_max" id="world_info_min_activations_depth_max_counter">
                                             </div>
+                                            <div class="alignitemscenter flex-container flexFlowColumn flexGrow flexShrink gap0 flexBasis48p" title="Cap the number of entry activation recursions" data-i18n="[title]Cap the number of entry activation recursions">
+                                                <small>
+                                                    <span data-i18n="Max Recursion Steps">Max Recursion Steps</span>
+                                                    <div class="fa-solid fa-triangle-exclamation opacity50p" data-i18n="[title]0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc\n(disabled when min activations are used)" title="0 = unlimited, 1 = scans once and doesn't recurse, 2 = scans once and recurses once, etc&#10;(disabled when min activations are used)"></div>
+                                                </small>
+                                                <input class="neo-range-slider" type="range" id="world_info_max_recursion_steps" name="world_info_max_recursion_steps" min="0" max="10" step="1">
+                                                <input class="neo-range-input" type="number" min="0" max="10" step="1" data-for="world_info_max_recursion_steps" id="world_info_max_recursion_steps_counter">
+                                            </div>
                                             <div class="alignitemscenter flex-container flexFlowColumn flexGrow flexShrink flexBasis48p">
                                                 <small data-i18n="Insertion Strategy">

                                         <span data-i18n="Font Scale">Font Scale</span>
                                         <div class="fa-solid fa-circle-info opacity50p" data-i18n="[title]Font size" title="Font size"></div>
                                     </small>
-                                    <input class="neo-range-slider" type="range" id="font_scale" name="font_scale" min="0.8" max="1.2" step="0.01">
+                                    <input class="neo-range-slider" type="range" id="font_scale" name="font_scale" min="0.5" max="1.5" step="0.01">
-                                    <input class="neo-range-input" type="number" min="0.8" max="1.2" step="0.01" data-for="font_scale" id="font_scale_counter">
+                                    <input class="neo-range-input" type="number" min="0.5" max="1.5" step="0.01" data-for="font_scale" id="font_scale_counter">
                                 </div>
                                 <div class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">

                                     <input id="movingUImode" type="checkbox" />
                                     <small data-i18n="Movable UI Panels">MovingUI&nbsp;<i class="fa-solid fa-desktop"></i></small>
                                 </label>
-                                <div data-newbie-hidden id="movingUIreset" title="Reset MovingUI panel sizes/locations." class="menu_button margin0" data-i18n="[title]Reset MovingUI panel sizes/locations."><i class=" fa-solid fa-recycle margin-r5"></i> Reset</div>
+                                <div data-newbie-hidden id="movingUIreset" title="Reset MovingUI panel sizes/locations." class="menu_button margin0" data-i18n="[title]Reset MovingUI panel sizes/locations."><i class=" fa-solid fa-recycle margin-r5"></i> <span data-i18n="mui_reset">Reset</span></div>
                             </div>
                             <div data-newbie-hidden id="MovingUI-presets-block" class="flex-container alignitemscenter">
                                 <div class="flex-container alignItemsFlexEnd">

                                 <div data-newbie-hidden>
                                     <label for="persona_description_position" data-i18n="Position:">Position:</label>
                                     <select id="persona_description_position">
+                                        <option value="9" data-i18n="None (disabled)">None (disabled)</option>
                                         <option value="0" data-i18n="In Story String / Prompt Manager">In Story String / Prompt Manager</option>
                                         <option value="2" data-i18n="Top of Author's Note">Top of Author's Note</option>
                                         <option value="3" data-i18n="Bottom of Author's Note">Bottom of Author's Note</option>

                         <div class="flex-container wide100p flexGap10">
                             <div class="flex4 flex-container flexFlowColumn flexNoGap">
                                 <div class="flex-container justifySpaceBetween">
-                                    <small for="characterFilter" data-i18n="Filter to Character(s)">
+                                    <small for="characterFilter" data-i18n="Filter to Characters or Tags">
-                                        Filter to Character(s)
+                                        Filter to Characters or Tags
                                     </small>
                                     <label class="checkbox_label flexNoGap margin-r5" for="character_exclusion">
                                         <input type="checkbox" name="character_exclusion" />
                                         <span>
-                                            <small data-i18n="Character Exclusion">Character Exclusion</small>
+                                            <small title="Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry" data-i18n="[title]Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry">
+                                                <span data-i18n="Exclude">Exclude</span>
+                                                <div class="fa-solid fa-circle-info opacity50p"></div>
+                                            </small>
                                         </span>
                                     </label>
                                 </div>

     <script src="lib/jquery-cookie-1.4.1.min.js"></script>
     <script src="lib/jquery.ui.touch-punch.min.js"></script>
     <script src="lib/showdown.min.js"></script>
+    <script src="lib/showdown-patch.js"></script>
     <script src="lib/showdown-katex.min.js"></script>
     <script src="lib/popper.js"></script>
     <script src="lib/purify.min.js"></script>

public/lib/showdown-patch.js+24 -0 Viewed

+showdown.subParser('unhashHTMLSpans', function (text, options, globals) {
+    'use strict';
+    text = globals.converter._dispatch('unhashHTMLSpans.before', text, options, globals);
+    for (var i = 0; i < globals.gHtmlSpans.length; ++i) {
+        var repText = globals.gHtmlSpans[i],
+            // limiter to prevent infinite loop (assume 10 as limit for recurse)
+            limit = 0;
+        while (/¨C(\d+)C/.test(repText)) {
+            var num = RegExp.$1;
+            repText = repText.replace('¨C' + num + 'C', globals.gHtmlSpans[num]);
+            if (limit === 10000) {
+                console.error('maximum nesting of 10000 spans reached!!!');
+                break;
+            }
+            ++limit;
+        }
+        text = text.replace('¨C' + i + 'C', repText);
+    }
+    text = globals.converter._dispatch('unhashHTMLSpans.after', text, options, globals);
+    return text;
+});

public/locales/ar-sa.json+1 -1 Viewed

     "Alt Method": "طريقة بديلة",
     "AI21 API Key": "مفتاح API لـ AI21",
     "AI21 Model": "نموذج AI21",
-    "MakerSuite API Key": "مفتاح واجهة برمجة تطبيقات MakerSuite",
+    "Google AI Studio API Key": "مفتاح واجهة برمجة تطبيقات Google AI Studio",
     "Google Model": "نموذج جوجل",
     "MistralAI API Key": "مفتاح واجهة برمجة التطبيقات MistralAI",
     "MistralAI Model": "نموذج ميسترال آي آي",

public/locales/de-de.json+1 -1 Viewed

     "Alt Method": "Alternative Methode",
     "AI21 API Key": "AI21 API-Schlüssel",
     "AI21 Model": "AI21-Modell",
-    "MakerSuite API Key": "MakerSuite API-Schlüssel",
+    "Google AI Studio API Key": "Google AI Studio API-Schlüssel",
     "Google Model": "Google-Modell",
     "MistralAI API Key": "MistralAI API-Schlüssel",
     "MistralAI Model": "MistralAI-Modell",

public/locales/es-es.json+1 -1 Viewed

     "Alt Method": "Método alternativo",
     "AI21 API Key": "Clave API de AI21",
     "AI21 Model": "Modelo de AI21",
-    "MakerSuite API Key": "Clave API de MakerSuite",
+    "Google AI Studio API Key": "Clave API de Google AI Studio",
     "Google Model": "Modelo de Google",
     "MistralAI API Key": "Clave API de MistralAI",
     "MistralAI Model": "Modelo MistralAI",

public/locales/fr-fr.json+1 -1 Viewed

     "Alt Method": "Méthode alternative",
     "AI21 API Key": "Clé API AI21",
     "AI21 Model": "Modèle AI21",
-    "MakerSuite API Key": "Clé API MakerSuite",
+    "Google AI Studio API Key": "Clé API Google AI Studio",
     "Google Model": "Modèle Google",
     "MistralAI API Key": "Clé API MistralAI",
     "MistralAI Model": "Modèle MistralAI",

public/locales/is-is.json+1 -1 Viewed

     "Alt Method": "Aðferð Bakmenn",
     "AI21 API Key": "Lykill API fyrir AI21",
     "AI21 Model": "AI21 Módel",
-    "MakerSuite API Key": "MakerSuite API lykill",
+    "Google AI Studio API Key": "Google AI Studio API lykill",
     "Google Model": "Google líkan",
     "MistralAI API Key": "MistralAI API lykill",
     "MistralAI Model": "MistralAI líkan",

public/locales/it-it.json+1 -1 Viewed

     "Alt Method": "Metodo alternativo",
     "AI21 API Key": "Chiave API di AI21",
     "AI21 Model": "Modello AI21",
-    "MakerSuite API Key": "Chiave API MakerSuite",
+    "Google AI Studio API Key": "Chiave API Google AI Studio",
     "Google Model": "Modello Google",
     "MistralAI API Key": "Chiave API MistralAI",
     "MistralAI Model": "Modello MistralAI",

public/locales/ja-jp.json+1 -1 Viewed

     "Alt Method": "代替手法",
     "AI21 API Key": "AI21のAPIキー",
     "AI21 Model": "AI21モデル",
-    "MakerSuite API Key": "MakerSuite APIキー",
+    "Google AI Studio API Key": "Google AI Studio APIキー",
     "Google Model": "Google モデル",
     "MistralAI API Key": "MistralAI API キー",
     "MistralAI Model": "MistralAI モデル",

public/locales/ko-kr.json+1 -1 Viewed

     "Alt Method": "대체 방법",
     "AI21 API Key": "AI21 API 키",
     "AI21 Model": "AI21 모델",
-    "MakerSuite API Key": "MakerSuite API 키",
+    "Google AI Studio API Key": "Google AI Studio API 키",
     "Google Model": "구글 모델",
     "MistralAI API Key": "MistralAI API 키",
     "MistralAI Model": "MistralAI 모델",

public/locales/pt-pt.json+1 -1 Viewed

     "Alt Method": "Método Alternativo",
     "AI21 API Key": "Chave da API AI21",
     "AI21 Model": "Modelo AI21",
-    "MakerSuite API Key": "Chave API MakerSuite",
+    "Google AI Studio API Key": "Chave API Google AI Studio",
     "Google Model": "Modelo Google",
     "MistralAI API Key": "Chave de API MistralAI",
     "MistralAI Model": "Modelo MistralAI",

public/locales/ru-ru.json+55 -8 Viewed

     "Smoothing Factor": "Коэффициент сглаживания",
     "No Repeat Ngram Size": "Размер no_repeat_ngram",
     "Min Length": "Мин. длина",
-    "Alternative server URL (leave empty to use the default value).": "Альтернативный URL сервера (оставьте пустым для стандартного значения)",
+    "Alternative server URL (leave empty to use the default value).": "URL альтернативного сервера (оставьте пустым для стандартного значения)",
     "Remove your real OAI API Key from the API panel BEFORE typing anything into this box": "Удалите свой личный OAI API Key из панели API, и ТОЛЬКО ПОСЛЕ ЭТОГО вводите что-то сюда",
     "We cannot provide support for problems encountered while using an unofficial OpenAI proxy": "Мы не сможем предоставить помощь с проблемами, с которыми вы столкнетесь при использовании неофициальных прокси для OpenAI",
     "Context Size (tokens)": "Размер контекста (в токенах)",

     "Generate only one line per request": "Генерировать одну строку на запрос",
     "Misc. Settings": "Доп. настройки",
     "Auto-Continue": "Авто-продолжение",
-    "Collapse Consecutive Newlines": "Сворачивать последовательные новые строки",
+    "Collapse Consecutive Newlines": "Сворачивать неск. новых строк в одну",
     "Allow for Chat Completion APIs": "Разрешить для Chat Completion API",
     "Target length (tokens)": "Целевая длина (в токенах)",
     "World Info": "Информация о мире",

     "Prefer Character Card Prompt": "Приоритет промпту из карточки персонажа",
     "Prefer Character Card Jailbreak": "Приоритет джейлбрейку из карточки персонажа",
     "Press Send to continue": "Кнопка отправки продолжает сообщение",
-    "Quick 'Continue' button": "Кнопка быстрого продолжения",
+    "Quick 'Continue' button": "Быстрое продолжение",
     "Log prompts to console": "Выводить промпты в консоль",
     "Never resize avatars": "Не менять размер аватарок",
     "Show avatar filenames": "Показывать названия файлов аватарок",

     "(Write a comma-separated list of tags)": "(Список тегов через запятую)",
     "(A brief description of the personality)": "(Краткое описание личности)",
     "(Circumstances and context of the interaction)": "(Обстоятельства и контекст этого диалога)",
-    "(Examples of chat dialog. Begin each example with START on a new line.)": "(Примеры диалога. Начинайте каждый пример с START или новой линией.)",
+    "(Examples of chat dialog. Begin each example with START on a new line.)": "(Примеры диалога. Начинайте каждый пример с START или новой строкой.)",
     "Type here...": "Пишите здесь...",
     "Comma separated (required)": "Через запятую (обязательное поле)",
     "What this keyword should mean to the AI, sent verbatim": "Что это ключевое слово должно означать для ИИ, отправляется дословно",

     "Click to set a new User Name": "Нажмите, чтобы задать новое имя пользователя.",
     "Click to lock your selected persona to the current chat. Click again to remove the lock.": "Нажмите, чтобы закрепить выбранную персону для текущего чата. Нажмите еще раз, чтобы открепить.",
     "Click to set user name for all messages": "Нажмите, чтобы задать имя пользователя для всех сообщений.",
-    "Create a dummy persona": "Создать персону-болванку",
+    "Create a dummy persona": "Создать пустую персону",
     "Character Management": "Управление персонажами",
     "Locked = Character Management panel will stay open": "Закреплено = Панель управление персонажами останется открытой",
     "Select/Create Characters": "Выбрать/Создать персонажа",

     "Automatically select a background based on the chat context": "Автоматический выбор фона в зависимости от контекста чата",
     "Filter": "Фильтр",
     "Exclude message from prompts": "Исключить сообщение из промпта",
-    "Include message in prompts": "Включить сообщение в подсказки",
+    "Include message in prompts": "Включить сообщение в промпт",
     "Create checkpoint": "Создать чекпоинт",
     "Create Branch": "Создать ветку",
     "Embed file or image": "Вставить файл или изображение",

     "Proxy Server URL": "Адрес прокси-сервера",
     "MistralAI Model": "Модель MistralAI",
     "MistralAI API Key": "Ключ от API MistralAI",
-    "MakerSuite API Key": "Ключ от API MakerSuite",
+    "Google AI Studio API Key": "Ключ от API Google AI Studio",
     "Google Model": "Модель Google",
     "Cohere API Key": "Ключ от API Cohere",
     "Cohere Model": "Модель Cohere",

     "ext_regex_ai_output_desc": "Сообщения, полученные от API",
     "ext_regex_sts_desc": "Сообщения, отправленные с помощью команд STscript",
     "ext_regex_wi_desc": "Содержимое лорбуков и миров. Для работы требует включения флажка \"Только промпт\"!",
-    "ext_regex_only_format_display_desc": "История чата не изменится, замена будет осуществляться только в отображаемом сообщении (в UI)"
+    "ext_regex_only_format_display_desc": "История чата не изменится, замена будет осуществляться только в отображаемом сообщении (в UI)",
+    "Prefer Character Card Instructions": "Приоритет инструкциям из карточек",
+    "If checked and the character card contains a Post-History Instructions override, use that instead": "Если в карточке персонажа имеется собственная инструкция после истории, в промпт попадёт именно она",
+    "Auto-select Input Text": "Автовыделение вводимого текста",
+    "Enable auto-select of input text in some text fields when clicking/selecting them. Applies to popup input textboxes, and possible other custom input fields.": "Автоматически выделять вводимый текст в некоторых текстовых полях при клике/выборе. Работает для вспл. окон и различных кастомных полей ввода.",
+    "Reset MovingUI panel sizes/locations.": "Сбросить расположение и размеры панелей MovingUI.",
+    "mui_reset": "Сброс",
+    "Quick 'Impersonate' button": "Быстрое перевоплощение",
+    "Show a button in the input area to ask the AI to impersonate your character for a single message": "Показать в поле ввода кнопку, по нажатии на которую ИИ сгенерирует одно сообщение от лица вашего персонажа.",
+    "Separators as Stop Strings": "Разделители как стоп-строки",
+    "Names as Stop Strings": "Имена как стоп-строки",
+    "Add Character and User names to a list of stopping strings.": "Добавлять имена персонажа и пользователя в список стоп-строк.",
+    "Allow Post-History Instructions": "Разрешить инструкции после истории",
+    "context_allow_post_history_instructions": "Добавлять в конец промпта инструкции после истории. Работает только при наличии таких инструкций в карточке И при включенной опции ''Приоритет инструкциям из карточек''.\nНЕ РЕКОМЕНДУЕТСЯ ДЛЯ МОДЕЛЕЙ TEXT COMPLETION, МОЖЕТ ПОРТИТЬ ВЫХОДНОЙ ТЕКСТ.",
+    "First User Prefix": "Первый префикс пользователя",
+    "Inserted before the first User's message.": "Вставляется перед первым сообщением пользователя.",
+    "Last User Prefix": "Последний префикс пользователя",
+    "instruct_last_input_sequence": "Вставляется перед последним сообщением пользователя.",
+    "Inserted before a User message and as a last prompt line when impersonating.": "Вставляется перед сообщением пользователя в качестве последней строки промпта при перевоплощении.",
+    "Inserted before a System (added by slash commands or extensions) message.": "Вставляется перед сообщением системы (может быть добавлено слэш-командой или расширением).",
+    "Load Asset List": "Загрузить список ресурсов",
+    "Never add character names.": "Не вставлять имя персонажа.",
+    "Don't add character names unless necessary.": "Вставлять имя персонажа только когда это необходимо.",
+    "character_names_none": "Не добавлять имена персонажей в качестве префикса. Может повредить качеству ответов в групповых чатах, используйте с осторожностью.",
+    "Auxiliary": "Вспомогательный",
+    "Post-History Instructions": "Инструкции после истории",
+    "Current persona updated": "Текущая персона изменена",
+    "Your messages will now be sent as ${0}": "Ваши сообщения будут отправляться от лица ${0}",
+    "Copied!": "Скопировано!",
+    "Are you sure you want to delete this message?": "Вы точно хотите удалить это сообщение?",
+    "Delete Message": "Удалить сообщение",
+    "Delete Swipe": "Удалить свайп",
+    "Could not get a reply from API. Check your connection settings / API key and try again.": "Не удалось получить ответ от API. Проверьте настройки соединения и API-ключ и повторите попытку.",
+    "Connecting To Proxy": "Подключение к прокси",
+    "Are you sure you want to connect to the following proxy URL?": "Вы точно хотите соединиться с прокси по этому адресу?",
+    "API connection successful!": "Соединение с API установлено!",
+    "Proxy Saved": "Прокси сохранена",
+    "Proxy Deleted": "Прокси удалена",
+    "Could not find proxy with name '${0}'": "Не удалось найти прокси с названием '${0}'",
+    "Proxy preset '${0}' not found in proxies array.": "Пресет с названием '${0}' не найден в списке прокси.",
+    "Please wait for the previous request to complete.": "Пожалуйста, дождитесь окончания обработки предыдущего запроса.",
+    "Start new chat?": "Начать новый чат?",
+    "If necessary, you can later restore this chat file from the /backups folder": "При необходимости этот чат можно будет восстановить из папки /backups",
+    "Also delete the current chat file": "Также удалить текущий чат",
+    "chat_rename_1": "Введите новое имя чата:",
+    "chat_rename_2": "!!Не используйте имя уже существующего файла, это приведёт к ошибке!!",
+    "chat_rename_3": "Будут разрушены связи между чатами-чекпоинтами.",
+    "chat_rename_4": "Расширение '.jsonl' дописывать не нужно."
+}

public/locales/uk-ua.json+1 -1 Viewed

     "Alt Method": "Альтернативний метод",
     "AI21 API Key": "Ключ API для AI21",
     "AI21 Model": "Модель AI21",
-    "MakerSuite API Key": "Ключ API MakerSuite",
+    "Google AI Studio API Key": "Ключ API Google AI Studio",
     "Google Model": "Модель Google",
     "MistralAI API Key": "Ключ API MistralAI",
     "MistralAI Model": "Модель MistralAI",

public/locales/vi-vn.json+1 -1 Viewed

     "Alt Method": "Phương pháp thay thế",
     "AI21 API Key": "Khóa API của AI21",
     "AI21 Model": "Mô hình AI21",
-    "MakerSuite API Key": "Khóa API MakerSuite",
+    "Google AI Studio API Key": "Khóa API Google AI Studio",
     "Google Model": "Mô hình Google",
     "MistralAI API Key": "Khóa API MistralAI",
     "MistralAI Model": "Mô hình MistralAI",

public/locales/zh-cn.json+1 -1 Viewed

     "Alt Method": "备用方法",
     "AI21 API Key": "AI21 API 密钥",
     "AI21 Model": "AI21 模型",
-    "MakerSuite API Key": "MakerSuite API 密钥",
+    "Google AI Studio API Key": "Google AI Studio API 密钥",
     "Google Model": "Google 模型",
     "MistralAI API Key": "MistralAI API 密钥",
     "MistralAI Model": "MistralAI 模型",

public/locales/zh-tw.json+1 -1 Viewed

     "Alt Method": "替代方法",
     "AI21 API Key": "AI21 API 金鑰",
     "AI21 Model": "AI21 模型",
-    "MakerSuite API Key": "MakerSuite API 金鑰",
+    "Google AI Studio API Key": "Google AI Studio API 金鑰",
     "Google Model": "Google 模型",
     "MistralAI API Key": "MistralAI API 金鑰",
     "MistralAI Model": "MistralAI 模型",

public/script.js+113 -81 Viewed

     context_presets,
     resetMovableStyles,
     forceCharacterEditorTokenize,
+    applyPowerUserSettings,
 } from './scripts/power-user.js';
 import {

 import { INTERACTABLE_CONTROL_CLASS, initKeyboard } from './scripts/keyboard.js';
 import { initDynamicStyles } from './scripts/dynamic-styles.js';
 import { SlashCommandEnumValue, enumTypes } from './scripts/slash-commands/SlashCommandEnumValue.js';
-import { enumIcons } from './scripts/slash-commands/SlashCommandCommonEnumsProvider.js';
+import { commonEnumProviders, enumIcons } from './scripts/slash-commands/SlashCommandCommonEnumsProvider.js';
 //exporting functions and vars for mods
 export {

     GENERATION_STOPPED: 'generation_stopped',
     GENERATION_ENDED: 'generation_ended',
     EXTENSIONS_FIRST_LOAD: 'extensions_first_load',
+    EXTENSION_SETTINGS_LOADED: 'extension_settings_loaded',
     SETTINGS_LOADED: 'settings_loaded',
     SETTINGS_UPDATED: 'settings_updated',
     GROUP_UPDATED: 'group_updated',

 export let name1 = default_user_name;
 export let name2 = 'SillyTavern System';
 export let chat = [];
-let safetychat = [
-    {
-        name: systemUserName,
-        is_user: false,
-        create_date: 0,
-        mes: 'You deleted a character/chat and arrived back here for safety reasons! Pick another character!',
-    },
-];
 let chatSaveTimeout;
 let importFlashTimeout;
 export let isChatSaving = false;

 export const MAX_INJECTION_DEPTH = 1000;
+const SAFETY_CHAT = [
+    {
+        name: systemUserName,
+        force_avatar: system_avatar,
+        is_system: true,
+        is_user: false,
+        create_date: 0,
+        mes: 'You deleted a character/chat and arrived back here for safety reasons! Pick another character!',
+    },
+];
 export let system_messages = {};
 async function getSystemMessages() {

+    }
     if (Number(messageId) === 0 && !isSystem && !isUser) {
+        const mesBeforeReplace = mes;
+        const chatMessage = chat[messageId];
         mes = substituteParams(mes, undefined, ch_name);
+        if (chatMessage && chatMessage.mes === mesBeforeReplace && chatMessage.extra?.display_text !== mesBeforeReplace) {
+            chatMessage.mes = mes;
+        }
+    }
     mesForShowdownParse = mes;

@@ -2185,7 +2195,7 @@ export function addCopyToCodeBlocks(messageElement) {
2185	codeBlocks.get(i).appendChild(copyButton);	2195	codeBlocks.get(i).appendChild(copyButton);
2186	copyButton.addEventListener('pointerup', function (event) {	2196	copyButton.addEventListener('pointerup', function (event) {
2187	navigator.clipboard.writeText(codeBlocks.get(i).innerText);	2197	navigator.clipboard.writeText(codeBlocks.get(i).innerText);
2188	toastr.info('Copied!', '', { timeOut: 2000 });	2198	toastr.info(t`Copied!`, '', { timeOut: 2000 });
2189	});	2199	});
2190	}	2200	}
2191	}	2201	}

     const INJECT_TAG = 'PERSONA_DESCRIPTION';
     setExtensionPrompt(INJECT_TAG, '', extension_prompt_types.IN_PROMPT, 0);
-    if (!power_user.persona_description) {
+    if (!power_user.persona_description || power_user.persona_description_position === persona_description_positions.NONE) {
         return;
+    }

+}
 export function isStreamingEnabled() {
-    const noStreamSources = [chat_completion_sources.SCALE, chat_completion_sources.AI21];
+    const noStreamSources = [chat_completion_sources.SCALE];
     return ((main_api == 'openai' && oai_settings.stream_openai && !noStreamSources.includes(oai_settings.chat_completion_source) && !(oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE && oai_settings.google_model.includes('bison')))
         || (main_api == 'kobold' && kai_settings.streaming_kobold && kai_flags.can_use_streaming)
         || (main_api == 'novel' && nai_settings.streaming_novel)

+}
 class StreamingProcessor {
-    constructor(type, force_name2, timeStarted, messageAlreadyGenerated) {
+    /**
+     * Creates a new streaming processor.
+     * @param {string} type Generation type
+     * @param {boolean} forceName2 If true, force the use of name2
+     * @param {Date} timeStarted Date when generation was started
+     * @param {string} continueMessage Previous message if the type is 'continue'
+     */
+    constructor(type, forceName2, timeStarted, continueMessage) {
         this.result = '';
         this.messageId = -1;
         this.messageDom = null;

         /** @type {HTMLTextAreaElement} */
         this.sendTextarea = document.querySelector('#send_textarea');
         this.type = type;
-        this.force_name2 = force_name2;
+        this.force_name2 = forceName2;
         this.isStopped = false;
         this.isFinished = false;
         this.generator = this.nullStreamingGeneration;
         this.abortController = new AbortController();
         this.firstMessageText = '...';
         this.timeStarted = timeStarted;
-        this.messageAlreadyGenerated = messageAlreadyGenerated;
+        this.continueMessage = type === 'continue' ? continueMessage : '';
         this.swipes = [];
         /** @type {import('./scripts/logprobs.js').TokenLogprobs[]} */
         this.messageLogprobs = [];

             await eventSource.emit(event_types.IMPERSONATE_READY, text);
+        }
-        const continueMsg = this.type === 'continue' ? this.messageAlreadyGenerated : undefined;
+        saveLogprobsForActiveMessage(this.messageLogprobs.filter(Boolean), this.continueMessage);
-        saveLogprobsForActiveMessage(this.messageLogprobs.filter(Boolean), continueMsg);
         await saveChatConditional();
         unblockGeneration();
         generatedPromptCache = '';

@@ -3106,7 +3122,7 @@ class StreamingProcessor {
3106	if (logprobs) {	3122	if (logprobs) {
3107	this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));	3123	this.messageLogprobs.push(...(Array.isArray(logprobs) ? logprobs : [logprobs]));
3108	}	3124	}
3109	await sw.tick(() => this.onProgressStreaming(this.messageId, this.messageAlreadyGenerated + text));	3125	await sw.tick(() => this.onProgressStreaming(this.messageId, this.continueMessage + text));
3110	}	3126	}
3111	const seconds = (timestamps[timestamps.length - 1] - timestamps[0]) / 1000;	3127	const seconds = (timestamps[timestamps.length - 1] - timestamps[0]) / 1000;
3112	console.warn(`Stream stats: ${timestamps.length} tokens, ${seconds.toFixed(2)} seconds, rate: ${Number(timestamps.length / seconds).toFixed(2)} TPS`);	3128	console.warn(`Stream stats: ${timestamps.length} tokens, ${seconds.toFixed(2)} seconds, rate: ${Number(timestamps.length / seconds).toFixed(2)} TPS`);

     const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
     const isImpersonate = type == 'impersonate';
-    let message_already_generated = isImpersonate ? `${name1}: ` : `${name2}: `;
     if (!(dryRun || type == 'regenerate' || type == 'swipe' || type == 'quiet')) {
         const interruptedByCommand = await processCommands(String($('#send_textarea').val()));

     const storyStringParams = {
         description: description,
         personality: personality,
-        persona: persona,
+        persona: power_user.persona_description_position == persona_description_positions.IN_PROMPT ? persona : '',
         scenario: scenario,
         system: isInstruct ? system : '',
         char: name2,

     let oaiMessageExamples = [];
     if (main_api === 'openai') {
-        message_already_generated = '';
         oaiMessages = setOpenAIMessages(coreChat);
         oaiMessageExamples = setOpenAIMessageExamples(mesExamplesArray);
+    }

+    }
     let examplesString = '';
-    let chatString = '';
+    let chatString = addChatsPreamble(addChatsSeparator(''));
     let cyclePrompt = '';
     async function getMessagesTokenCount() {

             storyString,
             afterScenarioAnchor,
             examplesString,
+            userAlignmentMessage,
             chatString,
-            quiet_prompt,
+            modifyLastPromptLine(''),
             cyclePrompt,
-            userAlignmentMessage,
         ].join('').replace(/\r/gm, '');
         return getTokenCountAsync(encodeString, power_user.token_padding);
+    }

+        }
         tokenCount += await getTokenCountAsync(item.replace(/\r/gm, ''));
-        chatString = item + chatString;
         if (tokenCount < this_max_context) {
+            chatString = chatString + item;
             arrMes[index] = item;
             lastAddedIndex = Math.max(lastAddedIndex, index);
         } else {

+        }
         tokenCount += await getTokenCountAsync(item.replace(/\r/gm, ''));
-        chatString = item + chatString;
         if (tokenCount < this_max_context) {
+            chatString = chatString + item;
             arrMes[i] = item;
             lastAddedIndex = Math.max(lastAddedIndex, i);
         } else {

@@ -3882,7 +3895,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
3882	cyclePrompt += oai_settings.continue_postfix;	3895	cyclePrompt += oai_settings.continue_postfix;
3883	continue_mag += oai_settings.continue_postfix;	3896	continue_mag += oai_settings.continue_postfix;
3884	}	3897	}
3885	message_already_generated = continue_mag;
3886	}	3898	}
3887		3899
3888	const originalType = type;	3900	const originalType = type;

     async function checkPromptSize() {
         console.debug('---checking Prompt size');
         setPromptString();
+        const jointMessages = mesSend.map((e) => `${e.extensionPrompts.join('')}${e.message}`).join('');
         const prompt = [
             beforeScenarioAnchor,
             storyString,
             afterScenarioAnchor,
             mesExmString,
-            mesSend.map((e) => `${e.extensionPrompts.join('')}${e.message}`).join(''),
+            addChatsPreamble(addChatsSeparator(jointMessages)),
             '\n',
+            modifyLastPromptLine(''),
             generatedPromptCache,
-            quiet_prompt,
         ].join('').replace(/\r/gm, '');
         let thisPromptContextSize = await getTokenCountAsync(prompt, power_user.token_padding);

             padding: power_user.token_padding,
             main_api: main_api,
             instruction: isInstruct ? substituteParams(power_user.prefer_character_prompt && system ? system : power_user.instruct.system_prompt) : '',
-            userPersona: (power_user.persona_description || ''),
+            userPersona: (power_user.persona_description_position == persona_description_positions.IN_PROMPT ? (persona || '') : ''),
         };
         //console.log(additionalPromptStuff);

         console.debug(`pushed prompt bits to itemizedPrompts array. Length is now: ${itemizedPrompts.length}`);
         if (isStreamingEnabled() && type !== 'quiet') {
-            streamingProcessor = new StreamingProcessor(type, force_name2, generation_started, message_already_generated);
+            streamingProcessor = new StreamingProcessor(type, force_name2, generation_started, continue_mag);
             if (isContinue) {
                 // Save reply does add cycle text to the prompt, so it's not needed here
                 streamingProcessor.firstMessageText = '';

+        }
         navigator.clipboard.writeText(rawPromptValues);
-        toastr.info('Copied!');
+        toastr.info(t`Copied!`);
     });
     popup.dlg.querySelector('#showRawPrompt').addEventListener('click', function () {

     // Regex uses vars, so add before formatting
     getMessage = getRegexedString(getMessage, isImpersonate ? regex_placement.USER_INPUT : regex_placement.AI_OUTPUT);
-    if (!displayIncompleteSentences && power_user.trim_sentences) {
-        getMessage = trimToEndSentence(getMessage, power_user.include_newline);
-    }
     if (power_user.collapse_newlines) {
         getMessage = collapseNewlines(getMessage);
+    }
-    if (power_user.trim_spaces) {
-        getMessage = getMessage.trim();
-    }
     // trailing invisible whitespace before every newlines, on a multiline string
     // "trailing whitespace on newlines       \nevery line of the string    \n?sample text" ->
     // "trailing whitespace on newlines\nevery line of the string\nsample text"

         getMessage = getMessage.trim();
+    }
+    if (!displayIncompleteSentences && power_user.trim_sentences) {
+        getMessage = trimToEndSentence(getMessage, power_user.include_newline);
+    }
+    if (power_user.trim_spaces) {
+        getMessage = getMessage.trim();
+    }
     return getMessage;
+}

     // replaces deleted charcter name with system user since it will be displayed next.
     name2 = systemUserName;
     // sets up system user to tell user about having deleted a character
-    chat = [...safetychat];
+    chat.splice(0, chat.length, ...SAFETY_CHAT);
     // resets chat metadata
     chat_metadata = {};
     // resets the characters array, forcing getcharacters to reset

@@ -6300,7 +6314,7 @@ export function setUserName(value) {
6300	console.log(`User name changed to ${name1}`);	6314	console.log(`User name changed to ${name1}`);
6301	$('#your_name').val(name1);	6315	$('#your_name').val(name1);
6302	if (power_user.persona_show_notifications) {	6316	if (power_user.persona_show_notifications) {
6303	toastr.success(`Your messages will now be sent as ${name1}`, 'Current persona updated');	6317	toastr.success(t`Your messages will now be sent as ${name1}`, t`Current persona updated`);
6304	}	6318	}
6305	saveSettingsDebounced();	6319	saveSettingsDebounced();
6306	}	6320	}

         // Load power user settings
         await loadPowerUserSettings(settings, data);
+        applyPowerUserSettings();
         // Load character tags
         loadTagsSettings(settings);

         selected_button = settings.selected_button;
         if (data.enable_extensions) {
+            const enableAutoUpdate = Boolean(data.enable_extensions_auto_update);
             const isVersionChanged = settings.currentVersion !== currentVersion;
-            await loadExtensionSettings(settings, isVersionChanged);
+            await loadExtensionSettings(settings, isVersionChanged, enableAutoUpdate);
-            eventSource.emit(event_types.EXTENSION_SETTINGS_LOADED);
+            await eventSource.emit(event_types.EXTENSION_SETTINGS_LOADED);
+        }
         firstRun = !!settings.firstRun;

         button: '#api_button_openai',
         source: chat_completion_sources.OPENAI,
     },
+    // Google alias
+    'google': {
+        selected: 'openai',
+        button: '#api_button_openai',
+        source: chat_completion_sources.MAKERSUITE,
+    },
     // OpenRouter special naming, to differentiate between chat comp and text comp
     'openrouter': {
         selected: 'openai',

 /**
  * @param {string} text API name
  */
-async function connectAPISlash(_, text) {
+async function connectAPISlash(args, text) {
     if (!text.trim()) {
         for (const [key, config] of Object.entries(CONNECT_API_MAP)) {
             if (config.selected !== main_api) continue;

@@ -8487,12 +8510,15 @@ async function connectAPISlash(_, text) {
8487		8510
8488	return key;	8511	return key;
8489	}	8512	}
		8513
		8514	console.error('FIXME: The current API is not in the API map');
		8515	return '';
8490	}	8516	}
8491		8517
8492	const apiConfig = CONNECT_API_MAP[text.toLowerCase()];	8518	const apiConfig = CONNECT_API_MAP[text.toLowerCase()];
8493	if (!apiConfig) {	8519	if (!apiConfig) {
8494	toastr.error(`Error: ${text} is not a valid API`);	8520	toastr.error(`Error: ${text} is not a valid API`);
8495	return;	8521	return '';
8496	}	8522	}
8497		8523
8498	$(`#main_api option[value='${apiConfig.selected \|\| text}']`).prop('selected', true);	8524	$(`#main_api option[value='${apiConfig.selected \|\| text}']`).prop('selected', true);

@@ -8512,14 +8538,18 @@ async function connectAPISlash(_, text) {
8512	$(apiConfig.button).trigger('click');	8538	$(apiConfig.button).trigger('click');
8513	}	8539	}
8514		8540
8515	toastr.info(`API set to ${text}, trying to connect..`);	8541	const quiet = isTrueBoolean(args?.quiet);
		8542	const toast = quiet ? jQuery() : toastr.info(`API set to ${text}, trying to connect..`);
8516		8543
8517	try {	8544	try {
8518	await waitUntilCondition(() => online_status !== 'no_connection', 10000, 100);	8545	await waitUntilCondition(() => online_status !== 'no_connection', 10000, 100);
8519	console.log('Connection successful');	8546	console.log('Connection successful');
8520	} catch {	8547	} catch {
8521	console.log('Could not connect after 5 seconds, skipping.');	8548	console.log('Could not connect after 10 seconds, skipping.');
8522	}	8549	}
		8550
		8551	toastr.clear(toast);
		8552	return text;
8523	}	8553	}
8524		8554
8525	/**	8555	/**

 /**
  * Deletes a character completely, including associated chats if specified
+ *
- * @param {string} characterKey - The key (avatar) of the character to be deleted
+ * @param {string|string[]} characterKey - The key (avatar) of the character to be deleted
  * @param {Object} [options] - Optional parameters for the deletion
  * @param {boolean} [options.deleteChats=true] - Whether to delete associated chats or not
  * @return {Promise<void>} - A promise that resolves when the character is successfully deleted
  */
 export async function deleteCharacter(characterKey, { deleteChats = true } = {}) {
-    const character = characters.find(x => x.avatar == characterKey);
+    if (!Array.isArray(characterKey)) {
+        characterKey = [characterKey];
+    }
+    for (const key of characterKey) {
+        const character = characters.find(x => x.avatar == key);
         if (!character) {
-        toastr.warning(`Character ${characterKey} not found. Cannot be deleted.`);
+            toastr.warning(`Character ${key} not found. Skipping deletion.`);
-        return;
+            continue;
+        }
         const chid = characters.indexOf(character);

         });
         if (!response.ok) {
-        throw new Error(`Failed to delete character: ${response.status} ${response.statusText}`);
+            toastr.error(`${response.status} ${response.statusText}`, 'Failed to delete character');
+            continue;
+        }
-    await removeCharacterFromUI(character.name, character.avatar);
+        delete tag_map[character.avatar];
+        select_rm_info('char_delete', character.name);
         if (deleteChats) {
             for (const chat of pastChats) {

+            }
+        }
-    eventSource.emit(event_types.CHARACTER_DELETED, { id: this_chid, character: characters[this_chid] });
+        await eventSource.emit(event_types.CHARACTER_DELETED, { id: chid, character: character });
+    }
+    await removeCharacterFromUI();
+}
 /**
  * Function to delete a character from UI after character deletion API success.
  * It manages necessary UI changes such as closing advanced editing popup, unsetting
  * character ID, resetting characters array and chat metadata, deselecting character's tab
- * panel, removing character name from navigation tabs, clearing chat, removing character's
+ * panel, removing character name from navigation tabs, clearing chat, fetching updated list of characters.
- * avatar from tag_map, fetching updated list of characters and updating the 'deleted
- * character' message.
  * It also ensures to save the settings after all the operations.
- *
- * @param {string} name - The name of the character to be deleted.
- * @param {string} avatar - The avatar URL of the character to be deleted.
- * @param {boolean} reloadCharacters - Whether the character list should be refreshed after deletion.
  */
-async function removeCharacterFromUI(name, avatar, reloadCharacters = true) {
+async function removeCharacterFromUI() {
     await clearChat();
     $('#character_cross').click();
     this_chid = undefined;
     characters.length = 0;
     name2 = systemUserName;
-    chat = [...safetychat];
+    chat.splice(0, chat.length, ...SAFETY_CHAT);
     chat_metadata = {};
     $(document.getElementById('rm_button_selected_ch')).children('h2').text('');
     this_chid = undefined;
-    delete tag_map[avatar];
+    await getCharacters();
-    if (reloadCharacters) await getCharacters();
-    select_rm_info('char_delete', name);
     await printMessages();
     saveSettingsDebounced();
+}

         name: 'api',
         callback: connectAPISlash,
         returns: 'the current API',
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'quiet',
+                description: 'Suppress the toast message on connection',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
+        ],
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({
                 description: 'API to connect to',

         const oldFileNameFull = $(this).closest('.select_chat_block_wrapper').find('.select_chat_block_filename').text();
         const oldFileName = oldFileNameFull.replace('.jsonl', '');
-        const popupText = `<h3>Enter the new name for the chat:<h3>
+        const popupText = await renderTemplateAsync('chatRename');
-        <small>!!Using an existing filename will produce an error!!<br>
-        This will break the link between checkpoint chats.<br>
-        No need to add '.jsonl' at the end.<br>
-        </small>`;
         const newName = await callPopup(popupText, 'input', oldFileName);
         if (!newName || newName == oldFileName) {

         else if (id == 'option_start_new_chat') {
             if ((selected_group || this_chid !== undefined) && !is_send_press) {
                 let deleteCurrentChat = false;
-                const result = await Popup.show.confirm('Start new chat?', `
+                const result = await Popup.show.confirm(t`Start new chat?`, await renderTemplateAsync('newChatConfirm'), {
-                    <label for="del_chat_checkbox" class="checkbox_label justifyCenter"
-                    title="If necessary, you can later restore this chat file from the /backups folder">
-                        <input type="checkbox" id="del_chat_checkbox" />
-                        <small>Also delete the current chat file</small>
-                    </label>`, {
                     onClose: () => deleteCurrentChat = !!$('#del_chat_checkbox').prop('checked'),
                 });
                 if (!result) {

         let deleteOnlySwipe = false;
         if (power_user.confirm_message_delete && fromSlashCommand !== true) {
-            const result = await callGenericPopup('Are you sure you want to delete this message?', POPUP_TYPE.CONFIRM, null, {
+            const result = await callGenericPopup(t`Are you sure you want to delete this message?`, POPUP_TYPE.CONFIRM, null, {
-                okButton: canDeleteSwipe ? 'Delete Swipe' : 'Delete Message',
+                okButton: canDeleteSwipe ? t`Delete Swipe` : t`Delete Message`,
                 cancelButton: 'Cancel',
-                customButtons: canDeleteSwipe ? ['Delete Message'] : null,
+                customButtons: canDeleteSwipe ? [t`Delete Message`] : null,
             });
             if (!result) {
                 return;

public/scripts/BulkEditOverlay.js+11 -11 Viewed

      * Delete one or more characters,
      * opens a popup.
+     *
-     * @param {number} characterId
+     * @param {string|string[]} characterKey
      * @param {boolean} [deleteChats]
      * @returns {Promise<void>}
      */
-    static delete = async (characterId, deleteChats = false) => {
+    static delete = async (characterKey, deleteChats = false) => {
-        const character = CharacterContextMenu.#getCharacter(characterId);
+        await deleteCharacter(characterKey, { deleteChats: deleteChats });
-        await deleteCharacter(character.avatar, { deleteChats: deleteChats });
     };
     static #getCharacter = (characterId) => characters[characterId] ?? null;

             this.container.removeEventListener('mouseup', cancelHold);
             this.container.removeEventListener('touchend', cancelHold);
-        },
+        }, BulkEditOverlay.longPressDelay);
-            BulkEditOverlay.longPressDelay);
     };
     handleLongPressEnd = (event) => {

                 const deleteChats = document.getElementById('del_char_checkbox').checked ?? false;
                 showLoader();
-                toastr.info('We\'re deleting your characters, please wait...', 'Working on it');
+                const toast = toastr.info('We\'re deleting your characters, please wait...', 'Working on it');
-                return Promise.allSettled(characterIds.map(async characterId => CharacterContextMenu.delete(characterId, deleteChats)))
+                const avatarList = characterIds.map(id => characters[id]?.avatar).filter(a => a);
-                    .then(() => getCharacters())
+                return CharacterContextMenu.delete(avatarList, deleteChats)
                     .then(() => this.browseState())
-                    .finally(() => hideLoader());
+                    .finally(() => {
+                        toastr.clear(toast);
+                        hideLoader();
+                    });
             });
         // At this moment the popup is already changed in the dom, but not yet closed/resolved. We build the avatar list here

public/scripts/extensions.js+33 -7 Viewed

 let saveMetadataTimeout = null;
 let requiresReload = false;
+let stateChanged = false;
 export function saveMetadataDebounced() {
     const context = getContext();

 async function enableExtension(name, reload = true) {
     extension_settings.disabledExtensions = extension_settings.disabledExtensions.filter(x => x !== name);
+    stateChanged = true;
     await saveSettings();
     if (reload) {
         location.reload();

 async function disableExtension(name, reload = true) {
     extension_settings.disabledExtensions.push(name);
+    stateChanged = true;
     await saveSettings();
     if (reload) {
         location.reload();

                 if (!isDisabled) {
                     const promise = Promise.all([addExtensionScript(name, manifest), addExtensionStyle(name, manifest)]);
-                    promise
+                    await promise
                         .then(() => activeExtensions.add(name))
                         .catch(err => console.log('Could not activate extension: ' + name, err));
                     promises.push(promise);

             await oldPopup.complete(POPUP_RESULT.CANCELLED);
+        }
-        const popup = new Popup(html, POPUP_TYPE.TEXT, '', { okButton: 'Close', wide: true, large: true, customButtons: [updateAllButton], allowVerticalScrolling: true });
+        let waitingForSave = false;
+        const popup = new Popup(html, POPUP_TYPE.TEXT, '', {
+            okButton: 'Close',
+            wide: true,
+            large: true,
+            customButtons: [updateAllButton],
+            allowVerticalScrolling: true,
+            onClosing: async () => {
+                if (waitingForSave) {
+                    return false;
+                }
+                if (stateChanged) {
+                    waitingForSave = true;
+                    const toast = toastr.info('The page will be reloaded shortly...', 'Extensions state changed');
+                    await saveSettings();
+                    toastr.clear(toast);
+                    waitingForSave = false;
+                    requiresReload = true;
+                }
+                return true;
+            },
+        });
         popupPromise = popup.show();
     } catch (error) {
         toastr.error('Error loading extensions. See browser console for details.');

     const response = await request.json();
     toastr.success(`Extension "${response.display_name}" by ${response.author} (version ${response.version}) has been installed successfully!`, 'Extension installation successful');
     console.debug(`Extension "${response.display_name}" has been installed successfully at ${response.extensionPath}`);
-    await loadExtensionSettings({}, false);
+    await loadExtensionSettings({}, false, false);
-    eventSource.emit(event_types.EXTENSION_SETTINGS_LOADED);
+    await eventSource.emit(event_types.EXTENSION_SETTINGS_LOADED);
+}
 /**
  * Loads extension settings from the app settings.
  * @param {object} settings App Settings
  * @param {boolean} versionChanged Is this a version change?
+ * @param {boolean} enableAutoUpdate Enable auto-update
  */
-async function loadExtensionSettings(settings, versionChanged) {
+async function loadExtensionSettings(settings, versionChanged, enableAutoUpdate) {
     if (settings.extension_settings) {
         Object.assign(extension_settings, settings.extension_settings);
+    }

     $('#extensions_notify_updates').prop('checked', extension_settings.notifyUpdates);
     // Activate offline extensions
-    eventSource.emit(event_types.EXTENSIONS_FIRST_LOAD);
+    await eventSource.emit(event_types.EXTENSIONS_FIRST_LOAD);
     extensionNames = await discoverExtensions();
     manifests = await getManifests(extensionNames);
-    if (versionChanged) {
+    if (versionChanged && enableAutoUpdate) {
         await autoUpdateExtensions(false);
+    }

public/scripts/extensions/caption/settings.html+4 -1 Viewed

                         <option value="zerooneai">01.AI (Yi)</option>
                         <option value="anthropic">Anthropic</option>
                         <option value="custom" data-i18n="Custom (OpenAI-compatible)">Custom (OpenAI-compatible)</option>
-                        <option value="google">Google MakerSuite</option>
+                        <option value="google">Google AI Studio</option>
                         <option value="koboldcpp">KoboldCpp</option>
                         <option value="llamacpp">llama.cpp</option>
                         <option value="ollama">Ollama</option>

                         <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
                         <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>
                         <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
+                        <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option>
+                        <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
                         <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
                         <option data-type="google" value="gemini-1.5-pro-exp-0801">gemini-1.5-pro-exp-0801</option>
+                        <option data-type="google" value="gemini-1.5-pro-exp-0827">gemini-1.5-pro-exp-0827</option>
                         <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>
                         <option data-type="openrouter" value="openai/gpt-4o">openai/gpt-4o</option>
                         <option data-type="openrouter" value="openai/gpt-4-turbo">openai/gpt-4-turbo</option>

public/scripts/extensions/memory/index.js+20 -6 Viewed

-import { getStringHash, debounce, waitUntilCondition, extractAllWords } from '../../utils.js';
+import { getStringHash, debounce, waitUntilCondition, extractAllWords, isTrueBoolean } from '../../utils.js';
 import { getContext, getApiUrl, extension_settings, doExtrasFetch, modules, renderExtensionTemplateAsync } from '../../extensions.js';
 import {
     activateSendButtons,

 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
 import { MacrosParser } from '../../macros.js';
 import { countWebLlmTokens, generateWebLlmChatPrompt, getWebLlmContextSize, isWebLlmSupported } from '../shared.js';
+import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 export { MODULE_NAME };
 const MODULE_NAME = '1_memory';

+    }
+}
-async function forceSummarizeChat() {
+/**
+ * Forces a summary generation for the current chat.
+ * @param {boolean} quiet If an informational toast should be displayed
+ * @returns {Promise<string>} Summarized text
+ */
+async function forceSummarizeChat(quiet) {
     if (extension_settings.memory.source === summary_sources.extras) {
         toastr.warning('Force summarization is not supported for Extras API');
         return;

         return '';
+    }
-    const toast = toastr.info('Summarizing chat...', 'Please wait', { timeOut: 0, extendedTimeOut: 0 });
+    const toast = quiet ? jQuery() : toastr.info('Summarizing chat...', 'Please wait', { timeOut: 0, extendedTimeOut: 0 });
     const value = extension_settings.memory.source === summary_sources.main
         ? await summarizeChatMain(context, true, skipWIAN)
         : await summarizeChatWebLLM(context, true);

 async function summarizeCallback(args, text) {
     text = text.trim();
-    // Using forceSummarizeChat to summarize the current chat
+    // Summarize the current chat if no text provided
     if (!text) {
-        return await forceSummarizeChat();
+        const quiet = isTrueBoolean(args.quiet);
+        return await forceSummarizeChat(quiet);
+    }
     const source = args.source || extension_settings.memory.source;

     $('#memory_prompt_words').off('click').on('input', onMemoryPromptWordsInput);
     $('#memory_prompt_interval').off('click').on('input', onMemoryPromptIntervalInput);
     $('#memory_prompt').off('click').on('input', onMemoryPromptInput);
-    $('#memory_force_summarize').off('click').on('click', forceSummarizeChat);
+    $('#memory_force_summarize').off('click').on('click', () => forceSummarizeChat(false));
     $('#memory_template').off('click').on('input', onMemoryTemplateInput);
     $('#memory_depth').off('click').on('input', onMemoryDepthInput);
     $('#memory_role').off('click').on('input', onMemoryRoleInput);

                 typeList: [ARGUMENT_TYPE.STRING],
                 defaultValue: '',
             }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'quiet',
+                description: 'suppress the toast message when summarizing the chat',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                enumList: commonEnumProviders.boolean('trueFalse')(),
+            }),
         ],
         unnamedArgumentList: [
             new SlashCommandArgument('text to summarize', [ARGUMENT_TYPE.STRING], false, false, ''),

public/scripts/extensions/quick-reply/html/settings.html+3 -0 Viewed

 			<label class="flex-container">
 				<input type="checkbox" id="qr--isCombined"><span data-i18n="Combine Quick Replies">Combine Quick Replies</span>
 			</label>
+            <label class="flex-container">
+                <input type="checkbox" id="qr--showPopoutButton"><span data-i18n="Show Popout Button">Show Popout Button</span>
+            </label>
 			<hr>

public/scripts/extensions/quick-reply/src/QuickReplySettings.js+2 -0 Viewed

     /**@type {Boolean}*/ isEnabled = false;
     /**@type {Boolean}*/ isCombined = false;
     /**@type {Boolean}*/ isPopout = false;
+    /**@type {Boolean}*/ showPopoutButton = true;
     /**@type {QuickReplyConfig}*/ config;
     /**@type {QuickReplyConfig}*/ _chatConfig;
     get chatConfig() {

             isEnabled: this.isEnabled,
             isCombined: this.isCombined,
             isPopout: this.isPopout,
+            showPopoutButton: this.showPopoutButton,
             config: this.config,
         };
+    }

public/scripts/extensions/quick-reply/src/ui/ButtonUi.js+3 -0 Viewed

                 root.id = 'qr--bar';
                 root.classList.add('flex-container');
                 root.classList.add('flexGap5');
+                if (this.settings.showPopoutButton) {
+                    root.classList.add('popoutVisible');
                     const popout = document.createElement('div'); {
                         popout.id = 'qr--popoutTrigger';
                         popout.classList.add('menu_button');

                         });
                         root.append(popout);
+                    }
+                }
                 if (this.settings.isCombined) {
                     const buttons = document.createElement('div'); {
                         buttonHolder = buttons;

public/scripts/extensions/quick-reply/src/ui/SettingsUi.js+10 -0 Viewed

     /**@type {HTMLInputElement}*/ isEnabled;
     /**@type {HTMLInputElement}*/ isCombined;
+    /**@type {HTMLInputElement}*/ showPopoutButton;
     /**@type {HTMLElement}*/ globalSetList;

         this.isCombined = this.dom.querySelector('#qr--isCombined');
         this.isCombined.checked = this.settings.isCombined;
         this.isCombined.addEventListener('click', ()=>this.onIsCombined());
+        this.showPopoutButton = this.dom.querySelector('#qr--showPopoutButton');
+        this.showPopoutButton.checked = this.settings.showPopoutButton;
+        this.showPopoutButton.addEventListener('click', ()=>this.onShowPopoutButton());
+    }
     prepareGlobalSetList() {

         this.settings.save();
+    }
+    async onShowPopoutButton() {
+        this.settings.showPopoutButton = this.showPopoutButton.checked;
+        this.settings.save();
+    }
     async onGlobalSetListSort() {
         this.settings.config.setList = Array.from(this.globalSetList.children).map((it,idx)=>{
             const set = this.settings.config.setList[Number(it.getAttribute('data-order'))];

public/scripts/extensions/quick-reply/style.css+3 -1 Viewed

   max-width: 100%;
   overflow-x: auto;
   order: 1;
-  padding-right: 2.5em;
   position: relative;
+}
 #qr--bar > #qr--popoutTrigger {

   right: 0.25em;
   top: 0;
+}
+#qr--bar.popoutVisible {
+  padding-right: 2.5em;
+}
 #qr--popout {
   display: flex;
   flex-direction: column;

public/scripts/extensions/quick-reply/style.less+3 -1 Viewed

     max-width: 100%;
     overflow-x: auto;
     order: 1;
-    padding-right: 2.5em;
     position: relative;
     >#qr--popoutTrigger {

@@ -34,6 +33,9 @@
34	top: 0;	33	top: 0;
35	}	34	}
36	}	35	}
		36	#qr--bar.popoutVisible {
		37	padding-right: 2.5em;
		38	}
37		39
38	#qr--popout {	40	#qr--popout {
39	display: flex;	41	display: flex;

public/scripts/extensions/shared.js+1 -1 Viewed

@@ -141,7 +141,7 @@ function throwIfInvalidModel(useReverseProxy) {
141	}	141	}
142		142
143	if (extension_settings.caption.multimodal_api === 'google' && !secret_state[SECRET_KEYS.MAKERSUITE] && !useReverseProxy) {	143	if (extension_settings.caption.multimodal_api === 'google' && !secret_state[SECRET_KEYS.MAKERSUITE] && !useReverseProxy) {
144	throw new Error('MakerSuite API key is not set.');	144	throw new Error('Google AI Studio API key is not set.');
145	}	145	}
146		146
147	if (extension_settings.caption.multimodal_api === 'ollama' && !textgenerationwebui_settings.server_urls[textgen_types.OLLAMA]) {	147	if (extension_settings.caption.multimodal_api === 'ollama' && !textgenerationwebui_settings.server_urls[textgen_types.OLLAMA]) {

public/scripts/extensions/stable-diffusion/index.js+63 -1 Viewed

     pollinations: 'pollinations',
     stability: 'stability',
     blockentropy: 'blockentropy',
+    huggingface: 'huggingface',
 };
 const initiators = {

     $('#sd_command_visible').prop('checked', extension_settings.sd.command_visible);
     $('#sd_interactive_visible').prop('checked', extension_settings.sd.interactive_visible);
     $('#sd_stability_style_preset').val(extension_settings.sd.stability_style_preset);
+    $('#sd_huggingface_model_id').val(extension_settings.sd.huggingface_model_id);
     for (const style of extension_settings.sd.styles) {
         const option = document.createElement('option');

     saveSettingsDebounced();
+}
+function onHFModelInput() {
+    extension_settings.sd.huggingface_model_id = $('#sd_huggingface_model_id').val();
+    saveSettingsDebounced();
+}
 function onComfyWorkflowChange() {
     extension_settings.sd.comfy_workflow = $('#sd_comfy_workflow').find(':selected').val();
     saveSettingsDebounced();

     extension_settings.sd.model = $('#sd_model').find(':selected').val();
     saveSettingsDebounced();
-    const cloudSources = [sources.horde, sources.novel, sources.openai, sources.togetherai, sources.pollinations, sources.stability, sources.blockentropy];
+    const cloudSources = [
+        sources.horde,
+        sources.novel,
+        sources.openai,
+        sources.togetherai,
+        sources.pollinations,
+        sources.stability,
+        sources.blockentropy,
+        sources.huggingface,
+    ];
     if (cloudSources.includes(extension_settings.sd.source)) {
         return;

         case sources.blockentropy:
             samplers = ['N/A'];
             break;
+        case sources.huggingface:
+            samplers = ['N/A'];
+            break;
+    }
     for (const sampler of samplers) {

         case sources.blockentropy:
             models = await loadBlockEntropyModels();
             break;
+        case sources.huggingface:
+            models = [{ value: '', text: '<Enter Model ID above>' }];
+            break;
+    }
     for (const model of models) {

         case sources.blockentropy:
             schedulers = ['N/A'];
             break;
+        case sources.huggingface:
+            schedulers = ['N/A'];
+            break;
+    }
     for (const scheduler of schedulers) {

         case sources.blockentropy:
             vaes = ['N/A'];
             break;
+        case sources.huggingface:
+            vaes = ['N/A'];
+            break;
+    }
     for (const vae of vaes) {

             case sources.blockentropy:
                 result = await generateBlockEntropyImage(prefixedPrompt, negativePrompt, signal);
                 break;
+            case sources.huggingface:
+                result = await generateHuggingFaceImage(prefixedPrompt, signal);
+                break;
+        }
         if (!result.data) {

     return { format: 'png', data: await promptResult.text() };
+}
+/**
+ * Generates an image in Hugging Face Inference API using the provided prompt and configuration settings (model selected).
+ * @param {string} prompt - The main instruction used to guide the image generation.
+ * @param {AbortSignal} signal - An AbortSignal object that can be used to cancel the request.
+ * @returns {Promise<{format: string, data: string}>} - A promise that resolves when the image generation and processing are complete.
+ */
+async function generateHuggingFaceImage(prompt, signal) {
+    const result = await fetch('/api/sd/huggingface/generate', {
+        method: 'POST',
+        headers: getRequestHeaders(),
+        signal: signal,
+        body: JSON.stringify({
+            model: extension_settings.sd.huggingface_model_id,
+            prompt: prompt,
+        }),
+    });
+    if (result.ok) {
+        const data = await result.json();
+        return { format: 'jpg', data: data.image };
+    } else {
+        const text = await result.text();
+        throw new Error(text);
+    }
+}
 async function onComfyOpenWorkflowEditorClick() {
     let workflow = await (await fetch('/api/sd/comfy/workflow', {
         method: 'POST',

@@ -3508,6 +3567,8 @@ function isValidState() {
3508	return secret_state[SECRET_KEYS.STABILITY];	3567	return secret_state[SECRET_KEYS.STABILITY];
3509	case sources.blockentropy:	3568	case sources.blockentropy:
3510	return secret_state[SECRET_KEYS.BLOCKENTROPY];	3569	return secret_state[SECRET_KEYS.BLOCKENTROPY];
		3570	case sources.huggingface:
		3571	return secret_state[SECRET_KEYS.HUGGINGFACE];
3511	}	3572	}
3512	}	3573	}
3513		3574

     $('#sd_swap_dimensions').on('click', onSwapDimensionsClick);
     $('#sd_stability_key').on('click', onStabilityKeyClick);
     $('#sd_stability_style_preset').on('change', onStabilityStylePresetChange);
+    $('#sd_huggingface_model_id').on('input', onHFModelInput);
     $('.sd_settings .inline-drawer-toggle').on('click', function () {
         initScrollHeight($('#sd_prompt_prefix'));

public/scripts/extensions/stable-diffusion/settings.html+8 -1 Viewed

             </label>
             <label for="sd_expand" class="checkbox_label" data-i18n="[title]sd_expand" title="Automatically extend prompts using text generation model">
                 <input id="sd_expand" type="checkbox" />
-                <span data-i18n="sd_expand_txt">Auto-enhance prompts</span>
+                <span data-i18n="sd_expand_txt">Auto-extend prompts</span>
+                <span class="right_menu_button fa-solid fa-triangle-exclamation" data-i18n="[title]sd_expand_warning" title="May produce unexpected results. Manual prompt editing is recommended."></span>
             </label>
             <label for="sd_snap" class="checkbox_label" data-i18n="[title]sd_snap" title="Snap generation requests with a forced aspect ratio (portraits, backgrounds) to the nearest known resolution, while trying to preserve the absolute pixel counts (recommended for SDXL).">
                 <input id="sd_snap" type="checkbox" />

                 <option value="comfy">ComfyUI</option>
                 <option value="drawthings">DrawThings HTTP API</option>
                 <option value="extras">Extras API (local / remote)</option>
+                <option value="huggingface">HuggingFace Inference API (serverless)</option>
                 <option value="novel">NovelAI Diffusion</option>
                 <option value="openai">OpenAI (DALL-E)</option>
                 <option value="pollinations">Pollinations</option>

                 <!-- (Original Text)<b>Important:</b> run DrawThings app with HTTP API switch enabled in the UI! The server must be accessible from the SillyTavern host machine. -->
                 <i><b data-i18n="Important:">Important:</b></i><i data-i18n="sd_drawthings_auth_txt"> run DrawThings app with HTTP API switch enabled in the UI! The server must be accessible from the SillyTavern host machine.</i>
             </div>
+            <div data-sd-source="huggingface">
+                <i>Hint: Save an API key in the Hugging Face (Text Completion) API settings to use it here.</i>
+                <label for="sd_huggingface_model_id" data-i18n="Model ID">Model ID</label>
+                <input id="sd_huggingface_model_id" type="text" class="text_pole"  data-i18n="[placeholder]e.g. black-forest-labs/FLUX.1-dev" placeholder="e.g. black-forest-labs/FLUX.1-dev" value="" />
+            </div>
             <div data-sd-source="vlad">
                 <label for="sd_vlad_url">SD.Next API URL</label>
                 <div class="flex-container flexnowrap">

public/scripts/extensions/tts/index.js+6 -1 Viewed

 async function tts(text, voiceId, char) {
     async function processResponse(response) {
         // RVC injection
-        if (extension_settings.rvc.enabled && typeof window['rvcVoiceConversion'] === 'function')
+        if (typeof window['rvcVoiceConversion'] === 'function' && extension_settings.rvc.enabled)
             response = await window['rvcVoiceConversion'](response, char, text);
         await addAudioJob(response, char);

     const message = structuredClone(context.chat[messageId]);
     const hashNew = getStringHash(message?.mes ?? '');
+    // Ignore prompt-hidden messages
+    if (message.is_system) {
+        return;
+    }
     // if no new messages, or same message, or same message hash, do nothing
     if (hashNew === lastMessageHash) {
         return;

public/scripts/extensions/vectors/settings.html+1 -1 Viewed

                 <select id="vectors_source" class="text_pole">
                     <option value="cohere">Cohere</option>
                     <option value="extras">Extras</option>
-                    <option value="palm">Google MakerSuite</option>
+                    <option value="palm">Google AI Studio</option>
                     <option value="llamacpp">llama.cpp</option>
                     <option value="transformers" data-i18n="Local (Transformers)">Local (Transformers)</option>
                     <option value="mistral">MistralAI</option>

public/scripts/nai-settings.js+16 -1 Viewed

     return null;
+}
+export function getKayraMaxResponseTokens() {
+    switch (novel_data?.tier) {
+        case 1:
+            return 100;
+        case 2:
+            return 100;
+        case 3:
+            return 150;
+    }
+    return maximum_output_length;
+}
 export function getNovelTier() {
     return nai_tiers[novel_data?.tier] ?? 'no_connection';
+}

         console.log(finalPrompt);
+    }
+    const adjustedMaxLength = nai_settings.model_novel.includes('kayra') ? getKayraMaxResponseTokens() : maximum_output_length;
     return {
         'input': finalPrompt,
         'model': nai_settings.model_novel,
         'use_string': true,
         'temperature': Number(nai_settings.temperature),
-        'max_length': maxLength < maximum_output_length ? maxLength : maximum_output_length,
+        'max_length': maxLength < adjustedMaxLength ? maxLength : adjustedMaxLength,
         'min_length': Number(nai_settings.min_length),
         'tail_free_sampling': Number(nai_settings.tail_free_sampling),
         'repetition_penalty': Number(nai_settings.repetition_penalty),

public/scripts/openai.js+47 -113 Viewed

 import { renderTemplateAsync } from './templates.js';
 import { SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
 import { Popup, POPUP_RESULT } from './popup.js';
+import { t } from './i18n.js';
 export {
     openai_messages_count,

 const scale_max = 8191;
 const claude_max = 9000; // We have a proper tokenizer, so theoretically could be larger (up to 9k)
 const claude_100k_max = 99000;
-let ai21_max = 9200; //can easily fit 9k gpt tokens because j2's tokenizer is efficient af
+const unlocked_max = max_2mil;
-const unlocked_max = max_200k;
 const oai_max_temp = 2.0;
-const claude_max_temp = 1.0; //same as j2
+const claude_max_temp = 1.0;
-const j2_max_topk = 10.0;
-const j2_max_freq = 5.0;
-const j2_max_pres = 5.0;
 const openrouter_website_model = 'OR_Website';
 const openai_max_stop_strings = 4;

     'custom_include_headers',
 ];
-function getPrefixMap() {
-    return selected_group ? {
-        assistant: '',
-        user: '',
-        system: 'OOC: ',
-    }
-        : {
-            assistant: '{{char}}:',
-            user: '{{user}}:',
-            system: '',
-        };
-}
 const default_settings = {
     preset_settings_openai: 'Default',
     temp_openai: 1.0,
     freq_pen_openai: 0,
     pres_pen_openai: 0,
-    count_pen: 0.0,
     top_p_openai: 1.0,
     top_k_openai: 0,
     min_p_openai: 0,

     openai_model: 'gpt-4-turbo',
     claude_model: 'claude-3-5-sonnet-20240620',
     google_model: 'gemini-1.5-pro',
-    ai21_model: 'j2-ultra',
+    ai21_model: 'jamba-1.5-large',
     mistralai_model: 'mistral-large-latest',
     cohere_model: 'command-r-plus',
     perplexity_model: 'llama-3.1-70b-instruct',

     assistant_prefill: '',
     assistant_impersonation: '',
     human_sysprompt_message: default_claude_human_sysprompt_message,
-    use_ai21_tokenizer: false,
-    use_google_tokenizer: false,
     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     use_alt_scale: false,

     temp_openai: 1.0,
     freq_pen_openai: 0,
     pres_pen_openai: 0,
-    count_pen: 0.0,
     top_p_openai: 1.0,
     top_k_openai: 0,
     min_p_openai: 0,

     openai_model: 'gpt-4-turbo',
     claude_model: 'claude-3-5-sonnet-20240620',
     google_model: 'gemini-1.5-pro',
-    ai21_model: 'j2-ultra',
+    ai21_model: 'jamba-1.5-large',
     mistralai_model: 'mistral-large-latest',
     cohere_model: 'command-r-plus',
     perplexity_model: 'llama-3.1-70b-instruct',

     assistant_prefill: '',
     assistant_impersonation: '',
     human_sysprompt_message: default_claude_human_sysprompt_message,
-    use_ai21_tokenizer: false,
-    use_google_tokenizer: false,
     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     use_alt_scale: false,

     const rememberKey = `Proxy_SkipConfirm_${getStringHash(oai_settings.reverse_proxy)}`;
     const skipConfirm = localStorage.getItem(rememberKey) === 'true';
-    const confirmation = skipConfirm || await Popup.show.confirm('Connecting To Proxy', `<span>Are you sure you want to connect to the following proxy URL?</span><var>${DOMPurify.sanitize(oai_settings.reverse_proxy)}</var>`);
+    const confirmation = skipConfirm || await Popup.show.confirm(t`Connecting To Proxy`, await renderTemplateAsync('proxyConnectionWarning', { proxyURL: DOMPurify.sanitize(oai_settings.reverse_proxy) }));
     if (!confirmation) {
         toastr.error('Update or remove your reverse proxy settings.');

         { role: 'system', content: charDescription, identifier: 'charDescription' },
         { role: 'system', content: charPersonalityText, identifier: 'charPersonality' },
         { role: 'system', content: scenarioText, identifier: 'scenario' },
-        { role: 'system', content: personaDescription, identifier: 'personaDescription' },
         // Unordered prompts without marker
         { role: 'system', content: impersonationPrompt, identifier: 'impersonate' },
         { role: 'system', content: quietPrompt, identifier: 'quietPrompt' },

             toastr.error(data.error.message || response.statusText, 'Chat Completion API');
             throw new Error(data);
+        }
+        if (data.message) {
+            toastr.error(data.message, 'Chat Completion API');
+            throw new Error(data);
+        }
+    }
     catch {
         // No JSON. Do nothing.

     const isClaude = oai_settings.chat_completion_source == chat_completion_sources.CLAUDE;
     const isOpenRouter = oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER;
     const isScale = oai_settings.chat_completion_source == chat_completion_sources.SCALE;
-    const isAI21 = oai_settings.chat_completion_source == chat_completion_sources.AI21;
     const isGoogle = oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE;
     const isOAI = oai_settings.chat_completion_source == chat_completion_sources.OPENAI;
     const isMistral = oai_settings.chat_completion_source == chat_completion_sources.MISTRALAI;

     const isQuiet = type === 'quiet';
     const isImpersonate = type === 'impersonate';
     const isContinue = type === 'continue';
-    const stream = oai_settings.stream_openai && !isQuiet && !isScale && !isAI21 && !(isGoogle && oai_settings.google_model.includes('bison'));
+    const stream = oai_settings.stream_openai && !isQuiet && !isScale && !(isGoogle && oai_settings.google_model.includes('bison'));
     const useLogprobs = !!power_user.request_token_probabilities;
     const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom);

         replaceItemizedPromptText(messageId, messages);
+    }
-    if (isAI21) {
-        const joinedMsgs = messages.reduce((acc, obj) => {
-            const prefix = getPrefixMap()[obj.role];
-            return acc + (prefix ? (selected_group ? '\n' : prefix + ' ') : '') + obj.content + '\n';
-        }, '');
-        messages = substituteParams(joinedMsgs) + (isImpersonate ? `${name1}:` : `${name2}:`);
-        replaceItemizedPromptText(messageId, messages);
-    }
     // If we're using the window.ai extension, use that instead
     // Doesn't support logit bias yet
     if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {

         generate_data['use_makersuite_sysprompt'] = oai_settings.use_makersuite_sysprompt;
+    }
-    if (isAI21) {
-        generate_data['top_k'] = Number(oai_settings.top_k_openai);
-        generate_data['count_pen'] = Number(oai_settings.count_pen);
-        generate_data['stop_tokens'] = [name1 + ':', substituteParams(oai_settings.new_chat_prompt), substituteParams(oai_settings.new_group_chat_prompt)];
-    }
     if (isMistral) {
         generate_data['safe_prompt'] = false; // already defaults to false, but just incase they change that in the future.
+    }

     oai_settings.temp_openai = settings.temp_openai ?? default_settings.temp_openai;
     oai_settings.freq_pen_openai = settings.freq_pen_openai ?? default_settings.freq_pen_openai;
     oai_settings.pres_pen_openai = settings.pres_pen_openai ?? default_settings.pres_pen_openai;
-    oai_settings.count_pen = settings.count_pen ?? default_settings.count_pen;
     oai_settings.top_p_openai = settings.top_p_openai ?? default_settings.top_p_openai;
     oai_settings.top_k_openai = settings.top_k_openai ?? default_settings.top_k_openai;
     oai_settings.top_a_openai = settings.top_a_openai ?? default_settings.top_a_openai;

         oai_settings.names_behavior = character_names_behavior.COMPLETION;
+    }
+    if (oai_settings.ai21_model.startsWith('j2-')) {
+        oai_settings.ai21_model = 'jamba-1.5-large';
+    }
     if (settings.wrap_in_quotes !== undefined) oai_settings.wrap_in_quotes = !!settings.wrap_in_quotes;
     if (settings.openai_model !== undefined) oai_settings.openai_model = settings.openai_model;
-    if (settings.use_ai21_tokenizer !== undefined) { oai_settings.use_ai21_tokenizer = !!settings.use_ai21_tokenizer; oai_settings.use_ai21_tokenizer ? ai21_max = 8191 : ai21_max = 9200; }
-    if (settings.use_google_tokenizer !== undefined) oai_settings.use_google_tokenizer = !!settings.use_google_tokenizer;
     if (settings.claude_use_sysprompt !== undefined) oai_settings.claude_use_sysprompt = !!settings.claude_use_sysprompt;
     if (settings.use_makersuite_sysprompt !== undefined) oai_settings.use_makersuite_sysprompt = !!settings.use_makersuite_sysprompt;
     if (settings.use_alt_scale !== undefined) { oai_settings.use_alt_scale = !!settings.use_alt_scale; updateScaleForm(); }

     $('#jailbreak_system').prop('checked', oai_settings.jailbreak_system);
     $('#openai_show_external_models').prop('checked', oai_settings.show_external_models);
     $('#openai_external_category').toggle(oai_settings.show_external_models);
-    $('#use_ai21_tokenizer').prop('checked', oai_settings.use_ai21_tokenizer);
-    $('#use_google_tokenizer').prop('checked', oai_settings.use_google_tokenizer);
     $('#claude_use_sysprompt').prop('checked', oai_settings.claude_use_sysprompt);
     $('#use_makersuite_sysprompt').prop('checked', oai_settings.use_makersuite_sysprompt);
     $('#scale-alt').prop('checked', oai_settings.use_alt_scale);

     $('#pres_pen_openai').val(oai_settings.pres_pen_openai);
     $('#pres_pen_counter_openai').val(Number(oai_settings.pres_pen_openai).toFixed(2));
-    $('#count_pen').val(oai_settings.count_pen);
-    $('#count_pen_counter').val(Number(oai_settings.count_pen).toFixed(2));
     $('#top_p_openai').val(oai_settings.top_p_openai);
     $('#top_p_counter_openai').val(Number(oai_settings.top_p_openai).toFixed(2));

         temperature: settings.temp_openai,
         frequency_penalty: settings.freq_pen_openai,
         presence_penalty: settings.pres_pen_openai,
-        count_penalty: settings.count_pen,
         top_p: settings.top_p_openai,
         top_k: settings.top_k_openai,
         top_a: settings.top_a_openai,

         assistant_prefill: settings.assistant_prefill,
         assistant_impersonation: settings.assistant_impersonation,
         human_sysprompt_message: settings.human_sysprompt_message,
-        use_ai21_tokenizer: settings.use_ai21_tokenizer,
-        use_google_tokenizer: settings.use_google_tokenizer,
         claude_use_sysprompt: settings.claude_use_sysprompt,
         use_makersuite_sysprompt: settings.use_makersuite_sysprompt,
         use_alt_scale: settings.use_alt_scale,

         temperature: ['#temp_openai', 'temp_openai', false],
         frequency_penalty: ['#freq_pen_openai', 'freq_pen_openai', false],
         presence_penalty: ['#pres_pen_openai', 'pres_pen_openai', false],
-        count_penalty: ['#count_pen', 'count_pen', false],
         top_p: ['#top_p_openai', 'top_p_openai', false],
         top_k: ['#top_k_openai', 'top_k_openai', false],
         top_a: ['#top_a_openai', 'top_a_openai', false],

         assistant_prefill: ['#claude_assistant_prefill', 'assistant_prefill', false],
         assistant_impersonation: ['#claude_assistant_impersonation', 'assistant_impersonation', false],
         human_sysprompt_message: ['#claude_human_sysprompt_textarea', 'human_sysprompt_message', false],
-        use_ai21_tokenizer: ['#use_ai21_tokenizer', 'use_ai21_tokenizer', true],
-        use_google_tokenizer: ['#use_google_tokenizer', 'use_google_tokenizer', true],
         claude_use_sysprompt: ['#claude_use_sysprompt', 'claude_use_sysprompt', true],
         use_makersuite_sysprompt: ['#use_makersuite_sysprompt', 'use_makersuite_sysprompt', true],
         use_alt_scale: ['#use_alt_scale', 'use_alt_scale', true],

@@ -4028,6 +3984,11 @@ async function onModelChange() {
4028	}	3984	}
4029		3985
4030	if ($(this).is('#model_ai21_select')) {	3986	if ($(this).is('#model_ai21_select')) {
		3987	if (value === '' \|\| value.startsWith('j2-')) {
		3988	value = 'jamba-1.5-large';
		3989	$('#model_ai21_select').val(value);
		3990	}
		3991
4031	console.log('AI21 model changed to', value);	3992	console.log('AI21 model changed to', value);
4032	oai_settings.ai21_model = value;	3993	oai_settings.ai21_model = value;
4033	}	3994	}

@@ -4230,7 +4191,7 @@ async function onModelChange() {
4230	else if (['command-light-nightly', 'command-nightly'].includes(oai_settings.cohere_model)) {	4191	else if (['command-light-nightly', 'command-nightly'].includes(oai_settings.cohere_model)) {
4231	$('#openai_max_context').attr('max', max_8k);	4192	$('#openai_max_context').attr('max', max_8k);
4232	}	4193	}
4233	else if (['command-r', 'command-r-plus'].includes(oai_settings.cohere_model)) {	4194	else if (oai_settings.cohere_model.includes('command-r')) {
4234	$('#openai_max_context').attr('max', max_128k);	4195	$('#openai_max_context').attr('max', max_128k);
4235	}	4196	}
4236	else if (['c4ai-aya-23'].includes(oai_settings.cohere_model)) {	4197	else if (['c4ai-aya-23'].includes(oai_settings.cohere_model)) {

     if (oai_settings.chat_completion_source == chat_completion_sources.AI21) {
         if (oai_settings.max_context_unlocked) {
             $('#openai_max_context').attr('max', unlocked_max);
-        } else {
+        } else if (oai_settings.ai21_model.includes('jamba-1.5') || oai_settings.ai21_model.includes('jamba-instruct')) {
-            $('#openai_max_context').attr('max', ai21_max);
+            $('#openai_max_context').attr('max', max_256k);
+        }
-        oai_settings.openai_max_context = Math.min(oai_settings.openai_max_context, Number($('#openai_max_context').attr('max')));
+        oai_settings.openai_max_context = Math.min(Number($('#openai_max_context').attr('max')), oai_settings.openai_max_context);
         $('#openai_max_context').val(oai_settings.openai_max_context).trigger('input');
+        $('#temp_openai').attr('max', oai_max_temp).val(oai_settings.temp_openai).trigger('input');
-        oai_settings.temp_openai = Math.min(claude_max_temp, oai_settings.temp_openai);
-        $('#temp_openai').attr('max', claude_max_temp).val(oai_settings.temp_openai).trigger('input');
-        oai_settings.freq_pen_openai = Math.min(j2_max_freq, oai_settings.freq_pen_openai < 0 ? 0 : oai_settings.freq_pen_openai);
-        $('#freq_pen_openai').attr('min', 0).attr('max', j2_max_freq).val(oai_settings.freq_pen_openai).trigger('input');
-        oai_settings.pres_pen_openai = Math.min(j2_max_pres, oai_settings.pres_pen_openai < 0 ? 0 : oai_settings.pres_pen_openai);
-        $('#pres_pen_openai').attr('min', 0).attr('max', j2_max_pres).val(oai_settings.pres_pen_openai).trigger('input');
-        oai_settings.top_k_openai = Math.min(j2_max_topk, oai_settings.top_k_openai);
-        $('#top_k_openai').attr('max', j2_max_topk).val(oai_settings.top_k_openai).trigger('input');
-    } else if (oai_settings.chat_completion_source != chat_completion_sources.AI21) {
-        oai_settings.freq_pen_openai = Math.min(2.0, oai_settings.freq_pen_openai);
-        $('#freq_pen_openai').attr('min', -2.0).attr('max', 2.0).val(oai_settings.freq_pen_openai).trigger('input');
-        oai_settings.pres_pen_openai = Math.min(2.0, oai_settings.pres_pen_openai);
-        $('#pres_pen_openai').attr('min', -2.0).attr('max', 2.0).val(oai_settings.pres_pen_openai).trigger('input');
-        oai_settings.top_k_openai = Math.min(200, oai_settings.top_k_openai);
-        $('#top_k_openai').attr('max', 200).val(oai_settings.top_k_openai).trigger('input');
+    }
     if (oai_settings.chat_completion_source == chat_completion_sources.CUSTOM) {

         $('#temp_openai').attr('max', oai_max_temp).val(oai_settings.temp_openai).trigger('input');
+    }
+    if (oai_settings.chat_completion_source === chat_completion_sources.COHERE) {
+        oai_settings.pres_pen_openai = Math.min(Math.max(0, oai_settings.pres_pen_openai), 1);
+        $('#pres_pen_openai').attr('max', 1).attr('min', 0).val(oai_settings.pres_pen_openai).trigger('input');
+        oai_settings.freq_pen_openai = Math.min(Math.max(0, oai_settings.freq_pen_openai), 1);
+        $('#freq_pen_openai').attr('max', 1).attr('min', 0).val(oai_settings.freq_pen_openai).trigger('input');
+    } else {
+        $('#pres_pen_openai').attr('max', 2).attr('min', -2).val(oai_settings.pres_pen_openai).trigger('input');
+        $('#freq_pen_openai').attr('max', 2).attr('min', -2).val(oai_settings.freq_pen_openai).trigger('input');
+    }
     $('#openai_max_context_counter').attr('max', Number($('#openai_max_context').attr('max')));
     saveSettingsDebounced();

@@ -4473,7 +4424,7 @@ async function onConnectButtonClick(e) {
4473	}	4424	}
4474		4425
4475	if (!secret_state[SECRET_KEYS.MAKERSUITE] && !oai_settings.reverse_proxy) {	4426	if (!secret_state[SECRET_KEYS.MAKERSUITE] && !oai_settings.reverse_proxy) {
4476	console.log('No secret key saved for MakerSuite');	4427	console.log('No secret key saved for Google AI Studio');
4477	return;	4428	return;
4478	}	4429	}
4479	}	4430	}

@@ -4673,17 +4624,17 @@ function toggleChatCompletionForms() {
4673	async function testApiConnection() {	4624	async function testApiConnection() {
4674	// Check if the previous request is still in progress	4625	// Check if the previous request is still in progress
4675	if (is_send_press) {	4626	if (is_send_press) {
4676	toastr.info('Please wait for the previous request to complete.');	4627	toastr.info(t`Please wait for the previous request to complete.`);
4677	return;	4628	return;
4678	}	4629	}
4679		4630
4680	try {	4631	try {
4681	const reply = await sendOpenAIRequest('quiet', [{ 'role': 'user', 'content': 'Hi' }]);	4632	const reply = await sendOpenAIRequest('quiet', [{ 'role': 'user', 'content': 'Hi' }]);
4682	console.log(reply);	4633	console.log(reply);
4683	toastr.success('API connection successful!');	4634	toastr.success(t`API connection successful!`);
4684	}	4635	}
4685	catch (err) {	4636	catch (err) {
4686	toastr.error('Could not get a reply from API. Check your connection settings / API key and try again.');	4637	toastr.error(t`Could not get a reply from API. Check your connection settings / API key and try again.`);
4687	}	4638	}
4688	}	4639	}
4689		4640

         'gemini-1.5-flash',
         'gemini-1.5-flash-latest',
         'gemini-1.5-flash-001',
+        'gemini-1.5-flash-exp-0827',
+        'gemini-1.5-flash-8b-exp-0827',
         'gemini-1.0-pro-vision-latest',
         'gemini-1.5-pro',
         'gemini-1.5-pro-latest',
         'gemini-1.5-pro-001',
         'gemini-1.5-pro-exp-0801',
+        'gemini-1.5-pro-exp-0827',
         'gemini-pro-vision',
         'claude-3',
         'claude-3-5',

@@ -4837,7 +4791,7 @@ function onProxyPresetChange() {
4837	if (selectedPreset) {	4791	if (selectedPreset) {
4838	setProxyPreset(selectedPreset.name, selectedPreset.url, selectedPreset.password);	4792	setProxyPreset(selectedPreset.name, selectedPreset.url, selectedPreset.password);
4839	} else {	4793	} else {
4840	console.error(`Proxy preset "${value}" not found in proxies array.`);	4794	console.error(t`Proxy preset '${value}' not found in proxies array.`);
4841	}	4795	}
4842	saveSettingsDebounced();	4796	saveSettingsDebounced();
4843	}	4797	}

     setProxyPreset(presetName, reverseProxy, proxyPassword);
     saveSettingsDebounced();
-    toastr.success('Proxy Saved');
+    toastr.success(t`Proxy Saved`);
     if ($('#openai_proxy_preset').val() !== presetName) {
         const option = document.createElement('option');
         option.text = presetName;

         saveSettingsDebounced();
         $('#openai_proxy_preset').val(selected_proxy.name);
-        toastr.success('Proxy Deleted');
+        toastr.success(t`Proxy Deleted`);
     } else {
-        toastr.error(`Could not find proxy with name "${presetName}"`);
+        toastr.error(t`Could not find proxy with name '${presetName}'`);
+    }
 });

         saveSettingsDebounced();
     });
-    $('#count_pen').on('input', function () {
-        oai_settings.count_pen = Number($(this).val());
-        $('#count_pen_counter').val(Number($(this).val()).toFixed(2));
-        saveSettingsDebounced();
-    });
     $('#top_p_openai').on('input', function () {
         oai_settings.top_p_openai = Number($(this).val());
         $('#top_p_counter_openai').val(Number($(this).val()).toFixed(2));

         saveSettingsDebounced();
     });
-    $('#use_ai21_tokenizer').on('change', function () {
-        oai_settings.use_ai21_tokenizer = !!$('#use_ai21_tokenizer').prop('checked');
-        oai_settings.use_ai21_tokenizer ? ai21_max = 8191 : ai21_max = 9200;
-        oai_settings.openai_max_context = Math.min(ai21_max, oai_settings.openai_max_context);
-        $('#openai_max_context').attr('max', ai21_max).val(oai_settings.openai_max_context).trigger('input');
-        $('#openai_max_context_counter').attr('max', Number($('#openai_max_context').attr('max')));
-        saveSettingsDebounced();
-    });
-    $('#use_google_tokenizer').on('change', function () {
-        oai_settings.use_google_tokenizer = !!$('#use_google_tokenizer').prop('checked');
-        saveSettingsDebounced();
-    });
     $('#claude_use_sysprompt').on('change', function () {
         oai_settings.claude_use_sysprompt = !!$('#claude_use_sysprompt').prop('checked');
         $('#claude_human_sysprompt_message_block').toggle(oai_settings.claude_use_sysprompt);

public/scripts/popup.js+7 -7 Viewed

  * @property {POPUP_RESULT|number?} [defaultResult=POPUP_RESULT.AFFIRMATIVE] - The default result of this popup when Enter is pressed. Can be changed from `POPUP_RESULT.AFFIRMATIVE`.
  * @property {CustomPopupButton[]|string[]?} [customButtons=null] - Custom buttons to add to the popup. If only strings are provided, the buttons will be added with default options, and their result will be in order from `2` onward.
  * @property {CustomPopupInput[]?} [customInputs=null] - Custom inputs to add to the popup. The display below the content and the input box, one by one.
- * @property {(popup: Popup) => boolean?} [onClosing=null] - Handler called before the popup closes, return `false` to cancel the close
+ * @property {(popup: Popup) => Promise<boolean?>|boolean?} [onClosing=null] - Handler called before the popup closes, return `false` to cancel the close
- * @property {(popup: Popup) => void?} [onClose=null] - Handler called after the popup closes, but before the DOM is cleaned up
+ * @property {(popup: Popup) => Promise<void?>|void?} [onClose=null] - Handler called after the popup closes, but before the DOM is cleaned up
  * @property {number?} [cropAspect=null] - Aspect ratio for the crop popup
  * @property {string?} [cropImage=null] - Image URL to display in the crop popup
  */

     /** @readonly @type {CustomPopupButton[]|string[]?} */ customButtons;
     /** @readonly @type {CustomPopupInput[]} */ customInputs;
-    /** @type {(popup: Popup) => boolean?} */ onClosing;
+    /** @type {(popup: Popup) => Promise<boolean?>|boolean?} */ onClosing;
-    /** @type {(popup: Popup) => void?} */ onClose;
+    /** @type {(popup: Popup) => Promise<void?>|void?} */ onClose;
     /** @type {POPUP_RESULT|number} */ result;
     /** @type {any} */ value;

         this.result = result;
         if (this.onClosing) {
-            const shouldClose = this.onClosing(this);
+            const shouldClose = await this.onClosing(this);
             if (!shouldClose) {
                 this.#isClosingPrevented = true;
                 // Set values back if we cancel out of closing the popup

         fixToastrForDialogs();
         // After the dialog is actually completely closed, remove it from the DOM
-        runAfterAnimation(this.dlg, () => {
+        runAfterAnimation(this.dlg, async () => {
             // Call the close on the dialog
             this.dlg.close();
             // Run a possible custom handler right before DOM removal
             if (this.onClose) {
-                this.onClose(this);
+                await this.onClose(this);
+            }
             // Remove it from the dom

public/scripts/power-user.js+32 -175 Viewed

     power_user,
     send_on_enter_options,
     getContextSettings,
+    applyPowerUserSettings,
 };
 export const MAX_CONTEXT_DEFAULT = 8192;

     TOP_AN: 2,
     BOTTOM_AN: 3,
     AT_DEPTH: 4,
+    NONE: 9,
 };
 let power_user = {

 export let context_presets = [];
 const storage_keys = {
-    fast_ui_mode: 'TavernAI_fast_ui_mode',
-    avatar_style: 'TavernAI_avatar_style',
-    chat_display: 'TavernAI_chat_display',
-    chat_width: 'chat_width',
-    font_scale: 'TavernAI_font_scale',
-    main_text_color: 'TavernAI_main_text_color',
-    italics_text_color: 'TavernAI_italics_text_color',
-    underline_text_color: 'TavernAI_underline_text_color',
-    quote_text_color: 'TavernAI_quote_text_color',
-    blur_tint_color: 'TavernAI_blur_tint_color',
-    chat_tint_color: 'TavernAI_chat_tint_color',
-    user_mes_blur_tint_color: 'TavernAI_user_mes_blur_tint_color',
-    bot_mes_blur_tint_color: 'TavernAI_bot_mes_blur_tint_color',
-    blur_strength: 'TavernAI_blur_strength',
-    shadow_color: 'TavernAI_shadow_color',
-    shadow_width: 'TavernAI_shadow_width',
-    border_color: 'TavernAI_border_color',
-    custom_css: 'TavernAI_custom_css',
-    waifuMode: 'TavernAI_waifuMode',
-    movingUI: 'TavernAI_movingUI',
-    noShadows: 'TavernAI_noShadows',
-    hotswap_enabled: 'HotswapEnabled',
-    timer_enabled: 'TimerEnabled',
-    timestamps_enabled: 'TimestampsEnabled',
-    timestamp_model_icon: 'TimestampModelIcon',
-    mesIDDisplay_enabled: 'mesIDDisplayEnabled',
-    hideChatAvatars_enabled: 'hideChatAvatarsEnabled',
-    message_token_count_enabled: 'MessageTokenCountEnabled',
-    expand_message_actions: 'ExpandMessageActions',
-    enableZenSliders: 'enableZenSliders',
-    enableLabMode: 'enableLabMode',
-    reduced_motion: 'reduced_motion',
-    compact_input_area: 'compact_input_area',
     auto_connect_legacy: 'AutoConnectEnabled',
     auto_load_chat_legacy: 'AutoLoadChatEnabled',
+    hideChatAvatars_legacy: 'hideChatAvatarsEnabled',
     storyStringValidationCache: 'StoryStringValidationCache',
 };

+}
 function switchHotswap() {
-    const value = localStorage.getItem(storage_keys.hotswap_enabled);
-    power_user.hotswap_enabled = value === null ? true : value == 'true';
     $('body').toggleClass('no-hotswap', !power_user.hotswap_enabled);
     $('#hotswapEnabled').prop('checked', power_user.hotswap_enabled);
+}
 function switchTimer() {
-    const value = localStorage.getItem(storage_keys.timer_enabled);
-    power_user.timer_enabled = value === null ? true : value == 'true';
     $('body').toggleClass('no-timer', !power_user.timer_enabled);
     $('#messageTimerEnabled').prop('checked', power_user.timer_enabled);
+}
 function switchTimestamps() {
-    const value = localStorage.getItem(storage_keys.timestamps_enabled);
-    power_user.timestamps_enabled = value === null ? true : value == 'true';
     $('body').toggleClass('no-timestamps', !power_user.timestamps_enabled);
     $('#messageTimestampsEnabled').prop('checked', power_user.timestamps_enabled);
+}
 function switchIcons() {
-    const value = localStorage.getItem(storage_keys.timestamp_model_icon);
-    power_user.timestamp_model_icon = value === null ? true : value == 'true';
     $('body').toggleClass('no-modelIcons', !power_user.timestamp_model_icon);
     $('#messageModelIconEnabled').prop('checked', power_user.timestamp_model_icon);
+}
 function switchTokenCount() {
-    const value = localStorage.getItem(storage_keys.message_token_count_enabled);
-    power_user.message_token_count_enabled = value === null ? false : value == 'true';
     $('body').toggleClass('no-tokenCount', !power_user.message_token_count_enabled);
     $('#messageTokensEnabled').prop('checked', power_user.message_token_count_enabled);
+}
 function switchMesIDDisplay() {
-    const value = localStorage.getItem(storage_keys.mesIDDisplay_enabled);
-    power_user.mesIDDisplay_enabled = value === null ? true : value == 'true';
-    /*     console.log(`
-        localstorage value:${value},
-        poweruser before:${before},
-        poweruser after:${power_user.mesIDDisplay_enabled}`) */
     $('body').toggleClass('no-mesIDDisplay', !power_user.mesIDDisplay_enabled);
     $('#mesIDDisplayEnabled').prop('checked', power_user.mesIDDisplay_enabled);
+}
 function switchHideChatAvatars() {
-    const value = localStorage.getItem(storage_keys.hideChatAvatars_enabled);
-    power_user.hideChatAvatars_enabled = value === null ? false : value == 'true';
-    /*console.log(`
-        localstorage value:${value},
-        poweruser after:${power_user.hideChatAvatars_enabled}`)
-    */
     $('body').toggleClass('hideChatAvatars', power_user.hideChatAvatars_enabled);
     $('#hideChatAvatarsEnabled').prop('checked', power_user.hideChatAvatars_enabled);
+}
 function switchMessageActions() {
-    const value = localStorage.getItem(storage_keys.expand_message_actions);
-    power_user.expand_message_actions = value === null ? false : value == 'true';
     $('body').toggleClass('expandMessageActions', power_user.expand_message_actions);
     $('#expandMessageActions').prop('checked', power_user.expand_message_actions);
     $('.extraMesButtons, .extraMesButtonsHint').removeAttr('style');
+}
 function switchReducedMotion() {
-    const value = localStorage.getItem(storage_keys.reduced_motion);
-    power_user.reduced_motion = value === null ? false : value == 'true';
     jQuery.fx.off = power_user.reduced_motion;
     const overrideDuration = power_user.reduced_motion ? 0 : ANIMATION_DURATION_DEFAULT;
     setAnimationDuration(overrideDuration);

@@ -534,8 +474,6 @@ function switchReducedMotion() {
534	}	474	}
535		475
536	function switchCompactInputArea() {	476	function switchCompactInputArea() {
537	const value = localStorage.getItem(storage_keys.compact_input_area);
538	power_user.compact_input_area = value === null ? true : value == 'true';
539	$('#send_form').toggleClass('compact', power_user.compact_input_area);	477	$('#send_form').toggleClass('compact', power_user.compact_input_area);
540	$('#compact_input_area').prop('checked', power_user.compact_input_area);	478	$('#compact_input_area').prop('checked', power_user.compact_input_area);
541	}	479	}

+        }
      */
     await delay(100);
-    const value = localStorage.getItem(storage_keys.enableLabMode);
-    power_user.enableLabMode = value === null ? false : value == 'true';
     $('body').toggleClass('enableLabMode', power_user.enableLabMode);
     $('#enableLabMode').prop('checked', power_user.enableLabMode);

 async function switchZenSliders() {
     await delay(100);
-    const value = localStorage.getItem(storage_keys.enableZenSliders);
-    power_user.enableZenSliders = value === null ? false : value == 'true';
     $('body').toggleClass('enableZenSliders', power_user.enableZenSliders);
     $('#enableZenSliders').prop('checked', power_user.enableZenSliders);

@@ -987,8 +921,6 @@ async function CreateZenSliders(elmnt) {
987	}	921	}
988	}	922	}
989	function switchUiMode() {	923	function switchUiMode() {
990	const fastUi = localStorage.getItem(storage_keys.fast_ui_mode);
991	power_user.fast_ui_mode = fastUi === null ? true : fastUi == 'true';
992	$('body').toggleClass('no-blur', power_user.fast_ui_mode);	924	$('body').toggleClass('no-blur', power_user.fast_ui_mode);
993	$('#fast_ui_mode').prop('checked', power_user.fast_ui_mode);	925	$('#fast_ui_mode').prop('checked', power_user.fast_ui_mode);
994	if (power_user.fast_ui_mode) {	926	if (power_user.fast_ui_mode) {

     $('.drawer-content.maximized').each(function () {
         $(this).find('.inline-drawer-maximize').trigger('click');
     });
-    const movingUI = localStorage.getItem(storage_keys.movingUI);
-    power_user.movingUI = movingUI === null ? false : movingUI == 'true';
     $('body').toggleClass('movingUI', power_user.movingUI);
     if (power_user.movingUI === true) {
         initMovingUI();

@@ -1055,9 +985,7 @@ function switchMovingUI() {
1055	}	985	}
1056	}	986	}
1057		987
1058	function noShadows() {	988	function applyNoShadows() {
1059	const noShadows = localStorage.getItem(storage_keys.noShadows);
1060	power_user.noShadows = noShadows === null ? false : noShadows == 'true';
1061	$('body').toggleClass('noShadows', power_user.noShadows);	989	$('body').toggleClass('noShadows', power_user.noShadows);
1062	$('#noShadowsmode').prop('checked', power_user.noShadows);	990	$('#noShadowsmode').prop('checked', power_user.noShadows);
1063	if (power_user.noShadows) {	991	if (power_user.noShadows) {

@@ -1071,12 +999,9 @@ function noShadows() {
1071	}	999	}
1072		1000
1073	function applyAvatarStyle() {	1001	function applyAvatarStyle() {
1074	power_user.avatar_style = Number(localStorage.getItem(storage_keys.avatar_style) ?? avatar_styles.ROUND);
1075	$('body').toggleClass('big-avatars', power_user.avatar_style === avatar_styles.RECTANGULAR);	1002	$('body').toggleClass('big-avatars', power_user.avatar_style === avatar_styles.RECTANGULAR);
1076	$('body').toggleClass('square-avatars', power_user.avatar_style === avatar_styles.SQUARE);	1003	$('body').toggleClass('square-avatars', power_user.avatar_style === avatar_styles.SQUARE);
1077	$('#avatar_style').val(power_user.avatar_style).prop('selected', true);	1004	$('#avatar_style').val(power_user.avatar_style).prop('selected', true);
1078	//$(`input[name="avatar_style"][value="${power_user.avatar_style}"]`).prop("checked", true);
1079
1080	}	1005	}
1081		1006
1082	function applyChatDisplay() {	1007	function applyChatDisplay() {

+}
 function applyChatWidth(type) {
-    power_user.chat_width = Number(localStorage.getItem(storage_keys.chat_width) ?? 50);
     if (type === 'forced') {
         let r = document.documentElement;
         r.style.setProperty('--sheldWidth', `${power_user.chat_width}vw`);

+}
 async function applyCustomCSS() {
-    power_user.custom_css = String(localStorage.getItem(storage_keys.custom_css) ?? '');
     $('#customCSS').val(power_user.custom_css);
     var styleId = 'custom-style';
     var style = document.getElementById(styleId);

+}
 async function applyBlurStrength() {
-    power_user.blur_strength = Number(localStorage.getItem(storage_keys.blur_strength) ?? 1);
+    document.documentElement.style.setProperty('--blurStrength', String(power_user.blur_strength));
-    document.documentElement.style.setProperty('--blurStrength', power_user.blur_strength);
     $('#blur_strength_counter').val(power_user.blur_strength);
     $('#blur_strength').val(power_user.blur_strength);
+}
 async function applyShadowWidth() {
-    power_user.shadow_width = Number(localStorage.getItem(storage_keys.shadow_width) ?? 2);
+    document.documentElement.style.setProperty('--shadowWidth', String(power_user.shadow_width));
-    document.documentElement.style.setProperty('--shadowWidth', power_user.shadow_width);
     $('#shadow_width_counter').val(power_user.shadow_width);
     $('#shadow_width').val(power_user.shadow_width);
+}
 async function applyFontScale(type) {
-    power_user.font_scale = Number(localStorage.getItem(storage_keys.font_scale) ?? 1);
     //this is to allow forced setting on page load, theme swap, etc
     if (type === 'forced') {
-        document.documentElement.style.setProperty('--fontScale', power_user.font_scale);
+        document.documentElement.style.setProperty('--fontScale', String(power_user.font_scale));
     } else {
         //this is to prevent the slider from updating page in real time
         $('#font_scale').off('mouseup touchend').on('mouseup touchend', () => {
-            document.documentElement.style.setProperty('--fontScale', power_user.font_scale);
+            document.documentElement.style.setProperty('--fontScale', String(power_user.font_scale));
         });
+    }

+        {
             key: 'blur_strength',
             action: async () => {
-                localStorage.setItem(storage_keys.blur_strength, power_user.blur_strength);
                 await applyBlurStrength();
             },
         },
+        {
             key: 'custom_css',
             action: async () => {
-                localStorage.setItem(storage_keys.custom_css, power_user.custom_css);
                 await applyCustomCSS();
             },
         },
+        {
             key: 'shadow_width',
             action: async () => {
-                localStorage.setItem(storage_keys.shadow_width, power_user.shadow_width);
                 await applyShadowWidth();
             },
         },
+        {
             key: 'font_scale',
             action: async () => {
-                localStorage.setItem(storage_keys.font_scale, power_user.font_scale);
                 await applyFontScale('forced');
             },
         },
+        {
             key: 'fast_ui_mode',
             action: async () => {
-                localStorage.setItem(storage_keys.fast_ui_mode, power_user.fast_ui_mode);
                 switchUiMode();
             },
         },
+        {
             key: 'waifuMode',
             action: async () => {
-                localStorage.setItem(storage_keys.waifuMode, power_user.waifuMode);
                 switchWaifuMode();
             },
         },
+        {
             key: 'chat_display',
             action: async () => {
-                localStorage.setItem(storage_keys.chat_display, power_user.chat_display);
                 applyChatDisplay();
             },
         },
+        {
             key: 'avatar_style',
             action: async () => {
-                localStorage.setItem(storage_keys.avatar_style, power_user.avatar_style);
                 applyAvatarStyle();
             },
         },
+        {
             key: 'noShadows',
             action: async () => {
-                localStorage.setItem(storage_keys.noShadows, power_user.noShadows);
+                applyNoShadows();
-                noShadows();
             },
         },
+        {

                 if (!power_user.chat_width) {
                     power_user.chat_width = 50;
+                }
-                localStorage.setItem(storage_keys.chat_width, String(power_user.chat_width));
                 applyChatWidth('forced');
             },
         },
+        {
             key: 'timer_enabled',
             action: async () => {
-                localStorage.setItem(storage_keys.timer_enabled, Boolean(power_user.timer_enabled));
                 switchTimer();
             },
         },
+        {
             key: 'timestamps_enabled',
             action: async () => {
-                localStorage.setItem(storage_keys.timestamps_enabled, Boolean(power_user.timestamps_enabled));
                 switchTimestamps();
             },
         },
+        {
             key: 'timestamp_model_icon',
             action: async () => {
-                localStorage.setItem(storage_keys.timestamp_model_icon, Boolean(power_user.timestamp_model_icon));
                 switchIcons();
             },
         },
+        {
             key: 'message_token_count_enabled',
             action: async () => {
-                localStorage.setItem(storage_keys.message_token_count_enabled, Boolean(power_user.message_token_count_enabled));
                 switchTokenCount();
             },
         },
+        {
             key: 'mesIDDisplay_enabled',
             action: async () => {
-                localStorage.setItem(storage_keys.mesIDDisplay_enabled, Boolean(power_user.mesIDDisplay_enabled));
                 switchMesIDDisplay();
             },
         },
+        {
             key: 'hideChatAvatars_enabled',
             action: async () => {
-                localStorage.setItem(storage_keys.hideChatAvatars_enabled, Boolean(power_user.hideChatAvatars_enabled));
                 switchHideChatAvatars();
             },
         },
+        {
             key: 'expand_message_actions',
             action: async () => {
-                localStorage.setItem(storage_keys.expand_message_actions, Boolean(power_user.expand_message_actions));
                 switchMessageActions();
             },
         },
+        {
             key: 'enableZenSliders',
             action: async () => {
-                localStorage.setItem(storage_keys.enableZenSliders, Boolean(power_user.enableZenSliders));
                 switchMessageActions();
             },
         },
+        {
             key: 'enableLabMode',
             action: async () => {
-                localStorage.setItem(storage_keys.enableLabMode, Boolean(power_user.enableLabMode));
                 switchMessageActions();
             },
         },
+        {
             key: 'hotswap_enabled',
             action: async () => {
-                localStorage.setItem(storage_keys.hotswap_enabled, Boolean(power_user.hotswap_enabled));
                 switchHotswap();
             },
         },

+        {
             key: 'reduced_motion',
             action: async () => {
-                localStorage.setItem(storage_keys.reduced_motion, String(power_user.reduced_motion));
                 $('#reduced_motion').prop('checked', power_user.reduced_motion);
                 switchReducedMotion();
             },

+        {
             key: 'compact_input_area',
             action: async () => {
-                localStorage.setItem(storage_keys.compact_input_area, String(power_user.compact_input_area));
                 $('#compact_input_area').prop('checked', power_user.compact_input_area);
                 switchCompactInputArea();
             },

     callGenericPopup(template, POPUP_TYPE.TEXT, '', { wide: true, large: true, allowVerticalScrolling: true });
+}
+function applyPowerUserSettings() {
     switchUiMode();
     applyFontScale('forced');
     applyThemeColor();

     applyShadowWidth();
     applyCustomCSS();
     switchMovingUI();
-noShadows();
+    applyNoShadows();
     switchHotswap();
     switchTimer();
     switchTimestamps();

     switchHideChatAvatars();
     switchTokenCount();
     switchMessageActions();
+}
 function getExampleMessagesBehavior() {
     if (power_user.strip_examples) {

         context_presets = data.context;
+    }
-    // These are still local storage
+    // These are still local storage. Delete in 1.12.7
-    const fastUi = localStorage.getItem(storage_keys.fast_ui_mode);
-    const movingUI = localStorage.getItem(storage_keys.movingUI);
-    const noShadows = localStorage.getItem(storage_keys.noShadows);
-    const hotswap = localStorage.getItem(storage_keys.hotswap_enabled);
-    const timer = localStorage.getItem(storage_keys.timer_enabled);
-    const timestamps = localStorage.getItem(storage_keys.timestamps_enabled);
-    const mesIDDisplay = localStorage.getItem(storage_keys.mesIDDisplay_enabled);
-    const hideChatAvatars = localStorage.getItem(storage_keys.hideChatAvatars_enabled);
-    const expandMessageActions = localStorage.getItem(storage_keys.expand_message_actions);
-    const enableZenSliders = localStorage.getItem(storage_keys.enableZenSliders);
-    const enableLabMode = localStorage.getItem(storage_keys.enableLabMode);
     const autoLoadChat = localStorage.getItem(storage_keys.auto_load_chat_legacy);
     const autoConnect = localStorage.getItem(storage_keys.auto_connect_legacy);
+    const hideChatAvatars = localStorage.getItem(storage_keys.hideChatAvatars_legacy);
     if (autoLoadChat) {
         power_user.auto_load_chat = autoLoadChat === 'true';

         localStorage.removeItem(storage_keys.auto_connect_legacy);
+    }
-    power_user.fast_ui_mode = fastUi === null ? true : fastUi == 'true';
+    if (hideChatAvatars) {
-    power_user.movingUI = movingUI === null ? false : movingUI == 'true';
+        power_user.hideChatAvatars_enabled = hideChatAvatars === 'true';
-    power_user.noShadows = noShadows === null ? false : noShadows == 'true';
+        localStorage.removeItem(storage_keys.hideChatAvatars_legacy);
-    power_user.hotswap_enabled = hotswap === null ? true : hotswap == 'true';
+    }
-    power_user.timer_enabled = timer === null ? true : timer == 'true';
-    power_user.timestamps_enabled = timestamps === null ? true : timestamps == 'true';
-    power_user.mesIDDisplay_enabled = mesIDDisplay === null ? true : mesIDDisplay == 'true';
-    power_user.hideChatAvatars_enabled = hideChatAvatars === null ? true : hideChatAvatars == 'true';
-    power_user.expand_message_actions = expandMessageActions === null ? true : expandMessageActions == 'true';
-    power_user.enableZenSliders = enableZenSliders === null ? false : enableZenSliders == 'true';
-    power_user.enableLabMode = enableLabMode === null ? false : enableLabMode == 'true';
-    power_user.avatar_style = Number(localStorage.getItem(storage_keys.avatar_style) ?? avatar_styles.ROUND);
-    //power_user.chat_display = Number(localStorage.getItem(storage_keys.chat_display) ?? chat_styles.DEFAULT);
-    power_user.chat_width = Number(localStorage.getItem(storage_keys.chat_width) ?? 50);
-    power_user.font_scale = Number(localStorage.getItem(storage_keys.font_scale) ?? 1);
-    power_user.blur_strength = Number(localStorage.getItem(storage_keys.blur_strength) ?? 10);
     if (power_user.chat_display === '') {
         power_user.chat_display = chat_styles.DEFAULT;

     $('#messageTimestampsEnabled').prop('checked', power_user.timestamps_enabled);
     $('#messageModelIconEnabled').prop('checked', power_user.timestamp_model_icon);
     $('#mesIDDisplayEnabled').prop('checked', power_user.mesIDDisplay_enabled);
-    $('#hideChatAvatarsEndabled').prop('checked', power_user.hideChatAvatars_enabled);
+    $('#hideChatAvatarsEnabled').prop('checked', power_user.hideChatAvatars_enabled);
     $('#prefer_character_prompt').prop('checked', power_user.prefer_character_prompt);
     $('#prefer_character_jailbreak').prop('checked', power_user.prefer_character_jailbreak);
     $('#enableZenSliders').prop('checked', power_user.enableZenSliders).trigger('input');

         saveSettingsDebounced();
     });
-    // Settings that go to local storage
     $('#fast_ui_mode').change(function () {
         power_user.fast_ui_mode = $(this).prop('checked');
-        localStorage.setItem(storage_keys.fast_ui_mode, power_user.fast_ui_mode);
         switchUiMode();
         saveSettingsDebounced();
     });

     $('#customCSS').on('input', () => {
         power_user.custom_css = String($('#customCSS').val());
-        localStorage.setItem(storage_keys.custom_css, power_user.custom_css);
         saveSettingsDebounced();
         applyCustomCSS();
     });
     $('#movingUImode').change(function () {
         power_user.movingUI = $(this).prop('checked');
-        localStorage.setItem(storage_keys.movingUI, power_user.movingUI);
         switchMovingUI();
         saveSettingsDebounced();
     });
     $('#noShadowsmode').change(function () {
         power_user.noShadows = $(this).prop('checked');
-        localStorage.setItem(storage_keys.noShadows, power_user.noShadows);
+        applyNoShadows();
-        noShadows();
         saveSettingsDebounced();
     });

     $('#avatar_style').on('change', function () {
         const value = $(this).find(':selected').val();
         power_user.avatar_style = Number(value);
-        localStorage.setItem(storage_keys.avatar_style, power_user.avatar_style);
         applyAvatarStyle();
         saveSettingsDebounced();
     });

     $('#chat_display').on('change', function () {
         const value = $(this).find(':selected').val();
         power_user.chat_display = Number(value);
-        localStorage.setItem(storage_keys.chat_display, power_user.chat_display);
         applyChatDisplay();
         saveSettingsDebounced();
     });
     $('#chat_width_slider').on('input', function (e, data) {
         const applyMode = data?.forced ? 'forced' : 'normal';
         power_user.chat_width = Number(e.target.value);
-        localStorage.setItem(storage_keys.chat_width, power_user.chat_width);
         applyChatWidth(applyMode);
+        saveSettingsDebounced();
         setHotswapsDebounced();
     });

         const applyMode = data?.forced ? 'forced' : 'normal';
         power_user.font_scale = Number(e.target.value);
         $('#font_scale_counter').val(power_user.font_scale);
-        localStorage.setItem(storage_keys.font_scale, power_user.font_scale);
         await applyFontScale(applyMode);
         saveSettingsDebounced();
     });

     $('input[name="blur_strength"]').on('input', async function (e) {
         power_user.blur_strength = Number(e.target.value);
         $('#blur_strength_counter').val(power_user.blur_strength);
-        localStorage.setItem(storage_keys.blur_strength, power_user.blur_strength);
         await applyBlurStrength();
         saveSettingsDebounced();
     });

     $('input[name="shadow_width"]').on('input', async function (e) {
         power_user.shadow_width = Number(e.target.value);
         $('#shadow_width_counter').val(power_user.shadow_width);
-        localStorage.setItem(storage_keys.shadow_width, power_user.shadow_width);
         await applyShadowWidth();
         saveSettingsDebounced();
     });

     $('#messageTimerEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.timer_enabled = value;
-        localStorage.setItem(storage_keys.timer_enabled, Boolean(power_user.timer_enabled));
         switchTimer();
+        saveSettingsDebounced();
     });
     $('#messageTimestampsEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.timestamps_enabled = value;
-        localStorage.setItem(storage_keys.timestamps_enabled, Boolean(power_user.timestamps_enabled));
         switchTimestamps();
+        saveSettingsDebounced();
     });
     $('#messageModelIconEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.timestamp_model_icon = value;
-        localStorage.setItem(storage_keys.timestamp_model_icon, Boolean(power_user.timestamp_model_icon));
         switchIcons();
+        saveSettingsDebounced();
     });
     $('#messageTokensEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.message_token_count_enabled = value;
-        localStorage.setItem(storage_keys.message_token_count_enabled, Boolean(power_user.message_token_count_enabled));
         switchTokenCount();
+        saveSettingsDebounced();
     });
     $('#expandMessageActions').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.expand_message_actions = value;
-        localStorage.setItem(storage_keys.expand_message_actions, Boolean(power_user.expand_message_actions));
         switchMessageActions();
+        saveSettingsDebounced();
     });
     $('#enableZenSliders').on('input', function () {

             return;
+        }
         power_user.enableZenSliders = value;
-        localStorage.setItem(storage_keys.enableZenSliders, Boolean(power_user.enableZenSliders));
-        saveSettingsDebounced();
         switchZenSliders();
+        saveSettingsDebounced();
     });
     $('#enableLabMode').on('input', function () {

+        }
         power_user.enableLabMode = value;
-        localStorage.setItem(storage_keys.enableLabMode, Boolean(power_user.enableLabMode));
-        saveSettingsDebounced();
         switchLabMode();
+        saveSettingsDebounced();
     });
     $('#mesIDDisplayEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.mesIDDisplay_enabled = value;
-        localStorage.setItem(storage_keys.mesIDDisplay_enabled, Boolean(power_user.mesIDDisplay_enabled));
         switchMesIDDisplay();
+        saveSettingsDebounced();
     });
     $('#hideChatAvatarsEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.hideChatAvatars_enabled = value;
-        localStorage.setItem(storage_keys.hideChatAvatars_enabled, Boolean(power_user.hideChatAvatars_enabled));
         switchHideChatAvatars();
+        saveSettingsDebounced();
     });
     $('#hotswapEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.hotswap_enabled = value;
-        localStorage.setItem(storage_keys.hotswap_enabled, Boolean(power_user.hotswap_enabled));
         switchHotswap();
+        saveSettingsDebounced();
     });
     $('#prefer_character_prompt').on('input', function () {

     $('#ui_mode_select').on('change', function () {
         const value = $(this).find(':selected').val();
         power_user.ui_mode = Number(value);
-        saveSettingsDebounced();
         switchSimpleMode();
+        saveSettingsDebounced();
     });
     $('#bogus_folders').on('input', function () {

     $('#reduced_motion').on('input', function () {
         power_user.reduced_motion = !!$(this).prop('checked');
-        localStorage.setItem(storage_keys.reduced_motion, String(power_user.reduced_motion));
         switchReducedMotion();
         saveSettingsDebounced();
     });
     $('#compact_input_area').on('input', function () {
         power_user.compact_input_area = !!$(this).prop('checked');
-        localStorage.setItem(storage_keys.compact_input_area, String(power_user.compact_input_area));
         switchCompactInputArea();
         saveSettingsDebounced();
     });

public/scripts/showdown-underscore.js+1 -1 Viewed

         return [{
             type: 'output',
-            regex: new RegExp('(<code>[\\s\\S]*?<\\/code>)|(?<!\\S)_(?!_)([^_\\n]+?)(?<!_)_(?!\\w)', 'g'),
+            regex: new RegExp('(<code(?:\\s+[^>]*)?>[\\s\\S]*?<\\/code>)|\\b(?<!_)_(?!_)(.*?)(?<!_)_(?!_)\\b', 'g'),
             replace: function(match, codeContent, italicContent) {
                 if (codeContent) {
                     // If it's inside <code> tags, return unchanged

public/scripts/slash-commands.js+6 -5 Viewed

+    }
+}
+/**
+ * Callback for the /gen command
+ * @param {object} args Named arguments
+ * @param {string} value Unnamed argument
+ * @returns {Promise<string>} The generated text
+ */
 async function generateCallback(args, value) {
-    if (!value) {
-        console.warn('WARN: No argument provided for /gen command');
-        return;
-    }
     // Prevent generate recursion
     $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
     const lock = isTrueBoolean(args?.lock);

public/scripts/tags.js+9 -1 Viewed

@@ -445,7 +445,11 @@ export function getTagKeyForEntity(entityOrKey) {
445	}	445	}
446		446
447	// Next lets check if its a valid character or character id, so we can swith it to its tag	447	// Next lets check if its a valid character or character id, so we can swith it to its tag
448	const character = characters.indexOf(x) >= 0 ? x : characters[x];	448	let character;
		449	if (!character && characters.indexOf(x) >= 0) character = x; // Check for char object
		450	if (!character && !isNaN(parseInt(entityOrKey))) character = characters[x]; // check if its a char id
		451	if (!character) character = characters.find(y => y.avatar === x); // check if its a char key
		452
449	if (character) {	453	if (character) {
450	x = character.avatar;	454	x = character.avatar;
451	}	455	}

     const tagsToImport = tagNamesToImport.map(tag => getTag(tag, { createNew: true }));
     const added = addTagsToEntity(tagsToImport, character.avatar);
+    if (added) {
         toastr.success(`Imported tags:<br />${tagsToImport.map(x => x.name).join(', ')}`, 'Importing Tags', { escapeHtml: false });
+    } else {
+        toastr.error(`Couldn't import tags:<br />${tagsToImport.map(x => x.name).join(', ')}`, 'Importing Tags', { escapeHtml: false });
+    }
     return added;
+}

public/scripts/templates/chatRename.html+6 -0 Viewed

+<h3 data-i18n="chat_rename_1">Enter the new name for the chat:</h3>
+<small>
+    <span data-i18n="chat_rename_2">!!Using an existing filename will produce an error!!</span><br>
+    <span data-i18n="chat_rename_3">This will break the link between checkpoint chats.</span><br>
+    <span data-i18n="chat_rename_4">No need to add '.jsonl' at the end.</span><br>
+</small>
 \ No newline at end of file

public/scripts/templates/newChatConfirm.html+4 -0 Viewed

+<label for="del_chat_checkbox" class="checkbox_label justifyCenter" data-i18n="[title]If necessary, you can later restore this chat file from the /backups folder" title="If necessary, you can later restore this chat file from the /backups folder">
+    <input type="checkbox" id="del_chat_checkbox" />
+    <small data-i18n="Also delete the current chat file">Also delete the current chat file</small>
+</label>
 \ No newline at end of file

public/scripts/templates/proxyConnectionWarning.html+1 -0 Viewed

@@ -0,0 +1 @@
		1	<span data-i18n="Are you sure you want to connect to the following proxy URL?">Are you sure you want to connect to the following proxy URL?</span><var>{{proxyURL}}</var>
	\ No newline at end of file	1	\ No newline at end of file

public/scripts/tokenizers.js+27 -23 Viewed

     CLAUDE: 11,
     LLAMA3: 12,
     GEMMA: 13,
+    JAMBA: 14,
     BEST_MATCH: 99,
 };

     tokenizers.YI,
     tokenizers.LLAMA3,
     tokenizers.GEMMA,
+    tokenizers.JAMBA,
     // uncomment when NovelAI releases Kayra and Clio weights, lol
     //tokenizers.NERD,
     //tokenizers.NERD2,

         decode: '/api/tokenizers/gemma/decode',
         count: '/api/tokenizers/gemma/encode',
     },
+    [tokenizers.JAMBA]: {
+        encode: '/api/tokenizers/jamba/encode',
+        decode: '/api/tokenizers/jamba/decode',
+        count: '/api/tokenizers/jamba/encode',
+    },
     [tokenizers.API_TEXTGENERATIONWEBUI]: {
         encode: '/api/tokenizers/remote/textgenerationwebui/encode',
         count: '/api/tokenizers/remote/textgenerationwebui/encode',

         tokenizerId: Number(tokenizerOption.value),
         tokenizerKey: Object.entries(tokenizers).find(([_, value]) => value === Number(tokenizerOption.value))[0].toLocaleLowerCase(),
         tokenizerName: tokenizerOption.text,
-    }))
+    }));
+}
 /**

             if (model.includes('gemma')) {
                 return tokenizers.GEMMA;
+            }
+            if (model.includes('yi')) {
+                return tokenizers.YI;
+            }
+            if (model.includes('jamba')) {
+                return tokenizers.JAMBA;
+            }
+        }
         return tokenizers.LLAMA;

     const mistralTokenizer = 'mistral';
     const yiTokenizer = 'yi';
     const gemmaTokenizer = 'gemma';
+    const jambaTokenizer = 'jamba';
     // Assuming no one would use it for different models.. right?
     if (oai_settings.chat_completion_source == chat_completion_sources.SCALE) {

@@ -562,12 +576,19 @@ export function getTokenizerModel() {
562	else if (oai_settings.openrouter_model.includes('GPT-NeoXT')) {	576	else if (oai_settings.openrouter_model.includes('GPT-NeoXT')) {
563	return gpt2Tokenizer;	577	return gpt2Tokenizer;
564	}	578	}
		579	else if (oai_settings.openrouter_model.includes('jamba')) {
		580	return jambaTokenizer;
		581	}
565	}	582	}
566		583
567	if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {	584	if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
568	return gemmaTokenizer;	585	return gemmaTokenizer;
569	}	586	}
570		587
		588	if (oai_settings.chat_completion_source == chat_completion_sources.AI21) {
		589	return jambaTokenizer;
		590	}
		591
571	if (oai_settings.chat_completion_source == chat_completion_sources.CLAUDE) {	592	if (oai_settings.chat_completion_source == chat_completion_sources.CLAUDE) {
572	return claudeTokenizer;	593	return claudeTokenizer;
573	}	594	}

  * @deprecated Use countTokensOpenAIAsync instead.
  */
 export function countTokensOpenAI(messages, full = false) {
-    const shouldTokenizeAI21 = oai_settings.chat_completion_source === chat_completion_sources.AI21 && oai_settings.use_ai21_tokenizer;
+    const tokenizerEndpoint = `/api/tokenizers/openai/count?model=${getTokenizerModel()}`;
-    const shouldTokenizeGoogle = oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE && oai_settings.use_google_tokenizer;
-    let tokenizerEndpoint = '';
-    if (shouldTokenizeAI21) {
-        tokenizerEndpoint = '/api/tokenizers/ai21/count';
-    } else if (shouldTokenizeGoogle) {
-        tokenizerEndpoint = `/api/tokenizers/google/count?model=${getTokenizerModel()}&reverse_proxy=${oai_settings.reverse_proxy}&proxy_password=${oai_settings.proxy_password}`;
-    } else {
-        tokenizerEndpoint = `/api/tokenizers/openai/count?model=${getTokenizerModel()}`;
-    }
     const cacheObject = getTokenCacheObject();
     if (!Array.isArray(messages)) {

     for (const message of messages) {
         const model = getTokenizerModel();
-        if (model === 'claude' || shouldTokenizeAI21 || shouldTokenizeGoogle) {
+        if (model === 'claude') {
             full = true;
+        }

  * @returns {Promise<number>} Token count.
  */
 export async function countTokensOpenAIAsync(messages, full = false) {
-    const shouldTokenizeAI21 = oai_settings.chat_completion_source === chat_completion_sources.AI21 && oai_settings.use_ai21_tokenizer;
+    const tokenizerEndpoint = `/api/tokenizers/openai/count?model=${getTokenizerModel()}`;
-    const shouldTokenizeGoogle = oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE && oai_settings.use_google_tokenizer;
-    let tokenizerEndpoint = '';
-    if (shouldTokenizeAI21) {
-        tokenizerEndpoint = '/api/tokenizers/ai21/count';
-    } else if (shouldTokenizeGoogle) {
-        tokenizerEndpoint = `/api/tokenizers/google/count?model=${getTokenizerModel()}`;
-    } else {
-        tokenizerEndpoint = `/api/tokenizers/openai/count?model=${getTokenizerModel()}`;
-    }
     const cacheObject = getTokenCacheObject();
     if (!Array.isArray(messages)) {

     for (const message of messages) {
         const model = getTokenizerModel();
-        if (model === 'claude' || shouldTokenizeAI21 || shouldTokenizeGoogle) {
+        if (model === 'claude') {
             full = true;
+        }

         url: getTextGenServer(),
         legacy_api: textgen_settings.legacy_api && (textgen_settings.type === OOBA || textgen_settings.type === APHRODITE),
         vllm_model: textgen_settings.vllm_model,
+        aphrodite_model: textgen_settings.aphrodite_model,
     };
+}

public/scripts/world-info.js+30 -2 Viewed

 export let world_info_use_group_scoring = false;
 export let world_info_character_strategy = world_info_insertion_strategy.character_first;
 export let world_info_budget_cap = 0;
+export let world_info_max_recursion_steps = 0;
 const saveWorldDebounced = debounce(async (name, data) => await _save(name, data), debounce_timeout.relaxed);
 const saveSettingsDebounced = debounce(() => {
     Object.assign(world_info, { globalSelect: selected_world_info });

         world_info_character_strategy,
         world_info_budget_cap,
         world_info_use_group_scoring,
+        world_info_max_recursion_steps,
     };
+}

         world_info_budget_cap = Number(settings.world_info_budget_cap);
     if (settings.world_info_use_group_scoring !== undefined)
         world_info_use_group_scoring = Boolean(settings.world_info_use_group_scoring);
+    if (settings.world_info_max_recursion_steps !== undefined)
+        world_info_max_recursion_steps = Number(settings.world_info_max_recursion_steps);
     // Migrate old settings
     if (world_info_budget > 100) {

     $('#world_info_budget_cap').val(world_info_budget_cap);
     $('#world_info_budget_cap_counter').val(world_info_budget_cap);
+    $('#world_info_max_recursion_steps').val(world_info_max_recursion_steps);
+    $('#world_info_max_recursion_steps_counter').val(world_info_max_recursion_steps);
     world_names = data.world_names?.length ? data.world_names : [];
     // Add to existing selected WI if it exists

     if (!isMobile()) {
         $(characterFilter).select2({
             width: '100%',
-            placeholder: 'All characters will pull from this entry.',
+            placeholder: 'Tie this entry to specific characters or characters with specific tags',
             allowClear: true,
             closeOnSelect: false,
         });

     console.debug(`[WI] --- SEARCHING ENTRIES (on ${sortedEntries.length} entries) ---`);
     while (scanState) {
+        //if world_info_max_recursion_steps is non-zero min activations are disabled, and vice versa
+        if (world_info_max_recursion_steps && world_info_max_recursion_steps <= count) {
+            console.debug('[WI] Search stopped by reaching max recursion steps', world_info_max_recursion_steps);
+            break;
+        }
         // Track how many times the loop has run. May be useful for debugging.
         count++;

     $('#world_info_min_activations').on('input', function () {
         world_info_min_activations = Number($(this).val());
-        $('#world_info_min_activations_counter').val($(this).val());
+        $('#world_info_min_activations_counter').val(world_info_min_activations);
+        if (world_info_min_activations !== 0) {
+            $('#world_info_max_recursion_steps').val(0).trigger('input');
+        } else {
             saveSettings();
+        }
     });
     $('#world_info_min_activations_depth_max').on('input', function () {

         saveSettings();
     });
+    $('#world_info_max_recursion_steps').on('input', function () {
+        world_info_max_recursion_steps = Number($(this).val());
+        $('#world_info_max_recursion_steps_counter').val(world_info_max_recursion_steps);
+        if (world_info_max_recursion_steps !== 0) {
+            $('#world_info_min_activations').val(0).trigger('input');
+        } else {
+            saveSettings();
+        }
+    });
     $('#world_button').on('click', async function (event) {
         const chid = $('#set_character_world').data('chid');

server.js+2 -2 Viewed

             }, app);
         server.on('error', reject);
         server.on('listening', resolve);
-        server.listen(url.port, url.hostname);
+        server.listen(url.port || 443, url.hostname);
     });
+}

         const server = http.createServer(app);
         server.on('error', reject);
         server.on('listening', resolve);
-        server.listen(url.port, url.hostname);
+        server.listen(url.port || 80, url.hostname);
     });
+}

src/cohere-stream.js+126 -0 Viewed

+const DATA_PREFIX = 'data:';
+/**
+ * Borrowed from Cohere SDK (MIT License)
+ * https://github.com/cohere-ai/cohere-typescript/blob/main/src/core/streaming-fetcher/Stream.ts
+ * Copyright (c) 2021 Cohere
+ */
+class CohereStream {
+    /** @type {ReadableStream} */
+    stream;
+    /** @type {string} */
+    prefix;
+    /** @type {string} */
+    messageTerminator;
+    /** @type {string|undefined} */
+    streamTerminator;
+    /** @type {AbortController} */
+    controller = new AbortController();
+    constructor({ stream, eventShape }) {
+        this.stream = stream;
+        if (eventShape.type === 'sse') {
+            this.prefix = DATA_PREFIX;
+            this.messageTerminator = '\n';
+            this.streamTerminator = eventShape.streamTerminator;
+        } else {
+            this.messageTerminator = eventShape.messageTerminator;
+        }
+    }
+    async *iterMessages()  {
+        const stream = readableStreamAsyncIterable(this.stream);
+        let buf = '';
+        let prefixSeen = false;
+        let parsedAnyMessages = false;
+        for await (const chunk of stream) {
+            buf += this.decodeChunk(chunk);
+            let terminatorIndex;
+            // Parse the chunk into as many messages as possible
+            while ((terminatorIndex = buf.indexOf(this.messageTerminator)) >= 0) {
+                // Extract the line from the buffer
+                let line = buf.slice(0, terminatorIndex + 1);
+                buf = buf.slice(terminatorIndex + 1);
+                // Skip empty lines
+                if (line.length === 0) {
+                    continue;
+                }
+                // Skip the chunk until the prefix is found
+                if (!prefixSeen && this.prefix != null) {
+                    const prefixIndex = line.indexOf(this.prefix);
+                    if (prefixIndex === -1) {
+                        continue;
+                    }
+                    prefixSeen = true;
+                    line = line.slice(prefixIndex + this.prefix.length);
+                }
+                // If the stream terminator is present, return
+                if (this.streamTerminator != null && line.includes(this.streamTerminator)) {
+                    return;
+                }
+                // Otherwise, yield message from the prefix to the terminator
+                const message = JSON.parse(line);
+                yield message;
+                prefixSeen = false;
+                parsedAnyMessages = true;
+            }
+        }
+        if (!parsedAnyMessages && buf.length > 0) {
+            try {
+                yield JSON.parse(buf);
+            } catch (e) {
+                console.error('Error parsing message:', e);
+            }
+        }
+    }
+    async *[Symbol.asyncIterator]() {
+        for await (const message of this.iterMessages()) {
+            yield message;
+        }
+    }
+    decodeChunk(chunk) {
+        const decoder = new TextDecoder('utf8');
+        return decoder.decode(chunk);
+    }
+}
+function readableStreamAsyncIterable(stream) {
+    if (stream[Symbol.asyncIterator]) {
+        return stream;
+    }
+    const reader = stream.getReader();
+    return {
+        async next() {
+            try {
+                const result = await reader.read();
+                if (result?.done) {
+                    reader.releaseLock();
+                } // release lock when stream becomes closed
+                return result;
+            } catch (e) {
+                reader.releaseLock(); // release lock when stream becomes errored
+                throw e;
+            }
+        },
+        async return() {
+            const cancelPromise = reader.cancel();
+            reader.releaseLock();
+            await cancelPromise;
+            return { done: true, value: undefined };
+        },
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+    };
+}
+module.exports = CohereStream;

src/endpoints/backends/chat-completions.js+63 -93 Viewed

 const express = require('express');
 const fetch = require('node-fetch').default;
-const Readable = require('stream').Readable;
 const { jsonParser } = require('../../express-common');
 const { CHAT_COMPLETION_SOURCES, GEMINI_SAFETY, BISON_SAFETY, OPENROUTER_HEADERS } = require('../../constants');
 const { forwardFetchResponse, getConfigValue, tryParse, uuidv4, mergeObjectWithYaml, excludeKeysByYaml, color } = require('../../util');
-const { convertClaudeMessages, convertGooglePrompt, convertTextCompletionPrompt, convertCohereMessages, convertMistralMessages, convertCohereTools } = require('../../prompt-converters');
+const { convertClaudeMessages, convertGooglePrompt, convertTextCompletionPrompt, convertCohereMessages, convertMistralMessages, convertCohereTools, convertAI21Messages } = require('../../prompt-converters');
+const CohereStream = require('../../cohere-stream');
 const { readSecret, SECRET_KEYS } = require('../secrets');
 const { getTokenizerModel, getSentencepiceTokenizer, getTiktokenTokenizer, sentencepieceTokenizers, TEXT_COMPLETION_MODELS } = require('../tokenizers');

 const API_MAKERSUITE = 'https://generativelanguage.googleapis.com';
 const API_01AI = 'https://api.01.ai/v1';
 const API_BLOCKENTROPY = 'https://api.blockentropy.ai/v1';
+const API_AI21 = 'https://api.ai21.com/studio/v1';
 /**
  * Applies a post-processing step to the generated messages.

 /**
  * Ollama strikes back. Special boy #2's steaming routine.
  * Wrap this abomination into proper SSE stream, again.
- * @param {import('node-fetch').Response} jsonStream JSON stream
+ * @param {Response} jsonStream JSON stream
  * @param {import('express').Request} request Express request
  * @param {import('express').Response} response Express response
  * @returns {Promise<any>} Nothing valuable
  */
 async function parseCohereStream(jsonStream, request, response) {
     try {
-        let partialData = '';
+        const stream = new CohereStream({ stream: jsonStream.body, eventShape: { type: 'json', messageTerminator: '\n' } });
-        jsonStream.body.on('data', (data) => {
-            const chunk = data.toString();
+        for await (const json of stream.iterMessages()) {
-            partialData += chunk;
-            while (true) {
-                let json;
-                try {
-                    json = JSON.parse(partialData);
-                } catch (e) {
-                    break;
-                }
             if (json.message) {
                 const message = json.message || 'Unknown error';
                 const chunk = { error: { message: message } };
                 response.write(`data: ${JSON.stringify(chunk)}\n\n`);
-                    partialData = '';
-                    break;
             } else if (json.event_type === 'text-generation') {
                 const text = json.text || '';
                 const chunk = { choices: [{ text }] };
                 response.write(`data: ${JSON.stringify(chunk)}\n\n`);
-                    partialData = '';
-                } else {
-                    partialData = '';
-                    break;
+            }
+        }
-        });
-        request.socket.on('close', function () {
-            if (jsonStream.body instanceof Readable) jsonStream.body.destroy();
-            response.end();
-        });
-        jsonStream.body.on('end', () => {
         console.log('Streaming request finished');
         response.write('data: [DONE]\n\n');
         response.end();
-        });
     } catch (error) {
         console.log('Error forwarding streaming response:', error);
         if (!response.headersSent) {

         if (!generateResponse.ok) {
             console.log(`Scale API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
-            return response.status(generateResponse.status).send({ error: true });
+            return response.status(500).send({ error: true });
+        }
         const generateResponseJson = await generateResponse.json();

     const apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MAKERSUITE);
     if (!request.body.reverse_proxy && !apiKey) {
-        console.log('MakerSuite API key is missing.');
+        console.log('Google AI Studio API key is missing.');
         return response.status(400).send({ error: true });
+    }

+    }
     const body = isGemini ? getGeminiBody() : getBisonBody();
-    console.log('MakerSuite request:', body);
+    console.log('Google AI Studio request:', body);
     try {
         const controller = new AbortController();

@@ -362,7 +341,7 @@ async function sendMakerSuiteRequest(request, response) {
362	}	341	}
363	} else {	342	} else {
364	if (!generateResponse.ok) {	343	if (!generateResponse.ok) {
365	console.log(`MakerSuite API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);	344	console.log(`Google AI Studio API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
366	return response.status(generateResponse.status).send({ error: true });	345	return response.status(generateResponse.status).send({ error: true });
367	}	346	}
368		347

             const candidates = generateResponseJson?.candidates;
             if (!candidates || candidates.length === 0) {
-                let message = 'MakerSuite API returned no candidate';
+                let message = 'Google AI Studio API returned no candidate';
                 console.log(message, generateResponseJson);
                 if (generateResponseJson?.promptFeedback?.blockReason) {
                     message += `\nPrompt was blocked due to : ${generateResponseJson.promptFeedback.blockReason}`;

             const responseContent = candidates[0].content ?? candidates[0].output;
             const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.[0]?.text;
             if (!responseText) {
-                let message = 'MakerSuite Candidate text empty';
+                let message = 'Google AI Studio Candidate text empty';
                 console.log(message, generateResponseJson);
                 return response.send({ error: { message } });
+            }
-            console.log('MakerSuite response:', responseText);
+            console.log('Google AI Studio response:', responseText);
             // Wrap it back to OAI format
             const reply = { choices: [{ 'message': { 'content': responseText } }] };
             return response.send(reply);
+        }
     } catch (error) {
-        console.log('Error communicating with MakerSuite API: ', error);
+        console.log('Error communicating with Google AI Studio API: ', error);
         if (!response.headersSent) {
             return response.status(500).send({ error: true });
+        }

     request.socket.on('close', function () {
         controller.abort();
     });
+    const convertedPrompt = convertAI21Messages(request.body.messages, request.body.char_name, request.body.user_name);
+    const body = {
+        messages: convertedPrompt,
+        model: request.body.model,
+        max_tokens: request.body.max_tokens,
+        temperature: request.body.temperature,
+        top_p: request.body.top_p,
+        stop: request.body.stop,
+        stream: request.body.stream,
+    };
     const options = {
         method: 'POST',
         headers: {

             'content-type': 'application/json',
             Authorization: `Bearer ${readSecret(request.user.directories, SECRET_KEYS.AI21)}`,
         },
-        body: JSON.stringify({
+        body: JSON.stringify(body),
-            numResults: 1,
-            maxTokens: request.body.max_tokens,
-            minTokens: 0,
-            temperature: request.body.temperature,
-            topP: request.body.top_p,
-            stopSequences: request.body.stop_tokens,
-            topKReturn: request.body.top_k,
-            frequencyPenalty: {
-                scale: request.body.frequency_penalty * 100,
-                applyToWhitespaces: false,
-                applyToPunctuations: false,
-                applyToNumbers: false,
-                applyToStopwords: false,
-                applyToEmojis: false,
-            },
-            presencePenalty: {
-                scale: request.body.presence_penalty,
-                applyToWhitespaces: false,
-                applyToPunctuations: false,
-                applyToNumbers: false,
-                applyToStopwords: false,
-                applyToEmojis: false,
-            },
-            countPenalty: {
-                scale: request.body.count_pen,
-                applyToWhitespaces: false,
-                applyToPunctuations: false,
-                applyToNumbers: false,
-                applyToStopwords: false,
-                applyToEmojis: false,
-            },
-            prompt: request.body.messages,
-        }),
         signal: controller.signal,
     };
-    fetch(`https://api.ai21.com/studio/v1/${request.body.model}/complete`, options)
+    console.log('AI21 request:', body);
-        .then(r => r.json())
-        .then(r => {
+    try {
-            if (r.completions === undefined) {
+        const generateResponse = await fetch(API_AI21 + '/chat/completions', options);
-                console.log(r);
+        if (request.body.stream) {
+            forwardFetchResponse(generateResponse, response);
         } else {
-                console.log(r.completions[0].data.text);
+            if (!generateResponse.ok) {
+                const errorText = await generateResponse.text();
+                console.log(`AI21 API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
+                const errorJson = tryParse(errorText) ?? { error: true };
+                return response.status(500).send(errorJson);
+            }
+            const generateResponseJson = await generateResponse.json();
+            console.log('AI21 response:', generateResponseJson);
+            return response.send(generateResponseJson);
+        }
+    } catch (error) {
+        console.log('Error communicating with AI21 API: ', error);
+        if (!response.headersSent) {
+            response.send({ error: true });
+        } else {
+            response.end();
+        }
+    }
-            const reply = { choices: [{ 'message': { 'content': r.completions?.[0]?.data?.text } }] };
-            return response.send(reply);
-        })
-        .catch(err => {
-            console.error(err);
-            return response.send({ error: true });
-        });
+}
 /**

             forwardFetchResponse(generateResponse, response);
         } else {
             if (!generateResponse.ok) {
-                console.log(`MistralAI API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
+                const errorText = await generateResponse.text();
-                // a 401 unauthorized response breaks the frontend auth, so return a 500 instead. prob a better way of dealing with this.
+                console.log(`MistralAI API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
-                // 401s are already handled by the streaming processor and dont pop up an error toast, that should probably be fixed too.
+                const errorJson = tryParse(errorText) ?? { error: true };
-                return response.status(generateResponse.status === 401 ? 500 : generateResponse.status).send({ error: true });
+                return response.status(500).send(errorJson);
+            }
             const generateResponseJson = await generateResponse.json();
             console.log('MistralAI response:', generateResponseJson);

             search_queries_only: false,
         };
+        const canDoSafetyMode = String(request.body.model).endsWith('08-2024');
+        if (canDoSafetyMode) {
+            requestBody.safety_mode = 'NONE';
+        }
         console.log('Cohere request:', requestBody);
         const config = {

         const apiUrl = API_COHERE + '/chat';
         if (request.body.stream) {
-            const stream = await fetch(apiUrl, config);
+            const stream = await global.fetch(apiUrl, config);
             parseCohereStream(stream, request, response);
         } else {
             const generateResponse = await fetch(apiUrl, config);
             if (!generateResponse.ok) {
-                console.log(`Cohere API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
+                const errorText = await generateResponse.text();
-                // a 401 unauthorized response breaks the frontend auth, so return a 500 instead. prob a better way of dealing with this.
+                console.log(`Cohere API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
-                // 401s are already handled by the streaming processor and dont pop up an error toast, that should probably be fixed too.
+                const errorJson = tryParse(errorText) ?? { error: true };
-                return response.status(generateResponse.status === 401 ? 500 : generateResponse.status).send({ error: true });
+                return response.status(500).send(errorJson);
+            }
             const generateResponseJson = await generateResponse.json();
             console.log('Cohere response:', generateResponseJson);

src/endpoints/google.js+1 -1 Viewed

         if (!result.ok) {
             const error = await result.json();
-            console.log(`MakerSuite API returned error: ${result.status} ${result.statusText}`, error);
+            console.log(`Google AI Studio API returned error: ${result.status} ${result.statusText}`, error);
             return response.status(result.status).send({ error: true });
+        }

src/endpoints/novelai.js+5 -5 Viewed

 const { jsonParser } = require('../express-common');
 const API_NOVELAI = 'https://api.novelai.net';
+const TEXT_NOVELAI = 'https://text.novelai.net';
 const IMAGE_NOVELAI = 'https://image.novelai.net';
 // Ban bracket generation, plus defaults

             'repetition_penalty_slope': req.body.repetition_penalty_slope,
             'repetition_penalty_frequency': req.body.repetition_penalty_frequency,
             'repetition_penalty_presence': req.body.repetition_penalty_presence,
-            'repetition_penalty_whitelist': isNewModel ? repPenaltyAllowList : null,
+            'repetition_penalty_whitelist': isNewModel ? repPenaltyAllowList.flat() : null,
             'top_a': req.body.top_a,
             'top_p': req.body.top_p,
             'top_k': req.body.top_k,

     };
     // Tells the model to stop generation at '>'
-    if ('theme_textadventure' === req.body.prefix &&
+    if ('theme_textadventure' === req.body.prefix && isNewModel) {
-        (true === req.body.model.includes('clio') ||
-         true === req.body.model.includes('kayra'))) {
         data.parameters.eos_token_id = 49405;
+    }

     };
     try {
-        const url = req.body.streaming ? `${API_NOVELAI}/ai/generate-stream` : `${API_NOVELAI}/ai/generate`;
+        const baseURL = req.body.model.includes('kayra') ? TEXT_NOVELAI : API_NOVELAI;
+        const url = req.body.streaming ? `${baseURL}/ai/generate-stream` : `${baseURL}/ai/generate`;
         const response = await fetch(url, { method: 'POST', timeout: 0, ...args });
         if (req.body.streaming) {

src/endpoints/settings.js+2 -0 Viewed

 const { getAllUserHandles, getUserDirectories } = require('../users');
 const ENABLE_EXTENSIONS = getConfigValue('enableExtensions', true);
+const ENABLE_EXTENSIONS_AUTO_UPDATE = getConfigValue('enableExtensionsAutoUpdate', true);
 const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false);
 // 10 minutes

         instruct,
         context,
         enable_extensions: ENABLE_EXTENSIONS,
+        enable_extensions_auto_update: ENABLE_EXTENSIONS_AUTO_UPDATE,
         enable_accounts: ENABLE_ACCOUNTS,
     });
 });

src/endpoints/stable-diffusion.js+41 -0 Viewed

 });
+const huggingface = express.Router();
+huggingface.post('/generate', jsonParser, async (request, response) => {
+    try {
+        const key = readSecret(request.user.directories, SECRET_KEYS.HUGGINGFACE);
+        if (!key) {
+            console.log('Hugging Face key not found.');
+            return response.sendStatus(400);
+        }
+        console.log('Hugging Face request:', request.body);
+        const result = await fetch(`https://api-inference.huggingface.co/models/${request.body.model}`, {
+            method: 'POST',
+            body: JSON.stringify({
+                inputs: request.body.prompt,
+            }),
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${key}`,
+            },
+        });
+        if (!result.ok) {
+            console.log('Hugging Face returned an error.');
+            return response.sendStatus(500);
+        }
+        const buffer = await result.buffer();
+        return response.send({
+            image: buffer.toString('base64'),
+        });
+    } catch (error) {
+        console.log(error);
+        return response.sendStatus(500);
+    }
+});
 router.use('/comfy', comfy);
 router.use('/together', together);
 router.use('/drawthings', drawthings);
 router.use('/pollinations', pollinations);
 router.use('/stability', stability);
 router.use('/blockentropy', blockentropy);
+router.use('/huggingface', huggingface);
 module.exports = { router };

src/endpoints/tokenizers.js+29 -48 Viewed

 const spp_mistral = new SentencePieceTokenizer('src/tokenizers/mistral.model');
 const spp_yi = new SentencePieceTokenizer('src/tokenizers/yi.model');
 const spp_gemma = new SentencePieceTokenizer('src/tokenizers/gemma.model');
+const spp_jamba = new SentencePieceTokenizer('src/tokenizers/jamba.model');
 const claude_tokenizer = new WebTokenizer('src/tokenizers/claude.json');
 const llama3_tokenizer = new WebTokenizer('src/tokenizers/llama3.json');

     'mistral',
     'yi',
     'gemma',
+    'jamba',
 ];
 /**

@@ -186,6 +188,10 @@ function getSentencepiceTokenizer(model) {
186	return spp_gemma;	188	return spp_gemma;
187	}	189	}
188		190
		191	if (model.includes('jamba')) {
		192	return spp_jamba;
		193	}
		194
189	return null;	195	return null;
190	}	196	}
191		197

@@ -322,6 +328,10 @@ function getTokenizerModel(requestModel) {
322	return 'gemma';	328	return 'gemma';
323	}	329	}
324		330
		331	if (requestModel.includes('jamba')) {
		332	return 'jamba';
		333	}
		334
325	// default	335	// default
326	return 'gpt-3.5-turbo';	336	return 'gpt-3.5-turbo';
327	}	337	}

 const router = express.Router();
-router.post('/ai21/count', jsonParser, async function (req, res) {
-    if (!req.body) return res.sendStatus(400);
-    const key = readSecret(req.user.directories, SECRET_KEYS.AI21);
-    const options = {
-        method: 'POST',
-        headers: {
-            accept: 'application/json',
-            'content-type': 'application/json',
-            Authorization: `Bearer ${key}`,
-        },
-        body: JSON.stringify({ text: req.body[0].content }),
-    };
-    try {
-        const response = await fetch('https://api.ai21.com/studio/v1/tokenize', options);
-        const data = await response.json();
-        return res.send({ 'token_count': data?.tokens?.length || 0 });
-    } catch (err) {
-        console.error(err);
-        return res.send({ 'token_count': 0 });
-    }
-});
-router.post('/google/count', jsonParser, async function (req, res) {
-    if (!req.body) return res.sendStatus(400);
-    const options = {
-        method: 'POST',
-        headers: {
-            accept: 'application/json',
-            'content-type': 'application/json',
-        },
-        body: JSON.stringify({ contents: convertGooglePrompt(req.body, String(req.query.model)).contents }),
-    };
-    try {
-        const reverseProxy = req.query.reverse_proxy?.toString() || '';
-        const proxyPassword = req.query.proxy_password?.toString() || '';
-        const apiKey = reverseProxy ? proxyPassword : readSecret(req.user.directories, SECRET_KEYS.MAKERSUITE);
-        const apiUrl = new URL(reverseProxy || API_MAKERSUITE);
-        const response = await fetch(`${apiUrl.origin}/v1beta/models/${req.query.model}:countTokens?key=${apiKey}`, options);
-        const data = await response.json();
-        return res.send({ 'token_count': data?.totalTokens || 0 });
-    } catch (err) {
-        console.error(err);
-        return res.send({ 'token_count': 0 });
-    }
-});
 router.post('/llama/encode', jsonParser, createSentencepieceEncodingHandler(spp_llama));
 router.post('/nerdstash/encode', jsonParser, createSentencepieceEncodingHandler(spp_nerd));
 router.post('/nerdstash_v2/encode', jsonParser, createSentencepieceEncodingHandler(spp_nerd_v2));
 router.post('/mistral/encode', jsonParser, createSentencepieceEncodingHandler(spp_mistral));
 router.post('/yi/encode', jsonParser, createSentencepieceEncodingHandler(spp_yi));
 router.post('/gemma/encode', jsonParser, createSentencepieceEncodingHandler(spp_gemma));
+router.post('/jamba/encode', jsonParser, createSentencepieceEncodingHandler(spp_jamba));
 router.post('/gpt2/encode', jsonParser, createTiktokenEncodingHandler('gpt2'));
 router.post('/claude/encode', jsonParser, createWebTokenizerEncodingHandler(claude_tokenizer));
 router.post('/llama3/encode', jsonParser, createWebTokenizerEncodingHandler(llama3_tokenizer));

 router.post('/mistral/decode', jsonParser, createSentencepieceDecodingHandler(spp_mistral));
 router.post('/yi/decode', jsonParser, createSentencepieceDecodingHandler(spp_yi));
 router.post('/gemma/decode', jsonParser, createSentencepieceDecodingHandler(spp_gemma));
+router.post('/jamba/decode', jsonParser, createSentencepieceDecodingHandler(spp_jamba));
 router.post('/gpt2/decode', jsonParser, createTiktokenDecodingHandler('gpt2'));
 router.post('/claude/decode', jsonParser, createWebTokenizerDecodingHandler(claude_tokenizer));
 router.post('/llama3/decode', jsonParser, createWebTokenizerDecodingHandler(llama3_tokenizer));

             return handler(req, res);
+        }
+        if (queryModel.includes('jamba')) {
+            const handler = createSentencepieceEncodingHandler(spp_jamba);
+            return handler(req, res);
+        }
         const model = getTokenizerModel(queryModel);
         const handler = createTiktokenEncodingHandler(model);
         return handler(req, res);

             return handler(req, res);
+        }
+        if (queryModel.includes('jamba')) {
+            const handler = createSentencepieceDecodingHandler(spp_jamba);
+            return handler(req, res);
+        }
         const model = getTokenizerModel(queryModel);
         const handler = createTiktokenDecodingHandler(model);
         return handler(req, res);

             return res.send({ 'token_count': num_tokens });
+        }
+        if (model === 'jamba') {
+            num_tokens = await countSentencepieceArrayTokens(spp_jamba, req.body);
+            return res.send({ 'token_count': num_tokens });
+        }
         const tokensPerName = queryModel.includes('gpt-3.5-turbo-0301') ? -1 : 1;
         const tokensPerMessage = queryModel.includes('gpt-3.5-turbo-0301') ? 4 : 3;
         const tokensPadding = 3;

     const baseUrl = String(request.body.url);
     const legacyApi = Boolean(request.body.legacy_api);
     const vllmModel = String(request.body.vllm_model) || '';
+    const aphroditeModel = String(request.body.aphrodite_model) || '';
     try {
         const args = {

                     break;
                 case TEXTGEN_TYPES.APHRODITE:
                     url += '/v1/tokenize';
-                    args.body = JSON.stringify({ 'prompt': text });
+                    args.body = JSON.stringify({ 'model': aphroditeModel, 'prompt': text });
                     break;
                 default:
                     url += '/v1/internal/encode';

src/endpoints/translate.js+1 -1 Viewed

 });
 router.post('/yandex', jsonParser, async (request, response) => {
+    try {
         const chunks = request.body.chunks;
         const lang = request.body.lang;

         console.log('Input text: ' + inputText);
-    try {
         const result = await fetch(`https://translate.yandex.net/api/v1/tr.json/translate?ucid=${ucid}&srv=android&format=text`, {
             method: 'POST',
             body: params,

src/prompt-converters.js+76 -0 Viewed

         'gemini-1.5-flash',
         'gemini-1.5-flash-latest',
         'gemini-1.5-flash-001',
+        'gemini-1.5-flash-exp-0827',
+        'gemini-1.5-flash-8b-exp-0827',
         'gemini-1.5-pro',
         'gemini-1.5-pro-latest',
         'gemini-1.5-pro-001',
         'gemini-1.5-pro-exp-0801',
+        'gemini-1.5-pro-exp-0827',
         'gemini-1.0-pro-vision-latest',
         'gemini-pro-vision',
     ];

+}
 /**
+ * Convert AI21 prompt. Classic: system message squash, user/assistant message merge.
+ * @param {object[]} messages Array of messages
+ * @param {string} charName Character name
+ * @param {string} userName User name
+ */
+function convertAI21Messages(messages, charName = '', userName = '') {
+    if (!Array.isArray(messages)) {
+        return [];
+    }
+    // Collect all the system messages up until the first instance of a non-system message, and then remove them from the messages array.
+    let i = 0, systemPrompt = '';
+    for (i = 0; i < messages.length; i++) {
+        if (messages[i].role !== 'system') {
+            break;
+        }
+        // Append example names if not already done by the frontend (e.g. for group chats).
+        if (userName && messages[i].name === 'example_user') {
+            if (!messages[i].content.startsWith(`${userName}: `)) {
+                messages[i].content = `${userName}: ${messages[i].content}`;
+            }
+        }
+        if (charName && messages[i].name === 'example_assistant') {
+            if (!messages[i].content.startsWith(`${charName}: `)) {
+                messages[i].content = `${charName}: ${messages[i].content}`;
+            }
+        }
+        systemPrompt += `${messages[i].content}\n\n`;
+    }
+    messages.splice(0, i);
+    // Prevent erroring out if the messages array is empty.
+    if (messages.length === 0) {
+        messages.unshift({
+            role: 'user',
+            content: '[Start a new chat]',
+        });
+    }
+    if (systemPrompt) {
+        messages.unshift({
+            role: 'system',
+            content: systemPrompt.trim(),
+        });
+    }
+    // Doesn't support completion names, so prepend if not already done by the frontend (e.g. for group chats).
+    messages.forEach(msg => {
+        if ('name' in msg) {
+            if (msg.role !== 'system' && !msg.content.startsWith(`${msg.name}: `)) {
+                msg.content = `${msg.name}: ${msg.content}`;
+            }
+            delete msg.name;
+        }
+    });
+    // Since the messaging endpoint only supports alternating turns, we have to merge messages with the same role if they follow each other
+    let mergedMessages = [];
+    messages.forEach((message) => {
+        if (mergedMessages.length > 0 && mergedMessages[mergedMessages.length - 1].role === message.role) {
+            mergedMessages[mergedMessages.length - 1].content += '\n\n' + message.content;
+        } else {
+            mergedMessages.push(message);
+        }
+    });
+    return mergedMessages;
+}
+/**
  * Convert a prompt from the ChatML objects to the format used by MistralAI.
  * @param {object[]} messages Array of messages
  * @param {string} charName Character name

     convertCohereMessages,
     convertMistralMessages,
     convertCohereTools,
+    convertAI21Messages,
 };

src/tokenizers/jamba.model+0 -0 Viewed

Binary file

src/transformers.mjs+1 -1 Viewed

         defaultModel: 'Cohee/fooocus_expansion-onnx',
         pipeline: null,
         configField: 'extras.promptExpansionModel',
-        quantized: true,
+        quantized: false,
     },
     'automatic-speech-recognition': {
         defaultModel: 'Xenova/whisper-small',

src/util.js+5 -4 Viewed

@@ -34,8 +34,9 @@ function getConfig() {
34	CACHED_CONFIG = config;	34	CACHED_CONFIG = config;
35	return config;	35	return config;
36	} catch (error) {	36	} catch (error) {
37	console.warn('Failed to read config.yaml');	37	console.error(color.red('FATAL: Failed to read config.yaml. Please check the file for syntax errors.'));
38	return {};	38	console.error(error.message);
		39	process.exit(1);
39	}	40	}
40	}	41	}
41		42

  * @returns {string} A UUIDv4 string
  */
 function uuidv4() {
-    if ('randomUUID' in crypto) {
+    if ('crypto' in global && 'randomUUID' in global.crypto) {
-        return crypto.randomUUID();
+        return global.crypto.randomUUID();
+    }
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         const r = Math.random() * 16 | 0;

src/vectors/makersuite-vectors.js+4 -4 Viewed

     const key = readSecret(directories, SECRET_KEYS.MAKERSUITE);
     if (!key) {
-        console.log('No MakerSuite key found');
+        console.log('No Google AI Studio key found');
-        throw new Error('No MakerSuite key found');
+        throw new Error('No Google AI Studio key found');
+    }
     const response = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/embedding-gecko-001:embedText?key=${key}`, {

     if (!response.ok) {
         const text = await response.text();
-        console.log('MakerSuite request failed', response.statusText, text);
+        console.log('Google AI Studio request failed', response.statusText, text);
-        throw new Error('MakerSuite request failed');
+        throw new Error('Google AI Studio request failed');
+    }
     const data = await response.json();

tests/package-lock.json+3 -4 Viewed

+            }
         },
         "node_modules/micromatch": {
-            "version": "4.0.7",
+            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-            "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-            "license": "MIT",
             "dependencies": {
                 "braces": "^3.0.3",
                 "picomatch": "^2.3.1"

Merge branch 'staging' into feat/xtc