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

Fix continue functionality not working as expected

Browse Source
This commit is contained in:
maver
2023-07-09 16:16:15 +02:00
parent f4cfa8ba94
commit 0e4ce734ad
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
public/scripts/openai.js
View File

@ -405,14 +405,30 @@ function formatWorldInfo(value) {
* *
* @param {PromptCollection} prompts - Map object containing all prompts where the key is the prompt identifier and the value is the prompt object. * @param {PromptCollection} prompts - Map object containing all prompts where the key is the prompt identifier and the value is the prompt object.
* @param {ChatCompletion} chatCompletion - An instance of ChatCompletion class that will be populated with the prompts. * @param {ChatCompletion} chatCompletion - An instance of ChatCompletion class that will be populated with the prompts.
* @param type
*/ */
function populateChatHistory(prompts, chatCompletion) { function populateChatHistory(prompts, chatCompletion, type = null, cyclePrompt = null) {
// Chat History // Chat History
chatCompletion.add(new MessageCollection('chatHistory'), prompts.index('chatHistory')); chatCompletion.add(new MessageCollection('chatHistory'), prompts.index('chatHistory'));
const mainChat = selected_group ? oai_settings.new_group_chat_prompt : oai_settings.new_chat_prompt;
const mainChatMessage = new Message('system', mainChat, 'newMainChat');
chatCompletion.reserveBudget(mainChatMessage); // Reserve budget for new chat message
const newChat = selected_group ? oai_settings.new_group_chat_prompt : oai_settings.new_chat_prompt;
const newChatMessage = new Message('system', newChat, 'newMainChat');
chatCompletion.reserveBudget(newChatMessage);
// Reserve budget for continue nudge
let continueMessage = null;
if (type === 'continue' && cyclePrompt) {
const continuePrompt = new Prompt({
identifier: 'continueNudge',
role: 'system',
content: '[Continue the following message. Do not include ANY parts of the original message. Use capitalization and punctuation as if your reply is a part of the original message:\n\n + ' + cyclePrompt + ']',
system_prompt: true
});
const preparedPrompt = promptManager.preparePrompt(continuePrompt);
continueMessage = Message.fromPrompt(preparedPrompt);
chatCompletion.reserveBudget(continueMessage);
}
const lastChatPrompt = openai_msgs[openai_msgs.length - 1]; const lastChatPrompt = openai_msgs[openai_msgs.length - 1];
const message = new Message('user', oai_settings.send_if_empty, 'emptyUserMessageReplacement'); const message = new Message('user', oai_settings.send_if_empty, 'emptyUserMessageReplacement');
@ -436,8 +452,15 @@ function populateChatHistory(prompts, chatCompletion) {
return true; return true;
}); });
chatCompletion.freeBudget(mainChatMessage); // Insert and free new chat
chatCompletion.insertAtStart(mainChatMessage, 'chatHistory'); chatCompletion.freeBudget(newChatMessage);
chatCompletion.insertAtStart(newChatMessage, 'chatHistory');
// Insert and free continue nudge
if (type === 'continue' && continueMessage) {
chatCompletion.freeBudget(continueMessage);
chatCompletion.insertAtEnd(continueMessage, 'chatHistory')
}
} }
/** /**
@ -566,24 +589,12 @@ function populateChatCompletion (prompts, chatCompletion, {bias, quietPrompt, ty
} }
} }
if (type === 'continue') {
const continuePrompt = new Prompt({
identifier: 'continueNudge',
role: 'system,',
content: '[Continue the following message. Do not include ANY parts of the original message. Use capitalization and punctuation as if your reply is a part of the original message:\n\n + ' + cyclePrompt + ']',
system_prompt: true
});
const preparedPrompt = promptManager.preparePrompt(continuePrompt);
const continueMessage = Message.fromPrompt(preparedPrompt);
chatCompletion.insertAtEnd(continueMessage, 'chatHistory')
}
// Decide whether dialogue examples should always be added // Decide whether dialogue examples should always be added
if (power_user.pin_examples) { if (power_user.pin_examples) {
populateDialogueExamples(prompts, chatCompletion); populateDialogueExamples(prompts, chatCompletion);
populateChatHistory(prompts, chatCompletion); populateChatHistory(prompts, chatCompletion, type, cyclePrompt);
} else { } else {
populateChatHistory(prompts, chatCompletion); populateChatHistory(prompts, chatCompletion, type, cyclePrompt);
populateDialogueExamples(prompts, chatCompletion); populateDialogueExamples(prompts, chatCompletion);
} }
} }