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

Added power user option to remove examples

Browse Source
This commit is contained in:
based
2023-08-20 02:25:07 +10:00
parent a4f075a9b1
commit 0d694dcc32
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/index.html
View File

@ -2225,6 +2225,10 @@
Keep Example Messages in Prompt Keep Example Messages in Prompt
</span> </span>
</label> </label>
<label class="checkbox_label" for="remove-examples-checkbox">
<input id="remove-examples-checkbox" type="checkbox" />
Strip Example Messages from Prompt
</label>
<label class="checkbox_label" for="collapse-newlines-checkbox"><input id="collapse-newlines-checkbox" type="checkbox" /> <label class="checkbox_label" for="collapse-newlines-checkbox"><input id="collapse-newlines-checkbox" type="checkbox" />
<span data-i18n="Remove Empty New Lines from Output"> <span data-i18n="Remove Empty New Lines from Output">
Remove Empty New Lines from Output Remove Empty New Lines from Output

3
public/script.js
View File

@ -2543,6 +2543,9 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
const blockHeading = main_api === 'openai' ? '<START>\n' : exampleSeparator; const blockHeading = main_api === 'openai' ? '<START>\n' : exampleSeparator;
let mesExamplesArray = mesExamples.split(/<START>/gi).slice(1).map(block => `${blockHeading}${block.trim()}\n`); let mesExamplesArray = mesExamples.split(/<START>/gi).slice(1).map(block => `${blockHeading}${block.trim()}\n`);
if(power_user.strip_examples)
mesExamplesArray = []
// First message in fresh 1-on-1 chat reacts to user/character settings changes // First message in fresh 1-on-1 chat reacts to user/character settings changes
if (chat.length) { if (chat.length) {
chat[0].mes = substituteParams(chat[0].mes); chat[0].mes = substituteParams(chat[0].mes);

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

@ -95,6 +95,7 @@ let power_user = {
collapse_newlines: false, collapse_newlines: false,
pygmalion_formatting: pygmalion_options.AUTO, pygmalion_formatting: pygmalion_options.AUTO,
pin_examples: false, pin_examples: false,
strip_examples: false,
trim_sentences: false, trim_sentences: false,
include_newline: false, include_newline: false,
always_force_name2: false, always_force_name2: false,
@ -729,6 +730,7 @@ function loadPowerUserSettings(settings, data) {
$("#spoiler_free_mode").prop("checked", power_user.spoiler_free_mode); $("#spoiler_free_mode").prop("checked", power_user.spoiler_free_mode);
$("#collapse-newlines-checkbox").prop("checked", power_user.collapse_newlines); $("#collapse-newlines-checkbox").prop("checked", power_user.collapse_newlines);
$("#pin-examples-checkbox").prop("checked", power_user.pin_examples); $("#pin-examples-checkbox").prop("checked", power_user.pin_examples);
$("#remove-examples-checkbox").prop("checked", power_user.strip_examples);
$("#always-force-name2-checkbox").prop("checked", power_user.always_force_name2); $("#always-force-name2-checkbox").prop("checked", power_user.always_force_name2);
$("#trim_sentences_checkbox").prop("checked", power_user.trim_sentences); $("#trim_sentences_checkbox").prop("checked", power_user.trim_sentences);
$("#include_newline_checkbox").prop("checked", power_user.include_newline); $("#include_newline_checkbox").prop("checked", power_user.include_newline);
@ -1675,10 +1677,27 @@ $(document).ready(() => {
}); });
$("#pin-examples-checkbox").change(function () { $("#pin-examples-checkbox").change(function () {
if ($(this).prop("checked")) {
$("#remove-examples-checkbox").prop("checked", false).prop("disabled", true);
power_user.strip_examples = false;
} else {
$("#remove-examples-checkbox").prop("disabled", false);
}
power_user.pin_examples = !!$(this).prop("checked"); power_user.pin_examples = !!$(this).prop("checked");
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$("#remove-examples-checkbox").change(function () {
if ($(this).prop("checked")) {
$("#pin-examples-checkbox").prop("checked", false).prop("disabled", true);
power_user.pin_examples = false;
} else {
$("#pin-examples-checkbox").prop("disabled", false);
}
power_user.strip_examples = !!$(this).prop("checked");
saveSettingsDebounced();
});
// include newline is the child of trim sentences // include newline is the child of trim sentences
// if include newline is checked, trim sentences must be checked // if include newline is checked, trim sentences must be checked
// if trim sentences is unchecked, include newline must be unchecked // if trim sentences is unchecked, include newline must be unchecked