Merge branch 'dev' of https://github.com/BlipRanger/SillyTavern into dev

public/script.js

@@ -2200,10 +2200,9 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
         // Determine token limit
         let this_max_context = getMaxContextSize();
 
-        if (extension_settings.chromadb.n_results !== 0) {
+        // Always run the extension interceptors.
-            await runGenerationInterceptors(coreChat, this_max_context);
+        await runGenerationInterceptors(coreChat, this_max_context);
-            console.log(`Core/all messages: ${coreChat.length}/${chat.length}`);
+        console.log(`Core/all messages: ${coreChat.length}/${chat.length}`);
-        }
 
         let storyString = "";
 
@@ -6701,6 +6700,28 @@ function importCharacter(file) {
     });
 }
 
+async function importFromURL(items, files) {
+    for (const item of items) {
+        if (item.type === 'text/uri-list') {
+            const uriList = await new Promise((resolve) => {
+                item.getAsString((uriList) => { resolve(uriList); });
+            });
+            const uris = uriList.split('\n').filter(uri => uri.trim() !== '');
+            try {
+                for (const uri of uris) {
+                    const request = await fetch(uri);
+                    const data = await request.blob();
+                    const fileName = request.headers.get('Content-Disposition')?.split('filename=')[1]?.replace(/"/g, '') || uri.split('/').pop() || 'file.png';
+                    const file = new File([data], fileName, { type: data.type });
+                    files.push(file);
+                }
+            } catch (error) {
+                console.error('Failed to import from URL', error);
+            }
+        }
+    }
+}
+
 const isPwaMode = window.navigator.standalone;
 if (isPwaMode) { $("body").addClass('PWA') }
 
@@ -8447,12 +8468,13 @@ $(document).ready(function () {
         $dropzone.removeClass('dragover');
     });
 
-    $dropzone.on('drop', (event) => {
+    $dropzone.on('drop', async (event) => {
         event.preventDefault();
         event.stopPropagation();
         $dropzone.removeClass('dragover');
 
-        const files = event.originalEvent.dataTransfer.files;
+        const files = Array.from(event.originalEvent.dataTransfer.files);
+        await importFromURL(event.originalEvent.dataTransfer.items, files);
         processDroppedFiles(files);
     });
 

public/scripts/extensions/infinity-context/index.js

@@ -622,11 +622,11 @@ window.chromadb_interceptGeneration = async (chat, maxContext) => {
             queryBlob = lastMessage.mes;
         }
         else {
-            for (let msg of chat) {
+            for (let msg of chat.slice(-extension_settings.chromadb.keep_context)) {
                 queryBlob += `${msg.mes}\n`
             }
         }
-        console.log("ChromDB Query text:", queryBlob);
+        console.log("CHROMADB: Query text:", queryBlob);
 
         if (recallStrategy === 'multichat') {
             console.log("Utilizing multichat")
@@ -642,7 +642,7 @@ window.chromadb_interceptGeneration = async (chat, maxContext) => {
         else {
             queriedMessages.sort((a, b) => b.distance - a.distance);
         }
-        console.log(queriedMessages);
+        console.debug("CHROMADB: Query results: %o", queriedMessages);
 
 
         let newChat = [];
@@ -702,6 +702,7 @@ window.chromadb_interceptGeneration = async (chat, maxContext) => {
             }
 
             const promptBlob = wrapperMsg.replace('{{memories}}', allMemoryBlob);
+            console.debug("CHROMADB: prompt blob: %o", promptBlob);
             context.setExtensionPrompt(MODULE_NAME, promptBlob, extension_prompt_types.AFTER_SCENARIO);
         }
         if (selectedStrategy === 'custom') {