Commit 362789a3 authored by AUTOMATIC1111's avatar AUTOMATIC1111
Browse files

gradio 3.39

parent 71efc5bd

extensions-builtin/Lora/ui_edit_user_metadata.py

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor) 
                random_prompt = gr.Textbox(label='Random prompt', lines=4, max_lines=4, interactive=False)



            with gr.Column(scale=1, min_width=120):

                generate_random_prompt = gr.Button('Generate').style(full_width=True, size="lg")

                generate_random_prompt = gr.Button('Generate', size="lg", scale=1)



        self.edit_notes = gr.TextArea(label='Notes', lines=4)

modules/gradio_extensons.py

0 → 100644
+60 −0
Original line number Diff line number Diff line 
import gradio as gr



from modules import scripts



def add_classes_to_gradio_component(comp):

    """

    this adds gradio-* to the component for css styling (ie gradio-button to gr.Button), as well as some others

    """



    comp.elem_classes = [f"gradio-{comp.get_block_name()}", *(comp.elem_classes or [])]



    if getattr(comp, 'multiselect', False):

        comp.elem_classes.append('multiselect')





def IOComponent_init(self, *args, **kwargs):

    self.webui_tooltip = kwargs.pop('tooltip', None)



    if scripts.scripts_current is not None:

        scripts.scripts_current.before_component(self, **kwargs)



    scripts.script_callbacks.before_component_callback(self, **kwargs)



    res = original_IOComponent_init(self, *args, **kwargs)



    add_classes_to_gradio_component(self)



    scripts.script_callbacks.after_component_callback(self, **kwargs)



    if scripts.scripts_current is not None:

        scripts.scripts_current.after_component(self, **kwargs)



    return res





def Block_get_config(self):

    config = original_Block_get_config(self)



    webui_tooltip = getattr(self, 'webui_tooltip', None)

    if webui_tooltip:

        config["webui_tooltip"] = webui_tooltip



    return config





def BlockContext_init(self, *args, **kwargs):

    res = original_BlockContext_init(self, *args, **kwargs)



    add_classes_to_gradio_component(self)



    return res





original_IOComponent_init = gr.components.IOComponent.__init__

original_Block_get_config = gr.blocks.Block.get_config

original_BlockContext_init = gr.blocks.BlockContext.__init__



gr.components.IOComponent.__init__ = IOComponent_init

gr.blocks.Block.get_config = Block_get_config

gr.blocks.BlockContext.__init__ = BlockContext_init

modules/scripts.py

+0 −60
Original line number Diff line number Diff line
@@ -631,63 +631,3 @@ def reload_script_body_only(): 




reload_scripts = load_scripts  # compatibility alias
 




def add_classes_to_gradio_component(comp):

    """

    this adds gradio-* to the component for css styling (ie gradio-button to gr.Button), as well as some others

    """



    comp.elem_classes = [f"gradio-{comp.get_block_name()}", *(comp.elem_classes or [])]



    if getattr(comp, 'multiselect', False):

        comp.elem_classes.append('multiselect')







def IOComponent_init(self, *args, **kwargs):

    self.webui_tooltip = kwargs.pop('tooltip', None)



    if scripts_current is not None:

        scripts_current.before_component(self, **kwargs)



    script_callbacks.before_component_callback(self, **kwargs)



    res = original_IOComponent_init(self, *args, **kwargs)



    add_classes_to_gradio_component(self)



    script_callbacks.after_component_callback(self, **kwargs)



    if scripts_current is not None:

        scripts_current.after_component(self, **kwargs)



    return res





def Block_get_config(self):

    config = original_Block_get_config(self)



    webui_tooltip = getattr(self, 'webui_tooltip', None)

    if webui_tooltip:

        config["webui_tooltip"] = webui_tooltip



    return config





original_IOComponent_init = gr.components.IOComponent.__init__

original_Block_get_config = gr.components.Block.get_config

gr.components.IOComponent.__init__ = IOComponent_init

gr.components.Block.get_config = Block_get_config





def BlockContext_init(self, *args, **kwargs):

    res = original_BlockContext_init(self, *args, **kwargs)



    add_classes_to_gradio_component(self)



    return res





original_BlockContext_init = gr.blocks.BlockContext.__init__

gr.blocks.BlockContext.__init__ = BlockContext_init

modules/shared.py

