From 2cdf53a3dd9364f21ad67d61584b6487f751d1f6 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:30:30 +0300
Subject: [PATCH 1/7] [chore] Lint login.html

---
 public/login.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/public/login.html b/public/login.html
index c52ca3d74..11456a22a 100644
--- a/public/login.html
+++ b/public/login.html
@@ -4,9 +4,9 @@
 <head>
     <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="mobile-web-app-capable" content="yes">
     <meta name="darkreader-lock">
     <meta name="robots" content="noindex, nofollow" />
     <style>
@@ -31,8 +31,6 @@
     <link href="css/fontawesome.min.css" rel="stylesheet">
     <link href="css/solid.min.css" rel="stylesheet">
     <link href="css/user.css" rel="stylesheet">
-    <script src="lib/jquery-3.5.1.min.js"></script>
-    <script src="scripts/login.js"></script>
     <title>SillyTavern</title>
 </head>
 
@@ -65,8 +63,7 @@
                                     <div id="loginButton" class="menu_button">Login</div>
                                 </div>
                             </div>
-                            <div id="passwordRecoveryBlock" style="display:none;"
-                                class="flex-container flexFlowColumn alignItemsCenter">
+                            <div id="passwordRecoveryBlock" style="display:none;" class="flex-container flexFlowColumn alignItemsCenter">
                                 <div id="recoverMessage">
                                     Recovery code has been posted to the server console.
                                 </div>
@@ -84,6 +81,10 @@
                 </div>
             </div>
         </div>
+    </div>
+
+    <script src="lib/jquery-3.5.1.min.js"></script>
+    <script src="scripts/login.js"></script>
 </body>
 
 </html>

From ff2c71c4ef54f06d58c9410eedcfd04bd400b881 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:48:28 +0300
Subject: [PATCH 2/7] MistralAI: Add new models to the list

---
 public/css/toggle-dependent.css               |  4 +++
 public/index.html                             | 10 ++++++-
 .../scripts/extensions/caption/settings.html  |  2 +-
 public/scripts/openai.js                      | 29 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/public/css/toggle-dependent.css b/public/css/toggle-dependent.css
index f4bded3c0..6abfa3e1d 100644
--- a/public/css/toggle-dependent.css
+++ b/public/css/toggle-dependent.css
@@ -482,3 +482,7 @@ label[for="trim_spaces"]:has(input:checked) i.warning {
     gap: 5px;
     margin: 10px 0;
 }
+
+#mistralai_other_models:empty {
+    display: none;
+}
diff --git a/public/index.html b/public/index.html
index 105e22738..5d5b0857b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3012,17 +3012,23 @@
                                         <option value="open-mixtral-8x7b">open-mixtral-8x7b</option>
                                         <option value="open-mixtral-8x22b">open-mixtral-8x22b</option>
                                         <option value="open-codestral-mamba">open-codestral-mamba</option>
+                                        <option value="ministral-3b-latest">ministral-3b-latest</option>
+                                        <option value="ministral-8b-latest">ministral-8b-latest</option>
+                                        <option value="mistral-tiny-latest">mistral-tiny-latest</option>
                                         <option value="mistral-small-latest">mistral-small-latest</option>
                                         <option value="mistral-medium-latest">mistral-medium-latest</option>
                                         <option value="mistral-large-latest">mistral-large-latest</option>
                                         <option value="codestral-latest">codestral-latest</option>
                                         <option value="codestral-mamba-latest">codestral-mamba-latest</option>
-                                        <option value="pixtral-latest">pixtral-latest</option>
+                                        <option value="pixtral-12b-latest">pixtral-12b-latest</option>
                                     </optgroup>
                                     <optgroup label="Sub-versions">
                                         <option value="open-mistral-nemo-2407">open-mistral-nemo-2407</option>
                                         <option value="open-mixtral-8x22b-2404">open-mixtral-8x22b-2404</option>
+                                        <option value="ministral-3b-2410">ministral-3b-2410</option>
+                                        <option value="ministral-8b-2410">ministral-8b-2410</option>
                                         <option value="mistral-tiny-2312">mistral-tiny-2312</option>
+                                        <option value="mistral-tiny-2407">mistral-tiny-2407</option>
                                         <option value="mistral-small-2312">mistral-small-2312</option>
                                         <option value="mistral-small-2402">mistral-small-2402</option>
                                         <option value="mistral-small-2409">mistral-small-2409</option>
@@ -3030,9 +3036,11 @@
                                         <option value="mistral-large-2402">mistral-large-2402</option>
                                         <option value="mistral-large-2407">mistral-large-2407</option>
                                         <option value="codestral-2405">codestral-2405</option>
+                                        <option value="codestral-2405-blue">codestral-2405-blue</option>
                                         <option value="codestral-mamba-2407">codestral-mamba-2407</option>
                                         <option value="pixtral-12b-2409">pixtral-12b-2409</option>
                                     </optgroup>
