added compact prompt option (4d4a9e73) · Commits · github_fork / Stable Diffusion Webui

extensions-builtin/mobile/javascript/mobile.js

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@ function isMobile() {
		}

		function reportWindowSize() {
		if (gradioApp().querySelector('.toprow-compact-tools')) return; // not applicable for compact prompt layout

		var currentlyMobile = isMobile();
		if (currentlyMobile == isSetupForMobile) return;
		isSetupForMobile = currentlyMobile;

javascript/extraNetworks.js

+33 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ function setupExtraNetworksForTab(tabname) {
		var refresh = gradioApp().getElementById(tabname + '_extra_refresh');
		var showDirsDiv = gradioApp().getElementById(tabname + '_extra_show_dirs');
		var showDirs = gradioApp().querySelector('#' + tabname + '_extra_show_dirs input');
		var promptContainer = gradioApp().querySelector('.prompt-container-compact#' + tabname + '_prompt_container');
		var negativePrompt = gradioApp().querySelector('#' + tabname + '_neg_prompt');

		tabs.appendChild(searchDiv);
		tabs.appendChild(sort);
		@@ -109,6 +111,37 @@ function setupExtraNetworksForTab(tabname) {
		showDirsUpdate();
		}

		function extraNetworksMovePromptToTab(tabname, id, showPrompt, showNegativePrompt) {
		if (!gradioApp().querySelector('.toprow-compact-tools')) return; // only applicable for compact prompt layout

		var promptContainer = gradioApp().getElementById(tabname + '_prompt_container');
		var prompt = gradioApp().getElementById(tabname + '_prompt_row');
		var negPrompt = gradioApp().getElementById(tabname + '_neg_prompt_row');
		var elem = id ? gradioApp().getElementById(id) : null;

		if (showNegativePrompt && elem) {
		elem.insertBefore(negPrompt, elem.firstChild);
		} else {
		promptContainer.insertBefore(negPrompt, promptContainer.firstChild);
		}

		if (showPrompt && elem) {
		elem.insertBefore(prompt, elem.firstChild);
		} else {
		promptContainer.insertBefore(prompt, promptContainer.firstChild);
		}
		}


		function extraNetworksUrelatedTabSelected(tabname) { // called from python when user selects an unrelated tab (generate)
		extraNetworksMovePromptToTab(tabname, '', false, false);
		}

		function extraNetworksTabSelected(tabname, id, showPrompt, showNegativePrompt) { // called from python when user selects an extra networks tab
		extraNetworksMovePromptToTab(tabname, id, showPrompt, showNegativePrompt);

		}

		function applyExtraNetworkFilter(tabname) {
		setTimeout(extraNetworksApplyFilter[tabname], 1);
		}

modules/shared_items.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ def reload_hypernetworks():


		ui_reorder_categories_builtin_items = [
		"prompt",
		"image",
		"inpaint",
		"sampler",
		"accordions",

modules/shared_options.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -272,6 +272,7 @@ options_templates.update(options_section(('ui', "User interface"), {
		"hires_fix_show_sampler": OptionInfo(False, "Hires fix: show hires checkpoint and sampler selection").needs_reload_ui(),
		"hires_fix_show_prompts": OptionInfo(False, "Hires fix: show hires prompt and negative prompt").needs_reload_ui(),
		"disable_token_counters": OptionInfo(False, "Disable prompt token counters").needs_reload_ui(),
		"compact_prompt_box": OptionInfo(True, "Compact prompt layout").info("puts prompt and negative prompt inside the Generate tab, leaving more vertical space for the image on the right").needs_reload_ui(),
		}))

modules/ui.py

+90 −157

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ from PIL import Image, PngImagePlugin # noqa: F401
		from modules.call_queue import wrap_gradio_gpu_call, wrap_queued_call, wrap_gradio_call

		from modules import gradio_extensons # noqa: F401
		from modules import sd_hijack, sd_models, script_callbacks, ui_extensions, deepbooru, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, shared_items, ui_settings, timer, sysinfo, ui_checkpoint_merger, ui_prompt_styles, scripts, sd_samplers, processing, ui_extra_networks
		from modules import sd_hijack, sd_models, script_callbacks, ui_extensions, deepbooru, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, shared_items, ui_settings, timer, sysinfo, ui_checkpoint_merger, scripts, sd_samplers, processing, ui_extra_networks, ui_toprow
		from modules.ui_components import FormRow, FormGroup, ToolButton, FormHTML, InputAccordion, ResizeHandleRow
		from modules.paths import script_path
		from modules.ui_common import create_refresh_button
		@@ -25,7 +25,6 @@ import modules.hypernetworks.ui as hypernetworks_ui
		import modules.textual_inversion.ui as textual_inversion_ui
		import modules.textual_inversion.textual_inversion as textual_inversion
		import modules.shared as shared
		import modules.images
		from modules import prompt_parser
		from modules.sd_hijack import model_hijack
		from modules.generation_parameters_copypaste import image_from_url_text
		@@ -177,79 +176,6 @@ def update_negative_prompt_token_counter(text, steps):
		return update_token_counter(text, steps, is_positive=False)


		class Toprow:
		"""Creates a top row UI with prompts, generate button, styles, extra little buttons for things, and enables some functionality related to their operation"""

		def __init__(self, is_img2img):
		id_part = "img2img" if is_img2img else "txt2img"
		self.id_part = id_part

		with gr.Row(elem_id=f"{id_part}_toprow", variant="compact"):
		with gr.Column(elem_id=f"{id_part}_prompt_container", scale=6):
		with gr.Row():
		with gr.Column(scale=80):
		with gr.Row():
		self.prompt = gr.Textbox(label="Prompt", elem_id=f"{id_part}_prompt", show_label=False, lines=3, placeholder="Prompt (press Ctrl+Enter or Alt+Enter to generate)", elem_classes=["prompt"])
		self.prompt_img = gr.File(label="", elem_id=f"{id_part}_prompt_image", file_count="single", type="binary", visible=False)

		with gr.Row():
		with gr.Column(scale=80):
		with gr.Row():
		self.negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{id_part}_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt (press Ctrl+Enter or Alt+Enter to generate)", elem_classes=["prompt"])

		self.button_interrogate = None
		self.button_deepbooru = None
		if is_img2img:
		with gr.Column(scale=1, elem_classes="interrogate-col"):
		self.button_interrogate = gr.Button('Interrogate\nCLIP', elem_id="interrogate")
		self.button_deepbooru = gr.Button('Interrogate\nDeepBooru', elem_id="deepbooru")

		with gr.Column(scale=1, elem_id=f"{id_part}_actions_column"):
		with gr.Row(elem_id=f"{id_part}_generate_box", elem_classes="generate-box"):
		self.interrupt = gr.Button('Interrupt', elem_id=f"{id_part}_interrupt", elem_classes="generate-box-interrupt")
		self.skip = gr.Button('Skip', elem_id=f"{id_part}_skip", elem_classes="generate-box-skip")
		self.submit = gr.Button('Generate', elem_id=f"{id_part}_generate", variant='primary')

		self.skip.click(
		fn=lambda: shared.state.skip(),
		inputs=[],
		outputs=[],
		)

		self.interrupt.click(
		fn=lambda: shared.state.interrupt(),
		inputs=[],
		outputs=[],
		)

		with gr.Row(elem_id=f"{id_part}_tools"):
		self.paste = ToolButton(value=paste_symbol, elem_id="paste", tooltip="Read generation parameters from prompt or last generation if prompt is empty into user interface.")
		self.clear_prompt_button = ToolButton(value=clear_prompt_symbol, elem_id=f"{id_part}_clear_prompt", tooltip="Clear prompt")
		self.apply_styles = ToolButton(value=ui_prompt_styles.styles_materialize_symbol, elem_id=f"{id_part}_style_apply", tooltip="Apply all selected styles to prompts.")
		self.restore_progress_button = ToolButton(value=restore_progress_symbol, elem_id=f"{id_part}_restore_progress", visible=False, tooltip="Restore progress")

		self.token_counter = gr.HTML(value="<span>0/75</span>", elem_id=f"{id_part}_token_counter", elem_classes=["token-counter"])
		self.token_button = gr.Button(visible=False, elem_id=f"{id_part}_token_button")
		self.negative_token_counter = gr.HTML(value="<span>0/75</span>", elem_id=f"{id_part}_negative_token_counter", elem_classes=["token-counter"])
		self.negative_token_button = gr.Button(visible=False, elem_id=f"{id_part}_negative_token_button")

		self.clear_prompt_button.click(
		fn=lambda *x: x,
		_js="confirm_clear_prompt",
		inputs=[self.prompt, self.negative_prompt],
		outputs=[self.prompt, self.negative_prompt],
		)

		self.ui_styles = ui_prompt_styles.UiPromptStyles(id_part, self.prompt, self.negative_prompt)
		self.ui_styles.setup_apply_button(self.apply_styles)

		self.prompt_img.change(
		fn=modules.images.image_data,
		inputs=[self.prompt_img],
		outputs=[self.prompt, self.prompt_img],
		show_progress=False,
		)


		def setup_progressbar(args, *kwargs):
		pass
		@@ -288,8 +214,8 @@ def apply_setting(key, value):
		return getattr(opts, key)


		def create_output_panel(tabname, outdir):
		return ui_common.create_output_panel(tabname, outdir)
		def create_output_panel(tabname, outdir, toprow=None):
		return ui_common.create_output_panel(tabname, outdir, toprow)


		def create_sampler_and_steps_selection(choices, tabname):
		@@ -336,7 +262,7 @@ def create_ui():
		scripts.scripts_txt2img.initialize_scripts(is_img2img=False)

		with gr.Blocks(analytics_enabled=False) as txt2img_interface:
		toprow = Toprow(is_img2img=False)
		toprow = ui_toprow.Toprow(is_img2img=False, is_compact=shared.opts.compact_prompt_box)

		dummy_component = gr.Label(visible=False)

		@@ -348,6 +274,9 @@ def create_ui():
		scripts.scripts_txt2img.prepare_ui()

		for category in ordered_ui_categories():
		if category == "prompt":
		toprow.create_inline_toprow_prompts()

		if category == "sampler":
		steps, sampler_name = create_sampler_and_steps_selection(sd_samplers.visible_sampler_names(), "txt2img")

		@@ -442,7 +371,7 @@ def create_ui():
		show_progress=False,
		)

		txt2img_gallery, generation_info, html_info, html_log = create_output_panel("txt2img", opts.outdir_txt2img_samples)
		txt2img_gallery, generation_info, html_info, html_log = create_output_panel("txt2img", opts.outdir_txt2img_samples, toprow)

		txt2img_args = dict(
		fn=wrap_gradio_gpu_call(modules.txt2img.txt2img, extra_outputs=[None, '', '']),
		@@ -554,7 +483,7 @@ def create_ui():
		scripts.scripts_img2img.initialize_scripts(is_img2img=True)

		with gr.Blocks(analytics_enabled=False) as img2img_interface:
		toprow = Toprow(is_img2img=True)
		toprow = ui_toprow.Toprow(is_img2img=True, is_compact=shared.opts.compact_prompt_box)

		extra_tabs = gr.Tabs(elem_id="img2img_extra_tabs")
		extra_tabs.__enter__()
		@@ -577,6 +506,13 @@ def create_ui():
		button = gr.Button(title)
		copy_image_buttons.append((button, name, elem))

		scripts.scripts_img2img.prepare_ui()

		for category in ordered_ui_categories():
		if category == "prompt":
		toprow.create_inline_toprow_prompts()

		if category == "image":
		with gr.Tabs(elem_id="mode_img2img"):
		img2img_selected_tab = gr.State(0)

		@@ -653,9 +589,6 @@ def create_ui():
		with FormRow():
		resize_mode = gr.Radio(label="Resize mode", elem_id="resize_mode", choices=["Just resize", "Crop and resize", "Resize and fill", "Just resize (latent upscale)"], type="index", value="Just resize")

		scripts.scripts_img2img.prepare_ui()

		for category in ordered_ui_categories():
		if category == "sampler":
		steps, sampler_name = create_sampler_and_steps_selection(sd_samplers.visible_sampler_names(), "img2img")

		@@ -769,7 +702,7 @@ def create_ui():
		if category not in {"accordions"}:
		scripts.scripts_img2img.setup_ui_for_section(category)

		img2img_gallery, generation_info, html_info, html_log = create_output_panel("img2img", opts.outdir_img2img_samples)
		img2img_gallery, generation_info, html_info, html_log = create_output_panel("img2img", opts.outdir_img2img_samples, toprow)

		img2img_args = dict(
		fn=wrap_gradio_gpu_call(modules.img2img.img2img, extra_outputs=[None, '', '']),

Admin message