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 pull request #1493 from valadaptive/generate-cleanups

Browse Source 
Clean up Generate(), part 1
This commit is contained in:
Cohee
2023-12-11 20:21:32 +02:00
committed by GitHub
parent e8678ea5df d38a4dc6c1
commit 7482a75bbd
4 changed files with 275 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/scripts/extensions/stable-diffusion/index.js
View File

@@ -1781,7 +1781,14 @@ async function generateMultimodalPrompt(generationType, quietPrompt) {
*/
async function generatePrompt(quietPrompt) {
const reply = await generateQuietPrompt(quietPrompt, false, false);
return processReply(reply);
const processedReply = processReply(reply);
if (!processedReply) {
toastr.error('Prompt generation produced no text. Make sure you\'re using a valid instruct template and try again', 'Image Generation');
throw new Error('Prompt generation failed.');
}
return processedReply;
}
async function sendGenerationRequest(generationType, prompt, characterName = null, callback) {