Commit 5ef75903 authored by AUTOMATIC1111's avatar AUTOMATIC1111
Browse files

always show extra networks tabs in the UI

parent 9d3dd64f

javascript/extraNetworks.js

+3 −5
Original line number Diff line number Diff line
@@ -2,16 +2,14 @@ function setupExtraNetworksForTab(tabname) { 
    gradioApp().querySelector('#' + tabname + '_extra_tabs').classList.add('extra-networks');



    var tabs = gradioApp().querySelector('#' + tabname + '_extra_tabs > div');

    var search = gradioApp().querySelector('#' + tabname + '_extra_search textarea');

    var searchDiv = gradioApp().getElementById(tabname + '_extra_search');

    var search = searchDiv.querySelector('textarea');

    var sort = gradioApp().getElementById(tabname + '_extra_sort');

    var sortOrder = gradioApp().getElementById(tabname + '_extra_sortorder');

    var refresh = gradioApp().getElementById(tabname + '_extra_refresh');



    search.classList.add('search');

    sort.classList.add('sort');

    sortOrder.classList.add('sortorder');

    sort.dataset.sortkey = 'sortDefault';

    tabs.appendChild(search);

    tabs.appendChild(searchDiv);

    tabs.appendChild(sort);

    tabs.appendChild(sortOrder);

    tabs.appendChild(refresh);

modules/ui.py

+20 −15
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ def create_toprow(is_img2img): 
            with gr.Row(elem_id=f"{id_part}_tools"):

                paste = ToolButton(value=paste_symbol, elem_id="paste")

                clear_prompt_button = ToolButton(value=clear_prompt_symbol, elem_id=f"{id_part}_clear_prompt")

                extra_networks_button = ToolButton(value=extra_networks_symbol, elem_id=f"{id_part}_extra_networks")

                prompt_style_apply = ToolButton(value=apply_style_symbol, elem_id=f"{id_part}_style_apply")

                save_style = ToolButton(value=save_style_symbol, elem_id=f"{id_part}_style_create")

                restore_progress_button = ToolButton(value=restore_progress_symbol, elem_id=f"{id_part}_restore_progress", visible=False)
@@ -331,7 +330,7 @@ def create_toprow(is_img2img): 
                prompt_styles = gr.Dropdown(label="Styles", elem_id=f"{id_part}_styles", choices=[k for k, v in shared.prompt_styles.styles.items()], value=[], multiselect=True)

                create_refresh_button(prompt_styles, shared.prompt_styles.reload, lambda: {"choices": [k for k, v in shared.prompt_styles.styles.items()]}, f"refresh_{id_part}_styles")



    return prompt, prompt_styles, negative_prompt, submit, button_interrogate, button_deepbooru, prompt_style_apply, save_style, paste, extra_networks_button, token_counter, token_button, negative_token_counter, negative_token_button, restore_progress_button

    return prompt, prompt_styles, negative_prompt, submit, button_interrogate, button_deepbooru, prompt_style_apply, save_style, paste, None, token_counter, token_button, negative_token_counter, negative_token_button, restore_progress_button





def setup_progressbar(*args, **kwargs):
@@ -419,16 +418,15 @@ def create_ui(): 
    modules.scripts.scripts_txt2img.initialize_scripts(is_img2img=False)



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

        txt2img_prompt, txt2img_prompt_styles, txt2img_negative_prompt, submit, _, _, txt2img_prompt_style_apply, txt2img_save_style, txt2img_paste, extra_networks_button, token_counter, token_button, negative_token_counter, negative_token_button, restore_progress_button = create_toprow(is_img2img=False)

        txt2img_prompt, txt2img_prompt_styles, txt2img_negative_prompt, submit, _, _, txt2img_prompt_style_apply, txt2img_save_style, txt2img_paste, _, token_counter, token_button, negative_token_counter, negative_token_button, restore_progress_button = create_toprow(is_img2img=False)



        dummy_component = gr.Label(visible=False)

        txt_prompt_img = gr.File(label="", elem_id="txt2img_prompt_image", file_count="single", type="binary", visible=False)



        with FormRow(variant='compact', elem_id="txt2img_extra_networks", visible=False) as extra_networks:

            from modules import ui_extra_networks

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

        extra_tabs = gr.Tabs(elem_id="txt2img_extra_tabs")

        extra_tabs.__enter__()



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

        with gr.Tab("Generation", id="txt2img_generation") as txt2img_generation_tab, gr.Row().style(equal_height=False):

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

                modules.scripts.scripts_txt2img.prepare_ui()
@@ -656,21 +654,24 @@ def create_ui(): 
            token_button.click(fn=wrap_queued_call(update_token_counter), inputs=[txt2img_prompt, steps], outputs=[token_counter])

            negative_token_button.click(fn=wrap_queued_call(update_token_counter), inputs=[txt2img_negative_prompt, steps], outputs=[negative_token_counter])



        from modules import ui_extra_networks

        extra_networks_ui = ui_extra_networks.create_ui(txt2img_interface, [txt2img_generation_tab], 'txt2img')

        ui_extra_networks.setup_ui(extra_networks_ui, txt2img_gallery)



        extra_tabs.__exit__()



    modules.scripts.scripts_current = modules.scripts.scripts_img2img

    modules.scripts.scripts_img2img.initialize_scripts(is_img2img=True)



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

        img2img_prompt, img2img_prompt_styles, img2img_negative_prompt, submit, img2img_interrogate, img2img_deepbooru, img2img_prompt_style_apply, img2img_save_style, img2img_paste, extra_networks_button, token_counter, token_button, negative_token_counter, negative_token_button, restore_progress_button = create_toprow(is_img2img=True)

        img2img_prompt, img2img_prompt_styles, img2img_negative_prompt, submit, img2img_interrogate, img2img_deepbooru, img2img_prompt_style_apply, img2img_save_style, img2img_paste, _, token_counter, token_button, negative_token_counter, negative_token_button, restore_progress_button = create_toprow(is_img2img=True)



        img2img_prompt_img = gr.File(label="", elem_id="img2img_prompt_image", file_count="single", type="binary", visible=False)



        with FormRow(variant='compact', elem_id="img2img_extra_networks", visible=False) as extra_networks:

            from modules import ui_extra_networks

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

        extra_tabs = gr.Tabs(elem_id="img2img_extra_tabs")

        extra_tabs.__enter__()



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

        with gr.Tab("Generation", id="img2img_generation") as img2img_generation_tab, FormRow().style(equal_height=False):

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

                copy_image_buttons = []

                copy_image_destinations = {}
@@ -1026,8 +1027,6 @@ def create_ui(): 
            token_button.click(fn=update_token_counter, inputs=[img2img_prompt, steps], outputs=[token_counter])

            negative_token_button.click(fn=wrap_queued_call(update_token_counter), inputs=[img2img_negative_prompt, steps], outputs=[negative_token_counter])



            ui_extra_networks.setup_ui(extra_networks_ui_img2img, img2img_gallery)



            img2img_paste_fields = [

                (img2img_prompt, "Prompt"),

                (img2img_negative_prompt, "Negative prompt"),
@@ -1055,6 +1054,12 @@ def create_ui(): 
                paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None,

            ))



        from modules import ui_extra_networks

        extra_networks_ui_img2img = ui_extra_networks.create_ui(img2img_interface, [img2img_generation_tab], 'img2img')

        ui_extra_networks.setup_ui(extra_networks_ui_img2img, img2img_gallery)



        extra_tabs.__exit__()



    modules.scripts.scripts_current = None



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

