The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Fix bundled embed.
comfyanonymouse1c528196ef7
diff --git a/comfy/sd1_clip.py b/comfy/sd1_clip.pyindex 6f3a7fd9a..e65cab285 100644--- a/comfy/sd1_clip.py+++ b/comfy/sd1_clip.py@@ -313,17 +313,14 @@ def expand_directory_list(directories):dirs.add(root)return list(dirs)-def bundled_embed(embed, key): #bundled embedding in lora format+def bundled_embed(embed, prefix, suffix): #bundled embedding in lora formati = 0out_list = []- while True:- i += 1- k = key.format(i)- w = embed.get(k, None)- if w is None:- break- else:- out_list.append(w)+ for k in embed:+ if k.startswith(prefix) and k.endswith(suffix):+ out_list.append(embed[k])+ if len(out_list) == 0:+ return Nonereturn torch.cat(out_list, dim=0)@@ -392,13 +389,13 @@ def load_embed(embedding_name, embedding_directory, embedding_size, embed_key=Noembed_out = torch.cat(out_list, dim=0)elif embed_key is not None and embed_key in embed:embed_out = embed[embed_key]- elif 'bundle_emb.place1.string_to_param.*' in embed:- embed_out = bundled_embed(embed, 'bundle_emb.place{}.string_to_param.*')- elif 'bundle_emb.place1.{}'.format(embed_key) in embed:- embed_out = bundled_embed(embed, 'bundle_emb.place{}.{}'.format('{}', embed_key))else:- values = embed.values()- embed_out = next(iter(values))+ embed_out = bundled_embed(embed, 'bundle_emb.', '.string_to_param.*')+ if embed_out is None:+ embed_out = bundled_embed(embed, 'bundle_emb.', '.{}'.format(embed_key))+ if embed_out is None:+ values = embed.values()+ embed_out = next(iter(values))return embed_outclass SDTokenizer: