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

Improve circuit breaker

Browse Source 
We now track the loop counter as a parameter of Generate that we
decrement with every recursive call, rather than a global variable,
and it *should* now work with quiet prompt generation.
This commit is contained in:
valadaptive
2023-12-10 18:43:17 -05:00
parent 3d7c901464
commit 3ab1962b84
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
public/script.js
View File

@@ -693,7 +693,6 @@ let abortController;
//css //css
var css_mes_bg = $('<div class="mes"></div>').css('background'); var css_mes_bg = $('<div class="mes"></div>').css('background');
var css_send_form_display = $('<div id=send_form></div>').css('display'); var css_send_form_display = $('<div id=send_form></div>').css('display');
let generate_loop_counter = 0;
const MAX_GENERATION_LOOPS = 5; const MAX_GENERATION_LOOPS = 5;
var kobold_horde_model = ''; var kobold_horde_model = '';
@@ -2889,7 +2888,7 @@ export async function generateRaw(prompt, api, instructOverride) {
} }
// Returns a promise that resolves when the text is done generating. // Returns a promise that resolves when the text is done generating.
async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage } = {}, dryRun = false) { async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage, maxLoops } = {}, dryRun = false) {
console.log('Generate entered'); console.log('Generate entered');
setGenerationProgress(0); setGenerationProgress(0);
generation_started = new Date(); generation_started = new Date();
@@ -2939,8 +2938,8 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
} }
if (selected_group && !is_group_generating && !dryRun) { if (selected_group && !is_group_generating && !dryRun) {
// TODO: await here! // Returns the promise that generateGroupWrapper returns; resolves when generation is done
return generateGroupWrapper(false, type, { quiet_prompt, force_chid, signal: abortController.signal, quietImage }); return generateGroupWrapper(false, type, { quiet_prompt, force_chid, signal: abortController.signal, quietImage, maxLoops });
} else if (selected_group && !is_group_generating && dryRun) { } else if (selected_group && !is_group_generating && dryRun) {
const characterIndexMap = new Map(characters.map((char, index) => [char.avatar, index])); const characterIndexMap = new Map(characters.map((char, index) => [char.avatar, index]));
const group = groups.find((x) => x.id === selected_group); const group = groups.find((x) => x.id === selected_group);
@@ -3862,23 +3861,25 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
if (type !== 'quiet') { if (type !== 'quiet') {
playMessageSound(); playMessageSound();
} }
generate_loop_counter = 0;
} else { } else {
++generate_loop_counter; // If maxLoops is not passed in (e.g. first time generating), set it to MAX_GENERATION_LOOPS
maxLoops ??= MAX_GENERATION_LOOPS;
if (generate_loop_counter > MAX_GENERATION_LOOPS) { if (maxLoops === 0) {
reject(new Error('Generate circuit breaker interruption')); reject(new Error('Generate circuit breaker interruption'));
if (type !== 'quiet') { if (type !== 'quiet') {
throwCircuitBreakerError(); throwCircuitBreakerError();
} }
return;
} }
// regenerate with character speech reenforced // regenerate with character speech reenforced
// to make sure we leave on swipe type while also adding the name2 appendage // to make sure we leave on swipe type while also adding the name2 appendage
setTimeout(() => { delay(1000).then(async () => {
Generate(type, { automatic_trigger, force_name2: true, quiet_prompt, skipWIAN, force_chid }); // The first await is for waiting for the generate to start. The second one is waiting for it to finish
}, 1000); const result = await await Generate(type, { automatic_trigger, force_name2: true, quiet_prompt, skipWIAN, force_chid, maxLoops: maxLoops - 1 });
resolve(result);
});
} }
if (power_user.auto_swipe) { if (power_user.auto_swipe) {
@@ -4414,7 +4415,6 @@ function getGenerateUrl(api) {
function throwCircuitBreakerError() { function throwCircuitBreakerError() {
callPopup(`Could not extract reply in ${MAX_GENERATION_LOOPS} attempts. Try generating again`, 'text'); callPopup(`Could not extract reply in ${MAX_GENERATION_LOOPS} attempts. Try generating again`, 'text');
generate_loop_counter = 0;
unblockGeneration(); unblockGeneration();
throw new Error('Generate circuit breaker interruption'); throw new Error('Generate circuit breaker interruption');
} }