Merge branch 'staging' into scored-search-sorting

public/css/world-info.css

@@ -157,7 +157,12 @@
     width: 10em;
 }
 
-#world_info_search,
+#world_info_search {
+    width: 10em;
+    min-width: 10em;
+    flex-grow: 1;
+}
+
 #world_info_sort_order {
     width: 7em;
 }

public/scripts/chats.js

@@ -685,6 +685,30 @@ async function downloadAttachment(attachment) {
     URL.revokeObjectURL(url);
 }
 
+/**
+ * Removes an attachment from the disabled list.
+ * @param {FileAttachment} attachment Attachment to enable
+ * @param {function} callback Success callback
+ */
+function enableAttachment(attachment, callback) {
+    ensureAttachmentsExist();
+    extension_settings.disabled_attachments = extension_settings.disabled_attachments.filter(url => url !== attachment.url);
+    saveSettingsDebounced();
+    callback();
+}
+
+/**
+ * Adds an attachment to the disabled list.
+ * @param {FileAttachment} attachment Attachment to disable
+ * @param {function} callback Success callback
+ */
+function disableAttachment(attachment, callback) {
+    ensureAttachmentsExist();
+    extension_settings.disabled_attachments.push(attachment.url);
+    saveSettingsDebounced();
+    callback();
+}
+
 /**
  * Moves a file attachment to a different source.
  * @param {FileAttachment} attachment Attachment to moves
@@ -752,11 +776,25 @@ async function deleteAttachment(attachment, source, callback, confirm = true) {
             break;
     }
 
+    if (Array.isArray(extension_settings.disabled_attachments) && extension_settings.disabled_attachments.includes(attachment.url)) {
+        extension_settings.disabled_attachments = extension_settings.disabled_attachments.filter(url => url !== attachment.url);
+        saveSettingsDebounced();
+    }
+
     const silent = confirm === false;
     await deleteFileFromServer(attachment.url, silent);
     callback();
 }
 
+/**
+ * Determines if the attachment is disabled.
+ * @param {FileAttachment} attachment Attachment to check
+ * @returns {boolean} True if attachment is disabled, false otherwise.
+ */
+function isAttachmentDisabled(attachment) {
+    return extension_settings.disabled_attachments.some(url => url === attachment?.url);
+}
+
 /**
  * Opens the attachment manager.
  */
