diff --git a/extra_networks_lyco.py b/extra_networks_lyco.py index 9068322..b7741b4 100644 --- a/extra_networks_lyco.py +++ b/extra_networks_lyco.py @@ -42,7 +42,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork): networks.load_networks(names, te_multipliers, unet_multipliers, dyn_dims) - if shared.opts.lora_add_hashes_to_infotext: + if shared.opts.lyco_add_hashes_to_infotext: network_hashes = [] for item in networks.loaded_networks: shorthash = item.network_on_disk.shorthash diff --git a/l_networks.py b/l_networks.py index ece5d8f..e73e24d 100644 --- a/l_networks.py +++ b/l_networks.py @@ -248,7 +248,7 @@ def load_network(name, network_on_disk): def purge_networks_from_memory(): - while len(networks_in_memory) > shared.opts.lora_in_memory_limit and len(networks_in_memory) > 0: + while len(networks_in_memory) > shared.opts.lyco_in_memory_limit and len(networks_in_memory) > 0: name = next(iter(networks_in_memory)) networks_in_memory.pop(name, None) @@ -326,9 +326,9 @@ def load_networks(names, te_multipliers=None, unet_multipliers=None, dyn_dims=No if failed_to_load_networks: lora_not_found_message = f'Lora not found: {", ".join(failed_to_load_networks)}' sd_hijack.model_hijack.comments.append(lora_not_found_message) - if shared.opts.lora_not_found_warning_console: + if shared.opts.lyco_not_found_warning_console: print(f'\n{lora_not_found_message}\n') - if shared.opts.lora_not_found_gradio_warning: + if shared.opts.lyco_not_found_gradio_warning: gr.Warning(lora_not_found_message) purge_networks_from_memory() @@ -501,7 +501,7 @@ def network_reset_cached_weight(self: Union[torch.nn.Conv2d, torch.nn.Linear]): def network_Linear_forward(self, input): - if shared.opts.lora_functional: + if shared.opts.lyco_functional: return network_forward(self, input, originals.Linear_forward) network_apply_weights(self) @@ -516,7 +516,7 @@ def network_Linear_load_state_dict(self, *args, **kwargs): def network_Conv2d_forward(self, input): - if shared.opts.lora_functional: + if shared.opts.lyco_functional: return network_forward(self, input, originals.Conv2d_forward) network_apply_weights(self) @@ -531,7 +531,7 @@ def network_Conv2d_load_state_dict(self, *args, **kwargs): def network_GroupNorm_forward(self, input): - if shared.opts.lora_functional: + if shared.opts.lyco_functional: return network_forward(self, input, originals.GroupNorm_forward) network_apply_weights(self) @@ -546,7 +546,7 @@ def network_GroupNorm_load_state_dict(self, *args, **kwargs): def network_LayerNorm_forward(self, input): - if shared.opts.lora_functional: + if shared.opts.lyco_functional: return network_forward(self, input, originals.LayerNorm_forward) network_apply_weights(self) diff --git a/scripts/lyco_script.py b/scripts/lyco_script.py index 5e18521..ce72245 100644 --- a/scripts/lyco_script.py +++ b/scripts/lyco_script.py @@ -36,15 +36,15 @@ script_callbacks.on_before_ui(before_ui) script_callbacks.on_infotext_pasted(networks.infotext_pasted) -shared.options_templates.update(shared.options_section(('extra_networks', "Extra Networks"), { - "sd_lora": shared.OptionInfo("None", "Add network to prompt", gr.Dropdown, lambda: {"choices": ["None", *networks.available_networks]}, refresh=networks.list_available_networks), - "lora_preferred_name": shared.OptionInfo("Alias from file", "When adding to prompt, refer to Lora by", gr.Radio, {"choices": ["Alias from file", "Filename"]}), - "lora_add_hashes_to_infotext": shared.OptionInfo(True, "Add Lora hashes to infotext"), - "lora_show_all": shared.OptionInfo(False, "Always show all networks on the Lora page").info("otherwise, those detected as for incompatible version of Stable Diffusion will be hidden"), - "lora_hide_unknown_for_versions": shared.OptionInfo([], "Hide networks of unknown versions for model versions", gr.CheckboxGroup, {"choices": ["SD1", "SD2", "SDXL"]}), - "lora_in_memory_limit": shared.OptionInfo(0, "Number of Lora networks to keep cached in memory", gr.Number, {"precision": 0}), - "lora_not_found_warning_console": shared.OptionInfo(False, "Lora not found warning in console"), - "lora_not_found_gradio_warning": shared.OptionInfo(False, "Lora not found warning popup in webui"), +shared.options_templates.update(shared.options_section(('lycoris', "LyCORIS"), { + "sd_lyco": shared.OptionInfo("None", "Add network to prompt", gr.Dropdown, lambda: {"choices": ["None", *networks.available_networks]}, refresh=networks.list_available_networks), + "lyco_preferred_name": shared.OptionInfo("Alias from file", "When adding to prompt, refer to Lora by", gr.Radio, {"choices": ["Alias from file", "Filename"]}), + "lyco_add_hashes_to_infotext": shared.OptionInfo(True, "Add Lora hashes to infotext"), + "lyco_show_all": shared.OptionInfo(False, "Always show all networks on the Lora page").info("otherwise, those detected as for incompatible version of Stable Diffusion will be hidden"), + "lyco_hide_unknown_for_versions": shared.OptionInfo([], "Hide networks of unknown versions for model versions", gr.CheckboxGroup, {"choices": ["SD1", "SD2", "SDXL"]}), + "lyco_in_memory_limit": shared.OptionInfo(0, "Number of Lora networks to keep cached in memory", gr.Number, {"precision": 0}), + "lyco_not_found_warning_console": shared.OptionInfo(False, "Lora not found warning in console"), + "lyco_not_found_gradio_warning": shared.OptionInfo(False, "Lora not found warning popup in webui"), })) @@ -63,18 +63,18 @@ def create_lora_json(obj: network.NetworkOnDisk): def api_networks(_: gr.Blocks, app: FastAPI): - @app.get("/sdapi/v1/loras") + @app.get("/sdapi/v1/lycos") async def get_loras(): return [create_lora_json(obj) for obj in networks.available_networks.values()] - @app.post("/sdapi/v1/refresh-loras") + @app.post("/sdapi/v1/refresh-lycos") async def refresh_loras(): return networks.list_available_networks() script_callbacks.on_app_started(api_networks) -re_lora = re.compile("