Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging

public/scripts/RossAscends-mods.js

@@ -13,6 +13,7 @@ import {
     menu_type,
     max_context,
     saveSettingsDebounced,
+    eventSource,
     active_group,
     active_character,
     setActiveGroup,
@@ -749,7 +750,6 @@ export function dragElement(elmnt) {
         observer.disconnect()
         console.debug(`Saving ${elmntName} UI position`)
         saveSettingsDebounced();
-
     }
 }
 
@@ -1090,7 +1090,11 @@ $("document").ready(function () {
         }
 
         if (event.key == "Escape") { //closes various panels
-            if ($("#curEditTextarea").is(":visible")) {
+            //dont override Escape hotkey functions from script.js
+            //"close edit box" and "cancel stream generation".
+
+            if ($("#curEditTextarea").is(":visible") || $("#mes_stop").is(":visible")) {
+                console.debug('escape key, but deferring to script.js routines')
                 return
             }
 
@@ -1103,10 +1107,12 @@ $("document").ready(function () {
                     return
                 }
             }
+
             if ($("#select_chat_popup").is(":visible")) {
                 $("#select_chat_cross").trigger('click');
                 return
             }
+
             if ($("#character_popup").is(":visible")) {
                 $("#character_cross").trigger('click');
                 return
@@ -1116,28 +1122,37 @@ $("document").ready(function () {
                 .not('#WorldInfo')
                 .not('#left-nav-panel')
                 .not('#right-nav-panel')
+                .not('#floatingPrompt')
                 .is(":visible")) {
                 let visibleDrawerContent = $(".drawer-content:visible")
                     .not('#WorldInfo')
                     .not('#left-nav-panel')
                     .not('#right-nav-panel')
+                    .not('#floatingPrompt')
+                console.log(visibleDrawerContent)
                 $(visibleDrawerContent).parent().find('.drawer-icon').trigger('click');
                 return
             }
 
             if ($("#floatingPrompt").is(":visible")) {
+                console.log('saw AN visible, trying to close')
                 $("#ANClose").trigger('click');
                 return
             }
+
             if ($("#WorldInfo").is(":visible")) {
                 $("#WIDrawerIcon").trigger('click');
                 return
             }
-            if ($("#left-nav-panel").is(":visible")) {
+
+            if ($("#left-nav-panel").is(":visible") &&
+                $(LPanelPin).prop('checked') === false) {
                 $("#leftNavDrawerIcon").trigger('click');
                 return
             }
-            if ($("#right-nav-panel").is(":visible")) {
+
+            if ($("#right-nav-panel").is(":visible") &&
+                $(RPanelPin).prop('checked') === false) {
                 $("#rightNavDrawerIcon").trigger('click');
                 return
             }

public/scripts/extensions/cfg/index.js

@@ -0,0 +1,319 @@
+import {
+    chat_metadata,
+    eventSource,
+    event_types,
+    saveSettingsDebounced,
+    this_chid,
+} from "../../../script.js";
+import { selected_group } from "../../group-chats.js";
+import { extension_settings, saveMetadataDebounced } from "../../extensions.js";
+import { getCharaFilename, delay } from "../../utils.js";
+import { power_user } from "../../power-user.js";
+import { metadataKeys } from "./util.js";
+
+// Keep track of where your extension is located, name should match repo name
+const extensionName = "cfg";
+const extensionFolderPath = `scripts/extensions/${extensionName}`;
+const defaultSettings = {
+    global: {
+        "guidance_scale": 1,
+        "negative_prompt": ''
+    },
+    chara: []
+};
+const settingType = {
+    guidance_scale: 0,
+    negative_prompt: 1
+}
+
+// Used for character and chat CFG values
+function updateSettings() {
+    saveSettingsDebounced();
+    loadSettings();
+}
+
+function setCharCfg(tempValue, setting) {
+    const avatarName = getCharaFilename();
+
+    // Assign temp object
+    let tempCharaCfg;
+    switch(setting) {
+        case settingType.guidance_scale:
+            tempCharaCfg = {
+                "name": avatarName,
+                "guidance_scale": Number(tempValue)
+            }
+            break;
+        case settingType.negative_prompt:
+            tempCharaCfg = {
+                "name": avatarName,
+                "negative_prompt": tempValue
+            }
+            break;
+        default:
+            return false;
+    }
+
+    let existingCharaCfgIndex;
+    let existingCharaCfg;
+
+    if (extension_settings.cfg.chara) {
+        existingCharaCfgIndex = extension_settings.cfg.chara.findIndex((e) => e.name === avatarName);
+        existingCharaCfg = extension_settings.cfg.chara[existingCharaCfgIndex];
+    }
+
+    if (extension_settings.cfg.chara && existingCharaCfg) {
+        const tempAssign = Object.assign(existingCharaCfg, tempCharaCfg);
+
+        // If both values are default, remove the entry
+        if (!existingCharaCfg.useChara && (tempAssign.guidance_scale ?? 1.00) === 1.00 && (tempAssign.negative_prompt?.length ?? 0) === 0) {
+            extension_settings.cfg.chara.splice(existingCharaCfgIndex, 1);
+        }
+    } else if (avatarName && tempValue.length > 0) {
+        if (!extension_settings.cfg.chara) {
+            extension_settings.cfg.chara = []
+        }
+
+        extension_settings.cfg.chara.push(tempCharaCfg);
+    } else {
+        console.debug("Character CFG error: No avatar name key could be found.");
+
+        // Don't save settings if something went wrong
+        return false;
+    }
+
+    updateSettings();
+
+    return true;
+}
+
+function setChatCfg(tempValue, setting) {
+    switch(setting) {
+        case settingType.guidance_scale:
+            chat_metadata[metadataKeys.guidance_scale] = tempValue;
+            break;
+        case settingType.negative_prompt:
+            chat_metadata[metadataKeys.negative_prompt] = tempValue;
+            break;
+        default:
+            return false;
+    }
+
+    saveMetadataDebounced();
+
+    return true;
+}
+
+// TODO: Only change CFG when character is selected
+function onCfgMenuItemClick() {
+    if (selected_group || this_chid) {
+        //show CFG config if it's hidden
+        if ($("#cfgConfig").css("display") !== 'flex') {
+            $("#cfgConfig").addClass('resizing')
+            $("#cfgConfig").css("display", "flex");
+            $("#cfgConfig").css("opacity", 0.0);
+            $("#cfgConfig").transition({
+                opacity: 1.0,
+                duration: 250,
+            }, async function () {
+                await delay(50);
+                $("#cfgConfig").removeClass('resizing')
+            });
+
+            //auto-open the main AN inline drawer
+            if ($("#CFGBlockToggle")
+                .siblings('.inline-drawer-content')
+                .css('display') !== 'block') {
+                $("#floatingPrompt").addClass('resizing')
+                $("#CFGBlockToggle").click();
+            }
+        } else {
+            //hide AN if it's already displayed
+            $("#cfgConfig").addClass('resizing')
+            $("#cfgConfig").transition({
+                opacity: 0.0,
+                duration: 250,
+            },
+                async function () {
+                    await delay(50);
+                    $("#cfgConfig").removeClass('resizing')
+                });
+            setTimeout(function () {
+                $("#cfgConfig").hide();
+            }, 250);
+
+        }
+        //duplicate options menu close handler from script.js
+        //because this listener takes priority
+        $("#options").stop().fadeOut(250);
+    } else {
+        toastr.warning(`Select a character before trying to configure CFG`, '', { timeOut: 2000 });
+    }
+}
+
+async function onChatChanged() {
+    loadSettings();
+    await modifyCharaHtml();
+}
+
+// Rearrange the panel if a group chat is present
+async function modifyCharaHtml() {
+    if (selected_group) {
+        $("#chara_cfg_container").hide();
+        $("#groupchat_cfg_use_chara_container").show();
+    } else {
+        $("#chara_cfg_container").show();
+        $("#groupchat_cfg_use_chara_container").hide();
+        // TODO: Remove chat checkbox here
+    }
+}
+
+// Reloads chat-specific settings
+function loadSettings() {
+    // Set chat CFG if it exists
+    $('#chat_cfg_guidance_scale').val(chat_metadata[metadataKeys.guidance_scale] ?? 1.0.toFixed(2));
+    $('#chat_cfg_guidance_scale_counter').text(chat_metadata[metadataKeys.guidance_scale]?.toFixed(2) ?? 1.0.toFixed(2));
+    $('#chat_cfg_negative_prompt').val(chat_metadata[metadataKeys.negative_prompt] ?? '');
+    $('#groupchat_cfg_use_chara').prop('checked', chat_metadata[metadataKeys.groupchat_individual_chars] ?? false);
+    if (chat_metadata[metadataKeys.negative_combine]?.length > 0) {
+        chat_metadata[metadataKeys.negative_combine].forEach((element) => {
+            $(`input[name="cfg_negative_combine"][value="${element}"]`)
+                .prop("checked", true);
+        });
+    }
+
+    // Set character CFG if it exists
+    if (!selected_group) {
+        const charaCfg = extension_settings.cfg.chara.find((e) => e.name === getCharaFilename());
+        $('#chara_cfg_guidance_scale').val(charaCfg?.guidance_scale ?? 1.00);
+        $('#chara_cfg_guidance_scale_counter').text(charaCfg?.guidance_scale?.toFixed(2) ?? 1.0.toFixed(2));
+        $('#chara_cfg_negative_prompt').val(charaCfg?.negative_prompt ?? '');
+    }
+}
+
+// Load initial extension settings
+async function initialLoadSettings() {
+    // Create the settings if they don't exist
+    extension_settings[extensionName] = extension_settings[extensionName] || {};
+    if (Object.keys(extension_settings[extensionName]).length === 0) {
+        Object.assign(extension_settings[extensionName], defaultSettings);
+        saveSettingsDebounced();
+    }
+
+    // Set global CFG values on load
+    $('#global_cfg_guidance_scale').val(extension_settings.cfg.global.guidance_scale);
+    $('#global_cfg_guidance_scale_counter').text(extension_settings.cfg.global.guidance_scale.toFixed(2));
+    $('#global_cfg_negative_prompt').val(extension_settings.cfg.global.negative_prompt);
+}
+
+function migrateSettings() {
+    let performSave = false;
+
+    if (power_user.guidance_scale) {
+        extension_settings.cfg.global.guidance_scale = power_user.guidance_scale;
+        delete power_user['guidance_scale'];
+        performSave = true;
+    }
+
+    if (power_user.negative_prompt) {
+        extension_settings.cfg.global.negative_prompt = power_user.negative_prompt;
+        delete power_user['negative_prompt'];
+        performSave = true;
+    }
+
+    if (performSave) {
+        saveSettingsDebounced();
+    }
+}
+
+// This function is called when the extension is loaded
+jQuery(async () => {
+    // This is an example of loading HTML from a file
+    const windowHtml = $(await $.get(`${extensionFolderPath}/window.html`));
+
+    // Append settingsHtml to extensions_settings
+    // extension_settings and extensions_settings2 are the left and right columns of the settings menu
+    // Left should be extensions that deal with system functions and right should be visual/UI related 
+    windowHtml.find('#CFGClose').on('click', function () {
+        $("#cfgConfig").transition({
+            opacity: 0,
+            duration: 200,
+            easing: 'ease-in-out',
+        });
+        setTimeout(function () { $('#cfgConfig').hide() }, 200);
+    });
+
+    windowHtml.find('#chat_cfg_guidance_scale').on('input', function() {
+        const numberValue = Number($(this).val());
+        const success = setChatCfg(numberValue, settingType.guidance_scale);
+        if (success) {
+            $('#chat_cfg_guidance_scale_counter').text(numberValue.toFixed(2));
+        }
+    });
+
+    windowHtml.find('#chat_cfg_negative_prompt').on('input', function() {
+        setChatCfg($(this).val(), settingType.negative_prompt);
+    });
+
+    windowHtml.find('#chara_cfg_guidance_scale').on('input', function() {
+        const value = $(this).val();
+        const success = setCharCfg(value, settingType.guidance_scale);
+        if (success) {
+            $('#chara_cfg_guidance_scale_counter').text(Number(value).toFixed(2));
+        }
+    });
+
+    windowHtml.find('#chara_cfg_negative_prompt').on('input', function() {
+        setCharCfg($(this).val(), settingType.negative_prompt);
+    });
+
+    windowHtml.find('#global_cfg_guidance_scale').on('input', function() {
+        extension_settings.cfg.global.guidance_scale = Number($(this).val());
+        $('#global_cfg_guidance_scale_counter').text(extension_settings.cfg.global.guidance_scale.toFixed(2));
+        saveSettingsDebounced();
+    });
+
+    windowHtml.find('#global_cfg_negative_prompt').on('input', function() {
+        extension_settings.cfg.global.negative_prompt = $(this).val();
+        saveSettingsDebounced();
+    });
+
+    windowHtml.find(`input[name="cfg_negative_combine"]`).on('input', function() {
+        const values = windowHtml.find(`input[name="cfg_negative_combine"]`)
+            .filter(":checked")
+            .map(function() { return parseInt($(this).val()) })
+            .get()
+            .filter((e) => e !== NaN) || [];
+
+        chat_metadata[metadataKeys.negative_combine] = values;
+        saveMetadataDebounced();
+    });
+
+    windowHtml.find('#groupchat_cfg_use_chara').on('input', function() {
+        const checked = !!$(this).prop('checked');
+        chat_metadata[metadataKeys.groupchat_individual_chars] = checked
+
+        if (checked) {
+            toastr.info("You can edit character CFG values in their respective character chats.");
+        }
+
+        saveMetadataDebounced();
+    });
+
+    $("#movingDivs").append(windowHtml);
+
+    initialLoadSettings();
+
+    if (extension_settings.cfg) {
+        migrateSettings();
+    }
+
+    const buttonHtml = $(await $.get(`${extensionFolderPath}/menuButton.html`));
+    buttonHtml.on('click', onCfgMenuItemClick)
+    buttonHtml.insertAfter("#option_toggle_AN");
+
+    // Hook events
+    eventSource.on(event_types.CHAT_CHANGED, async () => {
+        await onChatChanged();
+    });
+});

public/scripts/extensions/cfg/manifest.json

@@ -0,0 +1,11 @@
+{
+    "display_name": "CFG",
+    "loading_order": 1,
+    "requires": [],
+    "optional": [],
+    "js": "index.js",
+    "css": "style.css",
+    "author": "kingbri",
+    "version": "1.0.0",
+    "homePage": "https://github.com/SillyTavern/SillyTavern"
+}

public/scripts/extensions/cfg/menuButton.html

@@ -0,0 +1,4 @@
+<a id="option_toggle_CFG">
+    <i class="fa-lg fa-solid fa-scale-balanced"></i>
+    <span data-i18n="CFG Scale">CFG Scale</span>
+</a>

public/scripts/extensions/cfg/util.js

@@ -0,0 +1,72 @@
+import { chat_metadata, this_chid } from "../../../script.js";
+import { extension_settings, getContext } from "../../extensions.js"
+import { selected_group } from "../../group-chats.js";
+import { getCharaFilename } from "../../utils.js";
+
+export const cfgType = {
+    chat: 0,
+    chara: 1,
+    global: 2
+}
+export const metadataKeys = {
+    guidance_scale: "cfg_guidance_scale",
+    negative_prompt: "cfg_negative_prompt",
+    negative_combine: "cfg_negative_combine",
+    groupchat_individual_chars: "cfg_groupchat_individual_chars"
+}
+
+// Gets the CFG value from hierarchy of chat -> character -> global
+// Returns undefined values which should be handled in the respective backend APIs
+export function getCfg() {
+    let splitNegativePrompt = [];
+    const charaCfg = extension_settings.cfg.chara?.find((e) => e.name === getCharaFilename(this_chid));
+    const guidanceScale = getGuidanceScale(charaCfg);
+    const chatNegativeCombine = chat_metadata[metadataKeys.negative_combine] ?? [];
+
+    // If there's a guidance scale, continue. Otherwise assume undefined
+    if (guidanceScale?.value && guidanceScale?.value !== 1) {
+        if (guidanceScale.type === cfgType.chat || chatNegativeCombine.includes(cfgType.chat)) {
+            splitNegativePrompt.push(chat_metadata[metadataKeys.negative_prompt]?.trim());
+        }
+
+        if (guidanceScale.type === cfgType.chara || chatNegativeCombine.includes(cfgType.chara)) {
+            splitNegativePrompt.push(charaCfg.negative_prompt?.trim())
+        }
+
+        if (guidanceScale.type === cfgType.global || chatNegativeCombine.includes(cfgType.global)) {
+            splitNegativePrompt.push(extension_settings.cfg.global.negative_prompt?.trim());
+        }
+
+        const combinedNegatives = splitNegativePrompt.filter((e) => e.length > 0).join(", ");
+        console.debug(`Setting CFG with guidance scale: ${guidanceScale.value}, negatives: ${combinedNegatives}`)
+
+        return {
+            guidanceScale: guidanceScale.value,
+            negativePrompt: combinedNegatives
+        }
+    }
+}
+
+// If the guidance scale is 1, ignore the CFG negative prompt since it won't be used anyways
+function getGuidanceScale(charaCfg) {
+    const chatGuidanceScale = chat_metadata[metadataKeys.guidance_scale];
+    const groupchatCharOverride = chat_metadata[metadataKeys.groupchat_individual_chars] ?? false;
+    if (chatGuidanceScale && chatGuidanceScale !== 1 && !groupchatCharOverride) {
+        return {
+            type: cfgType.chat,
+            value: chatGuidanceScale
+        };
+    }
+
+    if ((!selected_group && charaCfg || groupchatCharOverride) && charaCfg?.guidance_scale !== 1) {
+        return {
+            type: cfgType.chara,
+            value: charaCfg.guidance_scale
+        };
+    }
+
+    return {
+        type: cfgType.global,
+        value: extension_settings.cfg.global.guidance_scale
+    };
+}

public/scripts/extensions/cfg/window.html

@@ -0,0 +1,142 @@
+<div id="cfgConfig" class="drawer-content flexGap5">
+    <div class="panelControlBar flex-container">
+        <div id="cfgConfigHeader" class="fa-solid fa-grip drag-grabber"></div>
+        <div id="CFGClose" class="fa-solid fa-circle-xmark"></div>
+    </div>
+    <div name="cfgConfigHolder" class="scrollY">
+        <div id="chat_cfg_container">
+            <div class="inline-drawer">
+                <div id="CFGBlockToggle" class="inline-drawer-toggle inline-drawer-header">
+                    <b>Chat CFG</b>
+                    <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
+                </div>
+                <div class="inline-drawer-content">
+                    <small>
+                        <b>Unique to this chat.</b><br>
+                    </small>
+                    <label for="chat_cfg_negative_prompt">
+                        <span data-i18n="Scale">Scale</span>
+                    </label>
+                    <div class="range-block-range-and-counter">
+                        <div class="range-block-range">
+                            <input type="range" id="chat_cfg_guidance_scale" name="volume" min="0.10" max="4.00" step="0.05">
+                        </div>
+                        <div class="range-block-counter">
+                            <div contenteditable="true" data-for="chat_cfg_guidance_scale" id="chat_cfg_guidance_scale_counter">
+                                select
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <label for="chat_cfg_negative_prompt">
+                            <span data-i18n="Negative Prompt">Negative Prompt</span>
+                        </label>
+                        <textarea id="chat_cfg_negative_prompt" rows="2" class="text_pole textarea_compact" data-i18n="[placeholder]write short replies, write replies using past tense" placeholder="write short replies, write replies using past tense"></textarea>
+                    </div>
+                    <div id="groupchat_cfg_use_chara_container">
+                        <label class="checkbox_label" for="groupchat_cfg_use_chara">
+                            <input type="checkbox" id="groupchat_cfg_use_chara" />
+                            <span data-i18n="Use character CFG scales">Use character CFG scales</span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="chara_cfg_container" style="display: none;">
+            <hr class="sysHR">
+            <div class="inline-drawer">
+                <div id="charaANBlockToggle" class="inline-drawer-toggle inline-drawer-header">
+                    <b>Character CFG</b>
+                    <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
+                </div>
+                <div class="inline-drawer-content">
+                    <small><b>Will be automatically added as the CFG for this character.</b></small>
+                    <br />
+                    <label for="chara_cfg_negative_prompt">
+                        <span data-i18n="Scale">Scale</span>
+                    </label>
+                    <div class="range-block-range-and-counter">
+                        <div class="range-block-range">
+                            <input type="range" id="chara_cfg_guidance_scale" name="volume" min="0.10" max="4.00" step="0.05">
+                        </div>
+                        <div class="range-block-counter">
+                            <div contenteditable="true" data-for="chara_cfg_guidance_scale" id="chara_cfg_guidance_scale_counter">
+                                select
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <label for="chara_cfg_negative_prompt">
+                            <span data-i18n="Negative Prompt">Negative Prompt</span>
+                        </label>
+                        <textarea id="chara_cfg_negative_prompt" rows="2" class="text_pole textarea_compact" data-i18n="[placeholder]write short replies, write replies using past tense" placeholder="write short replies, write replies using past tense"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="global_cfg_container">
+            <hr class="sysHR">
+            <div class="inline-drawer">
+                <div id="defaultANBlockToggle" class="inline-drawer-toggle inline-drawer-header">
+                    <b>Global CFG</b>
+                    <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
+                </div>
+                <div class="inline-drawer-content">
+                    <small><b>Will be used as the default CFG options for every chat unless overridden.</b></small>
+                    <br />
+                    <label for="global_cfg_negative_prompt">
+                        <span data-i18n="Scale">Scale</span>
+                    </label>
+                    <div class="range-block-range-and-counter">
+                        <div class="range-block-range">
+                            <input type="range" id="global_cfg_guidance_scale" name="volume" min="0.10" max="4.00" step="0.05">
+                        </div>
+                        <div class="range-block-counter">
+                            <div contenteditable="true" data-for="global_cfg_guidance_scale" id="global_cfg_guidance_scale_counter">
+                                select
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <label for="global_cfg_negative_prompt">
+                            <span data-i18n="Negative Prompt">Negative Prompt</span>
+                        </label>
+                        <textarea id="global_cfg_negative_prompt" rows="2" class="text_pole textarea_compact" data-i18n="[placeholder]write short replies, write replies using past tense" placeholder="write short replies, write replies using past tense"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="cfg_negative_combine_container">
+            <hr class="sysHR">
+            <div class="inline-drawer">
+                <div id="defaultANBlockToggle" class="inline-drawer-toggle inline-drawer-header">
+                    <b>Negative Cascading</b>
+                    <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
+                </div>
+                <div class="inline-drawer-content">
+                    <small>
+                        <b>Combine negative prompts from other boxes.</b>
+                        <br />
+                        For example, ticking the chat, global, and character boxes combine all negative prompts into a comma-separated string.
+                    </small>
+                    <br />
+                    <label for="cfg_negative_combine">
+                        <span data-i18n="Scale">Always Include</span>
+                    </label>
+                    <label class="checkbox_label">
+                        <input type="checkbox" name="cfg_negative_combine" value="0" />
+                        <span data-i18n="Chat Negatives">Chat Negatives</span>
+                    </label>
+                    <label class="checkbox_label">
+                        <input type="checkbox" name="cfg_negative_combine" value="1" />
+                        <span data-i18n="Character Negatives">Character Negatives</span>
+                    </label>
+                    <label class="checkbox_label">
+                        <input type="checkbox" name="cfg_negative_combine" value="2" />
+                        <span data-i18n="Global Negatives">Global Negatives</span>
+                    </label>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

public/scripts/extensions/tts/index.js

@@ -1,5 +1,5 @@
 import { callPopup, cancelTtsPlay, eventSource, event_types, isMultigenEnabled, is_send_press, saveSettingsDebounced } from '../../../script.js'
-import { ModuleWorkerWrapper, doExtrasFetch, extension_settings, getApiUrl, getContext } from '../../extensions.js'
+import { ModuleWorkerWrapper, doExtrasFetch, extension_settings, getApiUrl, getContext, modules } from '../../extensions.js'
 import { escapeRegex, getStringHash } from '../../utils.js'
 import { EdgeTtsProvider } from './edge.js'
 import { ElevenLabsTtsProvider } from './elevenlabs.js'
@@ -166,6 +166,11 @@ async function moduleWorker() {
 }
 
 function talkingAnimation(switchValue) {
+    if (!modules.includes('talkinghead')) {
+        console.debug("Talking Animation module not loaded");
+        return;
+    }
+
     const apiUrl = getApiUrl();
     const animationType = switchValue ? "start" : "stop";
 

public/scripts/group-chats.js

@@ -1166,6 +1166,8 @@ function select_group_chats(groupId, skipAnimation) {
         sortGroupMembers("#rm_group_add_members .group_member");
         await eventSource.emit(event_types.GROUP_UPDATED);
     });
+
+    eventSource.emit('groupSelected', {detail: {id: groupId, group: group}});
 }
 
 function updateFavButtonState(state) {
@@ -1197,6 +1199,7 @@ async function selectGroup() {
 
 function openCharacterDefinition(characterSelect) {
     if (is_group_generating) {
+        toastr.warning("Can't peek a character while group reply is being generated");
         console.warn("Can't peek a character def while group reply is being generated");
         return;
     }

public/scripts/jquery.ui.touch-punch.min.js

@@ -1,11 +1,249 @@
 /*!
- * jQuery UI Touch Punch 0.2.3
+ * jQuery UI Touch Punch 1.0.9 as modified by RWAP Software
+ * based on original touchpunch v0.2.3 which has not been updated since 2014
  *
+ * Updates by RWAP Software to take account of various suggested changes on the original code issues
+ *
+ * Original: https://github.com/furf/jquery-ui-touch-punch
  * Copyright 2011–2014, Dave Furfero
  * Dual licensed under the MIT or GPL Version 2 licenses.
  *
+ * Fork: https://github.com/RWAP/jquery-ui-touch-punch
+ *
  * Depends:
- *  jquery.ui.widget.js
- *  jquery.ui.mouse.js
+ * jquery.ui.widget.js
+ * jquery.ui.mouse.js
  */
-!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);
+
+(function( factory ) {
+    if ( typeof define === "function" && define.amd ) {
+
+        // AMD. Register as an anonymous module.
+        define([ "jquery", "jquery-ui" ], factory );
+    } else {
+
+        // Browser globals
+        factory( jQuery );
+    }
+}(function ($) {
+
+    // Detect touch support - Windows Surface devices and other touch devices
+    $.mspointer = window.navigator.msPointerEnabled;
+    $.touch = ( 'ontouchstart' in document
+        || 'ontouchstart' in window
+        || window.TouchEvent
+        || (window.DocumentTouch && document instanceof DocumentTouch)
+        || navigator.maxTouchPoints > 0
+        || navigator.msMaxTouchPoints > 0
+    );
+
+    // Ignore browsers without touch or mouse support
+    if ((!$.touch && !$.mspointer) || !$.ui.mouse) {
+        return;
+    }
+
+    let mouseProto = $.ui.mouse.prototype,
+        _mouseInit = mouseProto._mouseInit,
+        _mouseDestroy = mouseProto._mouseDestroy,
+        touchHandled;
+
+    /**
+     * Get the x,y position of a touch event
+     * @param {Object} event A touch event
+     */
+    function getTouchCoords (event) {
+        return {
+            x: event.originalEvent.changedTouches[0].pageX,
+            y: event.originalEvent.changedTouches[0].pageY
+        };
+    }
+
+    /**
+     * Simulate a mouse event based on a corresponding touch event
+     * @param {Object} event A touch event
+     * @param {String} simulatedType The corresponding mouse event
+     */
+    function simulateMouseEvent (event, simulatedType) {
+
+        // Ignore multi-touch events
+        if (event.originalEvent.touches.length > 1) {
+            return;
+        }
+
+        //Ignore input or textarea elements so user can still enter text
+        if ($(event.target).is("input") || $(event.target).is("textarea")) {
+            return;
+        }
+
+        // Prevent "Ignored attempt to cancel a touchmove event with cancelable=false" errors
+        if (event.cancelable) {
+            event.preventDefault();
+        }
+
+        let touch = event.originalEvent.changedTouches[0],
+            simulatedEvent = document.createEvent('MouseEvents');
+
+        // Initialize the simulated mouse event using the touch event's coordinates
+        simulatedEvent.initMouseEvent(
+            simulatedType,    // type
+            true,             // bubbles
+            true,             // cancelable
+            window,           // view
+            1,                // detail
+            touch.screenX,    // screenX
+            touch.screenY,    // screenY
+            touch.clientX,    // clientX
+            touch.clientY,    // clientY
+            false,            // ctrlKey
+            false,            // altKey
+            false,            // shiftKey
+            false,            // metaKey
+            0,                // button
+            null              // relatedTarget
+        );
+
+        // Dispatch the simulated event to the target element
+        event.target.dispatchEvent(simulatedEvent);
+    }
+
+    /**
+     * Handle the jQuery UI widget's touchstart events
+     * @param {Object} event The widget element's touchstart event
+     */
+    mouseProto._touchStart = function (event) {
+
+        let self = this;
+
+        // Interaction time
+        this._startedMove = event.timeStamp;
+
+        // Track movement to determine if interaction was a click
+        self._startPos = getTouchCoords(event);
+
+        // Ignore the event if another widget is already being handled
+        if (touchHandled || !self._mouseCapture(event.originalEvent.changedTouches[0])) {
+            return;
+        }
+
+        // Set the flag to prevent other widgets from inheriting the touch event
+        touchHandled = true;
+
+        // Track movement to determine if interaction was a click
+        self._touchMoved = false;
+
+        // Simulate the mouseover event
+        simulateMouseEvent(event, 'mouseover');
+
+        // Simulate the mousemove event
+        simulateMouseEvent(event, 'mousemove');
+
+        // Simulate the mousedown event
+        simulateMouseEvent(event, 'mousedown');
+    };
+
+    /**
+     * Handle the jQuery UI widget's touchmove events
+     * @param {Object} event The document's touchmove event
+     */
+    mouseProto._touchMove = function (event) {
+
+        // Ignore event if not handled
+        if (!touchHandled) {
+            return;
+        }
+
+        // Interaction was moved
+        this._touchMoved = true;
+
+        // Simulate the mousemove event
+        simulateMouseEvent(event, 'mousemove');
+    };
+
+    /**
+     * Handle the jQuery UI widget's touchend events
+     * @param {Object} event The document's touchend event
+     */
+    mouseProto._touchEnd = function (event) {
+
+        // Ignore event if not handled
+        if (!touchHandled) {
+            return;
+        }
+
+        // Simulate the mouseup event
+        simulateMouseEvent(event, 'mouseup');
+
+        // Simulate the mouseout event
+        simulateMouseEvent(event, 'mouseout');
+
+        // If the touch interaction did not move, it should trigger a click
+        // Check for this in two ways - length of time of simulation and distance moved
+        // Allow for Apple Stylus to be used also
+        let timeMoving = event.timeStamp - this._startedMove;
+        if (!this._touchMoved || timeMoving < 500) {
+            // Simulate the click event
+            simulateMouseEvent(event, 'click');
+        } else {
+            let endPos = getTouchCoords(event);
+            if ((Math.abs(endPos.x - this._startPos.x) < 10) && (Math.abs(endPos.y - this._startPos.y) < 10)) {
+
+                // If the touch interaction did not move, it should trigger a click
+                if (!this._touchMoved || event.originalEvent.changedTouches[0].touchType === 'stylus') {
+                    // Simulate the click event
+                    simulateMouseEvent(event, 'click');
+                }
+            }
+        }
+
+        // Unset the flag to determine the touch movement stopped
+        this._touchMoved = false;
+
+        // Unset the flag to allow other widgets to inherit the touch event
+        touchHandled = false;
+    };
+
+    /**
+     * A duck punch of the $.ui.mouse _mouseInit method to support touch events.
+     * This method extends the widget with bound touch event handlers that
+     * translate touch events to mouse events and pass them to the widget's
+     * original mouse event handling methods.
+     */
+    mouseProto._mouseInit = function () {
+
+        let self = this;
+
+        // Microsoft Surface Support = remove original touch Action
+        if ($.support.mspointer) {
+            self.element[0].style.msTouchAction = 'none';
+        }
+
+        // Delegate the touch handlers to the widget's element
+        self.element.on({
+            touchstart: $.proxy(self, '_touchStart'),
+            touchmove: $.proxy(self, '_touchMove'),
+            touchend: $.proxy(self, '_touchEnd')
+        });
+
+        // Call the original $.ui.mouse init method
+        _mouseInit.call(self);
+    };
+
+    /**
+     * Remove the touch event handlers
+     */
+    mouseProto._mouseDestroy = function () {
+
+        let self = this;
+
+        // Delegate the touch handlers to the widget's element
+        self.element.off({
+            touchstart: $.proxy(self, '_touchStart'),
+            touchmove: $.proxy(self, '_touchMove'),
+            touchend: $.proxy(self, '_touchEnd')
+        });
+
+        // Call the original $.ui.mouse destroy method
+        _mouseDestroy.call(self);
+    };
+
+}));

public/scripts/nai-settings.js

@@ -4,6 +4,7 @@ import {
     getStoppingStrings,
     getTextTokens
 } from "../script.js";
+import { getCfg } from "./extensions/cfg/util.js";
 import { tokenizers } from "./power-user.js";
 
 export {
@@ -26,12 +27,15 @@ const nai_settings = {
     top_k: 0,
     top_p: 1,
     top_a: 1,
+    top_g: 0,
     typical_p: 1,
     min_length: 0,
     model_novel: "euterpe-v2",
     preset_settings_novel: "Classic-Euterpe",
     streaming_novel: false,
     nai_preamble: default_preamble,
+    prefix: '',
+    cfg_uc: '',
 };
 
 const nai_tiers = {
@@ -92,6 +96,8 @@ function loadNovelPreset(preset) {
     nai_settings.top_g = preset.top_g;
     nai_settings.mirostat_lr = preset.mirostat_lr;
     nai_settings.mirostat_tau = preset.mirostat_tau;
+    nai_settings.prefix = preset.prefix;
+    nai_settings.cfg_uc = preset.cfg_uc || '';
     loadNovelSettingsUi(nai_settings);
 }
 
@@ -121,6 +127,8 @@ function loadNovelSettings(settings) {
     nai_settings.mirostat_lr = settings.mirostat_lr;
     nai_settings.mirostat_tau = settings.mirostat_tau;
     nai_settings.streaming_novel = !!settings.streaming_novel;
+    nai_settings.prefix = settings.prefix;
+    nai_settings.cfg_uc = settings.cfg_uc || '';
     loadNovelSettingsUi(nai_settings);
 }
 
@@ -193,6 +201,8 @@ function loadNovelSettingsUi(ui_settings) {
     $("#min_length_novel").val(ui_settings.min_length);
     $("#min_length_counter_novel").text(Number(ui_settings.min_length).toFixed(0));
     $('#nai_preamble_textarea').val(ui_settings.nai_preamble);
+    $('#nai_prefix').val(ui_settings.prefix || "");
+    $('#nai_cfg_uc').val(ui_settings.cfg_uc || "");
 
     $("#streaming_novel").prop('checked', ui_settings.streaming_novel);
 }
@@ -300,12 +310,17 @@ const sliders = [
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.min_length = Number(val).toFixed(0); },
     },
+    {
+        sliderId: "#nai_cfg_uc",
+        counterId: "#nai_cfg_uc_counter",
+        format: (val) => val,
+        setValue: (val) => { nai_settings.cfg_uc = val; },
+    },
 ];
 
-export function getNovelGenerationData(finalPromt, this_settings, this_amount_gen, isImpersonate) {
+export function getNovelGenerationData(finalPrompt, this_settings, this_amount_gen, isImpersonate) {
     const clio = nai_settings.model_novel.includes('clio');
     const kayra = nai_settings.model_novel.includes('kayra');
-    const isNewModel = clio || kayra;
 
     const tokenizerType = kayra ? tokenizers.NERD2 : (clio ? tokenizers.NERD : tokenizers.NONE);
     const stopSequences = (tokenizerType !== tokenizers.NONE)
@@ -313,15 +328,11 @@ export function getNovelGenerationData(finalPromt, this_settings, this_amount_ge
             .map(t => getTextTokens(tokenizerType, t))
         : undefined;
 
-    let useInstruct = false;
-    if (isNewModel) {
-        // NovelAI claims they scan backwards 1000 characters (not tokens!) to look for instruct brackets. That's really short.
-        const tail = finalPromt.slice(-1500);
-        useInstruct = tail.includes("}");
-    }
+    const prefix = nai_settings.prefix || autoSelectPrefix(finalPrompt);
+    const cfgSettings = getCfg();
 
     return {
-        "input": finalPromt,
+        "input": finalPrompt,
         "model": nai_settings.model_novel,
         "use_string": true,
         "temperature": parseFloat(nai_settings.temperature),
@@ -340,8 +351,8 @@ export function getNovelGenerationData(finalPromt, this_settings, this_amount_ge
         "top_g": parseFloat(nai_settings.top_g),
         "mirostat_lr": parseFloat(nai_settings.mirostat_lr),
         "mirostat_tau": parseFloat(nai_settings.mirostat_tau),
-        "cfg_scale": parseFloat(nai_settings.cfg_scale),
-        "cfg_uc": "",
+        "cfg_scale": cfgSettings?.guidanceScale ?? parseFloat(nai_settings.cfg_scale),
+        "cfg_uc": cfgSettings?.negativePrompt ?? nai_settings.cfg_uc ??  "",
         "phrase_rep_pen": nai_settings.phrase_rep_pen,
         //"stop_sequences": {{187}},
         "stop_sequences": stopSequences,
@@ -350,12 +361,28 @@ export function getNovelGenerationData(finalPromt, this_settings, this_amount_ge
         "use_cache": false,
         "use_string": true,
         "return_full_text": false,
-        "prefix": useInstruct ? "special_instruct" : (isNewModel ? "special_proseaugmenter" : "vanilla"),
+        "prefix": prefix,
         "order": this_settings.order,
         "streaming": nai_settings.streaming_novel,
     };
 }
 
+function autoSelectPrefix(finalPromt) {
+    let useInstruct = false;
+    const clio = nai_settings.model_novel.includes('clio');
+    const kayra = nai_settings.model_novel.includes('kayra');
+    const isNewModel = clio || kayra;
+
+    if (isNewModel) {
+        // NovelAI claims they scan backwards 1000 characters (not tokens!) to look for instruct brackets. That's really short.
+        const tail = finalPromt.slice(-1500);
+        useInstruct = tail.includes("}");
+    }
+
+    const prefix = useInstruct ? "special_instruct" : (isNewModel ? "special_proseaugmenter" : "vanilla");
+    return prefix;
+}
+
 export async function generateNovelWithStreaming(generate_data, signal) {
     const response = await fetch('/generate_novelai', {
         headers: getRequestHeaders(),
@@ -431,4 +458,9 @@ $(document).ready(function () {
         nai_settings.model_novel = $("#model_novel_select").find(":selected").val();
         saveSettingsDebounced();
     });
+
+    $("#nai_prefix").on('change', function () {
+        nai_settings.prefix = $("#nai_prefix").find(":selected").val();
+        saveSettingsDebounced();
+    });
 });

public/scripts/textgen-settings.js

@@ -6,6 +6,8 @@ import {
     setGenerationParamsFromPreset,
 } from "../script.js";
 
+import { getCfg } from "./extensions/cfg/util.js";
+
 import {
     power_user,
 } from "./power-user.js";
@@ -230,6 +232,8 @@ async function generateTextGenWithStreaming(generate_data, signal) {
 }
 
 export function getTextGenGenerationData(finalPromt, this_amount_gen, isImpersonate) {
+    const cfgValues = getCfg();
+
     return {
         'prompt': finalPromt,
         'max_new_tokens': this_amount_gen,
@@ -247,6 +251,8 @@ export function getTextGenGenerationData(finalPromt, this_amount_gen, isImperson
         'penalty_alpha': textgenerationwebui_settings.penalty_alpha,
         'length_penalty': textgenerationwebui_settings.length_penalty,
         'early_stopping': textgenerationwebui_settings.early_stopping,
+        'guidance_scale': cfgValues?.guidanceScale ?? 1,
+        'negative_prompt': cfgValues?.negativePrompt ?? '',
         'seed': textgenerationwebui_settings.seed,
         'add_bos_token': textgenerationwebui_settings.add_bos_token,
         'stopping_strings': getStoppingStrings(isImpersonate, false),

public/scripts/utils.js

@@ -375,15 +375,18 @@ export class IndexedDBStore {
         this.dbName = dbName;
         this.storeName = storeName;
         this.db = null;
+        this.version = Date.now();
     }
 
     async open() {
         return new Promise((resolve, reject) => {
-            const request = indexedDB.open(this.dbName);
+            const request = indexedDB.open(this.dbName, this.version);
 
             request.onupgradeneeded = (event) => {
                 const db = event.target.result;
-                db.createObjectStore(this.storeName, { keyPath: null, autoIncrement: false });
+                if (!db.objectStoreNames.contains(this.storeName)) {
+                    db.createObjectStore(this.storeName, { keyPath: null, autoIncrement: false });
+                }
             };
 
             request.onsuccess = (event) => {

public/scripts/world-info.js

@@ -1,4 +1,4 @@
-import { saveSettings, callPopup, substituteParams, getTokenCount, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type } from "../script.js";
+import { saveSettings, callPopup, substituteParams, getTokenCount, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types } from "../script.js";
 import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, delay, getCharaFilename, deepClone } from "./utils.js";
 import { getContext } from "./extensions.js";
 import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from "./authors-note.js";
@@ -1331,7 +1331,6 @@ export async function importEmbeddedWorldInfo() {
 }
 
 function onWorldInfoChange(_, text) {
-    let selectedWorlds;
     if (_ !== '__notSlashCommand__') { // if it's a slash command
         if (text !== undefined) { // and args are provided
             const slashInputSplitText = text.trim().toLowerCase().split(",");
@@ -1339,12 +1338,14 @@ function onWorldInfoChange(_, text) {
             slashInputSplitText.forEach((worldName) => {
                 const wiElement = getWIElement(worldName);
                 if (wiElement.length > 0) {
+                    selected_world_info.push(wiElement.text());
                     wiElement.prop("selected", true);
                     toastr.success(`Activated world: ${wiElement.text()}`);
                 } else {
                     toastr.error(`No world found named: ${worldName}`);
                 }
-            })
+            });
+            $("#world_info").trigger("change");
         } else { // if no args, unset all worlds
             toastr.success('Deactivated all worlds');
             selected_world_info = [];
@@ -1369,6 +1370,7 @@ function onWorldInfoChange(_, text) {
     }
 
     saveSettingsDebounced();
+    eventSource.emit(event_types.WORLDINFO_SETTINGS_UPDATED);
 }
 
 export async function importWorldInfo(file) {
@@ -1505,36 +1507,41 @@ jQuery(() => {
         }
     });
 
+    const saveSettings = () => {
+        saveSettingsDebounced()
+        eventSource.emit(event_types.WORLDINFO_SETTINGS_UPDATED);
+    }
+
     $(document).on("input", "#world_info_depth", function () {
         world_info_depth = Number($(this).val());
         $("#world_info_depth_counter").text($(this).val());
-        saveSettingsDebounced();
+        saveSettings();
     });
 
     $(document).on("input", "#world_info_budget", function () {
         world_info_budget = Number($(this).val());
         $("#world_info_budget_counter").text($(this).val());
-        saveSettingsDebounced();
+        saveSettings();
     });
 
     $(document).on("input", "#world_info_recursive", function () {
         world_info_recursive = !!$(this).prop('checked');
-        saveSettingsDebounced();
+        saveSettings();
     })
 
     $('#world_info_case_sensitive').on('input', function () {
         world_info_case_sensitive = !!$(this).prop('checked');
-        saveSettingsDebounced();
+        saveSettings();
     })
 
     $('#world_info_match_whole_words').on('input', function () {
         world_info_match_whole_words = !!$(this).prop('checked');
-        saveSettingsDebounced();
+        saveSettings();
     });
 
     $('#world_info_character_strategy').on('change', function () {
         world_info_character_strategy = $(this).val();
-        saveSettingsDebounced();
+        saveSettings();
     });
 
     $('#world_info_overflow_alert').on('change', function () {
@@ -1545,7 +1552,7 @@ jQuery(() => {
     $('#world_info_budget_cap').on('input', function () {
         world_info_budget_cap = Number($(this).val());
         $("#world_info_budget_cap_counter").text(world_info_budget_cap);
-        saveSettingsDebounced();
+        saveSettings();
     });
 
     $('#world_button').on('click', async function () {