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

Merge branch 'staging' into instruct-rework

Browse Source
This commit is contained in:
Cohee
2024-03-28 20:22:52 +02:00
parent 689af3151a 7c99d87238
commit c4427349c9
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/script.js
View File

@@ -2733,9 +2733,7 @@ class StreamingProcessor {
const continueMsg = this.type === 'continue' ? this.messageAlreadyGenerated : undefined;
saveLogprobsForActiveMessage(this.messageLogprobs.filter(Boolean), continueMsg);
await saveChatConditional();
activateSendButtons();
showSwipeButtons();
setGenerationProgress(0);
unblockGeneration();
generatedPromptCache = '';
//console.log("Generated text size:", text.length, text)
@@ -2778,11 +2776,8 @@ class StreamingProcessor {
this.isStopped = true;
this.hideMessageButtons(this.messageId);
$('#send_textarea').removeAttr('disabled');
is_send_press = false;
activateSendButtons();
setGenerationProgress(0);
showSwipeButtons();
generatedPromptCache = '';
unblockGeneration();
}
setFirstSwipe(messageId) {
@@ -4042,6 +4037,8 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
toastr.error(exception.error.message, 'Error', { timeOut: 10000, extendedTimeOut: 20000 });
}
generatedPromptCache = '';
unblockGeneration();
console.log(exception);
streamingProcessor = null;