Merge branch 'SillyTavern:staging' into staging

public/scripts/extensions/bulk-edit/index.js

@@ -0,0 +1,108 @@
+import { characters, getCharacters, saveSettingsDebounced, handleDeleteCharacter } from "../../../script.js";
+
+let is_bulk_edit = false;
+
+/**
+ * Toggles bulk edit mode on/off when the edit button is clicked.
+ */
+function onEditButtonClick() {
+    console.log("Edit button clicked");
+    // toggle bulk edit mode
+    if (is_bulk_edit) {
+        disableBulkSelect();
+        // hide the delete button
+        $("#bulkDeleteButton").hide();
+        is_bulk_edit = false;
+    } else {
+        enableBulkSelect();
+        // show the delete button
+        $("#bulkDeleteButton").show();
+        is_bulk_edit = true;
+    }
+}
+
+/**
+ * Deletes the character with the given chid.
+ *
+ * @param {string} this_chid - The chid of the character to delete.
+ */
+async function deleteCharacter(this_chid) {
+    await handleDeleteCharacter("del_ch", this_chid);
+}
+
+/**
+ * Deletes all characters that have been selected via the bulk checkboxes.
+ */
+async function onDeleteButtonClick() {
+    console.log("Delete button clicked");
+
+    // Create a mapping of chid to avatar
+    let toDelete = [];
+    $(".bulk_select_checkbox:checked").each((i, el) => {
+        const chid = $(el).parent().attr("chid");
+        const avatar = characters[chid].avatar;
+        // Add the avatar to the list of avatars to delete
+        toDelete.push(avatar);
+    });
+
+    // Delete the characters
+    for (const avatar of toDelete) {
+        console.log(`Deleting character with avatar ${avatar}`);
+        await getCharacters();
+
+        //chid should be the key of the character with the given avatar
+        const chid = Object.keys(characters).find((key) => characters[key].avatar === avatar);
+        console.log(`Deleting character with chid ${chid}`);
+        await deleteCharacter(chid);
+    }
+}
+
+/**
+ * Adds the bulk edit and delete buttons to the UI.
+ */
+function addButtons() {
+    const editButton = $(
+        "<i id='bulkEditButton' class='fa-solid fa-edit menu_button bulkEditButton' title='Bulk edit characters'></i>"
+    );
+    const deleteButton = $(
+        "<i id='bulkDeleteButton' class='fa-solid fa-trash menu_button bulkDeleteButton' title='Bulk delete characters' style='display: none;'></i>"
+    );
+
+    $("#charListGridToggle").after(editButton, deleteButton);
+
+    $("#bulkEditButton").on("click", onEditButtonClick);
+    $("#bulkDeleteButton").on("click", onDeleteButtonClick);
+}
+
+/**
+ * Enables bulk selection by adding a checkbox next to each character.
+ */
+function enableBulkSelect() {
+    $(".character_select").each((i, el) => {
+        const character = $(el).text();
+        const checkbox = $("<input type='checkbox' class='bulk_select_checkbox'>");
+        checkbox.on("change", () => {
+            // Do something when the checkbox is changed
+        });
+        $(el).prepend(checkbox);
+    });
+    // We also need to disable the default click event for the character_select divs
+    $(document).on("click", ".bulk_select_checkbox", function (event) {
+        event.stopImmediatePropagation();
+    });
+}
+
+/**
+ * Disables bulk selection by removing the checkboxes.
+ */
+function disableBulkSelect() {
+    $(".bulk_select_checkbox").remove();
+}
+
+/**
+ * Entry point that runs on page load.
+ */
+jQuery(async () => {
+    addButtons();
+    // loadSettings();
+});

public/scripts/extensions/bulk-edit/manifest.json

@@ -0,0 +1,11 @@
+{
+    "display_name": "Bulk Card Editor",
+    "loading_order": 9,
+    "requires": [],
+    "optional": [],
+    "js": "index.js",
+    "css": "style.css",
+    "author": "city-unit",
+    "version": "1.0.0",
+    "homePage": "https://github.com/city-unit"
+}

public/scripts/extensions/expressions/index.js

@@ -449,7 +449,7 @@ async function loadLiveChar() {
 
 function handleImageChange() {
     const imgElement = document.querySelector('img#expression-image.expression');
-    
+
     if (!imgElement) {
         console.log("Cannot find addExpressionImage()");
         return;
@@ -459,6 +459,7 @@ function handleImageChange() {
         previousSrc = imgElement.src;
         // Method get IP of endpoint
         const live2dResultFeedSrc = `${getApiUrl()}/api/live2d/result_feed`;
+        $('#expression-holder').css({ display: '' });
         if (imgElement.src !== live2dResultFeedSrc) {
             const expressionImageElement = document.querySelector('.expression_list_image');
 
@@ -922,7 +923,7 @@ async function setExpression(character, expression, force) {
             if (imgElement) {
                 console.log("setting value");
                 imgElement.src = getApiUrl() + '/api/live2d/result_feed';
-            }     
+            }
     }
 }
 

public/scripts/extensions/memory/index.js

@@ -1,6 +1,7 @@
 import { getStringHash, debounce, waitUntilCondition, extractAllWords } from "../../utils.js";
 import { getContext, getApiUrl, extension_settings, doExtrasFetch, modules } from "../../extensions.js";
 import { eventSource, event_types, extension_prompt_types, generateQuietPrompt, is_send_press, saveSettingsDebounced, substituteParams } from "../../../script.js";
+import { is_group_generating, selected_group } from "../../group-chats.js";
 export { MODULE_NAME };
 
 const MODULE_NAME = '1_memory';
@@ -333,6 +334,10 @@ async function summarizeChat(context) {
 
 async function summarizeChatMain(context, force) {
     try {
+        // Wait for group to finish generating
+        if (selected_group) {
+            await waitUntilCondition(() => is_group_generating === false, 1000, 10);
+        }
         // Wait for the send button to be released
         waitUntilCondition(() => is_send_press === false, 30000, 100);
     } catch {