@@ -806,7 +844,9 @@ async function openAttachmentManager() {
         const sortedAttachmentList = attachments.slice().filter(filterFn).sort(sortFn);
 
         for (const attachment of sortedAttachmentList) {
+            const isDisabled = isAttachmentDisabled(attachment);
             const attachmentTemplate = template.find('.attachmentListItemTemplate .attachmentListItem').clone();
+            attachmentTemplate.toggleClass('disabled', isDisabled);
             attachmentTemplate.find('.attachmentFileIcon').attr('title', attachment.url);
             attachmentTemplate.find('.attachmentListItemName').text(attachment.name);
             attachmentTemplate.find('.attachmentListItemSize').text(humanFileSize(attachment.size));
@@ -816,6 +856,8 @@ async function openAttachmentManager() {
             attachmentTemplate.find('.deleteAttachmentButton').on('click', () => deleteAttachment(attachment, source, renderAttachments));
             attachmentTemplate.find('.downloadAttachmentButton').on('click', () => downloadAttachment(attachment));
             attachmentTemplate.find('.moveAttachmentButton').on('click', () => moveAttachment(attachment, source, renderAttachments));
+            attachmentTemplate.find('.enableAttachmentButton').toggle(isDisabled).on('click', () => enableAttachment(attachment, renderAttachments));
+            attachmentTemplate.find('.disableAttachmentButton').toggle(!isDisabled).on('click', () => disableAttachment(attachment, renderAttachments));
             template.find(sources[source]).append(attachmentTemplate);
         }
     }
@@ -1117,6 +1159,10 @@ export async function uploadFileAttachmentToServer(file, target) {
 }
 
 function ensureAttachmentsExist() {
+    if (!Array.isArray(extension_settings.disabled_attachments)) {
+        extension_settings.disabled_attachments = [];
+    }
+
     if (!Array.isArray(extension_settings.attachments)) {
         extension_settings.attachments = [];
     }
@@ -1137,7 +1183,7 @@ function ensureAttachmentsExist() {
 }
 
 /**
- * Gets all currently available attachments.
+ * Gets all currently available attachments. Ignores disabled attachments.
  * @returns {FileAttachment[]} List of attachments
  */
 export function getDataBankAttachments() {
@@ -1146,11 +1192,11 @@ export function getDataBankAttachments() {
     const chatAttachments = chat_metadata.attachments ?? [];
     const characterAttachments = extension_settings.character_attachments?.[characters[this_chid]?.avatar] ?? [];
 
-    return [...globalAttachments, ...chatAttachments, ...characterAttachments];
+    return [...globalAttachments, ...chatAttachments, ...characterAttachments].filter(x => !isAttachmentDisabled(x));
 }
 
 /**
- * Gets all attachments for a specific source.
+ * Gets all attachments for a specific source. Includes disabled attachments.
  * @param {string} source Attachment source
  * @returns {FileAttachment[]} List of attachments
  */
@@ -1165,6 +1211,8 @@ export function getDataBankAttachmentsForSource(source) {
         case ATTACHMENT_SOURCE.CHARACTER:
             return extension_settings.character_attachments?.[characters[this_chid]?.avatar] ?? [];
     }
+
+    return [];
 }
 
 /**

public/scripts/extensions.js

@@ -145,8 +145,18 @@ const extension_settings = {
     variables: {
         global: {},
     },
+    /**
+     * @type {import('./chats.js').FileAttachment[]}
+     */
     attachments: [],
+    /**
+     * @type {Record<string, import('./chats.js').FileAttachment[]>}
+     */
     character_attachments: {},
+    /**
+     * @type {string[]}
+     */
+    disabled_attachments: [],
 };
 
 let modules = [];

public/scripts/extensions/attachments/manager.html

@@ -106,11 +106,13 @@
             <div class="attachmentListItemName flex1"></div>
             <small class="attachmentListItemCreated"></small>
             <small class="attachmentListItemSize"></small>
-            <div class="viewAttachmentButton right_menu_button fa-solid fa-magnifying-glass" title="View attachment content"></div>
+            <div class="viewAttachmentButton right_menu_button fa-fw fa-solid fa-magnifying-glass" title="View attachment content"></div>
-            <div class="moveAttachmentButton right_menu_button fa-solid fa-arrows-alt" title="Move attachment"></div>
+            <div class="disableAttachmentButton right_menu_button fa-fw fa-solid fa-comment" title="Disable attachment"></div>
-            <div class="editAttachmentButton right_menu_button fa-solid fa-pencil" title="Edit attachment"></div>
+            <div class="enableAttachmentButton right_menu_button fa-fw fa-solid fa-comment-slash" title="Enable attachment"></div>
-            <div class="downloadAttachmentButton right_menu_button fa-solid fa-download" title="Download attachment"></div>
+            <div class="moveAttachmentButton right_menu_button fa-fw fa-solid fa-arrows-alt" title="Move attachment"></div>
-            <div class="deleteAttachmentButton right_menu_button fa-solid fa-trash" title="Delete attachment"></div>
+            <div class="editAttachmentButton right_menu_button fa-fw fa-solid fa-pencil" title="Edit attachment"></div>
+            <div class="downloadAttachmentButton right_menu_button fa-fw fa-solid fa-download" title="Download attachment"></div>
+            <div class="deleteAttachmentButton right_menu_button fa-fw fa-solid fa-trash" title="Delete attachment"></div>
         </div>
     </div>
 

public/scripts/extensions/attachments/style.css

@@ -19,6 +19,16 @@
     padding: 10px;
 }
 
