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

Cancel auto-continue if user input is not empty

This commit is contained in:
Cohee 2023-09-15 22:26:53 +03:00
parent 77c8bc8eb5
commit fc7a4538e9
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/script.js
View File

@ -3262,42 +3262,48 @@ function getNextMessageId(type) {
*/ */
export function triggerAutoContinue(messageChunk, isImpersonate) { export function triggerAutoContinue(messageChunk, isImpersonate) {
if (selected_group) { if (selected_group) {
console.debug('Auto-continue is disabled for group chat'); console.log('Auto-continue is disabled for group chat');
return; return;
} }
if (power_user.auto_continue.enabled && !is_send_press) { if (power_user.auto_continue.enabled && !is_send_press) {
if (power_user.auto_continue.target_length <= 0) { if (power_user.auto_continue.target_length <= 0) {
console.debug('Auto-continue target length is 0, not triggering auto-continue'); console.log('Auto-continue target length is 0, not triggering auto-continue');
return; return;
} }
if (main_api === 'openai' && !power_user.auto_continue.allow_chat_completions){ if (main_api === 'openai' && !power_user.auto_continue.allow_chat_completions){
console.debug('Auto-continue for OpenAI is disabled by user.'); console.log('Auto-continue for OpenAI is disabled by user.');
return; return;
} }
if (isImpersonate) { if (isImpersonate) {
console.debug('Continue for impersonation is not implemented yet'); console.log('Continue for impersonation is not implemented yet');
return; return;
} }
const textareaText = String($('#send_textarea').val());
const USABLE_LENGTH = 5; const USABLE_LENGTH = 5;
if (textareaText.length > 0) {
console.log('Not triggering auto-continue because user input is not empty');
return;
}
if (messageChunk.trim().length > USABLE_LENGTH && chat.length) { if (messageChunk.trim().length > USABLE_LENGTH && chat.length) {
const lastMessage = chat[chat.length - 1]; const lastMessage = chat[chat.length - 1];
const messageLength = getTokenCount(lastMessage.mes); const messageLength = getTokenCount(lastMessage.mes);
const shouldAutoContinue = messageLength < power_user.auto_continue.target_length; const shouldAutoContinue = messageLength < power_user.auto_continue.target_length;
if (shouldAutoContinue) { if (shouldAutoContinue) {
console.debug(`Triggering auto-continue. Message tokens: ${messageLength}. Target tokens: ${power_user.auto_continue.target_length}`); console.log(`Triggering auto-continue. Message tokens: ${messageLength}. Target tokens: ${power_user.auto_continue.target_length}. Message chunk: ${messageChunk}`);
$("#option_continue").trigger('click'); $("#option_continue").trigger('click');
} else { } else {
console.debug(`Not triggering auto-continue. Message tokens: ${messageLength}. Target tokens: ${power_user.auto_continue.target_length}`); console.log(`Not triggering auto-continue. Message tokens: ${messageLength}. Target tokens: ${power_user.auto_continue.target_length}`);
return; return;
} }
} else { } else {
console.debug('Last generated chunk was empty, not triggering auto-continue'); console.log('Last generated chunk was empty, not triggering auto-continue');
return; return;
} }
} }