Merge branch 'master' into master

2 files changed, 10 insertions, 7 deletions

diff --git a/modules/textual_inversion/preprocess.py b/modules/textual_inversion/preprocess.py
index c0ac11d3..2239cb84 100644
--- a/modules/textual_inversion/preprocess.py
+++ b/modules/textual_inversion/preprocess.py
@@ -6,8 +6,7 @@ import sys
 import tqdm

 import time

 

-from modules import shared, images, deepbooru

-from modules.paths import models_path

+from modules import paths, shared, images, deepbooru

 from modules.shared import opts, cmd_opts

 from modules.textual_inversion import autocrop

 

@@ -199,7 +198,7 @@ def preprocess_work(process_src, process_dst, process_width, process_height, pre
 

             dnn_model_path = None

             try:

-                dnn_model_path = autocrop.download_and_cache_models(os.path.join(models_path, "opencv"))

+                dnn_model_path = autocrop.download_and_cache_models(os.path.join(paths.models_path, "opencv"))

             except Exception as e:

                 print("Unable to load face detection model for auto crop selection. Falling back to lower quality haar method.", e)

 

diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py
index 4e90f690..a1a406c2 100644
--- a/modules/textual_inversion/textual_inversion.py
+++ b/modules/textual_inversion/textual_inversion.py
@@ -112,6 +112,7 @@ class EmbeddingDatabase:
         self.skipped_embeddings = {}

         self.expected_shape = -1

         self.embedding_dirs = {}

+        self.previously_displayed_embeddings = ()

 

     def add_embedding_dir(self, path):

         self.embedding_dirs[path] = DirWithTextualInversionEmbeddings(path)

@@ -194,7 +195,7 @@ class EmbeddingDatabase:
         if not os.path.isdir(embdir.path):

             return

 

-        for root, dirs, fns in os.walk(embdir.path):

+        for root, dirs, fns in os.walk(embdir.path, followlinks=True):

             for fn in fns:

                 try:

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

@@ -228,9 +229,12 @@ class EmbeddingDatabase:
             self.load_from_dir(embdir)

             embdir.update()

 

-        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())}")

+        displayed_embeddings = (tuple(self.word_embeddings.keys()), tuple(self.skipped_embeddings.keys()))

+        if self.previously_displayed_embeddings != displayed_embeddings:

+            self.previously_displayed_embeddings = displayed_embeddings

+            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())}")

 

     def find_embedding_at_position(self, tokens, offset):

         token = tokens[offset]