From cd7df3e0e794c3aca14bc93099c236f2389e5c49 Mon Sep 17 00:00:00 2001 From: 50h100a Date: Fri, 7 Jul 2023 19:04:59 -0400 Subject: [PATCH 1/3] Correct oversight from tidying names for PR... --- public/scripts/extensions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/scripts/extensions.js b/public/scripts/extensions.js index a4a6d5de9..1c7f2052c 100644 --- a/public/scripts/extensions.js +++ b/public/scripts/extensions.js @@ -456,6 +456,6 @@ $(document).ready(async function () { $("#extensions_connect").on('click', connectClickHandler); $("#extensions_autoconnect").on('input', autoConnectInputHandler); $("#extensions_details").on('click', showExtensionsDetails); - $(document).on('click', '.disable_extension', onDisableExtensionClick); - $(document).on('click', '.enable_extension', onEnableExtensionClick); + $(document).on('click', '.toggle_disable', onDisableExtensionClick); + $(document).on('click', '.toggle_enable', onEnableExtensionClick); }); From 1be05fa51426f1b640569a1a1946ea97f59c283a Mon Sep 17 00:00:00 2001 From: 50h100a Date: Fri, 7 Jul 2023 19:41:57 -0400 Subject: [PATCH 2/3] Always run extension interceptors. --- public/script.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/script.js b/public/script.js index 84c02c9e8..6cedb4a3e 100644 --- a/public/script.js +++ b/public/script.js @@ -2198,10 +2198,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) { - await runGenerationInterceptors(coreChat, this_max_context); - console.log(`Core/all messages: ${coreChat.length}/${chat.length}`); - } + // Always run the extension interceptors. + await runGenerationInterceptors(coreChat, this_max_context); + console.log(`Core/all messages: ${coreChat.length}/${chat.length}`); let storyString = ""; From 5983e50d21a1a1a180830254f3a46d4263a6e8aa Mon Sep 17 00:00:00 2001 From: 50h100a Date: Fri, 7 Jul 2023 19:43:27 -0400 Subject: [PATCH 3/3] Query from *in context* messages, not every single message since the dawn of time... --- public/scripts/extensions/infinity-context/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/scripts/extensions/infinity-context/index.js b/public/scripts/extensions/infinity-context/index.js index f00f266dc..0e804ac75 100644 --- a/public/scripts/extensions/infinity-context/index.js +++ b/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') {