From 42fa3c79d70d069f483ba8b06d3cc31efbe09b55 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 8 Sep 2024 22:23:25 +0300
Subject: [PATCH 1/5] Add Tabby model selection

---
 public/css/select2-overrides.css   |  7 +++++-
 public/index.html                  | 17 ++++++++++---
 public/script.js                   |  5 +++-
 public/scripts/preset-manager.js   |  1 +
 public/scripts/slash-commands.js   |  1 +
 public/scripts/textgen-models.js   | 39 ++++++++++++++++++++++++++++++
 public/scripts/textgen-settings.js |  6 +++++
 7 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/public/css/select2-overrides.css b/public/css/select2-overrides.css
index 01577846e..47d9746ac 100644
--- a/public/css/select2-overrides.css
+++ b/public/css/select2-overrides.css
@@ -15,8 +15,13 @@
     z-index: 40000;
 }
 
-.select2-selection__clear {
+.select2-container .select2-selection .select2-selection__clear {
     color: var(--SmartThemeBodyColor);
+    font-size: 24px;
+    padding: 0;
+    position: absolute;
+    right: 5px;
+    top: 0;
 }
 
 .select2-container .select2-search__field {
diff --git a/public/index.html b/public/index.html
index c949839d8..9696b4200 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2335,8 +2335,7 @@
                                 </div>
                                 <div class="flex1">
                                     <h4>
-                                        <span data-i18n="Ollama Model">Ollama Model
-                                    </h4>
+                                        <span data-i18n="Ollama Model">Ollama Model</span>
                                     </h4>
                                     <select id="ollama_model">
                                         <option data-i18n="-- Connect to the API --">
@@ -2373,7 +2372,19 @@
                                     <h4>
                                         <span data-i18n="Tabby Model">Tabby Model</span>
                                     </h4>
-                                    </h4>
+                                    <select id="tabby_model">
+                                        <option data-i18n="-- Connect to the API --">
+                                            -- Connect to the API --
+                                        </option>
+                                    </select>
+                                    <small>
+                                        <i class="fa-solid fa-lightbulb"></i>
+                                        &nbsp;
+                                        <code>inline_model_loading: true</code>
+                                        <span data-i18n="must be set in Tabby's config.yml to switch models.">
+                                            must be set in Tabby's config.yml to switch models.
+                                        </span>
+                                    </small>
                                     <div id="tabby_download_model" class="menu_button menu_button_icon">
                                         <i class="fa-solid fa-download"></i>
                                         <span data-i18n="Download">Download</span>
diff --git a/public/script.js b/public/script.js
index a835592a7..473934099 100644
--- a/public/script.js
+++ b/public/script.js
@@ -224,7 +224,7 @@ import {
 import { getBackgrounds, initBackgrounds, loadBackgroundSettings, background_settings } from './scripts/backgrounds.js';
 import { hideLoader, showLoader } from './scripts/loader.js';
 import { BulkEditOverlay, CharacterContextMenu } from './scripts/BulkEditOverlay.js';
-import { loadFeatherlessModels, loadMancerModels, loadOllamaModels, loadTogetherAIModels, loadInfermaticAIModels, loadOpenRouterModels, loadVllmModels, loadAphroditeModels, loadDreamGenModels, initTextGenModels } from './scripts/textgen-models.js';
+import { loadFeatherlessModels, loadMancerModels, loadOllamaModels, loadTogetherAIModels, loadInfermaticAIModels, loadOpenRouterModels, loadVllmModels, loadAphroditeModels, loadDreamGenModels, initTextGenModels, loadTabbyModels } from './scripts/textgen-models.js';
 import { appendFileContent, hasPendingFileAttachment, populateFileAttachment, decodeStyleTags, encodeStyleTags, isExternalMediaAllowed, getCurrentEntityId } from './scripts/chats.js';
 import { initPresetManager } from './scripts/preset-manager.js';
 import { MacrosParser, evaluateMacros, getLastMessageId } from './scripts/macros.js';
@@ -1214,6 +1214,9 @@ async function getStatusTextgen() {
         } else if (textgen_settings.type === FEATHERLESS) {
             loadFeatherlessModels(data?.data);
             setOnlineStatus(textgen_settings.featherless_model);
+        } else if (textgen_settings.type === TABBY) {
+            loadTabbyModels(data?.data);
+            setOnlineStatus(textgen_settings.tabby_model || data?.result);
         } else {
             setOnlineStatus(data?.result);
         }
diff --git a/public/scripts/preset-manager.js b/public/scripts/preset-manager.js
index 896de485e..c32719ea4 100644
--- a/public/scripts/preset-manager.js
+++ b/public/scripts/preset-manager.js
@@ -338,6 +338,7 @@ class PresetManager {
             'max_tokens_second',
             'openrouter_providers',
             'openrouter_allow_fallbacks',
+            'tabby_model',
         ];
         const settings = Object.assign({}, getSettingsByApiId(this.apiId));
 
diff --git a/public/scripts/slash-commands.js b/public/scripts/slash-commands.js
index dfee15768..299211ba8 100644
--- a/public/scripts/slash-commands.js
+++ b/public/scripts/slash-commands.js
@@ -3426,6 +3426,7 @@ function getModelOptions(quiet) {
         { id: 'vllm_model', api: 'textgenerationwebui', type: textgen_types.VLLM },
         { id: 'aphrodite_model', api: 'textgenerationwebui', type: textgen_types.APHRODITE },
         { id: 'ollama_model', api: 'textgenerationwebui', type: textgen_types.OLLAMA },
+        { id: 'tabby_model', api: 'textgenerationwebui', type: textgen_types.TABBY },
         { id: 'model_openai_select', api: 'openai', type: chat_completion_sources.OPENAI },
         { id: 'model_claude_select', api: 'openai', type: chat_completion_sources.CLAUDE },
         { id: 'model_windowai_select', api: 'openai', type: chat_completion_sources.WINDOWAI },
diff --git a/public/scripts/textgen-models.js b/public/scripts/textgen-models.js
index d35f2b724..a72ec07cb 100644
--- a/public/scripts/textgen-models.js
+++ b/public/scripts/textgen-models.js
@@ -12,6 +12,7 @@ let dreamGenModels = [];
 let vllmModels = [];
 let aphroditeModels = [];
 let featherlessModels = [];
+let tabbyModels = [];
 export let openRouterModels = [];
 
 /**
@@ -66,6 +67,30 @@ export async function loadOllamaModels(data) {
     }
 }
 
+export async function loadTabbyModels(data) {
+    if (!Array.isArray(data)) {
+        console.error('Invalid Tabby models data', data);
+        return;
+    }
+
+    tabbyModels = data;
+    tabbyModels.sort((a, b) => a.id.localeCompare(b.id));
+    tabbyModels.unshift({ id: '' });
+
+    if (!tabbyModels.find(x => x.id === textgen_settings.tabby_model)) {
+        textgen_settings.tabby_model = tabbyModels[0]?.id || '';
+    }
+
+    $('#tabby_model').empty();
+    for (const model of tabbyModels) {
+        const option = document.createElement('option');
+        option.value = model.id;
+        option.text = model.id;
+        option.selected = model.id === textgen_settings.tabby_model;
+        $('#tabby_model').append(option);
+    }
+}
+
 export async function loadTogetherAIModels(data) {
     if (!Array.isArray(data)) {
         console.error('Invalid Together AI models data', data);
@@ -310,6 +335,12 @@ function onOllamaModelSelect() {
     $('#api_button_textgenerationwebui').trigger('click');
 }
 
+function onTabbyModelSelect() {
+    const modelId = String($('#tabby_model').val());
+    textgen_settings.tabby_model = modelId;
+    $('#api_button_textgenerationwebui').trigger('click');
+}
+
 function onOpenRouterModelSelect() {
     const modelId = String($('#openrouter_model').val());
     textgen_settings.openrouter_model = modelId;
@@ -641,6 +672,7 @@ export function initTextGenModels() {
     $('#aphrodite_model').on('change', onAphroditeModelSelect);
     $('#featherless_model').on('change', onFeatherlessModelSelect);
     $('#tabby_download_model').on('click', downloadTabbyModel);
+    $('#tabby_model').on('change', onTabbyModelSelect);
 
     const providersSelect = $('.openrouter_providers');
     for (const provider of OPENROUTER_PROVIDERS) {
@@ -671,6 +703,13 @@ export function initTextGenModels() {
             searchInputCssClass: 'text_pole',
             width: '100%',
         });
+        $('#tabby_model').select2({
+            placeholder: '[Currently loaded]',
+            searchInputPlaceholder: 'Search models...',
+            searchInputCssClass: 'text_pole',
+            width: '100%',
+            allowClear: true,
+        });
         $('#model_infermaticai_select').select2({
             placeholder: 'Select a model',
             searchInputPlaceholder: 'Search models...',
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 4d0fc8213..68a090318 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -180,6 +180,7 @@ const settings = {
     vllm_model: '',
     aphrodite_model: '',
     dreamgen_model: 'opus-v1-xl/text',
+    tabby_model: '',
     legacy_api: false,
     sampler_order: KOBOLDCPP_ORDER,
     logit_bias: [],
@@ -1047,6 +1048,11 @@ export function getTextGenModel() {
             return settings.featherless_model;
         case HUGGINGFACE:
             return 'tgi';
+        case TABBY:
+            if (settings.tabby_model) {
+                return settings.tabby_model;
+            }
+            break;
         default:
             return undefined;
     }

From 7534e137aeaf47ed089a91d38ef8359788cbf428 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 8 Sep 2024 22:24:03 +0300
Subject: [PATCH 2/5] Parse Tabby streaming error.

---
 public/scripts/textgen-settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 68a090318..b3d8dea5b 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -996,7 +996,7 @@ function tryParseStreamingError(response, decoded) {
         // No JSON. Do nothing.
     }
 
-    const message = data?.error?.message || data?.message;
+    const message = data?.error?.message || data?.message || data?.detail;
 
     if (message) {
         toastr.error(message, 'Text Completion API');

From 038b9b95ce0dc4de05ee4d145043128957d979ee Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:26:13 +0300
Subject: [PATCH 3/5] Remove stray tags

---
 public/index.html | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/public/index.html b/public/index.html
index 9696b4200..8c65bb17e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1905,11 +1905,11 @@
                 <div class="flex-container flexFlowColumn">
                     <div id="main-API-selector-block">
                         <select id="main_api">
-                            <option value="textgenerationwebui"><span data-i18n="Text Completion">Text Completion</span></option>
-                            <option value="openai"><span data-i18n="Chat Completion">Chat Completion</span></option>
-                            <option value="novel"><span data-i18n="NovelAI">NovelAI</span></option>
-                            <option value="koboldhorde"><span data-i18n="KoboldAI Horde">KoboldAI Horde</span></option>
-                            <option value="kobold"><span data-i18n="KoboldAI">KoboldAI Classic</span></option>
+                            <option value="textgenerationwebui" data-i18n="Text Completion">Text Completion</option>
+                            <option value="openai" data-i18n="Chat Completion">Chat Completion</option>
+                            <option value="novel" data-i18n="NovelAI">NovelAI</option>
+                            <option value="koboldhorde" data-i18n="KoboldAI Horde">KoboldAI Horde</option>
+                            <option value="kobold" data-i18n="KoboldAI">KoboldAI Classic</option>
                         </select>
                     </div>
                     <div id="kobold_horde" style="position: relative;"> <!-- shows the kobold settings -->
@@ -3251,7 +3251,7 @@
                                 </small>
                             </label>
                             <div>
-                                <input type="text" id="instruct_activation_regex" class="text_pole textarea_compact" placeholder="e.g. /llama(-)?[3|3.1]/i"></input>
+                                <input type="text" id="instruct_activation_regex" class="text_pole textarea_compact" placeholder="e.g. /llama(-)?[3|3.1]/i">
                             </div>
                             <div>
                                 <label for="instruct_system_prompt" class="flex-container">
@@ -3748,7 +3748,7 @@
                                 <div class="flex-container">
                                     <span data-i18n="Chat Style:">Chat Style:</span><br>
                                     <select id="chat_display" class="widthNatural flex1 margin0">
-                                        <option value="0" data-i18n="Flat">Flat</span>
+                                        <option value="0" data-i18n="Flat">Flat</option>
                                         <option value="1" data-i18n="Bubbles">Bubbles</option>
                                         <option value="2" data-i18n="Document">Document</option>
                                     </select>
@@ -5597,8 +5597,8 @@
                                     </div>
                                     <div class="range-block-range">
                                         <select name="characterFilter" class="select2_multi_sameline" multiple>
-                                            <option value="">
-                                                <span data-i18n="-- Characters not found --">-- Characters not found --</span>
+                                            <option value="" data-i18n="-- Characters not found --">
+                                                -- Characters not found --
                                             </option>
                                         </select>
                                     </div>
@@ -5655,7 +5655,6 @@
                 <input class="openai_logit_bias_text text_pole" data-i18n="[placeholder]Text or token ids" placeholder="Text or [token ids]" />
                 <input class="openai_logit_bias_value text_pole" type="number" min="-100" value="0" max="100" />
                 <i class="menu_button fa-solid fa-xmark openai_logit_bias_remove"></i>
-                </form>
             </div>
         </div>
         <div id="logit_bias_template" class="template_element">

From 0811ec7fc32f389d6d451919d50b564c8a455992 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:56:10 +0300
Subject: [PATCH 4/5] Use Tabby-recognizable YAML

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 8c65bb17e..f2cefeaf8 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2380,7 +2380,7 @@
                                     <small>
                                         <i class="fa-solid fa-lightbulb"></i>
                                         &nbsp;
-                                        <code>inline_model_loading: true</code>
+                                        <code>inline_model_loading: True</code>
                                         <span data-i18n="must be set in Tabby's config.yml to switch models.">
                                             must be set in Tabby's config.yml to switch models.
                                         </span>

From 7c73792f8a8bc0f30479e76d41f48aeb7fa3819e Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Tue, 10 Sep 2024 00:03:44 +0300
Subject: [PATCH 5/5] Extend inline loading hint

---
 public/index.html | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/public/index.html b/public/index.html
index e55e9ba8a..21f1b0fb2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2377,14 +2377,19 @@
                                             -- Connect to the API --
                                         </option>
                                     </select>
-                                    <small>
-                                        <i class="fa-solid fa-lightbulb"></i>
-                                        &nbsp;
-                                        <code>inline_model_loading: True</code>
-                                        <span data-i18n="must be set in Tabby's config.yml to switch models.">
-                                            must be set in Tabby's config.yml to switch models.
-                                        </span>
-                                    </small>
+                                    <div class="marginTopBot5">
+                                        <small>
+                                            <i class="fa-solid fa-lightbulb"></i>
+                                            &nbsp;
+                                            <code>inline_model_loading: True</code>
+                                            <span data-i18n="must be set in Tabby's config.yml to switch models.">
+                                                must be set in Tabby's config.yml to switch models.
+                                            </span>
+                                            <b data-i18n="Use an admin API key.">
+                                                Use an admin API key.
+                                            </b>
+                                        </small>
+                                    </div>
                                     <div id="tabby_download_model" class="menu_button menu_button_icon">
                                         <i class="fa-solid fa-download"></i>
                                         <span data-i18n="Download">Download</span>