Merge branch 'SillyTavern:staging' into staging

public/scripts/RossAscends-mods.js

@@ -987,6 +987,12 @@ $("document").ready(function () {
                 Generate();
             }
         }
+        if ($(':focus').attr('id') === 'dialogue_popup_input' && !isMobile()) {
+            if (!event.shiftKey && !event.ctrlKey && event.key == "Enter") {
+                event.preventDefault();
+                $('#dialogue_popup_ok').trigger('click');
+            }
+        }
         //ctrl+shift+up to scroll to context line
         if (event.shiftKey && event.ctrlKey && event.key == "ArrowUp") {
             event.preventDefault();
@@ -1134,5 +1140,11 @@ $("document").ready(function () {
                 return
             }
         }
+
+        if (event.ctrlKey && /^[1-9]$/.test(event.key)) {
+            // Your code here
+            event.preventDefault();
+            console.log("Ctrl +" + event.key + " pressed!");
+        }
     }
 });

public/scripts/extensions/quick-reply/index.js

@@ -1,6 +1,7 @@
 import { saveSettingsDebounced, callPopup, getRequestHeaders } from "../../../script.js";
 import { getContext, extension_settings } from "../../extensions.js";
 import { initScrollHeight, resetScrollHeight } from "../../utils.js";
+import { executeSlashCommands, getSlashCommandsHelp, registerSlashCommand } from "../../slash-commands.js";
 
 
 export { MODULE_NAME };
@@ -256,7 +257,7 @@ async function applyQuickReplyPreset(name) {
     const quickReplyPreset = presets.find(x => x.name == name);
 
     if (!quickReplyPreset) {
-        console.log(`error, QR preset '${name}' not found`)
+        toastr.warning(`error, QR preset '${name}' not found. Confirm you are using proper case sensitivity!`)
         return;
     }
 
@@ -268,9 +269,27 @@ async function applyQuickReplyPreset(name) {
     moduleWorker();
 
     $(`#quickReplyPresets option[value="${name}"]`).attr('selected', true);
-
     console.debug('QR Preset applied: ' + name);
-    //loadMovingUIState()
+}
+
+async function doQRPresetSwitch(_, text) {
+    text = String(text)
+    applyQuickReplyPreset(text)
+}
+
+async function doQR(_, text) {
+    if (!text) {
+        toastr.warning('must specify which QR # to use')
+        return
+    }
+
+    text = Number(text)
+    //use scale starting with 0 
+    //ex: user inputs "/qr 2" >> qr with data-index 1 (but 2nd item displayed) gets triggered
+    let QRnum = Number(text - 1)
+    if (QRnum <= 0) { QRnum = 0 }
+    const whichQR = $("#quickReplies").find(`[data-index='${QRnum}']`);
+    whichQR.trigger('click')
 }
 
 jQuery(async () => {
@@ -326,5 +345,11 @@ jQuery(async () => {
 
     await loadSettings('init');
     addQuickReplyBar();
+
 });
 
+$(document).ready(() => {
+    registerSlashCommand('qr', doQR, [], "- requires number argument, activates the specified QuickReply", true, true);
+    registerSlashCommand('qrset', doQRPresetSwitch, [], "- arg: QuickReply Preset Name, swaps to that QR preset", true, true);
+
+})

public/scripts/nai-settings.js

@@ -13,6 +13,8 @@ export {
     getNovelTier,
 };
 
+const default_preamble = "[ Style: chat, complex, sensory, visceral ]";
+
 const nai_settings = {
     temperature: 0.5,
     repetition_penalty: 1,
@@ -29,6 +31,7 @@ const nai_settings = {
     model_novel: "euterpe-v2",
     preset_settings_novel: "Classic-Euterpe",
     streaming_novel: false,
+    nai_preamble: default_preamble,
 };
 
 const nai_tiers = {
@@ -76,6 +79,7 @@ function loadNovelSettings(settings) {
     $(`#model_novel_select option[value=${nai_settings.model_novel}]`).attr("selected", true);
     $('#model_novel_select').val(nai_settings.model_novel);
 
+    if (settings.nai_preamble !== undefined) nai_settings.nai_preamble = settings.nai_preamble;
     nai_settings.preset_settings_novel = settings.preset_settings_novel;
     nai_settings.temperature = settings.temperature;
     nai_settings.repetition_penalty = settings.repetition_penalty;
@@ -157,6 +161,7 @@ function loadNovelSettingsUi(ui_settings) {
     $("#phrase_rep_pen_counter_novel").text(getPhraseRepPenCounter(ui_settings.phrase_rep_pen));
     $("#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);
 
     $("#streaming_novel").prop('checked', ui_settings.streaming_novel);
 }
@@ -259,6 +264,13 @@ 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("}");
+    }
+
     return {
         "input": finalPromt,
         "model": nai_settings.model_novel,
@@ -286,7 +298,7 @@ export function getNovelGenerationData(finalPromt, this_settings, this_amount_ge
         "use_cache": false,
         "use_string": true,
         "return_full_text": false,
-        "prefix": isNewModel ? "special_instruct" : "vanilla",
+        "prefix": useInstruct ? "special_instruct" : (isNewModel ? "special_proseaugmenter" : "vanilla"),
         "order": this_settings.order,
         "streaming": nai_settings.streaming_novel,
     };
@@ -334,6 +346,17 @@ export async function generateNovelWithStreaming(generate_data, signal) {
     }
 }
 
+$("#nai_preamble_textarea").on('input', function () {
+    nai_settings.nai_preamble = $('#nai_preamble_textarea').val();
+    saveSettingsDebounced();
+});
+
+$("#nai_preamble_restore").on('click', function () {
+    nai_settings.nai_preamble = default_preamble;
+    $('#nai_preamble_textarea').val(nai_settings.nai_preamble);
+    saveSettingsDebounced();
+});
+
 $(document).ready(function () {
     sliders.forEach(slider => {
         $(document).on("input", slider.sliderId, function () {