Merge branch 'dev' into release_candidate

3 files changed, 12 insertions, 6 deletions

diff --git a/extensions-builtin/Lora/extra_networks_lora.py b/extensions-builtin/Lora/extra_networks_lora.py
index b5fea4d2..66ee9c85 100644
--- a/extensions-builtin/Lora/extra_networks_lora.py
+++ b/extensions-builtin/Lora/extra_networks_lora.py
@@ -9,14 +9,14 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
     def activate(self, p, params_list):

         additional = shared.opts.sd_lora

 

-        if additional != "None" 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 not any(x for x in params_list if x.items[0] == additional):

             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]))

 

         names = []

         multipliers = []

         for params in params_list:

-            assert len(params.items) > 0

+            assert params.items

 

             names.append(params.items[0])

             multipliers.append(float(params.items[1]) if len(params.items) > 1 else 1.0)

diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py
index eec14712..34ff57dd 100644
--- a/extensions-builtin/Lora/lora.py
+++ b/extensions-builtin/Lora/lora.py
@@ -219,7 +219,7 @@ def load_lora(name, lora_on_disk):
         else:

             raise AssertionError(f"Bad Lora layer name: {key_diffusers} - must end in lora_up.weight, lora_down.weight or alpha")

 

-    if len(keys_failed_to_match) > 0:

+    if keys_failed_to_match:

         print(f"Failed to match keys when loading Lora {lora_on_disk.filename}: {keys_failed_to_match}")

 

     return lora

@@ -267,7 +267,7 @@ def load_loras(names, multipliers=None):
         lora.multiplier = multipliers[i] if multipliers else 1.0

         loaded_loras.append(lora)

 

-    if len(failed_to_load_loras) > 0:

+    if failed_to_load_loras:

         sd_hijack.model_hijack.comments.append("Failed to find Loras: " + ", ".join(failed_to_load_loras))

 

 

@@ -448,7 +448,11 @@ def list_available_loras():
             continue

 

         name = os.path.splitext(os.path.basename(filename))[0]

-        entry = LoraOnDisk(name, filename)

+        try:

+            entry = LoraOnDisk(name, filename)

+        except OSError:  # should catch FileNotFoundError and PermissionError etc.

+            errors.report(f"Failed to load LoRA {name} from {filename}", exc_info=True)

+            continue

 

         available_loras[name] = entry

 

diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index 259e99ac..da49790b 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -13,7 +13,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
         lora.list_available_loras()

 

     def list_items(self):

-        for name, lora_on_disk in lora.available_loras.items():

+        for index, (name, lora_on_disk) in enumerate(lora.available_loras.items()):

             path, ext = os.path.splitext(lora_on_disk.filename)

 

             alias = lora_on_disk.get_alias()

@@ -27,6 +27,8 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
                 "prompt": json.dumps(f"<lora:{alias}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),

                 "local_preview": f"{path}.{shared.opts.samples_format}",

                 "metadata": json.dumps(lora_on_disk.metadata, indent=4) if lora_on_disk.metadata else None,

+                "sort_keys": {'default': index, **self.get_sort_keys(lora_on_disk.filename)},

+

             }

 

     def allowed_directories_for_previews(self):