Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

This commit is contained in:
RossAscends
2023-11-06 02:46:21 +09:00
3 changed files with 10 additions and 4 deletions

View File

@ -476,7 +476,7 @@
<input class="neo-range-input" type="number" min="0" max="4096" step="1" data-for="rep_pen_range_textgenerationwebui" id="rep_pen_range_counter_textgenerationwebui">
</div>
<div data-forAphro=False data-newbie-hidden class="alignitemscenter flex-container marginBot5 flexFlowColumn flexBasis48p flexGrow flexShrink gap0" data-i18n="Encoder Rep. Pen.">
<small>Encoder Repetition Penalty
<small>Encoder Penalty
</small>
<input class="neo-range-slider" type="range" id="encoder_rep_pen_textgenerationwebui" name="volume" min="0.8" max="1.5" step="0.01" />
@ -5065,4 +5065,4 @@
</script>
</body>
</html>
</html>

View File

@ -1274,6 +1274,11 @@ function messageFormatting(mes, ch_name, isSystem, isUser) {
isSystem = false;
}
// Let hidden messages have markdown
if (isSystem && ch_name !== systemUserName) {
isSystem = false;
}
// Prompt bias replacement should be applied on the raw message
if (!power_user.show_user_prompt_bias && ch_name && !isUser && !isSystem) {
mes = mes.replaceAll(substituteParams(power_user.user_prompt_bias), "");
@ -4776,7 +4781,7 @@ function getFirstMessage() {
is_user: false,
is_system: false,
send_date: getMessageTimeStamp(),
mes: getRegexedString(firstMes, regex_placement.AI_OUTPUT),
mes: substituteParams(getRegexedString(firstMes, regex_placement.AI_OUTPUT)),
extra: {},
};

View File

@ -3527,6 +3527,7 @@ a {
aspect-ratio: 2 / 3;
padding: 0;
border: 0;
background-color: transparent;
}
.zoomed_avatar img {
@ -3706,4 +3707,4 @@ a {
height: 100vh;
z-index: 9999;
}
}
}