Merge branch 'dev' into patch-1

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/extra_networks_hypernet.py b/modules/extra_networks_hypernet.py
index 04f27c9f..b6a6dc0e 100644
--- a/modules/extra_networks_hypernet.py
+++ b/modules/extra_networks_hypernet.py
@@ -1,4 +1,4 @@
-from modules import extra_networks, shared, extra_networks

+from modules import extra_networks, shared

 from modules.hypernetworks import hypernetwork

 

 

@@ -9,7 +9,7 @@ class ExtraNetworkHypernet(extra_networks.ExtraNetwork):
     def activate(self, p, params_list):

         additional = shared.opts.sd_hypernetwork

 

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

             hypernet_prompt_text = f"<hypernet:{additional}:{shared.opts.extra_networks_default_multiplier}>"

             p.all_prompts = [f"{prompt}{hypernet_prompt_text}" for prompt in p.all_prompts]

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

@@ -17,7 +17,7 @@ class ExtraNetworkHypernet(extra_networks.ExtraNetwork):
         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)