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

Add Karras and hiding of SD buttons

Browse Source
This commit is contained in:
Maya
2023-05-17 19:17:44 +00:00
parent dfb0e5994a
commit 5a95fed134
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/scripts/extensions.js
View File

@ -193,7 +193,6 @@ async function connectToApi(baseUrl) {
modules = data.modules; modules = data.modules;
await activateExtensions(); await activateExtensions();
eventSource.emit(event_types.EXTRAS_CONNECTED, modules); eventSource.emit(event_types.EXTRAS_CONNECTED, modules);
$("#extensionsMenuButton").css("display", "flex");
} }
updateStatus(getExtensionsResult.ok); updateStatus(getExtensionsResult.ok);

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

@ -106,6 +106,7 @@ const defaultSettings = {
// Horde settings // Horde settings
horde: false, horde: false,
horde_nsfw: false, horde_nsfw: false,
horde_karras: true,
} }
async function loadSettings() { async function loadSettings() {
@ -121,6 +122,7 @@ async function loadSettings() {
$('#sd_height').val(extension_settings.sd.height).trigger('input'); $('#sd_height').val(extension_settings.sd.height).trigger('input');
$('#sd_horde').prop('checked', extension_settings.sd.horde); $('#sd_horde').prop('checked', extension_settings.sd.horde);
$('#sd_horde_nsfw').prop('checked', extension_settings.sd.horde_nsfw); $('#sd_horde_nsfw').prop('checked', extension_settings.sd.horde_nsfw);
$('#sd_horde_karras').prop('checked', extension_settings.sd.horde_karras);
$('#sd_restore_faces').prop('checked', extension_settings.sd.restore_faces); $('#sd_restore_faces').prop('checked', extension_settings.sd.restore_faces);
$('#sd_enable_hr').prop('checked', extension_settings.sd.enable_hr); $('#sd_enable_hr').prop('checked', extension_settings.sd.enable_hr);
@ -181,6 +183,11 @@ async function onHordeNsfwInput() {
saveSettingsDebounced(); saveSettingsDebounced();
} }
async function onHordeKarrasInput() {
extension_settings.sd.horde_karras = !!$(this).prop('checked');
saveSettingsDebounced();
}
function onRestoreFacesInput() { function onRestoreFacesInput() {
extension_settings.sd.restore_faces = !!$(this).prop('checked'); extension_settings.sd.restore_faces = !!$(this).prop('checked');
saveSettingsDebounced(); saveSettingsDebounced();
@ -473,6 +480,7 @@ async function generateExtrasImage(prompt, callback) {
negative_prompt: extension_settings.sd.negative_prompt, negative_prompt: extension_settings.sd.negative_prompt,
restore_faces: !!extension_settings.sd.restore_faces, restore_faces: !!extension_settings.sd.restore_faces,
enable_hr: !!extension_settings.sd.enable_hr, enable_hr: !!extension_settings.sd.enable_hr,
karras: !!extension_settings.sd.horde_karras,
}), }),
}); });
@ -592,17 +600,19 @@ function addSDGenButtons() {
}); });
} }
async function moduleWorker() { function isConnectedToExtras() {
const context = getContext(); return modules.includes('sd');
}
if (context.onlineStatus === 'no_connection') { async function moduleWorker() {
$('#sd_gen').hide(200); if (isConnectedToExtras() || extension_settings.sd.horde) {
$('.sd_message_gen').hide();
}
else {
$('#sd_gen').show(200); $('#sd_gen').show(200);
$('.sd_message_gen').show(); $('.sd_message_gen').show();
} }
else {
$('#sd_gen').hide(200);
$('.sd_message_gen').hide();
}
} }
addSDGenButtons(); addSDGenButtons();
@ -746,6 +756,12 @@ jQuery(async () => {
<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>
<div class="flex-container flexGap5 marginTop10 margin-bot-10px">
<label class="checkbox_label">
<input id="sd_horde_karras" type="checkbox" />
Karras (only for Horde, not all samplers supported)
</label>
</div>
<label for="sd_prompt_prefix">Generated prompt prefix</label> <label for="sd_prompt_prefix">Generated prompt prefix</label>
<textarea id="sd_prompt_prefix" class="text_pole textarea_compact" rows="2"></textarea> <textarea id="sd_prompt_prefix" class="text_pole textarea_compact" rows="2"></textarea>
<label for="sd_negative_prompt">Negative prompt</label> <label for="sd_negative_prompt">Negative prompt</label>
@ -764,6 +780,7 @@ jQuery(async () => {
$('#sd_height').on('input', onHeightInput); $('#sd_height').on('input', onHeightInput);
$('#sd_horde').on('input', onHordeInput); $('#sd_horde').on('input', onHordeInput);
$('#sd_horde_nsfw').on('input', onHordeNsfwInput); $('#sd_horde_nsfw').on('input', onHordeNsfwInput);
$('#sd_horde_karras').on('input', onHordeKarrasInput);
$('#sd_restore_faces').on('input', onRestoreFacesInput); $('#sd_restore_faces').on('input', onRestoreFacesInput);
$('#sd_enable_hr').on('input', onHighResFixInput); $('#sd_enable_hr').on('input', onHighResFixInput);

2
public/style.css
View File

@ -500,8 +500,6 @@ code {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
display: none;
} }
#extensionsMenuButton:hover { #extensionsMenuButton:hover {

1
server.js
View File

@ -2981,6 +2981,7 @@ app.post('/horde_generateimage', jsonParser, async (request, response) => {
steps: request.body.steps, steps: request.body.steps,
width: request.body.width, width: request.body.width,
height: request.body.height, height: request.body.height,
karras: Boolean(request.body.karras),
n: 1, n: 1,
}, },
r2: false, r2: false,