From c36e8efd38799ec6932b625fa467718c02ff3f03 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 30 Jul 2025 09:14:59 -0400 Subject: [PATCH] add missing interrogate in output panel Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 1 + extensions-builtin/sdnext-modernui | 2 +- modules/ui_common.py | 2 +- modules/ui_control.py | 2 +- modules/ui_img2img.py | 2 +- modules/ui_sections.py | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e82e1b2b..c7d062f7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - fix inpaint image metadata - fix processing image save loop - fix api progress reporting endpoint + - add missing interrogate in output panel ## Update for 2025-07-29 diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 4bf0ca38e..06c9747d2 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 4bf0ca38e8721d30b9fa86d0d6c33e66f50d1b79 +Subproject commit 06c9747d29a2d7271f9265199f1557a1722cb108 diff --git a/modules/ui_common.py b/modules/ui_common.py index dfaad5d38..33a76e850 100644 --- a/modules/ui_common.py +++ b/modules/ui_common.py @@ -246,7 +246,7 @@ def create_output_panel(tabname, preview=True, prompt=None, height=None, transfe elem_classes=["gallery_main"], ) if prompt is not None: - ui_sections.create_interrogate_button(tab=tabname, inputs=result_gallery, outputs=prompt) + ui_sections.create_interrogate_button(tab=tabname, inputs=result_gallery, outputs=prompt, what='output') with gr.Column(elem_id=f"{tabname}_footer", elem_classes="gallery_footer"): dummy_component = gr.Label(visible=False) diff --git a/modules/ui_control.py b/modules/ui_control.py index 8a5f42004..778ba5515 100644 --- a/modules/ui_control.py +++ b/modules/ui_control.py @@ -191,7 +191,7 @@ def create_ui(_blocks: gr.Blocks=None): input_image = gr.Image(label="Input", show_label=False, type="pil", interactive=True, tool="editor", height=gr_height, visible=True, image_mode='RGB', elem_id='control_input_select', elem_classes=['control-image']) input_resize = gr.Image(label="Input", show_label=False, type="pil", interactive=True, tool="select", height=gr_height, visible=False, image_mode='RGB', elem_id='control_input_resize', elem_classes=['control-image']) input_inpaint = gr.Image(label="Input", show_label=False, type="pil", interactive=True, tool="sketch", height=gr_height, visible=False, image_mode='RGB', elem_id='control_input_inpaint', brush_radius=32, mask_opacity=0.6, elem_classes=['control-image']) - btn_interrogate = ui_sections.create_interrogate_button('control') + btn_interrogate = ui_sections.create_interrogate_button('control', what='input') with gr.Row(): input_buttons = [gr.Button('Select', visible=True, interactive=False), gr.Button('Inpaint', visible=True, interactive=True), gr.Button('Outpaint', visible=True, interactive=True)] with gr.Tab('Video', id='in-video') as tab_video: diff --git a/modules/ui_img2img.py b/modules/ui_img2img.py index cd4866f49..15490b1b7 100644 --- a/modules/ui_img2img.py +++ b/modules/ui_img2img.py @@ -69,7 +69,7 @@ def create_ui(): state = gr.Textbox(value='', visible=False) with gr.TabItem('Image', id='img2img_image', elem_id="img2img_image_tab") as tab_img2img: img_init = gr.Image(label="", elem_id="img2img_image", show_label=False, interactive=True, type="pil", tool="editor", image_mode="RGBA", height=512) - interrogate_btn = ui_sections.create_interrogate_button(tab='img2img') + interrogate_btn = ui_sections.create_interrogate_button(tab='img2img', what='input') add_copy_image_controls('img2img', img_init) with gr.TabItem('Inpaint', id='img2img_inpaint', elem_id="img2img_inpaint_tab") as tab_inpaint: diff --git a/modules/ui_sections.py b/modules/ui_sections.py index f6612f6b2..94fbde348 100644 --- a/modules/ui_sections.py +++ b/modules/ui_sections.py @@ -92,8 +92,8 @@ def create_resolution_inputs(tab, default_width=1024, default_height=1024): return width, height -def create_interrogate_button(tab: str, inputs: list = None, outputs: str = None): - button_interrogate = gr.Button(ui_symbols.interrogate, elem_id=f"{tab}_interrogate", elem_classes=['interrogate']) +def create_interrogate_button(tab: str, inputs: list = None, outputs: str = None, what: str = ''): + button_interrogate = gr.Button(ui_symbols.interrogate, elem_id=f"{tab}_interrogate_{what}", elem_classes=['interrogate']) if inputs is not None and outputs is not None: button_interrogate.click(fn=interrogate.interrogate, inputs=inputs, outputs=[outputs]) return button_interrogate