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

Refactor error handling

Browse Source 
Remove the StreamingProcessor.hook method and use a try-catch block to
await the generator promise and set the generator, handling errors with
onError if it fails.
This commit is contained in:
valadaptive 2023-12-08 18:40:17 -05:00
parent d735b12399
commit 3cfc32c16d
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
public/script.js
View File

@ -2730,10 +2730,6 @@ class StreamingProcessor {
this.onErrorStreaming(); this.onErrorStreaming();
} }
hook(generatorFn) {
this.generator = generatorFn;
}
*nullStreamingGeneration() { *nullStreamingGeneration() {
throw new Error('Generation function for streaming is not hooked up'); throw new Error('Generation function for streaming is not hooked up');
} }
@ -3727,13 +3723,11 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
console.debug(`pushed prompt bits to itemizedPrompts array. Length is now: ${itemizedPrompts.length}`); console.debug(`pushed prompt bits to itemizedPrompts array. Length is now: ${itemizedPrompts.length}`);
/** @type {Promise<any>} */ /** @type {Promise<any>} */
let streamingHookPromise = Promise.resolve(); let streamingGeneratorPromise = Promise.resolve();
if (main_api == 'openai') { if (main_api == 'openai') {
if (isStreamingEnabled() && type !== 'quiet') { if (isStreamingEnabled() && type !== 'quiet') {
streamingHookPromise = sendOpenAIRequest(type, generate_data.prompt, streamingProcessor.abortController.signal) streamingGeneratorPromise = sendOpenAIRequest(type, generate_data.prompt, streamingProcessor.abortController.signal);
.then(fn => streamingProcessor.hook(fn))
.catch(onError);
} }
else { else {
sendOpenAIRequest(type, generate_data.prompt, abortController.signal).then(onSuccess).catch(onError); sendOpenAIRequest(type, generate_data.prompt, abortController.signal).then(onSuccess).catch(onError);
@ -3743,19 +3737,13 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
generateHorde(finalPrompt, generate_data, abortController.signal, true).then(onSuccess).catch(onError); generateHorde(finalPrompt, generate_data, abortController.signal, true).then(onSuccess).catch(onError);
} }
else if (main_api == 'textgenerationwebui' && isStreamingEnabled() && type !== 'quiet') { else if (main_api == 'textgenerationwebui' && isStreamingEnabled() && type !== 'quiet') {
streamingHookPromise = generateTextGenWithStreaming(generate_data, streamingProcessor.abortController.signal) streamingGeneratorPromise = generateTextGenWithStreaming(generate_data, streamingProcessor.abortController.signal);
.then(fn => streamingProcessor.hook(fn))
.catch(onError);
} }
else if (main_api == 'novel' && isStreamingEnabled() && type !== 'quiet') { else if (main_api == 'novel' && isStreamingEnabled() && type !== 'quiet') {
streamingHookPromise = generateNovelWithStreaming(generate_data, streamingProcessor.abortController.signal) streamingGeneratorPromise = generateNovelWithStreaming(generate_data, streamingProcessor.abortController.signal);
.then(fn => streamingProcessor.hook(fn))
.catch(onError);
} }
else if (main_api == 'kobold' && isStreamingEnabled() && type !== 'quiet') { else if (main_api == 'kobold' && isStreamingEnabled() && type !== 'quiet') {
streamingHookPromise = generateKoboldWithStreaming(generate_data, streamingProcessor.abortController.signal) streamingGeneratorPromise = generateKoboldWithStreaming(generate_data, streamingProcessor.abortController.signal);
.then(fn => streamingProcessor.hook(fn))
.catch(onError);
} }
else { else {
try { try {
@ -3780,20 +3768,27 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} }
if (isStreamingEnabled() && type !== 'quiet') { if (isStreamingEnabled() && type !== 'quiet') {
hideSwipeButtons(); try {
await streamingHookPromise; const streamingGenerator = await streamingGeneratorPromise;
let getMessage = await streamingProcessor.generate(); streamingProcessor.generator = streamingGenerator;
let messageChunk = cleanUpMessage(getMessage, isImpersonate, isContinue, false); hideSwipeButtons();
let getMessage = await streamingProcessor.generate();
let messageChunk = cleanUpMessage(getMessage, isImpersonate, isContinue, false);
if (isContinue) { if (isContinue) {
getMessage = continue_mag + getMessage; getMessage = continue_mag + getMessage;
}
if (streamingProcessor && !streamingProcessor.isStopped && streamingProcessor.isFinished) {
await streamingProcessor.onFinishStreaming(streamingProcessor.messageId, getMessage);
streamingProcessor = null;
triggerAutoContinue(messageChunk, isImpersonate);
}
resolve();
} catch (err) {
onError(err);
} }
if (streamingProcessor && !streamingProcessor.isStopped && streamingProcessor.isFinished) {
await streamingProcessor.onFinishStreaming(streamingProcessor.messageId, getMessage);
streamingProcessor = null;
triggerAutoContinue(messageChunk, isImpersonate);
}
} }
async function onSuccess(data) { async function onSuccess(data) {