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

Support original-placeholder

Browse Source
This commit is contained in:
maver
2023-06-24 17:01:03 +02:00
parent 6674a0a974
commit 6c25211f0a
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/PromptManager.js
View File

@ -519,14 +519,20 @@ PromptManagerModule.prototype.getPromptIndexById = function (identifier) {
/**
* Prepares a prompt by creating a new object with its role and content.
* @param {Object} prompt - Prompt object
* @param original
* @returns {Object} An object with "role" and "content" properties
*/
PromptManagerModule.prototype.preparePrompt = function (prompt) {
PromptManagerModule.prototype.preparePrompt = function (prompt, original = null) {
const groupMembers = this.getActiveGroupCharacters();
if (0 < groupMembers.length) return {role: prompt.role || 'system', content: substituteParams(prompt.content ?? '', null, null, groupMembers.join(', '))}
const preparedPrompt = new Prompt(prompt);
preparedPrompt.content = substituteParams(prompt.content);
if (original) {
if (0 < groupMembers.length) preparedPrompt.content = substituteParams(prompt.content ?? '', null, null, original, groupMembers.join(', '));
else preparedPrompt.content = substituteParams(prompt.content, null, null, original);
} else {
if (0 < groupMembers.length) preparedPrompt.content = substituteParams(prompt.content ?? '', null, null, null, groupMembers.join(', '));
else preparedPrompt.content = substituteParams(prompt.content);
}
return preparedPrompt;
}