+.attachmentListItem.disabled .attachmentListItemName {
+    text-decoration: line-through;
+    opacity: 0.75;
+}
+
+.attachmentListItem.disabled .attachmentFileIcon {
+    opacity: 0.75;
+    cursor: not-allowed;
+}
+
 .attachmentListItemSize {
     min-width: 4em;
     text-align: right;

public/scripts/extensions/stable-diffusion/index.js

@@ -2189,11 +2189,11 @@ async function sendGenerationRequest(generationType, prompt, characterName = nul
         ? extension_settings.sd.prompt_prefix
         : combinePrefixes(extension_settings.sd.prompt_prefix, getCharacterPrefix());
 
-    const prefixedPrompt = combinePrefixes(prefix, prompt, '{prompt}');
+    const prefixedPrompt = substituteParams(combinePrefixes(prefix, prompt, '{prompt}'));
 
-    const negativePrompt = noCharPrefix.includes(generationType)
+    const negativePrompt = substituteParams(noCharPrefix.includes(generationType)
         ? extension_settings.sd.negative_prompt
-        : combinePrefixes(extension_settings.sd.negative_prompt, getCharacterNegativePrefix());
+        : combinePrefixes(extension_settings.sd.negative_prompt, getCharacterNegativePrefix()));
 
     let result = { format: '', data: '' };
     const currentChatId = getCurrentChatId();

public/scripts/extensions/vectors/index.js

@@ -281,7 +281,7 @@ async function synchronizeChat(batchSize = 5) {
         console.error('Vectors: Failed to synchronize chat', error);
 
         const message = getErrorMessage(error.cause);
-        toastr.error(message, 'Vectorization failed');
+        toastr.error(message, 'Vectorization failed', { preventDuplicates: true });
         return -1;
     } finally {
         syncBlocked = false;
@@ -444,6 +444,7 @@ async function retrieveFileChunks(queryText, collectionId) {
  * @param {string} fileName File name
  * @param {string} collectionId File collection ID
  * @param {number} chunkSize Chunk size
+ * @returns {Promise<boolean>} True if successful, false if not
  */
 async function vectorizeFile(fileText, fileName, collectionId, chunkSize) {
     try {
@@ -462,8 +463,11 @@ async function vectorizeFile(fileText, fileName, collectionId, chunkSize) {
 
         toastr.clear(toast);
         console.log(`Vectors: Inserted ${chunks.length} vector items for file ${fileName} into ${collectionId}`);
+        return true;
     } catch (error) {
+        toastr.error(String(error), 'Failed to vectorize file', { preventDuplicates: true });
         console.error('Vectors: Failed to vectorize file', error);
+        return false;
     }
 }
 
@@ -546,6 +550,7 @@ async function rearrangeChat(chat) {
         const insertedText = getPromptText(queriedMessages);
         setExtensionPrompt(EXTENSION_PROMPT_TAG, insertedText, settings.position, settings.depth, settings.include_wi);
     } catch (error) {
+        toastr.error('Generation interceptor aborted. Check browser console for more details.', 'Vector Storage');
         console.error('Vectors: Failed to rearrange chat', error);
     }
 }
@@ -911,6 +916,8 @@ async function onVectorizeAllFilesClick() {
         const chatAttachments = getContext().chat.filter(x => x.extra?.file).map(x => x.extra.file);
         const allFiles = [...dataBank, ...chatAttachments];
 
+        let allSuccess = true;
+
         for (const file of allFiles) {
             const text = await getFileAttachment(file.url);
             const collectionId = getFileCollectionId(file.url);
@@ -921,10 +928,18 @@ async function onVectorizeAllFilesClick() {
                 continue;
             }
 
-            await vectorizeFile(text, file.name, collectionId, settings.chunk_size);
+            const result = await vectorizeFile(text, file.name, collectionId, settings.chunk_size);
+
+            if (!result) {
+                allSuccess = false;
+            }
         }
 
+        if (allSuccess) {
             toastr.success('All files vectorized', 'Vectorization successful');
+        } else {
+            toastr.warning('Some files failed to vectorize. Check browser console for more details.', 'Vector Storage');
+        }
     } catch (error) {
         console.error('Vectors: Failed to vectorize all files', error);
         toastr.error('Failed to vectorize all files', 'Vectorization failed');

public/scripts/world-info.js

@@ -192,7 +192,8 @@ class WorldInfoBuffer {
                 return haystack.includes(transformedString);
             }
             else {
-                const regex = new RegExp(`\\b${escapeRegex(transformedString)}\\b`);
+                // Use custom boundaries to include punctuation and other non-alphanumeric characters
+                const regex = new RegExp(`(?:^|\\W)(${escapeRegex(transformedString)})(?:$|\\W)`);
                 if (regex.test(haystack)) {
                     return true;
                 }
@@ -753,7 +754,12 @@ function nullWorldInfo() {
 function displayWorldEntries(name, data, navigation = navigation_option.none) {
     updateEditor = (navigation) => displayWorldEntries(name, data, navigation);
 
-    $('#world_popup_entries_list').empty().show();
+    const worldEntriesList = $('#world_popup_entries_list');
+
+    // We save costly performance by removing all events before emptying. Because we know there are no relevant event handlers reacting on removing elements
+    // This prevents jQuery from actually going through all registered events on the controls for each entry when removing it
+    worldEntriesList.find('*').off();
+    worldEntriesList.empty().show();
 
     if (!data || !('entries' in data)) {
         $('#world_popup_new').off('click').on('click', nullWorldInfo);
@@ -761,7 +767,7 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
         $('#world_popup_export').off('click').on('click', nullWorldInfo);
         $('#world_popup_delete').off('click').on('click', nullWorldInfo);
         $('#world_duplicate').off('click').on('click', nullWorldInfo);
-        $('#world_popup_entries_list').hide();
+        worldEntriesList.hide();
         $('#world_info_pagination').html('');
         return;
     }
@@ -808,7 +814,11 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
         formatNavigator: PAGINATION_TEMPLATE,
         showNavigator: true,
         callback: function (/** @type {object[]} */ page) {
-            $('#world_popup_entries_list').empty();
+            // We save costly performance by removing all events before emptying. Because we know there are no relevant event handlers reacting on removing elements
+            // This prevents jQuery from actually going through all registered events on the controls for each entry when removing it
+            worldEntriesList.find('*').off();
+            worldEntriesList.empty();
+
             const keywordHeaders = `
             <div id="WIEntryHeaderTitlesPC" class="flex-container wide100p spaceBetween justifyCenter textAlignCenter" style="padding:0 4.5em;">
             <small class="flex1">
@@ -837,8 +847,8 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
                     block.find('.drag-handle').remove();
                 });
             }
-            $('#world_popup_entries_list').append(keywordHeaders);
+            worldEntriesList.append(keywordHeaders);
-            $('#world_popup_entries_list').append(blocks);
+            worldEntriesList.append(blocks);
         },
         afterSizeSelectorChange: function (e) {
             localStorage.setItem(storageKey, e.target.value);
@@ -850,6 +860,8 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
         },
     });
 
+
+
     if (typeof navigation === 'number' && Number(navigation) >= 0) {
         const selector = `#world_popup_entries_list [uid="${navigation}"]`;
         const data = getDataArray();
@@ -951,12 +963,12 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
     });
 
     // Check if a sortable instance exists
-    if ($('#world_popup_entries_list').sortable('instance') !== undefined) {
+    if (worldEntriesList.sortable('instance') !== undefined) {
         // Destroy the instance
-        $('#world_popup_entries_list').sortable('destroy');
+        worldEntriesList.sortable('destroy');
     }
 
-    $('#world_popup_entries_list').sortable({
+    worldEntriesList.sortable({
         delay: getSortableDelay(),
         handle: '.drag-handle',
         stop: async function (event, ui) {
@@ -2545,11 +2557,11 @@ function convertAgnaiMemoryBook(inputObj) {
             useProbability: false,
             group: '',
             groupOverride: false,
-            scanDepth: entry.extensions?.scan_depth ?? null,
+            scanDepth: null,
-            caseSensitive: entry.extensions?.case_sensitive ?? null,
+            caseSensitive: null,
-            matchWholeWords: entry.extensions?.match_whole_words ?? null,
+            matchWholeWords: null,
-            automationId: entry.extensions?.automation_id ?? '',
+            automationId: '',
-            role: entry.extensions?.role ?? extension_prompt_roles.SYSTEM,
+            role: extension_prompt_roles.SYSTEM,
         };
     });
 
@@ -2581,11 +2593,11 @@ function convertRisuLorebook(inputObj) {
             useProbability: entry.activationPercent ?? false,
             group: '',
             groupOverride: false,
-            scanDepth: entry.extensions?.scan_depth ?? null,
+            scanDepth: null,
-            caseSensitive: entry.extensions?.case_sensitive ?? null,
+            caseSensitive: null,
-            matchWholeWords: entry.extensions?.match_whole_words ?? null,
+            matchWholeWords: null,
-            automationId: entry.extensions?.automation_id ?? '',
+            automationId: '',
-            role: entry.extensions?.role ?? extension_prompt_roles.SYSTEM,
+            role: extension_prompt_roles.SYSTEM,
         };
     });
 
@@ -2622,11 +2634,11 @@ function convertNovelLorebook(inputObj) {
             useProbability: false,
             group: '',
             groupOverride: false,
-            scanDepth: entry.extensions?.scan_depth ?? null,
+            scanDepth: null,
-            caseSensitive: entry.extensions?.case_sensitive ?? null,
+            caseSensitive: null,
-            matchWholeWords: entry.extensions?.match_whole_words ?? null,
+            matchWholeWords: null,
-            automationId: entry.extensions?.automation_id ?? '',
+            automationId: '',
-            role: entry.extensions?.role ?? extension_prompt_roles.SYSTEM,
+            role: extension_prompt_roles.SYSTEM,
         };
     });