Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

public/index.html

@@ -48,6 +48,7 @@
     <script type="module" src="scripts/group-chats.js"></script>
     <script type="module" src="scripts/power-user.js"></script>
     <script type="module" src="scripts/kai-settings.js"></script>
+    <script type="module" src="scripts/textgen-settings.js"></script>
 
     <title>Tavern.AI</title>
 </head>
@@ -122,7 +123,7 @@
                         <h4>API key</h4>
                         <h5>Where to get (<a href="/notes/6" target="_blank">?</a>)</h5>
                         <input id="api_key_novel" name="api_key_novel" class="text_pole" maxlength="500" size="35" value="" autocomplete="off">
-                        <input id="api_button_novel" type="submit" value="Connect">
+                        <input id="api_button_novel" class="menu_button" type="submit" value="Connect">
                         <img id="api_loading_novel" src="img/load.svg">
                     </form>
                     <div id="online_status3">
@@ -137,27 +138,32 @@
                     <select id="model_novel_select" class="option_select_right_menu" style='margin-bottom: 16px;'>
                         <option value="euterpe-v2">Euterpe</option>
                         <option value="krake-v2">Krake</option>
-                    </select><br>
+                    </select>
-                    Preset settings
+                    <h4>
-                    <a href="/notes/7" class="notes-link" target="_blank">
+                        Preset settings
-                        <span class="note-link-span">?</span>
+                        <a href="/notes/7" class="notes-link" target="_blank">
-                    </a><br>
+                            <span class="note-link-span">?</span>
+                        </a>
+                    </h4>
                     <select id="settings_perset_novel" class="option_select_right_menu">
                         <option value="gui">Default</option>
                     </select>
-                </div>
+                    </div>
                 <div id="textgenerationwebui_api" style="display: none;position: relative;">
                     <div class="oobabooga_logo">
                         <a href="https://github.com/oobabooga/text-generation-webui" target="_blank">
                             oobabooga/text-generation-webui
                         </a>
                     </div>
-                    <span>Make sure you run it:
+                    <span>
+                        Make sure you run it:
                         <ul>
-                            <li>with
+                            <li>
+                                with
                                 <pre>--no-stream</pre> option
                             </li>
