Merge branch 'SillyTavern:staging' into staging

public/scripts/i18n.js

@@ -3,6 +3,55 @@ import { waitUntilCondition } from "./utils.js";
 const storageKey = "language";
 export const localeData = await fetch("i18n.json").then(response => response.json());
 
+function getMissingTranslations() {
+    const missingData = [];
+
+    for (const language of localeData.lang) {
+        $(document).find("[data-i18n]").each(function () {
+            const keys = $(this).data("i18n").split(';'); // Multi-key entries are ; delimited
+            for (const key of keys) {
+                const attributeMatch = key.match(/\[(\S+)\](.+)/); // [attribute]key
+                if (attributeMatch) { // attribute-tagged key
+                    const localizedValue = localeData?.[language]?.[attributeMatch[2]];
+                    if (!localizedValue) {
+                        missingData.push({ key, language, value: $(this).attr(attributeMatch[1]) });
+                    }
+                } else { // No attribute tag, treat as 'text'
+                    const localizedValue = localeData?.[language]?.[key];
+                    if (!localizedValue) {
+                        missingData.push({ key, language, value: $(this).text().trim() });
+                    }
+                }
+            }
+        });
+    }
+
+    // Remove duplicates
+    const uniqueMissingData = [];
+    for (const { key, language, value } of missingData) {
+        if (!uniqueMissingData.some(x => x.key === key && x.language === language && x.value === value)) {
+            uniqueMissingData.push({ key, language, value });
+        }
+    }
+
+    // Sort by language, then key
+    uniqueMissingData.sort((a, b) => a.language.localeCompare(b.language) || a.key.localeCompare(b.key));
+
+    // Map to { language: { key: value } }
+    const missingDataMap = {};
+    for (const { key, language, value } of uniqueMissingData) {
+        if (!missingDataMap[language]) {
+            missingDataMap[language] = {};
+        }
+        missingDataMap[language][key] = value;
+    }
+
+    console.table(uniqueMissingData);
+    console.log(missingDataMap);
+}
+
+window["getMissingTranslations"] = getMissingTranslations;
+
 export function applyLocale(root = document) {
     const overrideLanguage = localStorage.getItem("language");
     var language = overrideLanguage || navigator.language || navigator.userLanguage;

public/scripts/openai.js

@@ -174,6 +174,7 @@ const default_settings = {
     ai21_model: 'j2-ultra',
     windowai_model: '',
     openrouter_model: openrouter_website_model,
+    openrouter_use_fallback: true,
     jailbreak_system: false,
     reverse_proxy: '',
     legacy_streaming: false,
@@ -217,6 +218,7 @@ const oai_settings = {
     ai21_model: 'j2-ultra',
     windowai_model: '',
     openrouter_model: openrouter_website_model,
+    openrouter_use_fallback: true,
     jailbreak_system: false,
     reverse_proxy: '',
     legacy_streaming: false,
@@ -1158,6 +1160,7 @@ async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
     if (isOpenRouter) {
         generate_data['use_openrouter'] = true;
         generate_data['top_k'] = Number(oai_settings.top_k_openai);
+        generate_data['use_fallback'] = oai_settings.openrouter_use_fallback;
     }
 
     if (isScale) {
@@ -1842,6 +1845,7 @@ function loadOpenAISettings(data, settings) {
     oai_settings.claude_model = settings.claude_model ?? default_settings.claude_model;
     oai_settings.windowai_model = settings.windowai_model ?? default_settings.windowai_model;
     oai_settings.openrouter_model = settings.openrouter_model ?? default_settings.openrouter_model;
+    oai_settings.openrouter_use_fallback = settings.openrouter_use_fallback ?? default_settings.openrouter_use_fallback;
     oai_settings.ai21_model = settings.ai21_model ?? default_settings.ai21_model;
     oai_settings.chat_completion_source = settings.chat_completion_source ?? default_settings.chat_completion_source;
     oai_settings.api_url_scale = settings.api_url_scale ?? default_settings.api_url_scale;
@@ -1891,6 +1895,7 @@ function loadOpenAISettings(data, settings) {
     $('#use_ai21_tokenizer').prop('checked', oai_settings.use_ai21_tokenizer);
     $('#exclude_assistant').prop('checked', oai_settings.exclude_assistant);
     $('#scale-alt').prop('checked', oai_settings.use_alt_scale);
+    $('#openrouter_use_fallback').prop('checked', oai_settings.openrouter_use_fallback);
     if (settings.impersonation_prompt !== undefined) oai_settings.impersonation_prompt = settings.impersonation_prompt;
 
     $('#impersonation_prompt_textarea').val(oai_settings.impersonation_prompt);
@@ -2055,6 +2060,7 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
         claude_model: settings.claude_model,
         windowai_model: settings.windowai_model,
         openrouter_model: settings.openrouter_model,
+        openrouter_use_fallback: settings.openrouter_use_fallback,
         ai21_model: settings.ai21_model,
         temperature: settings.temp_openai,
         frequency_penalty: settings.freq_pen_openai,
@@ -2413,6 +2419,7 @@ function onSettingsPresetChange() {
         claude_model: ['#model_claude_select', 'claude_model', false],
         windowai_model: ['#model_windowai_select', 'windowai_model', false],
         openrouter_model: ['#model_openrouter_select', 'openrouter_model', false],
+        openrouter_use_fallback: ['#openrouter_use_fallback', 'openrouter_use_fallback', true],
         ai21_model: ['#model_ai21_select', 'ai21_model', false],
         openai_max_context: ['#openai_max_context', 'openai_max_context', false],
         openai_max_tokens: ['#openai_max_tokens', 'openai_max_tokens', false],
@@ -3125,6 +3132,11 @@ $(document).ready(async function () {
         saveSettingsDebounced();
     });
 
+    $('#openrouter_use_fallback').on('input', function () {
+        oai_settings.openrouter_use_fallback = !!$(this).prop('checked');
+        saveSettingsDebounced();
+    });
+
     $("#api_button_openai").on("click", onConnectButtonClick);
     $("#openai_reverse_proxy").on("input", onReverseProxyInput);
     $("#model_openai_select").on("change", onModelChange);

public/scripts/power-user.js

@@ -152,6 +152,7 @@ let power_user = {
     prefer_character_prompt: true,
     prefer_character_jailbreak: true,
     quick_continue: false,
+    continue_on_send: false,
     trim_spaces: true,
     relaxed_api_urls: false,
 
@@ -708,6 +709,7 @@ function loadPowerUserSettings(settings, data) {
 
     $('#relaxed_api_urls').prop("checked", power_user.relaxed_api_urls);
     $('#trim_spaces').prop("checked", power_user.trim_spaces);
+    $('#continue_on_send').prop("checked", power_user.continue_on_send);
     $('#quick_continue').prop("checked", power_user.quick_continue);
     $('#mes_continue').css('display', power_user.quick_continue ? '' : 'none');
     $('#auto_swipe').prop("checked", power_user.auto_swipe);
@@ -1968,6 +1970,12 @@ $(document).ready(() => {
         saveSettingsDebounced();
     });
 
+    $("#continue_on_send").on("input", function () {
+        const value = !!$(this).prop('checked');
+        power_user.continue_on_send = value;
+        saveSettingsDebounced();
+    });
+
     $("#quick_continue").on("input", function () {
         const value = !!$(this).prop('checked');
         power_user.quick_continue = value;