Unverified Commit 37c59c27 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #9723 from missionfloyd/extra-network-none 

Add "None" option to extra networks dropdowns
parents 38f1c818 f4b332f0

extensions-builtin/Lora/extra_networks_lora.py

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork): 
    def activate(self, p, params_list):

        additional = shared.opts.sd_lora



        if additional != "" and additional in lora.available_loras and len([x for x in params_list if x.items[0] == additional]) == 0:

        if additional != "None" and additional in lora.available_loras and len([x for x in params_list if x.items[0] == additional]) == 0:

            p.all_prompts = [x + f"<lora:{additional}:{shared.opts.extra_networks_default_multiplier}>" for x in p.all_prompts]

            params_list.append(extra_networks.ExtraNetworkParams(items=[additional, shared.opts.extra_networks_default_multiplier]))

extensions-builtin/Lora/scripts/lora_script.py

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ script_callbacks.on_before_ui(before_ui) 




shared.options_templates.update(shared.options_section(('extra_networks', "Extra Networks"), {

    "sd_lora": shared.OptionInfo("None", "Add Lora to prompt", gr.Dropdown, lambda: {"choices": [""] + [x for x in lora.available_loras]}, refresh=lora.list_available_loras),

    "sd_lora": shared.OptionInfo("None", "Add Lora to prompt", gr.Dropdown, lambda: {"choices": ["None"] + [x for x in lora.available_loras]}, refresh=lora.list_available_loras),

}))

modules/extra_networks_hypernet.py

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ class ExtraNetworkHypernet(extra_networks.ExtraNetwork): 
    def activate(self, p, params_list):

        additional = shared.opts.sd_hypernetwork



        if additional != "" and additional in shared.hypernetworks and len([x for x in params_list if x.items[0] == additional]) == 0:

        if additional != "None" and additional in shared.hypernetworks and len([x for x in params_list if x.items[0] == additional]) == 0:

            p.all_prompts = [x + f"<hypernet:{additional}:{shared.opts.extra_networks_default_multiplier}>" for x in p.all_prompts]

            params_list.append(extra_networks.ExtraNetworkParams(items=[additional, shared.opts.extra_networks_default_multiplier]))

modules/shared.py

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ options_templates.update(options_section(('extra_networks', "Extra Networks"), { 
    "extra_networks_card_width": OptionInfo(0, "Card width for Extra Networks (px)"),

    "extra_networks_card_height": OptionInfo(0, "Card height for Extra Networks (px)"),

    "extra_networks_add_text_separator": OptionInfo(" ", "Extra text to add before <...> when adding extra network to prompt"),

    "sd_hypernetwork": OptionInfo("None", "Add hypernetwork to prompt", gr.Dropdown, lambda: {"choices": [""] + [x for x in hypernetworks.keys()]}, refresh=reload_hypernetworks),

    "sd_hypernetwork": OptionInfo("None", "Add hypernetwork to prompt", gr.Dropdown, lambda: {"choices": ["None"] + [x for x in hypernetworks.keys()]}, refresh=reload_hypernetworks),

}))



options_templates.update(options_section(('ui', "User interface"), {

CRA Git | Maintained and supported by SUSTech CRA and CCSE