add alias to lyco network

read networks from LyCORIS dir if it exists
add credits

4 files changed, 21 insertions, 4 deletions

diff --git a/README.md b/README.md
index e6d8e4bd..b796d150 100644
--- a/README.md
+++ b/README.md
@@ -168,5 +168,6 @@ Licenses for borrowed code can be found in `Settings -> Licenses` screen, and al
 - Security advice - RyotaK

 - UniPC sampler - Wenliang Zhao - https://github.com/wl-zhao/UniPC

 - TAESD - Ollin Boer Bohan - https://github.com/madebyollin/taesd

+- LyCORIS - KohakuBlueleaf

 - Initial Gradio script - posted on 4chan by an Anonymous user. Thank you Anonymous user.

 - (You)

diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py
index 401430e8..7b4c0312 100644
--- a/extensions-builtin/Lora/networks.py
+++ b/extensions-builtin/Lora/networks.py
@@ -11,7 +11,7 @@ import network_full
 import torch

 from typing import Union

 

-from modules import shared, devices, sd_models, errors, scripts, sd_hijack

+from modules import shared, devices, sd_models, errors, scripts, sd_hijack, paths

 

 module_types = [

     network_lora.ModuleTypeLora(),

@@ -399,6 +399,7 @@ def list_available_networks():
     os.makedirs(shared.cmd_opts.lora_dir, exist_ok=True)

 

     candidates = list(shared.walk_files(shared.cmd_opts.lora_dir, allowed_extensions=[".pt", ".ckpt", ".safetensors"]))

+    candidates += list(shared.walk_files(os.path.join(paths.models_path, "LyCORIS"), allowed_extensions=[".pt", ".ckpt", ".safetensors"]))

     for filename in candidates:

         if os.path.isdir(filename):

             continue

diff --git a/extensions-builtin/Lora/scripts/lora_script.py b/extensions-builtin/Lora/scripts/lora_script.py
index 4c75821e..f478f718 100644
--- a/extensions-builtin/Lora/scripts/lora_script.py
+++ b/extensions-builtin/Lora/scripts/lora_script.py
@@ -22,7 +22,10 @@ def unload():
 

 def before_ui():

     ui_extra_networks.register_page(ui_extra_networks_lora.ExtraNetworksPageLora())

-    extra_networks.register_extra_network(extra_networks_lora.ExtraNetworkLora())

+

+    extra_network = extra_networks_lora.ExtraNetworkLora()

+    extra_networks.register_extra_network(extra_network)

+    extra_networks.register_extra_network_alias(extra_network, "lyco")

 

 

 if not hasattr(torch.nn, 'Linear_forward_before_network'):

diff --git a/modules/extra_networks.py b/modules/extra_networks.py
index 41799b0a..6ae07e91 100644
--- a/modules/extra_networks.py
+++ b/modules/extra_networks.py
@@ -4,16 +4,22 @@ from collections import defaultdict
 from modules import errors

 

 extra_network_registry = {}

+extra_network_aliases = {}

 

 

 def initialize():

     extra_network_registry.clear()

+    extra_network_aliases.clear()

 

 

 def register_extra_network(extra_network):

     extra_network_registry[extra_network.name] = extra_network

 

 

+def register_extra_network_alias(extra_network, alias):

+    extra_network_aliases[alias] = extra_network

+

+

 def register_default_extra_networks():

     from modules.extra_networks_hypernet import ExtraNetworkHypernet

     register_extra_network(ExtraNetworkHypernet())

@@ -82,20 +88,26 @@ def activate(p, extra_network_data):
     """call activate for extra networks in extra_network_data in specified order, then call

     activate for all remaining registered networks with an empty argument list"""

 

+    activated = []

+

     for extra_network_name, extra_network_args in extra_network_data.items():

         extra_network = extra_network_registry.get(extra_network_name, None)

+

+        if extra_network is None:

+            extra_network = extra_network_aliases.get(extra_network_name, None)

+

         if extra_network is None:

             print(f"Skipping unknown extra network: {extra_network_name}")

             continue

 

         try:

             extra_network.activate(p, extra_network_args)

+            activated.append(extra_network)

         except Exception as e:

             errors.display(e, f"activating extra network {extra_network_name} with arguments {extra_network_args}")

 

     for extra_network_name, extra_network in extra_network_registry.items():

-        args = extra_network_data.get(extra_network_name, None)

-        if args is not None:

+        if extra_network in activated:

             continue

 

         try: