WAS_Text_Parse_Embeddings_By_Name: Search all embedding paths

2023-07-22 20:21:14 -07:00
parent 7b18b2027e
commit 796ae04dcd
1 changed files with 8 additions and 7 deletions
@@ -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