rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NovelAI preamble code cleanup

This commit is contained in:
Mike Weldon 2023-08-03 18:22:46 -07:00
parent ea809023b5
commit 079b1623c5
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/index.html
View File

@ -815,8 +815,8 @@
<div class="fa-solid fa-clock-rotate-left "></div> <div class="fa-solid fa-clock-rotate-left "></div>
</div> </div>
</div> </div>
<div class="toggle-description justifyLeft" data-i18n="Use style tags to improve the quality of the output"> <div class="toggle-description justifyLeft" data-i18n="Use style tags to modify the writing style of the output">
Use style tags to improve the quality of the output Use style tags to modify the writing style of the output
</div> </div>
<div class="wide100p"> <div class="wide100p">
<textarea id="nai_preamble_textarea" class="text_pole textarea_compact" name="nai_preamble" rows="2" <textarea id="nai_preamble_textarea" class="text_pole textarea_compact" name="nai_preamble" rows="2"

22
public/script.js
View File

@ -2669,8 +2669,11 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
setPromtString(); setPromtString();
} }
// add chat preamble
mesSendString = addChatsPreamble(mesSendString);
// add a custom dingus (if defined) // add a custom dingus (if defined)
mesSendString = adjustChatsSeparator(mesSendString); mesSendString = addChatsSeparator(mesSendString);
let finalPromt = let finalPromt =
storyString + storyString +
@ -3156,16 +3159,13 @@ function parseTokenCounts(counts, thisPromptBits) {
}); });
} }
function adjustChatsSeparator(mesSendString) { function addChatsPreamble(mesSendString) {
if (main_api === 'novel') { const preamble = main_api === 'novel' ? nai_settings.preamble : "";
let preamble = "\n***\n" + nai_settings.nai_preamble; return preamble + '\n' + mesSendString;
if (!preamble.endsWith('\n')) {
preamble += '\n';
}
mesSendString = preamble + mesSendString;
} }
else if (power_user.custom_chat_separator && power_user.custom_chat_separator.length) { function addChatsSeparator(mesSendString) {
if (power_user.custom_chat_separator && power_user.custom_chat_separator.length) {
mesSendString = power_user.custom_chat_separator + '\n' + mesSendString; mesSendString = power_user.custom_chat_separator + '\n' + mesSendString;
} }
@ -3174,6 +3174,10 @@ function adjustChatsSeparator(mesSendString) {
mesSendString = mesSendString; mesSendString = mesSendString;
} }
else if (main_api === 'novel') {
mesSendString = '\n***\n' + mesSendString;
}
// add non-pygma dingus // add non-pygma dingus
else if (!is_pygmalion) { else if (!is_pygmalion) {
mesSendString = '\nThen the roleplay chat between ' + name1 + ' and ' + name2 + ' begins.\n' + mesSendString; mesSendString = '\nThen the roleplay chat between ' + name1 + ' and ' + name2 + ' begins.\n' + mesSendString;

8
public/scripts/nai-settings.js
View File

@ -79,7 +79,7 @@ function loadNovelSettings(settings) {
$(`#model_novel_select option[value=${nai_settings.model_novel}]`).attr("selected", true); $(`#model_novel_select option[value=${nai_settings.model_novel}]`).attr("selected", true);
$('#model_novel_select').val(nai_settings.model_novel); $('#model_novel_select').val(nai_settings.model_novel);
if (settings.nai_preamble !== undefined) nai_settings.nai_preamble = settings.nai_preamble; if (settings.nai_preamble !== undefined) nai_settings.preamble = settings.nai_preamble;
nai_settings.preset_settings_novel = settings.preset_settings_novel; nai_settings.preset_settings_novel = settings.preset_settings_novel;
nai_settings.temperature = settings.temperature; nai_settings.temperature = settings.temperature;
nai_settings.repetition_penalty = settings.repetition_penalty; nai_settings.repetition_penalty = settings.repetition_penalty;
@ -347,13 +347,13 @@ export async function generateNovelWithStreaming(generate_data, signal) {
} }
$("#nai_preamble_textarea").on('input', function () { $("#nai_preamble_textarea").on('input', function () {
nai_settings.nai_preamble = $('#nai_preamble_textarea').val(); nai_settings.preamble = $('#nai_preamble_textarea').val();
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$("#nai_preamble_restore").on('click', function () { $("#nai_preamble_restore").on('click', function () {
nai_settings.nai_preamble = default_preamble; nai_settings.preamble = default_preamble;
$('#nai_preamble_textarea').val(nai_settings.nai_preamble); $('#nai_preamble_textarea').val(nai_settings.preamble);
saveSettingsDebounced(); saveSettingsDebounced();
}); });