rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-04-19 05:07:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SillyTavern:release' into release

Browse Source
This commit is contained in:
erew123 2024-01-17 21:28:08 +00:00 committed by GitHub
commit f293c20e9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/index.html
View File

@ -1387,7 +1387,7 @@
<input type="checkbox" id="do_sample_textgenerationwebui" /> <input type="checkbox" id="do_sample_textgenerationwebui" />
<small data-i18n="Do Sample">Do Sample</small> <small data-i18n="Do Sample">Do Sample</small>
</label> </label>
<label data-forAphro="False" data-tg-type="ooba" class="checkbox_label flexGrow flexShrink" for="add_bos_token_textgenerationwebui"> <label data-forAphro="False" data-tg-type="ooba, tabby" class="checkbox_label flexGrow flexShrink" for="add_bos_token_textgenerationwebui">
<input type="checkbox" id="add_bos_token_textgenerationwebui" /> <input type="checkbox" id="add_bos_token_textgenerationwebui" />
<small data-i18n="Add BOS Token">Add BOS Token <small data-i18n="Add BOS Token">Add BOS Token
<div class="fa-solid fa-circle-info opacity50p " data-i18n="Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative." title="Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative."></div> <div class="fa-solid fa-circle-info opacity50p " data-i18n="Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative." title="Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative."></div>
@ -1411,7 +1411,7 @@
<input type="checkbox" id="skip_special_tokens_textgenerationwebui" /> <input type="checkbox" id="skip_special_tokens_textgenerationwebui" />
<small data-i18n="Skip Special Tokens">Skip Special Tokens</small> <small data-i18n="Skip Special Tokens">Skip Special Tokens</small>
</label> </label>
<label data-forAphro="False" data-tg-type="ooba, aphrodite" class="checkbox_label flexGrow flexShrink" for="temperature_last_textgenerationwebui"> <label data-forAphro="False" data-tg-type="ooba, aphrodite, tabby" class="checkbox_label flexGrow flexShrink" for="temperature_last_textgenerationwebui">
<input type="checkbox" id="temperature_last_textgenerationwebui" /> <input type="checkbox" id="temperature_last_textgenerationwebui" />
<small data-i18n="Temperature Last">Temperature Last <small data-i18n="Temperature Last">Temperature Last
<div class="fa-solid fa-circle-info opacity50p " data-i18n="Use the temperature sampler last." title="Use the temperature sampler last."></div> <div class="fa-solid fa-circle-info opacity50p " data-i18n="Use the temperature sampler last." title="Use the temperature sampler last."></div>

11
public/script.js
View File

@ -3464,9 +3464,13 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
scenario, scenario,
char: name2, char: name2,
user: name1, user: name1,
worldInfoBefore,
worldInfoAfter,
beforeScenarioAnchor, beforeScenarioAnchor,
afterScenarioAnchor, afterScenarioAnchor,
storyString,
mesExmString, mesExmString,
mesSendString,
finalMesSend, finalMesSend,
generatedPromptCache, generatedPromptCache,
main: system, main: system,
@ -9292,13 +9296,16 @@ jQuery(async function () {
$(document).keyup(function (e) { $(document).keyup(function (e) {
if (e.key === 'Escape') { if (e.key === 'Escape') {
if (power_user.auto_save_msg_edits === false) { const isEditVisible = $('#curEditTextarea').is(':visible');
if (isEditVisible && power_user.auto_save_msg_edits === false) {
closeMessageEditor(); closeMessageEditor();
$('#send_textarea').focus(); $('#send_textarea').focus();
return;
} }
if (power_user.auto_save_msg_edits === true) { if (isEditVisible && power_user.auto_save_msg_edits === true) {
$(`#chat .mes[mesid="${this_edit_mes_id}"] .mes_edit_done`).click(); $(`#chat .mes[mesid="${this_edit_mes_id}"] .mes_edit_done`).click();
$('#send_textarea').focus(); $('#send_textarea').focus();
return;
} }
if (!this_edit_mes_id && $('#mes_stop').is(':visible')) { if (!this_edit_mes_id && $('#mes_stop').is(':visible')) {
$('#mes_stop').trigger('click'); $('#mes_stop').trigger('click');

8
public/scripts/extensions/quick-reply/index.js
View File

@ -183,7 +183,7 @@ const init = async () => {
slash.init(); slash.init();
autoExec = new AutoExecuteHandler(settings); autoExec = new AutoExecuteHandler(settings);
autoExec.handleStartup(); await autoExec.handleStartup();
}; };
eventSource.on(event_types.APP_READY, init); eventSource.on(event_types.APP_READY, init);
@ -197,16 +197,16 @@ const onChatChanged = async (chatIdx) => {
manager.rerender(); manager.rerender();
buttons.refresh(); buttons.refresh();
autoExec.handleChatChanged(); await autoExec.handleChatChanged();
}; };
eventSource.on(event_types.CHAT_CHANGED, onChatChanged); eventSource.on(event_types.CHAT_CHANGED, onChatChanged);
const onUserMessage = async () => { const onUserMessage = async () => {
autoExec.handleUser(); await autoExec.handleUser();
}; };
eventSource.on(event_types.USER_MESSAGE_RENDERED, onUserMessage); eventSource.on(event_types.USER_MESSAGE_RENDERED, onUserMessage);
const onAiMessage = async () => { const onAiMessage = async () => {
autoExec.handleAi(); await autoExec.handleAi();
}; };
eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, onAiMessage); eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, onAiMessage);

4
public/scripts/textgen-settings.js
View File

@ -511,7 +511,7 @@ jQuery(function () {
'rep_pen_textgenerationwebui': 1, 'rep_pen_textgenerationwebui': 1,
'rep_pen_range_textgenerationwebui': 0, 'rep_pen_range_textgenerationwebui': 0,
'dynatemp_textgenerationwebui': false, 'dynatemp_textgenerationwebui': false,
'seed_textgenerationwebui': 1, 'seed_textgenerationwebui': -1,
'ban_eos_token_textgenerationwebui': false, 'ban_eos_token_textgenerationwebui': false,
'do_sample_textgenerationwebui': true, 'do_sample_textgenerationwebui': true,
'add_bos_token_textgenerationwebui': true, 'add_bos_token_textgenerationwebui': true,
@ -595,7 +595,7 @@ jQuery(function () {
function showTypeSpecificControls(type) { function showTypeSpecificControls(type) {
$('[data-tg-type]').each(function () { $('[data-tg-type]').each(function () {
const tgTypes = $(this).attr('data-tg-type').split(','); const tgTypes = $(this).attr('data-tg-type').split(',').map(x => x.trim());
for (const tgType of tgTypes) { for (const tgType of tgTypes) {
if (tgType === type || tgType == 'all') { if (tgType === type || tgType == 'all') {
$(this).show(); $(this).show();

2
start.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
if ! command -v npm &> /dev/null if ! command -v npm &> /dev/null
then then