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

Try to minimize side effects of generate dry running

Browse Source
This commit is contained in:
Cohee
2023-08-15 00:01:55 +03:00
parent 238b667262
commit a92333875c
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
public/scripts/PromptManager.js
View File

@ -1,7 +1,7 @@
import {callPopup, event_types, eventSource, main_api, saveSettingsDebounced, substituteParams} from "../script.js";
import {callPopup, event_types, eventSource, is_send_press, main_api, saveSettingsDebounced, substituteParams} from "../script.js";
import {TokenHandler} from "./openai.js";
import {power_user} from "./power-user.js";
import { debounce } from "./utils.js";
import { debounce, waitUntilCondition } from "./utils.js";
/**
* Register migrations for the prompt manager when settings are loaded or an Open AI preset is loaded.
@ -596,25 +596,29 @@ PromptManagerModule.prototype.render = function (afterTryGenerate = true) {
if (null === this.activeCharacter) return;
this.error = null;
if (true === afterTryGenerate) {
// Executed during dry-run for determining context composition
this.profileStart('filling context');
this.tryGenerate().then(() => {
this.profileEnd('filling context');
waitUntilCondition(() => is_send_press == false, 1024 * 1024, 100).then(() => {
if (true === afterTryGenerate) {
// Executed during dry-run for determining context composition
this.profileStart('filling context');
this.tryGenerate().then(() => {
this.profileEnd('filling context');
this.profileStart('render');
this.renderPromptManager();
this.renderPromptManagerListItems()
this.makeDraggable();
this.profileEnd('render');
});
} else {
// Executed during live communication
this.profileStart('render');
this.renderPromptManager();
this.renderPromptManagerListItems()
this.makeDraggable();
this.profileEnd('render');
});
} else {
// Executed during live communication
this.profileStart('render');
this.renderPromptManager();
this.renderPromptManagerListItems()
this.makeDraggable();
this.profileEnd('render');
}
}
}).catch(() => {
console.log('Timeout while waiting for send press to be false');
});
}
/**