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

Remove isGenerationAborted

Browse Source 
Just check the AbortSignal.
This commit is contained in:
valadaptive
2023-12-07 16:20:54 -05:00
parent f8a903e1fd
commit f5d2e50f5e
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/scripts/group-chats.js
View File

@@ -658,7 +658,6 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
let activationText = ''; let activationText = '';
let isUserInput = false; let isUserInput = false;
let isGenerationDone = false; let isGenerationDone = false;
let isGenerationAborted = false;
if (userInput?.length && !by_auto_mode) { if (userInput?.length && !by_auto_mode) {
isUserInput = true; isUserInput = true;
@@ -673,16 +672,10 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
const resolveOriginal = params.resolve; const resolveOriginal = params.resolve;
const rejectOriginal = params.reject; const rejectOriginal = params.reject;
if (params.signal instanceof AbortSignal) { if (params.signal instanceof AbortSignal && params.signal.aborted) {
if (params.signal.aborted) {
throw new Error('Already aborted signal passed. Group generation stopped'); throw new Error('Already aborted signal passed. Group generation stopped');
} }
params.signal.onabort = () => {
isGenerationAborted = true;
};
}
if (typeof params.resolve === 'function') { if (typeof params.resolve === 'function') {
params.resolve = function () { params.resolve = function () {
isGenerationDone = true; isGenerationDone = true;
@@ -760,7 +753,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
// TODO: This is awful. Refactor this // TODO: This is awful. Refactor this
while (true) { while (true) {
deactivateSendButtons(); deactivateSendButtons();
if (isGenerationAborted) { if (params.signal instanceof AbortSignal && params.signal.aborted) {
throw new Error('Group generation aborted'); throw new Error('Group generation aborted');
} }