Merge pull request #6384 from faber6/loads-ti-from-subdirs

allow loading embeddings from subdirectories

1 files changed, 12 insertions, 11 deletions

diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py
index 24b43045..0a059044 100644
--- a/modules/textual_inversion/textual_inversion.py
+++ b/modules/textual_inversion/textual_inversion.py
@@ -149,19 +149,20 @@ class EmbeddingDatabase:
             else:

                 self.skipped_embeddings[name] = embedding

 

-        for fn in os.listdir(self.embeddings_dir):

-            try:

-                fullfn = os.path.join(self.embeddings_dir, fn)

-

-                if os.stat(fullfn).st_size == 0:

+        for root, dirs, fns in os.walk(self.embeddings_dir):

+            for fn in fns:

+                try:

+                    fullfn = os.path.join(root, fn)

+

+                    if os.stat(fullfn).st_size == 0:

+                        continue

+

+                    process_file(fullfn, fn)

+                except Exception:

+                    print(f"Error loading embedding {fn}:", file=sys.stderr)

+                    print(traceback.format_exc(), file=sys.stderr)

                     continue

 

-                process_file(fullfn, fn)

-            except Exception:

-                print(f"Error loading embedding {fn}:", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

-                continue

-

         print(f"Textual inversion embeddings loaded({len(self.word_embeddings)}): {', '.join(self.word_embeddings.keys())}")

         if len(self.skipped_embeddings) > 0:

             print(f"Textual inversion embeddings skipped({len(self.skipped_embeddings)}): {', '.join(self.skipped_embeddings.keys())}")