rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
Cohee
2023-07-08 04:12:20 +03:00
parent 46e1a25d83 ed0c185284
commit 8e5fd7938c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/script.js
View File

@@ -2198,10 +2198,9 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// Determine token limit // Determine token limit
let this_max_context = getMaxContextSize(); 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 = ""; let storyString = "";

4
public/scripts/extensions.js
View File

@@ -456,6 +456,6 @@ $(document).ready(async function () {
$("#extensions_connect").on('click', connectClickHandler); $("#extensions_connect").on('click', connectClickHandler);
$("#extensions_autoconnect").on('input', autoConnectInputHandler); $("#extensions_autoconnect").on('input', autoConnectInputHandler);
$("#extensions_details").on('click', showExtensionsDetails); $("#extensions_details").on('click', showExtensionsDetails);
$(document).on('click', '.disable_extension', onDisableExtensionClick); $(document).on('click', '.toggle_disable', onDisableExtensionClick);
$(document).on('click', '.enable_extension', onEnableExtensionClick); $(document).on('click', '.toggle_enable', onEnableExtensionClick);
}); });

7
public/scripts/extensions/infinity-context/index.js
View File

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