Merge pull request #4573 from liamkerr/4415-update-generation-info (ec95ced6) · Commits · github_fork / Stable Diffusion Webui

javascript/generationParams.js

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		// attaches listeners to the txt2img and img2img galleries to update displayed generation param text when the image changes

		let txt2img_gallery, img2img_gallery, modal = undefined;
		onUiUpdate(function(){
		if (!txt2img_gallery) {
		txt2img_gallery = attachGalleryListeners("txt2img")
		}
		if (!img2img_gallery) {
		img2img_gallery = attachGalleryListeners("img2img")
		}
		if (!modal) {
		modal = gradioApp().getElementById('lightboxModal')
		modalObserver.observe(modal, { attributes : true, attributeFilter : ['style'] });
		}
		});

		let modalObserver = new MutationObserver(function(mutations) {
		mutations.forEach(function(mutationRecord) {
		let selectedTab = gradioApp().querySelector('#tabs div button.bg-white')?.innerText
		if (mutationRecord.target.style.display === 'none' && selectedTab === 'txt2img' \|\| selectedTab === 'img2img')
		gradioApp().getElementById(selectedTab+"_generation_info_button").click()
		});
		});

		function attachGalleryListeners(tab_name) {
		gallery = gradioApp().querySelector('#'+tab_name+'_gallery')
		gallery?.addEventListener('click', () => gradioApp().getElementById(tab_name+"_generation_info_button").click());
		gallery?.addEventListener('keydown', (e) => {
		if (e.keyCode == 37 \|\| e.keyCode == 39) // left or right arrow
		gradioApp().getElementById(tab_name+"_generation_info_button").click()
		});
		return gallery;
		}

+22 −0

Original line number	Diff line number	Diff line
		@@ -566,6 +566,19 @@ def apply_setting(key, value):
		return value


		def update_generation_info(args):
		generation_info, html_info, img_index = args
		try:
		generation_info = json.loads(generation_info)
		if img_index < 0 or img_index >= len(generation_info["infotexts"]):
		return html_info
		return plaintext_to_html(generation_info["infotexts"][img_index])
		except Exception:
		pass
		# if the json parse or anything else fails, just return the old html_info
		return html_info


		def create_refresh_button(refresh_component, refresh_method, refreshed_args, elem_id):
		def refresh():
		refresh_method()
		@@ -638,6 +651,15 @@ Requested path was: {f}
		with gr.Group():
		html_info = gr.HTML()
		generation_info = gr.Textbox(visible=False)
		if tabname == 'txt2img' or tabname == 'img2img':
		generation_info_button = gr.Button(visible=False, elem_id=f"{tabname}_generation_info_button")
		generation_info_button.click(
		fn=update_generation_info,
		_js="(x, y) => [x, y, selected_gallery_index()]",
		inputs=[generation_info, html_info],
		outputs=[html_info],
		preprocess=False
		)

		save.click(
		fn=wrap_gradio_call(save_files),

+2 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,8 @@ class Script(scripts.Script):
		grid = images.image_grid(processed.images, p.batch_size, rows=1 << ((len(prompt_matrix_parts) - 1) // 2))
		grid = images.draw_prompt_matrix(grid, p.width, p.height, prompt_matrix_parts)
		processed.images.insert(0, grid)
		processed.index_of_first_image = 1
		processed.infotexts.insert(0, processed.infotexts[0])

		if opts.grid_save:
		images.save_image(processed.images[0], p.outpath_grids, "prompt_matrix", prompt=original_prompt, seed=processed.seed, grid=True, p=p)

+5 −1

Original line number	Diff line number	Diff line
		@@ -145,6 +145,8 @@ class Script(scripts.Script):
		state.job_count = job_count

		images = []
		all_prompts = []
		infotexts = []
		for n, args in enumerate(jobs):
		state.job = f"{state.job_no + 1} out of {state.job_count}"

		@@ -157,5 +159,7 @@ class Script(scripts.Script):

		if checkbox_iterate:
		p.seed = p.seed + (p.batch_size * p.n_iter)
		all_prompts += proc.all_prompts
		infotexts += proc.infotexts

		return Processed(p, images, p.seed, "")
		return Processed(p, images, p.seed, "", all_prompts=all_prompts, infotexts=infotexts)