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

Add return value to /sd command and quiet flag

Browse Source
This commit is contained in:
Cohee 2024-01-24 20:15:10 +02:00
parent 4985afd816
commit e537def312
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ import {
} from '../../../script.js'; } from '../../../script.js';
import { getApiUrl, getContext, extension_settings, doExtrasFetch, modules, renderExtensionTemplate } from '../../extensions.js'; import { getApiUrl, getContext, extension_settings, doExtrasFetch, modules, renderExtensionTemplate } from '../../extensions.js';
import { selected_group } from '../../group-chats.js'; import { selected_group } from '../../group-chats.js';
import { stringFormat, initScrollHeight, resetScrollHeight, getCharaFilename, saveBase64AsFile, getBase64Async, delay } from '../../utils.js'; import { stringFormat, initScrollHeight, resetScrollHeight, getCharaFilename, saveBase64AsFile, getBase64Async, delay, isTrueBoolean } from '../../utils.js';
import { getMessageTimeStamp, humanizedDateTime } from '../../RossAscends-mods.js'; import { getMessageTimeStamp, humanizedDateTime } from '../../RossAscends-mods.js';
import { SECRET_KEYS, secret_state } from '../../secrets.js'; import { SECRET_KEYS, secret_state } from '../../secrets.js';
import { getNovelUnlimitedImageGeneration, getNovelAnlas, loadNovelSubscriptionData } from '../../nai-settings.js'; import { getNovelUnlimitedImageGeneration, getNovelAnlas, loadNovelSubscriptionData } from '../../nai-settings.js';
@ -145,8 +145,8 @@ const promptTemplates = {
}; };
const helpString = [ const helpString = [
`${m('(argument)')} – requests to generate an image. Supported arguments: ${m(j(Object.values(triggerWords).flat()))}.`, `${m('[quiet=false/true] (argument)')} – requests to generate an image and posts it to chat (unless quiet=true argument is specified). Supported arguments: ${m(j(Object.values(triggerWords).flat()))}.`,
'Anything else would trigger a "free mode" to make generate whatever you prompted. Example: \'/imagine apple tree\' would generate a picture of an apple tree.', 'Anything else would trigger a "free mode" to make generate whatever you prompted. Example: \'/imagine apple tree\' would generate a picture of an apple tree. Returns a link to the generated image.',
].join(' '); ].join(' ');
const defaultPrefix = 'best quality, absurdres, aesthetic,'; const defaultPrefix = 'best quality, absurdres, aesthetic,';
@ -1693,7 +1693,7 @@ function getRawLastMessage() {
return `((${processReply(lastMessage)})), (${processReply(situation)}:0.7), (${processReply(characterDescription)}:0.5)`; return `((${processReply(lastMessage)})), (${processReply(situation)}:0.7), (${processReply(characterDescription)}:0.5)`;
} }
async function generatePicture(_, trigger, message, callback) { async function generatePicture(args, trigger, message, callback) {
if (!trigger || trigger.trim().length === 0) { if (!trigger || trigger.trim().length === 0) {
console.log('Trigger word empty, aborting'); console.log('Trigger word empty, aborting');
return; return;
@ -1731,7 +1731,12 @@ async function generatePicture(_, trigger, message, callback) {
}; };
} }
if (isTrueBoolean(args?.quiet)) {
callback = () => { };
}
const dimensions = setTypeSpecificDimensions(generationType); const dimensions = setTypeSpecificDimensions(generationType);
let imagePath = '';
try { try {
const prompt = await getPrompt(generationType, message, trigger, quietPrompt); const prompt = await getPrompt(generationType, message, trigger, quietPrompt);
@ -1740,7 +1745,7 @@ async function generatePicture(_, trigger, message, callback) {
context.deactivateSendButtons(); context.deactivateSendButtons();
hideSwipeButtons(); hideSwipeButtons();
await sendGenerationRequest(generationType, prompt, characterName, callback); imagePath = await sendGenerationRequest(generationType, prompt, characterName, callback);
} catch (err) { } catch (err) {
console.trace(err); console.trace(err);
throw new Error('SD prompt text generation failed.'); throw new Error('SD prompt text generation failed.');
@ -1750,6 +1755,8 @@ async function generatePicture(_, trigger, message, callback) {
context.activateSendButtons(); context.activateSendButtons();
showSwipeButtons(); showSwipeButtons();
} }
return imagePath;
} }
function setTypeSpecificDimensions(generationType) { function setTypeSpecificDimensions(generationType) {
@ -1964,6 +1971,7 @@ async function sendGenerationRequest(generationType, prompt, characterName = nul
const filename = `${characterName}_${humanizedDateTime()}`; const filename = `${characterName}_${humanizedDateTime()}`;
const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format); const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format);
callback ? callback(prompt, base64Image, generationType) : sendMessage(prompt, base64Image, generationType); callback ? callback(prompt, base64Image, generationType) : sendMessage(prompt, base64Image, generationType);
return base64Image;
} }
async function generateTogetherAIImage(prompt, negativePrompt) { async function generateTogetherAIImage(prompt, negativePrompt) {