+                                    <optgroup id="mistralai_other_models" label="Other"></optgroup>
                                 </select>
                             </div>
                         </form>
diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html
index f6a6fc7a3..55c5bdaa6 100644
--- a/public/scripts/extensions/caption/settings.html
+++ b/public/scripts/extensions/caption/settings.html
@@ -35,7 +35,7 @@
                 <div class="flex1 flex-container flexFlowColumn flexNoGap">
                     <label for="caption_multimodal_model" data-i18n="Model">Model</label>
                     <select id="caption_multimodal_model" class="flex1 text_pole">
-                        <option data-type="mistral" value="pixtral-latest">pixtral-latest</option>
+                        <option data-type="mistral" value="pixtral-12b-latest">pixtral-12b-latest</option>
                         <option data-type="mistral" value="pixtral-12b-2409">pixtral-12b-2409</option>
                         <option data-type="zerooneai" value="yi-vision">yi-vision</option>
                         <option data-type="openai" value="gpt-4-vision-preview">gpt-4-vision-preview</option>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 9bd922907..11c11fe7c 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -1609,6 +1609,33 @@ function saveModelList(data) {
 
         $('#model_blockentropy_select').val(oai_settings.blockentropy_model).trigger('change');
     }
+
+    if (oai_settings.chat_completion_source == chat_completion_sources.MISTRALAI) {
+        /** @type {HTMLSelectElement} */
+        const mistralModelSelect = document.querySelector('#model_mistralai_select');
+        if (mistralModelSelect) {
+            const options = Array.from(mistralModelSelect.options);
+            options.forEach((option) => {
+                const existingModel = model_list.find(model => model.id === option.value);
+                if (!existingModel) {
+                    option.remove();
+                }
+            });
+
+            const otherOptionsGroup = mistralModelSelect.querySelector('#mistralai_other_models');
+            for (const model of model_list.filter(model => model?.capabilities?.completion_chat)) {
+                if (!options.some(option => option.value === model.id) && otherOptionsGroup) {
+                    otherOptionsGroup.append(new Option(model.id, model.id));
+                }
+            }
+
+            const selectedModel = model_list.find(model => model.id === oai_settings.mistralai_model);
+            if (!selectedModel) {
+                oai_settings.mistralai_model = model_list.find(model => model?.capabilities?.completion_chat)?.id;
+                $('#model_mistralai_select').val(oai_settings.mistralai_model).trigger('change');
+            }
+        }
+    }
 }
 
 function appendOpenRouterOptions(model_list, groupModels = false, sort = false) {
@@ -4659,6 +4686,8 @@ export function isImageInliningSupported() {
         'chatgpt-4o-latest',
         'yi-vision',
         'pixtral-latest',
+        'pixtral-12b-latest',
+        'pixtral-12b',
         'pixtral-12b-2409',
     ];
 

From 1ac6780e9c7f8a24a91ddbd8efd0f638e480cbd3 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:52:17 +0300
Subject: [PATCH 3/7] MistralAI: Explicitly set context size for ministral

---
 public/scripts/openai.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 11c11fe7c..bdb5f7f68 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -4129,6 +4129,8 @@ async function onModelChange() {
             $('#openai_max_context').attr('max', max_64k);
         } else if (oai_settings.mistralai_model.includes('pixtral')) {
             $('#openai_max_context').attr('max', max_128k);
+        } else if (oai_settings.mistralai_model.includes('ministral')) {
+            $('#openai_max_context').attr('max', max_32k);
         } else {
             $('#openai_max_context').attr('max', max_32k);
         }

From 5d5e552cbdaf46bd123a3ce5a90057e93d545e09 Mon Sep 17 00:00:00 2001
From: 50h100a <all_awful@proton.me>
Date: Sat, 19 Oct 2024 00:24:35 -0400
Subject: [PATCH 4/7] correctly interpret some alternate whitespaces in token
 names

---
 public/scripts/extensions/token-counter/index.js | 2 +-
 public/scripts/logprobs.js                       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/scripts/extensions/token-counter/index.js b/public/scripts/extensions/token-counter/index.js
index 2db5d1e53..5f473a46b 100644
--- a/public/scripts/extensions/token-counter/index.js
+++ b/public/scripts/extensions/token-counter/index.js
@@ -89,7 +89,7 @@ function drawChunks(chunks, ids) {
     $('#tokenized_chunks_display').empty();
 
     for (let i = 0; i < chunks.length; i++) {
-        let chunk = chunks[i].replace(/▁/g, ' '); // This is a leading space in sentencepiece. More info: Lower one eighth block (U+2581)
+        let chunk = chunks[i].replace(/[▁Ġ]/g, ' '); // This is a leading space in sentencepiece. More info: Lower one eighth block (U+2581)
 
         // If <0xHEX>, decode it
         if (/^<0x[0-9A-F]+>$/i.test(chunk)) {
diff --git a/public/scripts/logprobs.js b/public/scripts/logprobs.js
index 3eec73aae..e69a78132 100644
--- a/public/scripts/logprobs.js
+++ b/public/scripts/logprobs.js
@@ -160,7 +160,7 @@ function renderTopLogprobs() {
     let matched = false;
     for (const [token, probability, log] of candidates) {
         const container = $('<button class="flex-container flexFlowColumn logprobs_top_candidate"></button>');
-        const tokenNormalized = String(token).replace(/^▁/g, ' ');
+        const tokenNormalized = String(token).replace(/^[▁Ġ]/g, ' ');
 
         if (token === selectedToken || tokenNormalized === selectedToken) {
             matched = true;
@@ -230,7 +230,7 @@ function onAlternativeClicked(tokenLogprobs, alternative) {
     const replaceIndex = messageLogprobs.findIndex(x => x === tokenLogprobs);
 
     const tokens = messageLogprobs.slice(0, replaceIndex + 1).map(({ token }) => token);
-    tokens[replaceIndex] = String(alternative).replace(/^▁/g, ' ');
+    tokens[replaceIndex] = String(alternative).replace(/^[▁Ġ]/g, ' ').replace(/Ċ/g, '\n');
 
     const prefix = continueFrom || '';
     const prompt = prefix + tokens.join('');
@@ -343,7 +343,7 @@ function createSwipe(messageId, prompt) {
  * @returns {string}
  */
 function toVisibleWhitespace(input) {
-    return input.replace(/ /g, '·').replace(/▁/g, '·').replace(/\n/g, '↵');
+    return input.replace(/ /g, '·').replace(/[▁Ġ]/g, '·').replace(/[Ċ\n]/g, '↵');
 }
 
 /**
@@ -362,7 +362,7 @@ function withVirtualWhitespace(text, span) {
     if (text.match(/\s$/)) {
         result.push($(document.createTextNode('\u200b')));
     }
-    if (text.match(/^▁/)) {
+    if (text.match(/^[▁Ġ]/)) {
         result.unshift(document.createTextNode('\u200b'));
     }
     // line breaks are trickier. we don't currently handle consecutive line

From 9f97a144e81f6f128adf74369b489441ab0b8755 Mon Sep 17 00:00:00 2001
From: 50h100a <all_awful@proton.me>
Date: Sat, 19 Oct 2024 00:31:12 -0400
Subject: [PATCH 5/7] slightly change stream "abort" flow so token
 probabilities get successfully updated

---
 public/script.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/script.js b/public/script.js
index f39c58dc5..1986ce9a8 100644
--- a/public/script.js
+++ b/public/script.js
@@ -3194,7 +3194,8 @@ class StreamingProcessor {
     }
 
     onStopStreaming() {
-        this.onErrorStreaming();
+        this.abortController.abort();
+        this.isFinished = true;
     }
 
     /**
@@ -3239,9 +3240,13 @@ class StreamingProcessor {
             console.warn(`Stream stats: ${timestamps.length} tokens, ${seconds.toFixed(2)} seconds, rate: ${Number(timestamps.length / seconds).toFixed(2)} TPS`);
         }
         catch (err) {
-            console.error(err);
-            this.onErrorStreaming();
-            return;
+            // in the case of a self-inflicted abort, we have already cleaned up
+            if (!this.isFinished)
+            {
+                console.error(err);
+                this.onErrorStreaming();
+            }
+            return this.result;
         }
 
         this.isFinished = true;
@@ -4641,7 +4646,6 @@ export function stopGeneration() {
     let stopped = false;
     if (streamingProcessor) {
         streamingProcessor.onStopStreaming();
-        streamingProcessor = null;
         stopped = true;
     }
     if (abortController) {

From 78bbf0ed0265b23db35dda20f30f5e36174614bd Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 19 Oct 2024 13:13:24 +0300
Subject: [PATCH 6/7] Fix format

---
 public/script.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/script.js b/public/script.js
index 1986ce9a8..c3cc6fc12 100644
--- a/public/script.js
+++ b/public/script.js
@@ -3241,8 +3241,7 @@ class StreamingProcessor {
         }
         catch (err) {
             // in the case of a self-inflicted abort, we have already cleaned up
-            if (!this.isFinished)
-            {
+            if (!this.isFinished) {
                 console.error(err);
                 this.onErrorStreaming();
             }

From afde6e3f450d70840d03e59b8b189862e2dddccb Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 19 Oct 2024 13:13:42 +0300
Subject: [PATCH 7/7] Add word-break in logprobs display

---
 public/css/logprobs.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/logprobs.css b/public/css/logprobs.css
index 0cea4f67f..91a716c7d 100644
--- a/public/css/logprobs.css
+++ b/public/css/logprobs.css
@@ -56,6 +56,7 @@
     user-select: none;
     height: 100%;
     overflow-y: auto;
+    word-break: break-all;
 }
 
 .logprobs_empty_state {
