Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 9 insertions, 1 deletions

diff --git a/extensions-builtin/Lora/extra_networks_lora.py b/extensions-builtin/Lora/extra_networks_lora.py
index ba2945c6..005ff32c 100644
--- a/extensions-builtin/Lora/extra_networks_lora.py
+++ b/extensions-builtin/Lora/extra_networks_lora.py
@@ -6,9 +6,14 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
     def __init__(self):

         super().__init__('lora')

 

+        self.errors = {}

+        """mapping of network names to the number of errors the network had during operation"""

+

     def activate(self, p, params_list):

         additional = shared.opts.sd_lora

 

+        self.errors.clear()

+

         if additional != "None" and additional in networks.available_networks 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]))

@@ -56,4 +61,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
                 p.extra_generation_params["Lora hashes"] = ", ".join(network_hashes)

 

     def deactivate(self, p):

-        pass

+        if self.errors:

+            p.comment("Networks with errors: " + ", ".join(f"{k} ({v})" for k, v in self.errors.items()))

+

+            self.errors.clear()