Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui

8 files changed, 52 insertions, 9 deletions

diff --git a/modules/images.py b/modules/images.py
index 0bc3d524..ae3cdaf4 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -36,6 +36,8 @@ def image_grid(imgs, batch_size=1, rows=None):
         else:

             rows = math.sqrt(len(imgs))

             rows = round(rows)

+    if rows > len(imgs):

+        rows = len(imgs)

 

     cols = math.ceil(len(imgs) / rows)

 

diff --git a/modules/processing.py b/modules/processing.py
index afab6790..2d295932 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -450,8 +450,6 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Size": f"{p.width}x{p.height}",

         "Model hash": getattr(p, 'sd_model_hash', None if not opts.add_model_hash_to_info or not shared.sd_model.sd_model_hash else shared.sd_model.sd_model_hash),

         "Model": (None if not opts.add_model_name_to_info or not shared.sd_model.sd_checkpoint_info.model_name else shared.sd_model.sd_checkpoint_info.model_name.replace(',', '').replace(':', '')),

-        "Batch size": (None if p.batch_size < 2 else p.batch_size),

-        "Batch pos": (None if p.batch_size < 2 else position_in_batch),

         "Variation seed": (None if p.subseed_strength == 0 else all_subseeds[index]),

         "Variation seed strength": (None if p.subseed_strength == 0 else p.subseed_strength),

         "Seed resize from": (None if p.seed_resize_from_w == 0 or p.seed_resize_from_h == 0 else f"{p.seed_resize_from_w}x{p.seed_resize_from_h}"),

diff --git a/modules/sd_models.py b/modules/sd_models.py
index c45ddf83..300387a9 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -41,6 +41,7 @@ class CheckpointInfo:
             name = name[1:]

 

         self.name = name

+        self.name_for_extra = os.path.splitext(os.path.basename(filename))[0]

         self.model_name = os.path.splitext(name.replace("/", "_").replace("\\", "_"))[0]

         self.hash = model_hash(filename)

 

diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py
index 6cf00e65..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)

@@ -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]

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 5730c879..83367968 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -1,3 +1,4 @@
+import glob

 import os.path

 import urllib.parse

 from pathlib import Path

@@ -50,10 +51,41 @@ class ExtraNetworksPage:
     def link_preview(self, filename):

         return "./sd_extra_networks/thumb?filename=" + urllib.parse.quote(filename.replace('\\', '/')) + "&mtime=" + str(os.path.getmtime(filename))

 

+    def search_terms_from_path(self, filename, possible_directories=None):

+        abspath = os.path.abspath(filename)

+

+        for parentdir in (possible_directories if possible_directories is not None else self.allowed_directories_for_previews()):

+            parentdir = os.path.abspath(parentdir)

+            if abspath.startswith(parentdir):

+                return abspath[len(parentdir):].replace('\\', '/')

+

+        return ""

+

     def create_html(self, tabname):

         view = shared.opts.extra_networks_default_view

         items_html = ''

 

+        subdirs = {}

+        for parentdir in [os.path.abspath(x) for x in self.allowed_directories_for_previews()]:

+            for x in glob.glob(os.path.join(parentdir, '**/*'), recursive=True):

+                if not os.path.isdir(x):

+                    continue

+

+                subdir = os.path.abspath(x)[len(parentdir):].replace("\\", "/")

+                while subdir.startswith("/"):

+                    subdir = subdir[1:]

+

+                subdirs[subdir] = 1

+

+        if subdirs:

+            subdirs = {"": 1, **subdirs}

+

+        subdirs_html = "".join([f"""

+<button class='gr-button gr-button-lg gr-button-secondary{" search-all" if subdir=="" else ""}' onclick='extraNetworksSearchButton("{tabname}_extra_tabs", event)'>

+{html.escape(subdir if subdir!="" else "all")}

+</button>

+""" for subdir in subdirs])

+

         for item in self.list_items():

             items_html += self.create_html_for_item(item, tabname)

 

@@ -62,6 +94,9 @@ class ExtraNetworksPage:
             items_html = shared.html("extra-networks-no-cards.html").format(dirs=dirs)

 

         res = f"""

+<div id='{tabname}_{self.name}_subdirs' class='extra-network-subdirs extra-network-subdirs-{view}'>

+{subdirs_html}

+</div>

 <div id='{tabname}_{self.name}_cards' class='extra-network-{view}'>

 {items_html}

 </div>

@@ -90,6 +125,7 @@ class ExtraNetworksPage:
             "name": item["name"],

             "card_clicked": onclick,

             "save_card_preview": '"' + html.escape(f"""return saveCardPreview(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])})""") + '"',

+            "search_term": item.get("search_term", ""),

         }

 

         return self.card_page.format(**args)

diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
index c66cb830..a6799171 100644
--- a/modules/ui_extra_networks_checkpoints.py
+++ b/modules/ui_extra_networks_checkpoints.py
@@ -14,8 +14,7 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
         shared.refresh_checkpoints()

 

     def list_items(self):

-        for name, checkpoint1 in sd_models.checkpoints_list.items():

-            checkpoint: sd_models.CheckpointInfo = checkpoint1

+        for name, checkpoint in sd_models.checkpoints_list.items():

             path, ext = os.path.splitext(checkpoint.filename)

             previews = [path + ".png", path + ".preview.png"]

 

@@ -26,13 +25,14 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
                     break

 

             yield {

-                "name": checkpoint.model_name,

+                "name": checkpoint.name_for_extra,

                 "filename": path,

                 "preview": preview,

+                "search_term": self.search_terms_from_path(checkpoint.filename),

                 "onclick": '"' + html.escape(f"""return selectCheckpoint({json.dumps(name)})""") + '"',

                 "local_preview": path + ".png",

             }

 

     def allowed_directories_for_previews(self):

-        return [shared.cmd_opts.ckpt_dir, sd_models.model_path]

+        return [v for v in [shared.cmd_opts.ckpt_dir, sd_models.model_path] if v is not None]

 

diff --git a/modules/ui_extra_networks_hypernets.py b/modules/ui_extra_networks_hypernets.py
index 8c15f8eb..57851088 100644
--- a/modules/ui_extra_networks_hypernets.py
+++ b/modules/ui_extra_networks_hypernets.py
@@ -26,6 +26,7 @@ class ExtraNetworksPageHypernetworks(ui_extra_networks.ExtraNetworksPage):
                 "name": name,

                 "filename": path,

                 "preview": preview,

+                "search_term": self.search_terms_from_path(path),

                 "prompt": json.dumps(f"<hypernet:{name}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),

                 "local_preview": path + ".png",

             }

diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py
index a9d3064b..bb64eb81 100644
--- a/modules/ui_extra_networks_textual_inversion.py
+++ b/modules/ui_extra_networks_textual_inversion.py
@@ -25,6 +25,7 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage):
                 "name": embedding.name,

                 "filename": embedding.filename,

                 "preview": preview,

+                "search_term": self.search_terms_from_path(embedding.filename),

                 "prompt": json.dumps(embedding.name),

                 "local_preview": path + ".preview.png",

             }