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 prompting with bias and names

Browse Source
This commit is contained in:
SillyLossy
2023-05-20 19:54:27 +03:00
parent e7cbeba87d
commit db6dad5b2d
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/script.js
View File

@ -1367,7 +1367,13 @@ export function extractMessageBias(message) {
found.push(curMatch[1].trim()); found.push(curMatch[1].trim());
} }
return ` ${found.join(" ")} `; let biasString = '';
if (found.length) {
biasString = ` ${found.join(" ")} `
}
return biasString;
} }
function cleanGroupMessage(getMessage) { function cleanGroupMessage(getMessage) {
@ -1705,8 +1711,6 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
return; return;
} }
streamingProcessor = isStreamingEnabled() ? new StreamingProcessor(type, force_name2) : false;
// Hide swipes on either multigen or real streaming // Hide swipes on either multigen or real streaming
if (isStreamingEnabled() || isMultigenEnabled()) { if (isStreamingEnabled() || isMultigenEnabled()) {
hideSwipeButtons(); hideSwipeButtons();
@ -1814,8 +1818,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
storyString += appendToStoryString(Scenario, power_user.disable_scenario_formatting ? '' : 'Circumstances and context of the dialogue: '); storyString += appendToStoryString(Scenario, power_user.disable_scenario_formatting ? '' : 'Circumstances and context of the dialogue: ');
} }
// Pygmalion does that anyway if (promptBias || power_user.always_force_name2 || is_pygmalion) {
if (promptBias || (power_user.always_force_name2 && !is_pygmalion)) {
force_name2 = true; force_name2 = true;
} }
@ -1928,6 +1931,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
let mesSend = []; let mesSend = [];
console.log('calling runGenerate'); console.log('calling runGenerate');
streamingProcessor = isStreamingEnabled() ? new StreamingProcessor(type, force_name2) : false;
await runGenerate(); await runGenerate();
async function runGenerate(cycleGenerationPromt = '') { async function runGenerate(cycleGenerationPromt = '') {
@ -1960,14 +1964,6 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} }
} }
if (is_pygmalion && !isInstruct) { if (is_pygmalion && !isInstruct) {
if (i === arrMes.length - 1 && item.trim().startsWith(name1 + ":")) {//for add name2 when user sent
item = item + name2 + ":";
}
if (i === arrMes.length - 1 && !item.trim().startsWith(name1 + ":")) {//for add name2 when continue
if (textareaText == "") {
item = item + '\n' + name2 + ":";
}
}
if (item.trim().startsWith(name1)) { if (item.trim().startsWith(name1)) {
item = item.replace(name1 + ':', 'You:'); item = item.replace(name1 + ':', 'You:');
} }
@ -2026,7 +2022,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// Get instruct mode line // Get instruct mode line
if (isInstruct && tokens_already_generated === 0) { if (isInstruct && tokens_already_generated === 0) {
const name = isImpersonate ? (is_pygmalion ? 'You' : name1) : name2; const name = isImpersonate ? (is_pygmalion ? 'You' : name1) : name2;
mesSendString += formatInstructModePrompt(name, isImpersonate); mesSendString += formatInstructModePrompt(name, isImpersonate, promptBias);
} }
// Get non-instruct impersonation line // Get non-instruct impersonation line
@ -2039,7 +2035,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} }
// Add character's name // Add character's name
if (force_name2 && tokens_already_generated === 0) { if (!isInstruct && force_name2 && tokens_already_generated === 0) {
if (!mesSendString.endsWith('\n')) { if (!mesSendString.endsWith('\n')) {
mesSendString += '\n'; mesSendString += '\n';
} }

9
public/scripts/power-user.js
View File

@ -661,11 +661,16 @@ export function formatInstructStoryString(story) {
return text; return text;
} }
export function formatInstructModePrompt(name, isImpersonate) { export function formatInstructModePrompt(name, isImpersonate, promptBias) {
const includeNames = power_user.instruct.names || !!selected_group; const includeNames = power_user.instruct.names || !!selected_group;
const sequence = isImpersonate ? power_user.instruct.input_sequence : power_user.instruct.output_sequence; const sequence = isImpersonate ? power_user.instruct.input_sequence : power_user.instruct.output_sequence;
const separator = power_user.instruct.wrap ? '\n' : ''; const separator = power_user.instruct.wrap ? '\n' : '';
const text = includeNames ? (separator + sequence + separator + `${name}:`) : (separator + sequence); let text = includeNames ? (separator + sequence + separator + `${name}:`) : (separator + sequence);
if (!isImpersonate && promptBias) {
text += (includeNames ? promptBias : (separator + promptBias));
}
return text.trimEnd(); return text.trimEnd();
} }