Merge branch 'dev' into js-misc-fixes (50f63e22) · Commits · github_fork / Stable Diffusion Webui

javascript/ui.js

+8 −2

Original line number	Diff line number	Diff line
		@@ -208,17 +208,23 @@ function submit_img2img(){
		}

		function restoreProgressTxt2img(){
		showRestoreProgressButton("txt2img", false)
		var id = localStorage.getItem("txt2img_task_id")

		id = localStorage.getItem("txt2img_task_id")

		if(id) {
		requestProgress(id, gradioApp().getElementById('txt2img_gallery_container'), gradioApp().getElementById('txt2img_gallery'), function(){
		showSubmitButtons('txt2img', true)
		}, null, 0)
		}

		return [id]
		return id
		}

		function restoreProgressImg2img(){
		showRestoreProgressButton("img2img", false)

		var id = localStorage.getItem("img2img_task_id")

		if(id) {
		@@ -227,7 +233,7 @@ function restoreProgressImg2img(){
		}, null, 0)
		}

		return [id]
		return id
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -498,6 +498,11 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
		stored_opts = {k: opts.data[k] for k in p.override_settings.keys()}

		try:
		# if no checkpoint override or the override checkpoint can't be found, remove override entry and load opts checkpoint
		if sd_models.checkpoint_alisases.get(p.override_settings.get('sd_model_checkpoint')) is None:
		p.override_settings.pop('sd_model_checkpoint', None)
		sd_models.reload_model_weights()

		for k, v in p.override_settings.items():
		setattr(opts, k, v)

		@@ -514,8 +519,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
		if p.override_settings_restore_afterwards:
		for k, v in stored_opts.items():
		setattr(opts, k, v)
		if k == 'sd_model_checkpoint':
		sd_models.reload_model_weights()

		if k == 'sd_vae':
		sd_vae.reload_vae_weights()

+4 −1

Original line number	Diff line number	Diff line
		@@ -810,7 +810,10 @@ def create_ui():
		scale_by.release(**on_change_args)
		button_update_resize_to.click(**on_change_args)

		for component in img2img_image_inputs:
		# the code below is meant to update the resolution label after the image in the image selection UI has changed.
		# as it is now the event keeps firing continuously for inpaint edits, which ruins the page with constant requests.
		# I assume this must be a gradio bug and for now we'll just do it for non-inpaint inputs.
		for component in [init_img, sketch]:
		component.change(fn=lambda: None, _js="updateImg2imgResizeToTextAfterChangingImage", inputs=[], outputs=[], show_progress=False)

		tab_scale_to.select(fn=lambda: 0, inputs=[], outputs=[selected_scale_tab])

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ def apply_checkpoint(p, x, xs):
		info = modules.sd_models.get_closet_checkpoint_match(x)
		if info is None:
		raise RuntimeError(f"Unknown checkpoint: {x}")
		modules.sd_models.reload_model_weights(shared.sd_model, info)
		p.override_settings['sd_model_checkpoint'] = info.hash


		def confirm_checkpoints(p, xs):