Merge branch 'staging' into staging

public/scripts/extensions/attachments/files-dropped.html

@@ -0,0 +1,8 @@
+<div class="flex-container justifyCenter alignItemsBaseline">
+    <span>Save <span class="droppedFilesCount">{{count}}</span> file(s) to...</span>
+    <select class="droppedFilesTarget">
+        {{#each targets}}
+            <option value="{{this}}">{{this}}</option>
+        {{/each}}
+    </select>
+</div>

public/scripts/extensions/attachments/index.js

@@ -1,6 +1,9 @@
 import { renderExtensionTemplateAsync } from '../../extensions.js';
+import { registerSlashCommand } from '../../slash-commands.js';
 
 jQuery(async () => {
     const buttons = await renderExtensionTemplateAsync('attachments', 'buttons', {});
     $('#extensionsMenu').prepend(buttons);
+
+    registerSlashCommand('db', () => document.getElementById('manageAttachments')?.click(), ['databank', 'data-bank'], '– open the data bank', true, true);
 });

public/scripts/extensions/attachments/manager.html

@@ -7,8 +7,13 @@
     <div data-i18n="These files will be available for extensions that support attachments (e.g. Vector Storage).">
         These files will be available for extensions that support attachments (e.g. Vector Storage).
     </div>
-    <div data-i18n="Supported file types: Plain Text, PDF, Markdown, HTML, EPUB." class="marginTopBot5">
-        Supported file types: Plain Text, PDF, Markdown, HTML, EPUB.
+    <div class="marginTopBot5">
+        <span data-i18n="Supported file types: Plain Text, PDF, Markdown, HTML, EPUB." >
+            Supported file types: Plain Text, PDF, Markdown, HTML, EPUB.
+        </span>
+        <span data-i18n="Drag and drop files here to upload.">
+            Drag and drop files here to upload.
+        </span>
     </div>
     <div class="flex-container marginTopBot5">
         <input type="search" id="attachmentSearch" class="attachmentSearch text_pole margin0 flex1" placeholder="Search...">
@@ -102,7 +107,9 @@
             <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="moveAttachmentButton right_menu_button fa-solid fa-arrows-alt" title="Move attachment"></div>
             <div class="editAttachmentButton right_menu_button fa-solid fa-pencil" title="Edit attachment"></div>
+            <div class="downloadAttachmentButton right_menu_button fa-solid fa-download" title="Download attachment"></div>
             <div class="deleteAttachmentButton right_menu_button fa-solid fa-trash" title="Delete attachment"></div>
         </div>
     </div>

public/scripts/extensions/attachments/move-attachment.html

@@ -0,0 +1,8 @@
+<div class="flex-container justifyCenter alignItemsBaseline">
+    <span>Move <strong class="moveAttachmentName">{{name}}</strong> to...</span>
+    <select class="moveAttachmentTarget">
+        {{#each targets}}
+            <option value="{{this}}">{{this}}</option>
+        {{/each}}
+    </select>
+</div>

public/scripts/extensions/expressions/index.js

@@ -1270,13 +1270,10 @@ async function getExpressionsList() {
      * @returns {Promise<string[]>}
      */
     async function resolveExpressionsList() {
-        // get something for offline mode (default images)
-        if (!modules.includes('classify') && extension_settings.expressions.api == EXPRESSION_API.extras) {
-            return DEFAULT_EXPRESSIONS;
-        }
-
+        // See if we can retrieve a specific expression list from the API
         try {
-            if (extension_settings.expressions.api == EXPRESSION_API.extras) {
+            // Check Extras api first, if enabled and that module active
+            if (extension_settings.expressions.api == EXPRESSION_API.extras && modules.includes('classify')) {
                 const url = new URL(getApiUrl());
                 url.pathname = '/api/classify/labels';
 
@@ -1291,7 +1288,10 @@ async function getExpressionsList() {
                     expressionsList = data.labels;
                     return expressionsList;
                 }
-            } else {
+            }
+
+            // If running the local classify model (not using the LLM), we ask that one
+            if (extension_settings.expressions.api == EXPRESSION_API.local) {
                 const apiResult = await fetch('/api/extra/classify/labels', {
                     method: 'POST',
                     headers: getRequestHeaders(),
@@ -1303,11 +1303,12 @@ async function getExpressionsList() {
                     return expressionsList;
                 }
             }
-        }
-        catch (error) {
+        } catch (error) {
             console.log(error);
-            return [];
         }
+
+        // If there was no specific list, or an error, just return the default expressions
+        return DEFAULT_EXPRESSIONS;
     }
 
     const result = await resolveExpressionsList();

public/scripts/extensions/regex/index.js

@@ -94,7 +94,7 @@ async function loadRegexScripts() {
             await onRegexEditorOpenClick(scriptHtml.attr('id'));
         });
         scriptHtml.find('.export_regex').on('click', async function () {
-            const fileName = `${script.scriptName.replace(/[^a-z0-9]/gi, '_').toLowerCase()}.json`;
+            const fileName = `${script.scriptName.replace(/[\s.<>:"/\\|?*\x00-\x1F\x7F]/g, '_').toLowerCase()}.json`;
             const fileData = JSON.stringify(script, null, 4);
             download(fileData, fileName, 'application/json');
         });

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

@@ -1657,6 +1657,10 @@ async function loadNovelModels() {
             value: 'safe-diffusion',
             text: 'NAI Diffusion Anime V1 (Curated)',
         },
+        {
+            value: 'nai-diffusion-furry-3',
+            text: 'NAI Diffusion Furry V3',
+        },
         {
             value: 'nai-diffusion-furry',
             text: 'NAI Diffusion Furry',

public/scripts/extensions/translate/index.js

@@ -424,6 +424,24 @@ function createEventHandler(translateFunction, shouldTranslateFunction) {
     };
 }
 
+async function onTranslateInputMessageClick() {
+    const textarea = document.getElementById('send_textarea');
+
+    if (!(textarea instanceof HTMLTextAreaElement)) {
+        return;
+    }
+
+    if (!textarea.value) {
+        toastr.warning('Enter a message first');
+        return;
+    }
+
+    const toast = toastr.info('Input Message is translating', 'Please wait...');
+    const translatedText = await translate(textarea.value, extension_settings.translate.internal_language);
+    textarea.value = translatedText;
+    toastr.clear(toast);
+}
+
 // Prevents the chat from being translated in parallel
 let translateChatExecuting = false;
 
@@ -555,10 +573,16 @@ jQuery(() => {
         <div id="translate_chat" class="list-group-item flex-container flexGap5">
             <div class="fa-solid fa-language extensionsMenuExtensionButton" /></div>
             Translate Chat
-        </div>`;
+        </div>
+        <div id="translate_input_message" class="list-group-item flex-container flexGap5">
+            <div class="fa-solid fa-keyboard extensionsMenuExtensionButton" /></div>
+            Translate Input
+        </div>
+        `;
     $('#extensionsMenu').append(buttonHtml);
     $('#extensions_settings2').append(html);
     $('#translate_chat').on('click', onTranslateChatClick);
+    $('#translate_input_message').on('click', onTranslateInputMessageClick);
     $('#translation_clear').on('click', onTranslationsClearClick);
 
     for (const [key, value] of Object.entries(languageCodes)) {

public/scripts/extensions/vectors/index.js

@@ -23,6 +23,7 @@ import { collapseNewlines } from '../../power-user.js';
 import { SECRET_KEYS, secret_state, writeSecret } from '../../secrets.js';
 import { getDataBankAttachments, getFileAttachment } from '../../chats.js';
 import { debounce, getStringHash as calculateHash, waitUntilCondition, onlyUnique, splitRecursive } from '../../utils.js';
+import { getSortedEntries } from '../../world-info.js';
 
 const MODULE_NAME = 'vectors';
 
@@ -66,6 +67,11 @@ const settings = {
     file_position_db: extension_prompt_types.IN_PROMPT,
     file_depth_db: 4,
     file_depth_role_db: extension_prompt_roles.SYSTEM,
+
+    // For World Info
+    enabled_world_info: false,
+    enabled_for_all: false,
+    max_entries: 5,
 };
 
 const moduleWorker = new ModuleWorkerWrapper(synchronizeChat);
@@ -281,8 +287,10 @@ async function synchronizeChat(batchSize = 5) {
     }
 }
 
-// Cache object for storing hash values
-const hashCache = {};
+/**
+ * @type {Map<string, number>} Cache object for storing hash values
+ */
+const hashCache = new Map();
 
 /**
  * Gets the hash value for a given string
@@ -291,15 +299,15 @@ const hashCache = {};
  */
 function getStringHash(str) {
     // Check if the hash is already in the cache
-    if (Object.hasOwn(hashCache, str)) {
-        return hashCache[str];
+    if (hashCache.has(str)) {
+        return hashCache.get(str);
     }
 
     // Calculate the hash value
     const hash = calculateHash(str);
 
     // Store the hash in the cache
-    hashCache[str] = hash;
+    hashCache.set(str, hash);
 
     return hash;
 }
@@ -472,6 +480,10 @@ async function rearrangeChat(chat) {
             await processFiles(chat);
         }
 
+        if (settings.enabled_world_info) {
+            await activateWorldInfo(chat);
+        }
+
         if (!settings.enabled_chats) {
             return;
         }
@@ -845,6 +857,7 @@ async function purgeVectorIndex(collectionId) {
 function toggleSettings() {
     $('#vectors_files_settings').toggle(!!settings.enabled_files);
     $('#vectors_chats_settings').toggle(!!settings.enabled_chats);
+    $('#vectors_world_info_settings').toggle(!!settings.enabled_world_info);
     $('#together_vectorsModel').toggle(settings.source === 'togetherai');
     $('#openai_vectorsModel').toggle(settings.source === 'openai');
     $('#cohere_vectorsModel').toggle(settings.source === 'cohere');
@@ -934,6 +947,111 @@ async function onPurgeFilesClick() {
     }
 }
 
+async function activateWorldInfo(chat) {
+    if (!settings.enabled_world_info) {
+        console.debug('Vectors: Disabled for World Info');
+        return;
+    }
+
+    const entries = await getSortedEntries();
+
+    if (!Array.isArray(entries) || entries.length === 0) {
+        console.debug('Vectors: No WI entries found');
+        return;
+    }
+
+    // Group entries by "world" field
+    const groupedEntries = {};
+
+    for (const entry of entries) {
+        // Skip orphaned entries. Is it even possible?
+        if (!entry.world) {
+            console.debug('Vectors: Skipped orphaned WI entry', entry);
+            continue;
+        }
+
+        // Skip disabled entries
+        if (entry.disable) {
+            console.debug('Vectors: Skipped disabled WI entry', entry);
+            continue;
+        }
+
+        // Skip entries without content
+        if (!entry.content) {
+            console.debug('Vectors: Skipped WI entry without content', entry);
+            continue;
+        }
+
+        // Skip non-vectorized entries
+        if (!entry.vectorized && !settings.enabled_for_all) {
+            console.debug('Vectors: Skipped non-vectorized WI entry', entry);
+            continue;
+        }
+
+        if (!Object.hasOwn(groupedEntries, entry.world)) {
+            groupedEntries[entry.world] = [];
+        }
+
+        groupedEntries[entry.world].push(entry);
+    }
+
+    const collectionIds = [];
+
+    if (Object.keys(groupedEntries).length === 0) {
+        console.debug('Vectors: No WI entries to synchronize');
+        return;
+    }
+
+    // Synchronize collections
+    for (const world in groupedEntries) {
+        const collectionId = `world_${getStringHash(world)}`;
+        const hashesInCollection = await getSavedHashes(collectionId);
+        const newEntries = groupedEntries[world].filter(x => !hashesInCollection.includes(getStringHash(x.content)));
+        const deletedHashes = hashesInCollection.filter(x => !groupedEntries[world].some(y => getStringHash(y.content) === x));
+
+        if (newEntries.length > 0) {
+            console.log(`Vectors: Found ${newEntries.length} new WI entries for world ${world}`);
+            await insertVectorItems(collectionId, newEntries.map(x => ({ hash: getStringHash(x.content), text: x.content, index: x.uid })));
+        }
+
+        if (deletedHashes.length > 0) {
+            console.log(`Vectors: Deleted ${deletedHashes.length} old hashes for world ${world}`);
+            await deleteVectorItems(collectionId, deletedHashes);
+        }
+
+        collectionIds.push(collectionId);
+    }
+
+    // Perform a multi-query
+    const queryText = await getQueryText(chat);
+
+    if (queryText.length === 0) {
+        console.debug('Vectors: No text to query for WI');
+        return;
+    }
+
+    const queryResults = await queryMultipleCollections(collectionIds, queryText, settings.max_entries);
+    const activatedHashes = Object.values(queryResults).flatMap(x => x.hashes).filter(onlyUnique);
+    const activatedEntries = [];
+
+    // Activate entries found in the query results
+    for (const entry of entries) {
+        const hash = getStringHash(entry.content);
+
+        if (activatedHashes.includes(hash)) {
+            activatedEntries.push(entry);
+        }
+    }
+
+    if (activatedEntries.length === 0) {
+        console.debug('Vectors: No activated WI entries found');
+        return;
+    }
+
+    console.log(`Vectors: Activated ${activatedEntries.length} WI entries`, activatedEntries);
+    await eventSource.emit(event_types.WORLDINFO_FORCE_ACTIVATE, activatedEntries);
+}
+
 jQuery(async () => {
     if (!extension_settings.vectors) {
         extension_settings.vectors = settings;
@@ -1134,6 +1252,25 @@ jQuery(async () => {
         saveSettingsDebounced();
     });
 
+    $('#vectors_enabled_world_info').prop('checked', settings.enabled_world_info).on('input', () => {
+        settings.enabled_world_info = !!$('#vectors_enabled_world_info').prop('checked');
+        Object.assign(extension_settings.vectors, settings);
+        saveSettingsDebounced();
+        toggleSettings();
+    });
+
+    $('#vectors_enabled_for_all').prop('checked', settings.enabled_for_all).on('input', () => {
+        settings.enabled_for_all = !!$('#vectors_enabled_for_all').prop('checked');
+        Object.assign(extension_settings.vectors, settings);
+        saveSettingsDebounced();
+    });
+
+    $('#vectors_max_entries').val(settings.max_entries).on('input', () => {
+        settings.max_entries = Number($('#vectors_max_entries').val());
+        Object.assign(extension_settings.vectors, settings);
+        saveSettingsDebounced();
+    });
+
     const validSecret = !!secret_state[SECRET_KEYS.NOMICAI];
     const placeholder = validSecret ? '✔️ Key saved' : '❌ Missing key';
     $('#api_key_nomicai').attr('placeholder', placeholder);

public/scripts/extensions/vectors/settings.html

@@ -97,6 +97,46 @@
 
             <hr>
 
+            <h4>
+                World Info settings
+            </h4>
+
+            <label class="checkbox_label" for="vectors_enabled_world_info" title="Enable activation of World Info entries based on vector similarity.">
+                <input id="vectors_enabled_world_info" type="checkbox" class="checkbox">
+                Enabled for World Info
+            </label>
+
+            <div id="vectors_world_info_settings" class="marginTopBot5">
+                <div class="flex-container">
+                    <label for="vectors_enabled_for_all" class="checkbox_label">
+                        <input id="vectors_enabled_for_all" type="checkbox" />
+                        <span>Enabled for all entries</span>
+                    </label>
+                    <ul class="margin0">
+                        <li>
+                            <small>Checked: all entries except ❌ status can be activated.</small>
+                        </li>
+                        <li>
+                            <small>Unchecked: only entries with 🔗 status can be activated.</small>
+                        </li>
+                    </ul>
+                </div>
+                <div class="flex-container">
+                    <div class="flex1">
+                        <!--  Vacant for future use -->
+                    </div>
+                    <div class="flex1" title="Maximum number of entries to be activated">
+                        <label for="vectors_max_entries" >
+                            <small>Max Entries</small>
+                        </label>
+                        <input id="vectors_max_entries" type="number" class="text_pole widthUnset" min="1" max="9999" />
+                    </div>
+                    <div class="flex1">
+                        <!--  Vacant for future use -->
+                    </div>
+                </div>
+            </div>
+
             <h4>
                 File vectorization settings
             </h4>