mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2024-12-24 16:11:20 +01:00
Rename SD extension to "Image Generation"
This commit is contained in:
parent
cbc0b41773
commit
b3ced2c4c5
@ -3205,7 +3205,7 @@
|
|||||||
Chat Backgrounds
|
Chat Backgrounds
|
||||||
</h3>
|
</h3>
|
||||||
<div id="bg_chat_hint" class="wide100p textAlignCenter">
|
<div id="bg_chat_hint" class="wide100p textAlignCenter">
|
||||||
Chat backgrounds generated with the <code><i class="fa-solid fa-paintbrush"></i> Stable Diffusion</code> extension will appear here.
|
Chat backgrounds generated with the <code><i class="fa-solid fa-paintbrush"></i> Image Generation</code> extension will appear here.
|
||||||
</div>
|
</div>
|
||||||
<div id="bg_custom_content" class="bg_list">
|
<div id="bg_custom_content" class="bg_list">
|
||||||
</div>
|
</div>
|
||||||
|
@ -120,8 +120,8 @@ const promptTemplates = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const helpString = [
|
const helpString = [
|
||||||
`${m('(argument)')} – requests SD to make an image. Supported arguments: ${m(j(Object.values(triggerWords).flat()))}.`,
|
`${m('(argument)')} – requests to generate an image. Supported arguments: ${m(j(Object.values(triggerWords).flat()))}.`,
|
||||||
`Anything else would trigger a "free mode" to make SD generate whatever you prompted. Example: '/sd 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.`,
|
||||||
].join(' ');
|
].join(' ');
|
||||||
|
|
||||||
const defaultPrefix = 'best quality, absurdres, aesthetic,';
|
const defaultPrefix = 'best quality, absurdres, aesthetic,';
|
||||||
@ -776,7 +776,7 @@ async function onModelChange() {
|
|||||||
if (extension_settings.sd.source === sources.auto || extension_settings.sd.source === sources.vlad) {
|
if (extension_settings.sd.source === sources.auto || extension_settings.sd.source === sources.vlad) {
|
||||||
await updateAutoRemoteModel();
|
await updateAutoRemoteModel();
|
||||||
}
|
}
|
||||||
toastr.success('Model successfully loaded!', 'Stable Diffusion');
|
toastr.success('Model successfully loaded!', 'Image Generation');
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getAutoRemoteModel() {
|
async function getAutoRemoteModel() {
|
||||||
@ -1251,7 +1251,7 @@ function getRawLastMessage() {
|
|||||||
return message.mes;
|
return message.mes;
|
||||||
}
|
}
|
||||||
|
|
||||||
toastr.warning('No usable messages found.', 'Stable Diffusion');
|
toastr.warning('No usable messages found.', 'Image Generation');
|
||||||
throw new Error('No usable messages found.');
|
throw new Error('No usable messages found.');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1304,7 +1304,7 @@ async function generatePicture(_, trigger, message, callback) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const prompt = await getPrompt(generationType, message, trigger, quiet_prompt);
|
const prompt = await getPrompt(generationType, message, trigger, quiet_prompt);
|
||||||
console.log('Processed Stable Diffusion prompt:', prompt);
|
console.log('Processed image prompt:', prompt);
|
||||||
|
|
||||||
context.deactivateSendButtons();
|
context.deactivateSendButtons();
|
||||||
hideSwipeButtons();
|
hideSwipeButtons();
|
||||||
@ -1412,13 +1412,13 @@ async function sendGenerationRequest(generationType, prompt, characterName = nul
|
|||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
toastr.error('Image generation failed. Please try again.' + '\n\n' + String(err), 'Stable Diffusion');
|
toastr.error('Image generation failed. Please try again.' + '\n\n' + String(err), 'Image Generation');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentChatId !== getCurrentChatId()) {
|
if (currentChatId !== getCurrentChatId()) {
|
||||||
console.warn('Chat changed, aborting SD result saving');
|
console.warn('Chat changed, aborting SD result saving');
|
||||||
toastr.warning('Chat changed, generated image discarded.', 'Stable Diffusion');
|
toastr.warning('Chat changed, generated image discarded.', 'Image Generation');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1714,7 +1714,7 @@ function addSDGenButtons() {
|
|||||||
const buttonHtml = `
|
const buttonHtml = `
|
||||||
<div id="sd_gen" class="list-group-item flex-container flexGap5">
|
<div id="sd_gen" class="list-group-item flex-container flexGap5">
|
||||||
<div class="fa-solid fa-paintbrush extensionsMenuExtensionButton" title="Trigger Stable Diffusion" /></div>
|
<div class="fa-solid fa-paintbrush extensionsMenuExtensionButton" title="Trigger Stable Diffusion" /></div>
|
||||||
Stable Diffusion
|
Generate Image
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@ -1888,7 +1888,7 @@ $("#sd_dropdown [id]").on("click", function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
jQuery(async () => {
|
jQuery(async () => {
|
||||||
getContext().registerSlashCommand('sd', generatePicture, [], helpString, true, true);
|
getContext().registerSlashCommand('imagine', generatePicture, ['sd'], helpString, true, true);
|
||||||
|
|
||||||
$('#extensions_settings').append(renderExtensionTemplate('stable-diffusion', 'settings', defaultSettings));
|
$('#extensions_settings').append(renderExtensionTemplate('stable-diffusion', 'settings', defaultSettings));
|
||||||
$('#sd_source').on('change', onSourceChange);
|
$('#sd_source').on('change', onSourceChange);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"display_name": "Stable Diffusion",
|
"display_name": "Image Generation",
|
||||||
"loading_order": 10,
|
"loading_order": 10,
|
||||||
"requires": [],
|
"requires": [],
|
||||||
"optional": [
|
"optional": [
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<div class="inline-drawer">
|
<div class="inline-drawer">
|
||||||
<div class="inline-drawer-toggle inline-drawer-header">
|
<div class="inline-drawer-toggle inline-drawer-header">
|
||||||
<b>
|
<b>
|
||||||
Stable Diffusion
|
Image Generation
|
||||||
<a href="https://docs.sillytavern.app/extras/extensions/stable-diffusion/" class="notes-link" target="_blank">
|
<a href="https://docs.sillytavern.app/extras/extensions/stable-diffusion/" class="notes-link" target="_blank">
|
||||||
<span class="note-link-span">?</span>
|
<span class="note-link-span">?</span>
|
||||||
</a>
|
</a>
|
||||||
@ -120,7 +120,7 @@
|
|||||||
<input id="sd_width" type="range" max="{{dimension_max}}" min="{{dimension_min}}" step="{{dimension_step}}" value="{{width}}" />
|
<input id="sd_width" type="range" max="{{dimension_max}}" min="{{dimension_min}}" step="{{dimension_step}}" value="{{width}}" />
|
||||||
<label for="sd_height">Height (<span id="sd_height_value"></span>)</label>
|
<label for="sd_height">Height (<span id="sd_height_value"></span>)</label>
|
||||||
<input id="sd_height" type="range" max="{{dimension_max}}" min="{{dimension_min}}" step="{{dimension_step}}" value="{{height}}" />
|
<input id="sd_height" type="range" max="{{dimension_max}}" min="{{dimension_min}}" step="{{dimension_step}}" value="{{height}}" />
|
||||||
<label for="sd_model">Stable Diffusion model</label>
|
<label for="sd_model">Model</label>
|
||||||
<select id="sd_model"></select>
|
<select id="sd_model"></select>
|
||||||
<label for="sd_sampler">Sampling method</label>
|
<label for="sd_sampler">Sampling method</label>
|
||||||
<select id="sd_sampler"></select>
|
<select id="sd_sampler"></select>
|
||||||
@ -171,7 +171,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="inline-drawer">
|
<div class="inline-drawer">
|
||||||
<div class="inline-drawer-toggle inline-drawer-header">
|
<div class="inline-drawer-toggle inline-drawer-header">
|
||||||
<b>SD Prompt Templates</b>
|
<b>Image Prompt Templates</b>
|
||||||
<div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
|
<div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
|
||||||
</div>
|
</div>
|
||||||
<div id="sd_prompt_templates" class="inline-drawer-content">
|
<div id="sd_prompt_templates" class="inline-drawer-content">
|
||||||
|
Loading…
Reference in New Issue
Block a user