+2 −1
Original line number Diff line number Diff line
@@ -385,7 +385,8 @@ options_templates.update(options_section(('face-restoration', "Face restoration" 
}))



options_templates.update(options_section(('system', "System"), {

    "show_warnings": OptionInfo(False, "Show warnings in console."),

    "show_warnings": OptionInfo(False, "Show warnings in console.").needs_restart(),

    "show_gradio_deprecation_warnings": OptionInfo(True, "Show gradio deprecation warnings in console.").needs_restart(),

    "memmon_poll_rate": OptionInfo(8, "VRAM usage polls per second during generation.", gr.Slider, {"minimum": 0, "maximum": 40, "step": 1}).info("0 = disable"),

    "samples_log_stdout": OptionInfo(False, "Always print all generation info to standard output"),

    "multiple_tqdm": OptionInfo(True, "Add a second progress bar to the console that shows progress for an entire job."),

modules/ui.py

+12 −12
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import numpy as np 
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, errors, shared_items, ui_settings, timer, sysinfo, ui_checkpoint_merger, ui_prompt_styles, scripts

from modules.ui_components import FormRow, FormGroup, ToolButton, FormHTML

from modules.paths import script_path
@@ -34,6 +35,7 @@ from modules.generation_parameters_copypaste import image_from_url_text 
create_setting_component = ui_settings.create_setting_component



warnings.filterwarnings("default" if opts.show_warnings else "ignore", category=UserWarning)

warnings.filterwarnings("default" if opts.show_gradio_deprecation_warnings else "ignore", category=gr.deprecation.GradioDeprecationWarning)



# this is a fix for Windows users. Without it, javascript files will be served with text/html content-type and the browser will not show any UI

mimetypes.init()
@@ -146,7 +148,6 @@ def interrogate_deepbooru(image): 
def create_seed_inputs(target_interface):

    with FormRow(elem_id=f"{target_interface}_seed_row", variant="compact"):

        seed = (gr.Textbox if cmd_opts.use_textbox_seed else gr.Number)(label='Seed', value=-1, elem_id=f"{target_interface}_seed")

        seed.style(container=False)

        random_seed = ToolButton(random_symbol, elem_id=f"{target_interface}_random_seed", label='Random seed')

        reuse_seed = ToolButton(reuse_symbol, elem_id=f"{target_interface}_reuse_seed", label='Reuse seed')
@@ -158,7 +159,6 @@ def create_seed_inputs(target_interface): 
    with FormRow(visible=False, elem_id=f"{target_interface}_subseed_row") as seed_extra_row_1:

        seed_extras.append(seed_extra_row_1)

        subseed = gr.Number(label='Variation seed', value=-1, elem_id=f"{target_interface}_subseed")

        subseed.style(container=False)

        random_subseed = ToolButton(random_symbol, elem_id=f"{target_interface}_random_subseed")

        reuse_subseed = ToolButton(reuse_symbol, elem_id=f"{target_interface}_reuse_subseed")

        subseed_strength = gr.Slider(label='Variation strength', value=0.0, minimum=0, maximum=1, step=0.01, elem_id=f"{target_interface}_subseed_strength")
@@ -408,7 +408,7 @@ def create_ui(): 
            from modules import ui_extra_networks

            extra_networks_ui = ui_extra_networks.create_ui(extra_networks, toprow.extra_networks_button, 'txt2img')



        with gr.Row().style(equal_height=False):

        with gr.Row(equal_height=False):

            with gr.Column(variant='compact', elem_id="txt2img_settings"):

                scripts.scripts_txt2img.prepare_ui()
@@ -636,7 +636,7 @@ def create_ui(): 
            from modules import ui_extra_networks

            extra_networks_ui_img2img = ui_extra_networks.create_ui(extra_networks, toprow.extra_networks_button, 'img2img')



        with FormRow().style(equal_height=False):

        with FormRow(equal_height=False):

            with gr.Column(variant='compact', elem_id="img2img_settings"):

                copy_image_buttons = []

                copy_image_destinations = {}
@@ -658,19 +658,19 @@ def create_ui(): 
                    img2img_selected_tab = gr.State(0)



                    with gr.TabItem('img2img', id='img2img', elem_id="img2img_img2img_tab") as tab_img2img:

                        init_img = gr.Image(label="Image for img2img", elem_id="img2img_image", show_label=False, source="upload", interactive=True, type="pil", tool="editor", image_mode="RGBA").style(height=opts.img2img_editor_height)

                        init_img = gr.Image(label="Image for img2img", elem_id="img2img_image", show_label=False, source="upload", interactive=True, type="pil", tool="editor", image_mode="RGBA", height=opts.img2img_editor_height)

                        add_copy_image_controls('img2img', init_img)



                    with gr.TabItem('Sketch', id='img2img_sketch', elem_id="img2img_img2img_sketch_tab") as tab_sketch:

                        sketch = gr.Image(label="Image for img2img", elem_id="img2img_sketch", show_label=False, source="upload", interactive=True, type="pil", tool="color-sketch", image_mode="RGBA").style(height=opts.img2img_editor_height)

                        sketch = gr.Image(label="Image for img2img", elem_id="img2img_sketch", show_label=False, source="upload", interactive=True, type="pil", tool="color-sketch", image_mode="RGBA", height=opts.img2img_editor_height)

                        add_copy_image_controls('sketch', sketch)



                    with gr.TabItem('Inpaint', id='inpaint', elem_id="img2img_inpaint_tab") as tab_inpaint:

                        init_img_with_mask = gr.Image(label="Image for inpainting with mask", show_label=False, elem_id="img2maskimg", source="upload", interactive=True, type="pil", tool="sketch", image_mode="RGBA").style(height=opts.img2img_editor_height)

                        init_img_with_mask = gr.Image(label="Image for inpainting with mask", show_label=False, elem_id="img2maskimg", source="upload", interactive=True, type="pil", tool="sketch", image_mode="RGBA", height=opts.img2img_editor_height)

                        add_copy_image_controls('inpaint', init_img_with_mask)



                    with gr.TabItem('Inpaint sketch', id='inpaint_sketch', elem_id="img2img_inpaint_sketch_tab") as tab_inpaint_color:

                        inpaint_color_sketch = gr.Image(label="Color sketch inpainting", show_label=False, elem_id="inpaint_sketch", source="upload", interactive=True, type="pil", tool="color-sketch", image_mode="RGBA").style(height=opts.img2img_editor_height)

                        inpaint_color_sketch = gr.Image(label="Color sketch inpainting", show_label=False, elem_id="inpaint_sketch", source="upload", interactive=True, type="pil", tool="color-sketch", image_mode="RGBA", height=opts.img2img_editor_height)

                        inpaint_color_sketch_orig = gr.State(None)

                        add_copy_image_controls('inpaint_sketch', inpaint_color_sketch)
@@ -993,7 +993,7 @@ def create_ui(): 
        ui_postprocessing.create_ui()



    with gr.Blocks(analytics_enabled=False) as pnginfo_interface:

        with gr.Row().style(equal_height=False):

        with gr.Row(equal_height=False):

            with gr.Column(variant='panel'):

                image = gr.Image(elem_id="pnginfo_image", label="Source", source="upload", interactive=True, type="pil")
@@ -1018,10 +1018,10 @@ def create_ui(): 
    modelmerger_ui = ui_checkpoint_merger.UiCheckpointMerger()



    with gr.Blocks(analytics_enabled=False) as train_interface:

        with gr.Row().style(equal_height=False):

        with gr.Row(equal_height=False):

            gr.HTML(value="<p style='margin-bottom: 0.7em'>See <b><a href=\"https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Textual-Inversion\">wiki</a></b> for detailed explanation.</p>")



        with gr.Row(variant="compact").style(equal_height=False):

        with gr.Row(variant="compact", equal_height=False):

            with gr.Tabs(elem_id="train_tabs"):



                with gr.Tab(label="Create embedding", id="create_embedding"):
@@ -1181,7 +1181,7 @@ def create_ui(): 


            with gr.Column(elem_id='ti_gallery_container'):

                ti_output = gr.Text(elem_id="ti_output", value="", show_label=False)

                gr.Gallery(label='Output', show_label=False, elem_id='ti_gallery').style(columns=4)

                gr.Gallery(label='Output', show_label=False, elem_id='ti_gallery', columns=4)

                gr.HTML(elem_id="ti_progress", value="")

                ti_outcome = gr.HTML(elem_id="ti_error", value="")

CRA Git | Maintained and supported by SUSTech CRA and CCSE