Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

.github/readme.md

@@ -293,8 +293,9 @@ You can find them archived here:
 
 ## Screenshots
 
-<img width="400" alt="image" src="https://user-images.githubusercontent.com/18619528/228649245-8061c60f-63dc-488e-9325-f151b7a3ec2d.png">
-<img width="400" alt="image" src="https://user-images.githubusercontent.com/18619528/228649856-fbdeef05-d727-4d5a-be80-266cbbc6b811.png">
+<img width="400" alt="image" src="https://github.com/SillyTavern/SillyTavern/assets/61471128/e902c7a2-45a6-4415-97aa-c59c597669c1"> 
+<img width="400" alt="image" src="https://github.com/SillyTavern/SillyTavern/assets/61471128/f8a79c47-4fe9-4564-9e4a-bf247ed1c961">
+
 
 ## License and credits
 

public/script.js

@@ -9292,13 +9292,16 @@ jQuery(async function () {
 
     $(document).keyup(function (e) {
         if (e.key === 'Escape') {
-            if (power_user.auto_save_msg_edits === false) {
+            const isEditVisible = $('#curEditTextarea').is(':visible');
+            if (isEditVisible && power_user.auto_save_msg_edits === false) {
                 closeMessageEditor();
                 $('#send_textarea').focus();
+                return;
             }
-            if (power_user.auto_save_msg_edits === true) {
+            if (isEditVisible && power_user.auto_save_msg_edits === true) {
                 $(`#chat .mes[mesid="${this_edit_mes_id}"] .mes_edit_done`).click();
                 $('#send_textarea').focus();
+                return;
             }
             if (!this_edit_mes_id && $('#mes_stop').is(':visible')) {
                 $('#mes_stop').trigger('click');

public/scripts/extensions/expressions/index.js

@@ -422,6 +422,8 @@ async function loadTalkingHead() {
     const spriteFolderName = getSpriteFolderName();
 
     const talkingheadPath = `/characters/${encodeURIComponent(spriteFolderName)}/talkinghead.png`;
+    const emotionsSettingsPath = `/characters/${encodeURIComponent(spriteFolderName)}/_emotions.json`;
+    const animatorSettingsPath = `/characters/${encodeURIComponent(spriteFolderName)}/_animator.json`;
 
     try {
         const spriteResponse = await fetch(talkingheadPath);
@@ -450,6 +452,69 @@ async function loadTalkingHead() {
         const loadResponseText = await loadResponse.text();
         console.log(`Load talkinghead response: ${loadResponseText}`);
 
+        // Optional: per-character emotion templates
+        let emotionsSettings;
+        try {
+            const emotionsResponse = await fetch(emotionsSettingsPath);
+            if (emotionsResponse.ok) {
+                emotionsSettings = await emotionsResponse.json();
+                console.log(`Loaded ${emotionsSettingsPath}`);
+            } else {
+                throw new Error();
+            }
+        }
+        catch (error) {
+            emotionsSettings = {};  // blank -> use server defaults (to unload the previous character's customizations)
+            console.log(`No valid config at ${emotionsSettingsPath}, using server defaults`);
+        }
+        try {
+            const url = new URL(getApiUrl());
+            url.pathname = '/api/talkinghead/load_emotion_templates';
+            const apiResult = await doExtrasFetch(url, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Bypass-Tunnel-Reminder': 'bypass',
+                },
+                body: JSON.stringify(emotionsSettings),
+            });
+        }
+        catch (error) {
+            // it's ok if not supported
+            console.log('Failed to send _emotions.json (backend too old?), ignoring');
+        }
+
+        // Optional: per-character animator and postprocessor config
+        let animatorSettings;
+        try {
+            const animatorResponse = await fetch(animatorSettingsPath);
+            if (animatorResponse.ok) {
+                animatorSettings = await animatorResponse.json();
+                console.log(`Loaded ${animatorSettingsPath}`);
+            } else {
+                throw new Error();
+            }
+        }
+        catch (error) {
+            animatorSettings = {};  // blank -> use server defaults (to unload the previous character's customizations)
+            console.log(`No valid config at ${animatorSettingsPath}, using server defaults`);
+        }
+        try {
+            const url = new URL(getApiUrl());
+            url.pathname = '/api/talkinghead/load_animator_settings';
+            const apiResult = await doExtrasFetch(url, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Bypass-Tunnel-Reminder': 'bypass',
+                },
+                body: JSON.stringify(animatorSettings),
+            });
+        }
+        catch (error) {
+            // it's ok if not supported
+            console.log('Failed to send _animator.json (backend too old?), ignoring');
+        }
     } catch (error) {
         console.error(`Error loading talkinghead image: ${talkingheadPath} - ${error}`);
     }

src/endpoints/backends/chat-completions.js

@@ -334,7 +334,7 @@ async function sendMakerSuiteRequest(request, response) {
             }
 
             const responseContent = candidates[0].content ?? candidates[0].output;
-            const responseText = typeof responseContent === 'string' ? responseContent : responseContent.parts?.[0]?.text;
+            const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.[0]?.text;
             if (!responseText) {
                 let message = 'MakerSuite Candidate text empty';
                 console.log(message, generateResponseJson);