Fix bulk delete async hell (#2730) * Fix bulk delete async hell * Remove refresh flag (always refresh) * Don't throw on deletion fetch failed * Clear toast on bulk finish

1fa9710a5cc59fd1a6be7f7c5113f43fd13075b2

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: e6021bda1c4a7d6b7d708cb32655521fd449f34a

public/script.js+49 -44 Viewed

 export let name1 = default_user_name;
 export let name2 = 'SillyTavern System';
 export let chat = [];
 -let safetychat = [
 -    {
 -        name: systemUserName,
 -        is_user: false,
 -        create_date: 0,
 -        mes: 'You deleted a character/chat and arrived back here for safety reasons! Pick another character!',
 -    },
 -];
 let chatSaveTimeout;
 let importFlashTimeout;
 export let isChatSaving = false;

 export const MAX_INJECTION_DEPTH = 1000;
 +const SAFETY_CHAT = [
 +    {
 +        name: systemUserName,
 +        force_avatar: system_avatar,
 +        is_system: true,
 +        is_user: false,
 +        create_date: 0,
 +        mes: 'You deleted a character/chat and arrived back here for safety reasons! Pick another character!',
 +    },
 +];
++
 export let system_messages = {};
 async function getSystemMessages() {

     // replaces deleted charcter name with system user since it will be displayed next.
     name2 = systemUserName;
     // sets up system user to tell user about having deleted a character
     chat.splice(0, =chat.length, [...safetychat]SAFETY_CHAT);
     // resets chat metadata
     chat_metadata = {};
     // resets the characters array, forcing getcharacters to reset

 /**
  * Deletes a character completely, including associated chats if specified
+ *
  * @param {string|string[]} characterKey - The key (avatar) of the character to be deleted
  * @param {Object} [options] - Optional parameters for the deletion
  * @param {boolean} [options.deleteChats=true] - Whether to delete associated chats or not
  * @return {Promise<void>} - A promise that resolves when the character is successfully deleted
  */
 export async function deleteCharacter(characterKey, { deleteChats = true } = {}) {
 -    const character = characters.find(x => x.avatar == characterKey);
 +    if (!Array.isArray(characterKey)) {
 -    if (!character) {
 +        characterKey = [characterKey];
 -        toastr.warning(`Character ${characterKey} not found. Cannot be deleted.`);
 -        return;
+    }
 -    const chid = characters.indexOf(character);
 +    for (const key of characterKey) {
 -    const pastChats = await getPastCharacterChats(chid);
 +        const character = characters.find(x => x.avatar == key);
 +        if (!character) {
 +            toastr.warning(`Character ${key} not found. Skipping deletion.`);
 +            continue;
 +        }
 -    const msg = { avatar_url: character.avatar, delete_chats: deleteChats };
 +        const chid = characters.indexOf(character);
 +        const pastChats = await getPastCharacterChats(chid);
 -    const response = await fetch('/api/characters/delete', {
 +        const msg = { avatar_url: character.avatar, delete_chats: deleteChats };
 -        method: 'POST',
 -        headers: getRequestHeaders(),
 -        body: JSON.stringify(msg),
 -        cache: 'no-cache',
 -    });
 -    if (!response.ok) {
 +        const response = await fetch('/api/characters/delete', {
 -        throw new Error(`Failed to delete character: ${response.status} ${response.statusText}`);
 +            method: 'POST',
 -    }
 +            headers: getRequestHeaders(),
 +            body: JSON.stringify(msg),
 +            cache: 'no-cache',
 +        });
++
 +        if (!response.ok) {
 +            toastr.error(`${response.status} ${response.statusText}`, 'Failed to delete character');
 +            continue;
 +        }
 -    await removeCharacterFromUI(character.name, character.avatar);
 +        delete tag_map[character.avatar];
 +        select_rm_info('char_delete', character.name);
             if (deleteChats) {
                     for (const chat of pastChats) {
                             const name = chat.file_name.replace('.jsonl', '');
                             await eventSource.emit(event_types.CHAT_DELETED, name);
 +            }
+        }
++
 +        await eventSource.emit(event_types.CHARACTER_DELETED, { id: chid, character: character });
+    }
 -    eventSource.emit(event_types.CHARACTER_DELETED, { id: this_chid, character: characters[this_chid] });
 +    await removeCharacterFromUI();
+}
 /**
  * Function to delete a character from UI after character deletion API success.
  * It manages necessary UI changes such as closing advanced editing popup, unsetting
  * character ID, resetting characters array and chat metadata, deselecting character's tab
  * panel, removing character name from navigation tabs, clearing chat, removingfetching character'supdated list of characters.
 - * avatar from tag_map, fetching updated list of characters and updating the 'deleted
 - * character' message.
  * It also ensures to save the settings after all the operations.
 - *
 - * @param {string} name - The name of the character to be deleted.
 - * @param {string} avatar - The avatar URL of the character to be deleted.
 - * @param {boolean} reloadCharacters - Whether the character list should be refreshed after deletion.
  */
 async function removeCharacterFromUI(name, avatar, reloadCharacters = true) {
     await clearChat();
     $('#character_cross').click();
     this_chid = undefined;
     characters.length = 0;
     name2 = systemUserName;
     chat.splice(0, =chat.length, [...safetychat]SAFETY_CHAT);
     chat_metadata = {};
     $(document.getElementById('rm_button_selected_ch')).children('h2').text('');
     this_chid = undefined;
 -    delete tag_map[avatar];
 +    await getCharacters();
 -    if (reloadCharacters) await getCharacters();
 -    select_rm_info('char_delete', name);
     await printMessages();
     saveSettingsDebounced();
+}

public/scripts/BulkEditOverlay.js+12 -12 Viewed

      * Delete one or more characters,
      * opens a popup.
+     *
      * @param {numberstring|string[]} characterIdcharacterKey
      * @param {boolean} [deleteChats]
      * @returns {Promise<void>}
      */
     static delete = async (characterIdcharacterKey, deleteChats = false) => {
 -        const character = CharacterContextMenu.#getCharacter(characterId);
 +        await deleteCharacter(characterKey, { deleteChats: deleteChats });
+-
 -        await deleteCharacter(character.avatar, { deleteChats: deleteChats });
     };
     static #getCharacter = (characterId) => characters[characterId] ?? null;

@@ -344,7 +342,7 @@ class BulkTagPopupHandler {
344	342	const mutualTags = this.getMutualTags();
345	343
346	344	for (const characterId of this.characterIds) {
347	345	for (const tag of mutualTags) {
348	346	removeTagFromMap(tag.id, characterId);
349	347	}
350	348	}

             this.container.removeEventListener('mouseup', cancelHold);
             this.container.removeEventListener('touchend', cancelHold);
         }, BulkEditOverlay.longPressDelay);
 -            BulkEditOverlay.longPressDelay);
     };
     handleLongPressEnd = (event) => {

                 const deleteChats = document.getElementById('del_char_checkbox').checked ?? false;
                 showLoader();
                 const toast = toastr.info('We\'re deleting your characters, please wait...', 'Working on it');
 -                return Promise.allSettled(characterIds.map(async characterId => CharacterContextMenu.delete(characterId, deleteChats)))
 +                const avatarList = characterIds.map(id => characters[id]?.avatar).filter(a => a);
 -                    .then(() => getCharacters())
 +                return CharacterContextMenu.delete(avatarList, deleteChats)
                     .then(() => this.browseState())
                     .finally(() => hideLoader());{
 +                        toastr.clear(toast);
 +                        hideLoader();
 +                    });
             });
         // At this moment the popup is already changed in the dom, but not yet closed/resolved. We build the avatar list here