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

Generate: Move reply prefix call to common function

Browse Source 
Helps pass down user biases to OpenAI's prompt builder.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri
2023-07-01 16:37:39 -04:00
parent 080ecec5f2
commit 990a5faf7d
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/script.js
View File

@ -1996,7 +1996,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
deactivateSendButtons(); deactivateSendButtons();
let { messageBias, promptBias } = getBiasStrings(textareaText, type); let { messageBias, promptBias, isUserPromptBias } = getBiasStrings(textareaText, type);
//********************************* //*********************************
//PRE FORMATING STRING //PRE FORMATING STRING
@ -2071,7 +2071,8 @@ 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: ');
} }
if (promptBias || power_user.always_force_name2 || is_pygmalion) { // kingbri MARK: - Make sure the prompt bias isn't the same as the user bias
if ((promptBias && !isUserPromptBias) || power_user.always_force_name2 || is_pygmalion) {
force_name2 = true; force_name2 = true;
} }
@ -2313,15 +2314,19 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
mesSendString += '\n'; mesSendString += '\n';
} }
let addedPromptBias = promptBias || substituteParams(power_user.user_prompt_bias) || '';
// Add a leading space to the prompt bias if applicable // Add a leading space to the prompt bias if applicable
if (addedPromptBias.length !== 0 && !addedPromptBias.startsWith(' ')) { if (!promptBias || promptBias.length === 0) {
addedPromptBias = ` ${addedPromptBias}` console.debug("No prompt bias was found.");
mesSendString += `${name2}:`;
} else if (promptBias.startsWith(' ')) {
console.debug(`A prompt bias with a leading space was found: ${promptBias}`);
mesSendString += `${name2}:${promptBias}`
} else {
console.debug(`A prompt bias was found: ${promptBias}`);
mesSendString += `${name2}: ${promptBias}`;
} }
mesSendString += (`${name2}:${addedPromptBias}`);
} else if (power_user.user_prompt_bias) { } else if (power_user.user_prompt_bias) {
console.debug(`A prompt bias was found without character's name appended: ${promptBias}`);
mesSendString += substituteParams(power_user.user_prompt_bias); mesSendString += substituteParams(power_user.user_prompt_bias);
} }
@ -2735,8 +2740,14 @@ export function getBiasStrings(textareaText, type) {
} }
} }
promptBias = messageBias || promptBias || ''; promptBias = messageBias || promptBias || power_user.user_prompt_bias || '';
return { messageBias, promptBias }; const isUserPromptBias = promptBias === power_user.user_prompt_bias;
// Substitute params for everything
messageBias = substituteParams(messageBias);
promptBias = substituteParams(promptBias);
return { messageBias, promptBias, isUserPromptBias };
} }
function formatMessageHistoryItem(chatItem, isInstruct) { function formatMessageHistoryItem(chatItem, isInstruct) {