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

Indicate injected items by extension prompts in finalMesSend

Browse Source
This commit is contained in:
Cohee
2024-03-25 18:37:32 +02:00
parent 0d1f38c866
commit e9b05d4adc
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/script.js
View File

@@ -3237,8 +3237,9 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
} }
// Inject all Depth prompts. Chat Completion does it separately // Inject all Depth prompts. Chat Completion does it separately
let injectedIndices = [];
if (main_api !== 'openai') { if (main_api !== 'openai') {
doChatInject(coreChat, isContinue); injectedIndices = doChatInject(coreChat, isContinue);
} }
// Insert character jailbreak as the last user message (if exists, allowed, preferred, and not using Chat Completion) // Insert character jailbreak as the last user message (if exists, allowed, preferred, and not using Chat Completion)
@@ -3656,6 +3657,10 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
return combinedPrompt; return combinedPrompt;
}; };
finalMesSend.forEach((item, i) => {
item.injected = Array.isArray(injectedIndices) && injectedIndices.includes(i);
});
let data = { let data = {
api: main_api, api: main_api,
combinedPrompt: null, combinedPrompt: null,
@@ -3973,9 +3978,10 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
* Injects extension prompts into chat messages. * Injects extension prompts into chat messages.
* @param {object[]} messages Array of chat messages * @param {object[]} messages Array of chat messages
* @param {boolean} isContinue Whether the generation is a continuation. If true, the extension prompts of depth 0 are injected at position 1. * @param {boolean} isContinue Whether the generation is a continuation. If true, the extension prompts of depth 0 are injected at position 1.
* @returns {void} * @returns {number[]} Array of indices where the extension prompts were injected
*/ */
function doChatInject(messages, isContinue) { function doChatInject(messages, isContinue) {
const injectedIndices = [];
let totalInsertedMessages = 0; let totalInsertedMessages = 0;
messages.reverse(); messages.reverse();
@@ -4014,10 +4020,16 @@ function doChatInject(messages, isContinue) {
const injectIdx = depth + totalInsertedMessages; const injectIdx = depth + totalInsertedMessages;
messages.splice(injectIdx, 0, ...roleMessages); messages.splice(injectIdx, 0, ...roleMessages);
totalInsertedMessages += roleMessages.length; totalInsertedMessages += roleMessages.length;
injectedIndices.push(...Array.from({ length: roleMessages.length }, (_, i) => injectIdx + i));
} }
} }
for (let i = 0; i < injectedIndices.length; i++) {
injectedIndices[i] = messages.length - injectedIndices[i] - 1;
}
messages.reverse(); messages.reverse();
return injectedIndices;
} }
function flushWIDepthInjections() { function flushWIDepthInjections() {