modules/ui_extra_networks.py

+23 −35
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ def pages_in_preferred_order(pages): 
    return sorted(pages, key=lambda x: tab_scores[x.name])





def create_ui(container, button, tabname):

def create_ui(interface: gr.Blocks, unrelated_tabs, tabname):

    ui = ExtraNetworksUi()

    ui.pages = []

    ui.pages_contents = []
@@ -363,9 +363,10 @@ def create_ui(container, button, tabname): 
    ui.stored_extra_pages = pages_in_preferred_order(extra_pages.copy())

    ui.tabname = tabname



    with gr.Tabs(elem_id=tabname+"_extra_tabs"):

    related_tabs = []



    for page in ui.stored_extra_pages:

            with gr.Tab(page.title, id=page.id_page):

        with gr.Tab(page.title, id=page.id_page) as tab:

            elem_id = f"{tabname}_{page.id_page}_cards_html"

            page_elem = gr.HTML('Loading...', elem_id=elem_id)

            ui.pages.append(page_elem)
@@ -376,35 +377,21 @@ def create_ui(container, button, tabname): 
            editor.create_ui()

            ui.user_metadata_editors.append(editor)



    gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False)

    gr.Dropdown(choices=['Default Sort', 'Date Created', 'Date Modified', 'Name'], value='Default Sort', elem_id=tabname+"_extra_sort", multiselect=False, visible=False, show_label=False, interactive=True)

    ToolButton(up_down_symbol, elem_id=tabname+"_extra_sortorder")

    button_refresh = gr.Button('Refresh', elem_id=tabname+"_extra_refresh")

            related_tabs.append(tab)



    edit_search = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", elem_classes="search", placeholder="Search...", visible=False, interactive=True)

    dropdown_sort = gr.Dropdown(choices=['Default Sort', 'Date Created', 'Date Modified', 'Name'], value='Default Sort', elem_id=tabname+"_extra_sort", elem_classes="sort", multiselect=False, visible=False, show_label=False, interactive=True)

    button_sortorder = ToolButton(up_down_symbol, elem_id=tabname+"_extra_sortorder", elem_classes="sortorder", visible=False)

    button_refresh = gr.Button('Refresh', elem_id=tabname+"_extra_refresh", visible=False)



    ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False)

    ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False)



    def toggle_visibility(is_visible):

        is_visible = not is_visible



        return is_visible, gr.update(visible=is_visible), gr.update(variant=("secondary-down" if is_visible else "secondary"))



    def fill_tabs(is_empty):

        """Creates HTML for extra networks' tabs when the extra networks button is clicked for the first time."""



        if not ui.pages_contents:

            refresh()



        if is_empty:

            return True, *ui.pages_contents



        return True, *[gr.update() for _ in ui.pages_contents]



    state_visible = gr.State(value=False)

    button.click(fn=toggle_visibility, inputs=[state_visible], outputs=[state_visible, container, button], show_progress=False)

    for tab in unrelated_tabs:

        tab.select(fn=lambda: [gr.update(visible=False) for _ in range(5)], inputs=[], outputs=[edit_search, edit_search, dropdown_sort, button_sortorder, button_refresh], show_progress=False)



    state_empty = gr.State(value=True)

    button.click(fn=fill_tabs, inputs=[state_empty], outputs=[state_empty, *ui.pages], show_progress=False)

    for tab in related_tabs:

        tab.select(fn=lambda: [gr.update(visible=True) for _ in range(5)], inputs=[], outputs=[edit_search, edit_search, dropdown_sort, button_sortorder, button_refresh], show_progress=False)



    def refresh():

        for pg in ui.stored_extra_pages:
@@ -414,6 +401,7 @@ def create_ui(container, button, tabname): 


        return ui.pages_contents



    interface.load(fn=refresh, inputs=[], outputs=[*ui.pages])

    button_refresh.click(fn=refresh, inputs=[], outputs=ui.pages)



    return ui

style.css

+4 −4
Original line number Diff line number Diff line
@@ -766,9 +766,10 @@ footer { 
/* extra networks UI */



.extra-network-cards{

    height: 725px;

    overflow: scroll;

    resize: vertical;

}



.extra-networks > div.tab-nav{

    height: 3.4rem;

}



.extra-networks > div > [id *= '_extra_']{
@@ -784,7 +785,6 @@ footer { 
}

.extra-networks .tab-nav .search,

.extra-networks .tab-nav .sort{

    display: inline-block;

    margin: 0.3em;

    align-self: center;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE