Merge branch 'dev' into gradio4

This commit is contained in:
AUTOMATIC1111
2024-01-27 10:14:00 +03:00
136 changed files with 5241 additions and 5425 deletions

View File

@@ -1,13 +1,14 @@
import gradio as gr
from modules import scripts, shared, ui_common, postprocessing, call_queue, ui_toprow
import modules.generation_parameters_copypaste as parameters_copypaste
import modules.infotext_utils as parameters_copypaste
from modules.ui_components import ResizeHandleRow
def create_ui():
dummy_component = gr.Textbox(visible=False)
tab_index = gr.State(value=0)
dummy_component = gr.Label(visible=False)
tab_index = gr.Number(value=0, visible=False)
with gr.Row(equal_height=False, variant='compact'):
with ResizeHandleRow(equal_height=False, variant='compact'):
with gr.Column(variant='compact'):
with gr.Tabs(elem_id="mode_extras"):
with gr.TabItem('Single Image', id="single_image", elem_id="extras_single_tab") as tab_single:
@@ -28,14 +29,14 @@ def create_ui():
toprow.create_inline_toprow_image()
submit = toprow.submit
result_images, html_info_x, html_info, html_log = ui_common.create_output_panel("extras", shared.opts.outdir_extras_samples)
output_panel = ui_common.create_output_panel("extras", shared.opts.outdir_extras_samples)
tab_single.select(fn=lambda: 0, inputs=[], outputs=[tab_index])
tab_batch.select(fn=lambda: 1, inputs=[], outputs=[tab_index])
tab_batch_dir.select(fn=lambda: 2, inputs=[], outputs=[tab_index])
submit.click(
fn=call_queue.wrap_gradio_gpu_call(postprocessing.run_postprocessing, extra_outputs=[None, '']),
fn=call_queue.wrap_gradio_gpu_call(postprocessing.run_postprocessing_webui, extra_outputs=[None, '']),
_js="submit_extras",
inputs=[
dummy_component,
@@ -48,9 +49,9 @@ def create_ui():
*script_inputs
],
outputs=[
result_images,
html_info_x,
html_log,
output_panel.gallery,
output_panel.generation_info,
output_panel.html_log,
],
show_progress=False,
)