From 796ae04dcd526d5301d6908defb0a4df75fa9004 Mon Sep 17 00:00:00 2001 From: Jordan Thompson Date: Sat, 22 Jul 2023 20:21:14 -0700 Subject: [PATCH] WAS_Text_Parse_Embeddings_By_Name: Search all embedding paths --- WAS_Node_Suite.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/WAS_Node_Suite.py b/WAS_Node_Suite.py index 1743787..a3c82b5 100644 --- a/WAS_Node_Suite.py +++ b/WAS_Node_Suite.py @@ -8986,13 +8986,14 @@ class WAS_Text_Parse_Embeddings_By_Name: return (self.convert_a1111_embeddings(text), ) def convert_a1111_embeddings(self, text): - import re - for filename in os.listdir(os.path.join(MODELS_DIR, 'embeddings')): - basename, ext = os.path.splitext(filename) - pattern = re.compile(r'\b{}\b'.format(re.escape(basename))) - replacement = 'embedding:{}'.format(basename) - text = re.sub(pattern, replacement, text) - return text + for embeddings_path in comfy_paths.folder_names_and_paths["embeddings"][0]: + for filename in os.listdir(embeddings_path): + basename, ext = os.path.splitext(filename) + pattern = re.compile(r'\b{}\b'.format(re.escape(basename))) + replacement = 'embedding:{}'.format(basename) + text = re.sub(pattern, replacement, text) + + return text # Text Dictionary Concatenate