diff --git a/CHANGELOG.md b/CHANGELOG.md index 1846b847b..1ad309e3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log for SD.Next +## Update for 05/31/2023 + +- add pause option next to stop/skip +- redesign action box to be uniform accross all themes + ## Update for 05/30/2023 Another bigger one...And more to come in the next few days... diff --git a/javascript/ui.js b/javascript/ui.js index 7a2bd837d..24c623fc4 100644 --- a/javascript/ui.js +++ b/javascript/ui.js @@ -119,13 +119,14 @@ function create_submit_args(args) { } function showSubmitButtons(tabname, show) { - gradioApp().getElementById(`${tabname}_interrupt`).style.display = show ? 'none' : 'block'; - gradioApp().getElementById(`${tabname}_skip`).style.display = show ? 'none' : 'block'; + // gradioApp().getElementById(`${tabname}_interrupt`).style.display = show ? 'none' : 'block'; + // gradioApp().getElementById(`${tabname}_skip`).style.display = show ? 'none' : 'block'; // gradioApp().getElementById(tabname+'_interrupt').style.display = "block" // gradioApp().getElementById(tabname+'_skip').style.display = "block" } function submit(...args) { + console.log('submit txt2img:', args); rememberGallerySelection('txt2img_gallery'); showSubmitButtons('txt2img', false); const id = randomId(); @@ -137,6 +138,7 @@ function submit(...args) { } function submit_img2img(...args) { + console.log('submit img2img:', args); rememberGallerySelection('img2img_gallery'); showSubmitButtons('img2img', false); const id = randomId(); diff --git a/modules/txt2img.py b/modules/txt2img.py index 5b0d3309e..7a55da30c 100644 --- a/modules/txt2img.py +++ b/modules/txt2img.py @@ -9,15 +9,16 @@ from modules.memstats import memory_stats def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, clip_skip: int, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, denoising_strength: float, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, override_settings_texts, *args): # pylint: disable=unused-argument - if shared.sd_model is None: - shared.log.warning('Model not loaded') - return shared.log.debug(f'txt2img: id_task={id_task}|prompt={prompt}|negative_prompt={negative_prompt}|prompt_styles={prompt_styles}|steps={steps}|sampler_index={sampler_index}|restore_faces={restore_faces}|tiling={tiling}|n_iter={n_iter}|batch_size={batch_size}|cfg_scale={cfg_scale}|clip_skip={clip_skip}|seed={seed}|subseed={subseed}|subseed_strength={subseed_strength}|seed_resize_from_h={seed_resize_from_h}|seed_resize_from_w={seed_resize_from_w}|seed_enable_extras={seed_enable_extras}|height={height}|width={width}|enable_hr={enable_hr}|denoising_strength={denoising_strength}|hr_scale={hr_scale}|hr_upscaler={hr_upscaler}|hr_second_pass_steps={hr_second_pass_steps}|hr_resize_x={hr_resize_x}|hr_resize_y={hr_resize_y}|override_settings_texts={override_settings_texts}args={args}') if sampler_index is None: shared.log.warning('Selected sampler is not enabled') sampler_index = 0 override_settings = create_override_settings_dict(override_settings_texts) + if shared.sd_model is None: + shared.log.warning('Model not loaded') + return + p = StableDiffusionProcessingTxt2Img( sd_model=shared.sd_model, outpath_samples=shared.opts.outdir_samples or shared.opts.outdir_txt2img_samples, diff --git a/modules/ui.py b/modules/ui.py index 5c4f177f0..788b0bef2 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -437,7 +437,7 @@ def create_ui(): clip_skip, seed, subseed, subseed_strength, seed_resize_from_h, seed_resize_from_w, - seed_checkbox, # seed_enable_extras + seed_checkbox, height, width, enable_hr, @@ -449,7 +449,6 @@ def create_ui(): hr_resize_y, override_settings, ] + custom_inputs, - outputs=[ txt2img_gallery, generation_info,