-                            <li>in notebook mode (not
+                            <li>
+                                in notebook mode (not
                                 <pre>--cai-chat</pre> or
                                 <pre>--chat</pre>)
                             </li>
@@ -457,7 +463,7 @@
                                         Top K
                                     </div>
                                     <div class="range-block-counter">
-                                        <span id=" top_k_counter_textgenerationwebui">select</span>
+                                        <span id="top_k_counter_textgenerationwebui">select</span>
                                     </div>
                                     <div class="range-block-range">
                                         <input type="range" id="top_k_textgenerationwebui" name="volume" min="0" max="200" step="1">
@@ -467,7 +473,7 @@
                                             Top P
                                         </div>
                                         <div class="range-block-counter">
-                                            <span id=" top_p_counter_textgenerationwebui">select</span>
+                                            <span id="top_p_counter_textgenerationwebui">select</span>
                                         </div>
                                         <div class="range-block-range">
                                             <input type="range" id="top_p_textgenerationwebui" name="volume" min="0" max="1" step="0.1">
@@ -478,7 +484,7 @@
                                             Typical P
                                         </div>
                                         <div class="range-block-counter">
-                                            <span id=" typical_p_counter_textgenerationwebui">select</span>
+                                            <span id="typical_p_counter_textgenerationwebui">select</span>
                                         </div>
                                         <div class="range-block-range">
                                             <input type="range" id="typical_p_textgenerationwebui" name="volume" min="0" max="1" step="0.1">
@@ -489,7 +495,7 @@
                                             Penalty Alpha
                                         </div>
                                         <div class="range-block-counter">
-                                            <span id=" penalty_alpha_counter_textgenerationwebui">select</span>
+                                            <span id="penalty_alpha_counter_textgenerationwebui">select</span>
                                         </div>
                                         <div class="range-block-range">
                                             <input type="range" id="penalty_alpha_textgenerationwebui" name="volume" min="0" max="5" step="0.05" />
@@ -1040,8 +1046,8 @@
                     <div class=mes_edit_done><img src=img/done.png></div>
                 </div>
                 <div class=mes_text></div>
+                <div class="mes_bias"></div>
             </div>
-            <div class="mes_bias">${bias}</div>
             <div class="swipe_right">
                 <img src="img/swipe_right.png">
                 <div class="swipes-counter"></div>

public/script.js

@@ -6,6 +6,11 @@ import {
     loadKoboldSettings,
 } from "./scripts/kai-settings.js";
 
+import {
+    textgenerationwebui_settings,
+    loadTextGenSettings,
+} from "./scripts/textgen-settings.js";
+
 import {
     world_info_budget,
     world_info_data,
@@ -246,16 +251,6 @@ var user_avatar = "you.png";
 var amount_gen = 80; //default max length of AI generated responses
 var max_context = 2048;
 
-var textgenerationwebui_settings = {
-    temp: 0.5,
-    top_p: 0.9,
-    top_k: 0,
-    typical_p: 1,
-    rep_pen: 1.1,
-    rep_pen_size: 0,
-    penalty_alpha: 0,
-};
-
 var is_pygmalion = false;
 var tokens_already_generated = 0;
 var message_already_generated = "";
@@ -1974,8 +1969,7 @@ async function getSettings(type) {
 
                 //Load AI model config settings (temp, context length, anchors, and anchor order)
 
-                textgenerationwebui_settings =
+                loadTextGenSettings(settings.textgenerationwebui_settings);
-                    settings.textgenerationwebui_settings || textgenerationwebui_settings;
 
                 amount_gen = settings.amount_gen;
                 if (settings.max_context !== undefined)
@@ -2085,23 +2079,6 @@ async function getSettings(type) {
                     api_server_textgenerationwebui
                 );
 
-                for (var i of [
-                    "temp",
-                    "rep_pen",
-                    "rep_pen_size",
-                    "top_k",
-                    "top_p",
-                    "typical_p",
-                    "penalty_alpha",
-                ]) {
-                    $("#" + i + "_textgenerationwebui").val(
-                        textgenerationwebui_settings[i]
-                    );
-                    $("#" + i + "_counter_textgenerationwebui").html(
-                        textgenerationwebui_settings[i]
-                    );
-                }
-
                 selected_button = settings.selected_button;
 
             }
@@ -3713,31 +3690,6 @@ $(document).ready(function () {
         }
     });
 
-
-
-    for (var i of [
-        "temp",
-        "rep_pen",
-        "rep_pen_size",
-        "top_k",
-        "top_p",
-        "typical_p",
-        "penalty_alpha",
-    ]) {
-        $("#" + i + "_textgenerationwebui").attr("x-setting-id", i);
-        $(document).on("input", "#" + i + "_textgenerationwebui", function () {
-            var i = $(this).attr("x-setting-id");
-            var val = $(this).val();
-            if (isInt(val)) {
-                $("#" + i + "_counter_textgenerationwebui").html($(this).val() + ".00");
-            } else {
-                $("#" + i + "_counter_textgenerationwebui").html($(this).val());
-            }
-            textgenerationwebui_settings[i] = parseFloat(val);
-            saveSettingsDebounced();
-        });
-    }
-
     ////////////////// OPTIMIZED RANGE SLIDER LISTENERS////////////////
 
     const sliders = [

public/scripts/RossAscends-mods.js

@@ -8,7 +8,7 @@ import {
 	online_status,
 	main_api,
 	api_server,
-	api_key_novel,
+	nai_settings,
 	api_server_textgenerationwebui,
 	is_send_press,
 

public/scripts/nai-settings.js

@@ -0,0 +1,108 @@
+import {
+    saveSettingsDebounced,
+} from "../script.js";
+
+export {
+    nai_settings,
+    loadNovelPreset,
+    loadNovelSettings,
+    getNovelTier,
+};
+
+const nai_settings = {
+    temp_novel: 0.5,
+    rep_pen_novel: 1,
+    rep_pen_size_novel: 100,
+    model_novel: "euterpe-v2",
+    api_key_novel: "",
+    preset_settings_novel: "Classic-Euterpe",
+};
+
+const nai_tiers = {
+    0: 'Paper',
+    1: 'Tablet',
+    2: 'Scroll',
+    3: 'Opus',
+};
+
+function getNovelTier(tier) {
+    return nai_tiers[tier] ?? 'no_connection';
+}
+
+function loadNovelPreset(preset) {
+    nai_settings.temp_novel = preset.temperature;
+    nai_settings.rep_pen_novel = preset.repetition_penalty;
+    nai_settings.rep_pen_size_novel = preset.repetition_penalty_range;
+    $("#temp_novel").val(nai_settings.temp_novel);
+    $("#temp_counter_novel").html(nai_settings.temp_novel);
+
+    $("#rep_pen_novel").val(nai_settings.rep_pen_novel);
+    $("#rep_pen_counter_novel").html(nai_settings.rep_pen_novel);
+
+    $("#rep_pen_size_novel").val(nai_settings.rep_pen_size_novel);
+    $("#rep_pen_size_counter_novel").html(`${nai_settings.rep_pen_size_novel} Tokens`);
+}
+
+function loadNovelSettings(settings){
+    //load Novel API KEY is exists
+    if (settings.api_key_novel != undefined) {
+        nai_settings.api_key_novel = settings.api_key_novel;
+        $("#api_key_novel").val(nai_settings.api_key_novel);
+    }
+
+    //load the rest of the Novel settings without any checks
+    nai_settings.model_novel = settings.model_novel;
+    $(`#model_novel_select option[value=${nai_settings.model_novel}]`).attr("selected", true);
+
+    nai_settings.temp_novel = settings.temp_novel;
+    nai_settings.rep_pen_novel = settings.rep_pen_novel;
+    nai_settings.rep_pen_size_novel = settings.rep_pen_size_novel;
+
+    $("#temp_novel").val(nai_settings.temp_novel);
+    $("#temp_counter_novel").text(Number(nai_settings.temp_novel).toFixed(2));
+
+    $("#rep_pen_novel").val(nai_settings.rep_pen_novel);
+    $("#rep_pen_counter_novel").text(Number(nai_settings.rep_pen_novel).toFixed(2));
+
+    $("#rep_pen_size_novel").val(nai_settings.rep_pen_size_novel);
+    $("#rep_pen_size_counter_novel").text(`${nai_settings.rep_pen_size_novel} Tokens`);
+}
+
+const sliders = [
+    {
+        sliderId: "#temp_novel",
+        counterId: "#temp_counter_novel",
+        format: (val) => Number(val).toFixed(2),
+        setValue: (val) => { nai_settings.temp_novel = Number(val); },
+    },
+    {
+        sliderId: "#rep_pen_novel",
+        counterId: "#rep_pen_counter_novel",
+        format: (val) => Number(val).toFixed(2),
+        setValue: (val) => { nai_settings.rep_pen_novel = Number(val); },
+    },
+    {
+        sliderId: "#rep_pen_size_novel",
+        counterId: "#rep_pen_size_counter_novel",
+        format: (val) => `${val} Tokens`,
+        setValue: (val) => { nai_settings.rep_pen_size_novel = Number(val); },
+    },
+];
+
+$(document).ready(function () {
+    sliders.forEach(slider => {
+        $(document).on("input", slider.sliderId, function () {
+            const value = $(this).val();
+            const formattedValue = slider.format(value);
+            slider.setValue(value);
+            $(slider.counterId).html(formattedValue);
+            console.log('saving');
+            saveSettingsDebounced();
+        });
+    });
+    
+    $("#model_novel_select").change(function () {
+        nai_settings.model_novel = $("#model_novel_select").find(":selected").val();
+        saveSettingsDebounced();
+    });
+});

public/scripts/textgen-settings.js

@@ -0,0 +1,51 @@
+import {
+    saveSettingsDebounced,
+} from "../script.js";
+
+export {
+    textgenerationwebui_settings,
+    loadTextGenSettings,
+}
+
+let textgenerationwebui_settings = {
+    temp: 0.5,
+    top_p: 0.9,
+    top_k: 0,
+    typical_p: 1,
+    rep_pen: 1.1,
+    rep_pen_size: 0,
+    penalty_alpha: 0,
+};
+
+const setting_names = [
+    "temp",
+    "rep_pen",
+    "rep_pen_size",
+    "top_k",
+    "top_p",
+    "typical_p",
+    "penalty_alpha",
+];
+
+function loadTextGenSettings(settings) {
+    textgenerationwebui_settings = settings ? settings : textgenerationwebui_settings;
+
+    for (const i of setting_names) {
+        const val = parseFloat(textgenerationwebui_settings[i]);
+        $(`#${i}_textgenerationwebui`).val(val);
+        $(`#${i}_counter_textgenerationwebui`).text(val.toFixed(2));
+    }
+}
+
+$(document).ready(function() {
+    for (const i of setting_names) {
+        $(`#${i}_textgenerationwebui`).attr("x-setting-id", i);
+        $(document).on("input", `#${i}_textgenerationwebui`, function () {
+            const id = $(this).attr("x-setting-id");
+            const val = parseFloat($(this).val());
+            $(`#${id}_counter_textgenerationwebui`).text(val.toFixed(2));
+            textgenerationwebui_settings[id] = parseFloat(val);
+            saveSettingsDebounced();
+        });
+    }
+})

public/style.css

@@ -787,7 +787,8 @@ img[src*="user-slash-solid.svg"] {
 }
 
 #api_button:hover,
-#api_button_novel:hover {
+#api_button_novel:hover,
+#api_button_textgenerationwebui {
     background-color: green;
 }
 

server.js

@@ -88,6 +88,11 @@ const directories = {
     avatars: 'public/User Avatars',
     groups: 'public/groups/',
     groupChats: 'public/group chats',
+    chats: 'public/chats/',
+    characters: 'public/characters/',
+    backgrounds: 'public/backgrounds',
+    novelAI_Settings: 'public/NovelAI Settings',
+    koboldAI_Settings: 'public/KoboldAI Settings',
 };
 
 // CSRF Protection //
@@ -1597,6 +1602,7 @@ app.listen(server_port, (listen ? '0.0.0.0' : '127.0.0.1'), function () {
             is_colab = true;
         }
     }
+    ensurePublicDirectoriesExist();
     console.log('Launching...');
     if (autorun) open('http:127.0.0.1:' + server_port);
     console.log('TavernAI started: http://127.0.0.1:' + server_port);
@@ -1791,3 +1797,11 @@ function getCharacterFile2(directories, i) {
         convertStage2();
     }
 }
+
+function ensurePublicDirectoriesExist() {
+    for (const dir of Object.values(directories)) {
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir);
+        }
+    }
+}