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

Fix group wrapper not resolving to a valid text

Browse Source
This commit is contained in:
Cohee
2023-12-11 19:00:42 +02:00
parent 0fcf8fd491
commit e96fb0c1b5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1781,6 +1781,12 @@ async function generateMultimodalPrompt(generationType, quietPrompt) {
*/ */
async function generatePrompt(quietPrompt) { async function generatePrompt(quietPrompt) {
const reply = await generateQuietPrompt(quietPrompt, false, false); const reply = await generateQuietPrompt(quietPrompt, false, false);
if (!reply) {
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 processReply(reply); return processReply(reply);
} }

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

@ -627,6 +627,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
const group = groups.find((x) => x.id === selected_group); const group = groups.find((x) => x.id === selected_group);
let typingIndicator = $('#chat .typing_indicator'); let typingIndicator = $('#chat .typing_indicator');
let textResult = '';
if (!group || !Array.isArray(group.members) || !group.members.length) { if (!group || !Array.isArray(group.members) || !group.members.length) {
sendSystemMessage(system_message_types.EMPTY, '', { isSmallSys: true }); sendSystemMessage(system_message_types.EMPTY, '', { isSmallSys: true });
@ -726,7 +727,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
// Wait for generation to finish // Wait for generation to finish
const generateFinished = await Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) }); const generateFinished = await Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
await generateFinished; textResult = await generateFinished;
} }
} finally { } finally {
typingIndicator.hide(); typingIndicator.hide();
@ -740,7 +741,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
showSwipeButtons(); showSwipeButtons();
} }
return Promise.resolve(); return Promise.resolve(textResult);
} }
function getLastMessageGenerationId() { function getLastMessageGenerationId() {