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

Add dialogue examples first if user decides

Browse Source
This commit is contained in:
maver
2023-06-18 15:37:31 +02:00
parent 474571e17a
commit 5afd60c578
1 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
public/scripts/openai.js
View File

@ -367,6 +367,58 @@ function formatWorldInfo(value) {
return stringFormat(oai_settings.wi_format, value); return stringFormat(oai_settings.wi_format, value);
} }
/**
* Populates the chat history of the conversation.
*
* @param {Map} 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.
*/
function populateChatHistory(prompts, chatCompletion) {
// Chat History
chatCompletion.add( new MessageCollection('chatHistory'), prompts.index('chatHistory'));
const mainChat = selected_group ? '[Start a new group chat. Group members: ${names}]' : '[Start a new Chat]';
const mainChatMessage = new Message('system', mainChat, 'newMainChat');
// Insert chat messages
if (chatCompletion.canAfford(mainChatMessage)) {
chatCompletion.insert(mainChatMessage, 'chatHistory');
[...openai_msgs].forEach((prompt, index) => {
const chatMessage = new Message(prompt.role, prompt.content, 'chatHistory-' + index);
if (chatCompletion.canAfford(chatMessage)) {
chatCompletion.insert(chatMessage, 'chatHistory');
}
});
}
}
/**
* This function populates the dialogue examples in the conversation.
*
* @param {Map} 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.
*/
function populateDialogueExamples(prompts, chatCompletion) {
chatCompletion.add( new MessageCollection('dialogueExamples'), prompts.index('dialogueExamples'));
if (openai_msgs_example.length) {
// Insert chat message examples if there's enough budget if there is enough budget left for at least one example.
const dialogueExampleChat = new Message('system', '[Start a new Chat]', 'newChat');
const prompt = openai_msgs_example[0];
const dialogueExample = new Message(prompt[0].role || '', prompt[0].content || '', 'dialogueExampleTest');
if (chatCompletion.canAfford(dialogueExampleChat) &&
chatCompletion.canAfford(dialogueExample)) {
chatCompletion.insert(dialogueExampleChat, 'dialogueExamples');
[...openai_msgs_example].forEach((prompt, index) => {
const chatMessage = new Message(prompt[0].role || '', prompt[0].content || '', 'dialogueExamples-' + index);
if (chatCompletion.canAfford(chatMessage)) {
chatCompletion.insert(chatMessage, 'dialogueExamples');
}
});
}
}
}
/** /**
* Populate a chat conversation by adding prompts to the conversation and managing system and user prompts. * Populate a chat conversation by adding prompts to the conversation and managing system and user prompts.
* *
@ -378,6 +430,7 @@ function formatWorldInfo(value) {
* @param {string} options.type - The type of the chat, can be 'impersonate'. * @param {string} options.type - The type of the chat, can be 'impersonate'.
*/ */
function populateChatCompletion (prompts, chatCompletion, {bias, quietPrompt, type} = {}) { function populateChatCompletion (prompts, chatCompletion, {bias, quietPrompt, type} = {}) {
//Helper function for the recurring task of preparing a prompt for the chat completion
const addToChatCompletion = (source, target = null) => { const addToChatCompletion = (source, target = null) => {
if (false === prompts.has(source)) return; if (false === prompts.has(source)) return;
@ -388,6 +441,7 @@ function populateChatCompletion (prompts, chatCompletion, {bias, quietPrompt, ty
chatCompletion.add(collection, index); chatCompletion.add(collection, index);
}; };
// Character and world information
addToChatCompletion('worldInfoBefore'); addToChatCompletion('worldInfoBefore');
addToChatCompletion('worldInfoAfter'); addToChatCompletion('worldInfoAfter');
addToChatCompletion('charDescription'); addToChatCompletion('charDescription');
@ -422,50 +476,26 @@ function populateChatCompletion (prompts, chatCompletion, {bias, quietPrompt, ty
chatCompletion.insert(quietPromptMessage, 'main'); chatCompletion.insert(quietPromptMessage, 'main');
} }
// Bias
if (bias && bias.trim().length) addToChatCompletion('bias'); if (bias && bias.trim().length) addToChatCompletion('bias');
// Tavern Extras - Summary
if (prompts.has('summary')) chatCompletion.insert(Message.fromPrompt(prompts.get('summary')), 'main'); if (prompts.has('summary')) chatCompletion.insert(Message.fromPrompt(prompts.get('summary')), 'main');
// Authors Note
if (prompts.has('authorsNote')) { if (prompts.has('authorsNote')) {
const authorsNote = Message.fromPrompt(prompts.get('authorsNote')); const authorsNote = Message.fromPrompt(prompts.get('authorsNote'));
if (extension_prompt_types.AFTER_SCENARIO) chatCompletion.insert(authorsNote, 'scenario'); if (extension_prompt_types.AFTER_SCENARIO) chatCompletion.insert(authorsNote, 'scenario');
else chatCompletion.insert(authorsNote, 'main') else chatCompletion.insert(authorsNote, 'main')
} }
// Chat History // Decide whether dialogue examples should always be added
chatCompletion.add( new MessageCollection('chatHistory'), prompts.index('chatHistory')); if (power_user.pin_examples) {
const mainChat = selected_group ? '[Start a new group chat. Group members: ${names}]' : '[Start a new Chat]'; populateDialogueExamples(prompts, chatCompletion);
const mainChatMessage = new Message('system', mainChat, 'newMainChat'); populateChatHistory(prompts, chatCompletion);
// Insert chat messages } else {
if (chatCompletion.canAfford(mainChatMessage)) { populateChatHistory(prompts, chatCompletion);
chatCompletion.insert(mainChatMessage, 'chatHistory'); populateDialogueExamples(prompts, chatCompletion);
[...openai_msgs].forEach((prompt, index) => {
const chatMessage = new Message(prompt.role, prompt.content, 'chatHistory-' + index);
if (chatCompletion.canAfford(chatMessage)) {
chatCompletion.insert(chatMessage, 'chatHistory');
}
});
}
chatCompletion.add( new MessageCollection('dialogueExamples'), prompts.index('dialogueExamples'));
if (openai_msgs_example.length) {
// Insert chat message examples if there's enough budget if there is enough budget left for at least one example.
const dialogueExampleChat = new Message('system', '[Start a new Chat]', 'newChat');
const prompt = openai_msgs_example[0];
const dialogueExample = new Message(prompt[0].role || '', prompt[0].content || '', 'dialogueExampleTest');
if (chatCompletion.canAfford(dialogueExampleChat) &&
chatCompletion.canAfford(dialogueExample)) {
chatCompletion.insert(dialogueExampleChat, 'dialogueExamples');
[...openai_msgs_example].forEach((prompt, index) => {
const chatMessage = new Message(prompt[0].role || '', prompt[0].content || '', 'dialogueExamples-' + index);
if (chatCompletion.canAfford(chatMessage)) {
chatCompletion.insert(chatMessage, 'dialogueExamples');
}
});
}
} }
} }