From e5d3ae2bf4e9d39c35e6edc96d6449fd42528e55 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 15 Jul 2023 20:39:04 +0300
Subject: user metadata system for custom networks

---
 modules/ui_extra_networks_checkpoints.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/ui_extra_networks_checkpoints.py')

diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
index 8b9ab71b..bb5071e6 100644
--- a/modules/ui_extra_networks_checkpoints.py
+++ b/modules/ui_extra_networks_checkpoints.py
@@ -18,7 +18,7 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
             path, ext = os.path.splitext(checkpoint.filename)
             yield {
                 "name": checkpoint.name_for_extra,
-                "filename": path,
+                "filename": checkpoint.filename,
                 "preview": self.find_preview(path),
                 "description": self.find_description(path),
                 "search_term": self.search_terms_from_path(checkpoint.filename) + " " + (checkpoint.sha256 or ""),
-- 
cgit v1.2.3


From a1d6ada69ac686a628e79b61b8f86d01592a7209 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 16 Jul 2023 08:38:23 +0300
Subject: allow refreshing single card after editing user metadata instead of
 all cards

---
 modules/ui_extra_networks_checkpoints.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'modules/ui_extra_networks_checkpoints.py')

diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
index bb5071e6..ef8cdf35 100644
--- a/modules/ui_extra_networks_checkpoints.py
+++ b/modules/ui_extra_networks_checkpoints.py
@@ -12,21 +12,24 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
     def refresh(self):
         shared.refresh_checkpoints()
 
+    def create_item(self, name, index=None):
+        checkpoint: sd_models.CheckpointInfo = sd_models.checkpoints_list.get(name)
+        path, ext = os.path.splitext(checkpoint.filename)
+        return {
+            "name": checkpoint.name_for_extra,
+            "filename": checkpoint.filename,
+            "preview": self.find_preview(path),
+            "description": self.find_description(path),
+            "search_term": self.search_terms_from_path(checkpoint.filename) + " " + (checkpoint.sha256 or ""),
+            "onclick": '"' + html.escape(f"""return selectCheckpoint({json.dumps(name)})""") + '"',
+            "local_preview": f"{path}.{shared.opts.samples_format}",
+            "sort_keys": {'default': index, **self.get_sort_keys(checkpoint.filename)},
+
+        }
+
     def list_items(self):
-        checkpoint: sd_models.CheckpointInfo
-        for index, (name, checkpoint) in enumerate(sd_models.checkpoints_list.items()):
-            path, ext = os.path.splitext(checkpoint.filename)
-            yield {
-                "name": checkpoint.name_for_extra,
-                "filename": checkpoint.filename,
-                "preview": self.find_preview(path),
-                "description": self.find_description(path),
-                "search_term": self.search_terms_from_path(checkpoint.filename) + " " + (checkpoint.sha256 or ""),
-                "onclick": '"' + html.escape(f"""return selectCheckpoint({json.dumps(name)})""") + '"',
-                "local_preview": f"{path}.{shared.opts.samples_format}",
-                "sort_keys": {'default': index, **self.get_sort_keys(checkpoint.filename)},
-
-            }
+        for index, name in enumerate(sd_models.checkpoints_list):
+            yield self.create_item(name, index)
 
     def allowed_directories_for_previews(self):
         return [v for v in [shared.cmd_opts.ckpt_dir, sd_models.model_path] if v is not None]
-- 
cgit v1.2.3


From 47d9dd0240872dc70fd26bc1bf309f49fe17c104 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 16 Jul 2023 09:25:32 +0300
Subject: speedup extra networks listing

---
 modules/ui_extra_networks_checkpoints.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/ui_extra_networks_checkpoints.py')

diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
index ef8cdf35..e73b5b1f 100644
--- a/modules/ui_extra_networks_checkpoints.py
+++ b/modules/ui_extra_networks_checkpoints.py
@@ -1,8 +1,8 @@
 import html
-import json
 import os
 
 from modules import shared, ui_extra_networks, sd_models
+from modules.ui_extra_networks import quote_js
 
 
 class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
@@ -21,7 +21,7 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
             "preview": self.find_preview(path),
             "description": self.find_description(path),
             "search_term": self.search_terms_from_path(checkpoint.filename) + " " + (checkpoint.sha256 or ""),
-            "onclick": '"' + html.escape(f"""return selectCheckpoint({json.dumps(name)})""") + '"',
+            "onclick": '"' + html.escape(f"""return selectCheckpoint({quote_js(name)})""") + '"',
             "local_preview": f"{path}.{shared.opts.samples_format}",
             "sort_keys": {'default': index, **self.get_sort_keys(checkpoint.filename)},
 
-- 
cgit v1.2.3


From ccd97886da1f659472cdca3de8731f59a70bbc28 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 16 Jul 2023 09:49:22 +0300
Subject: fix bogus metadata for extra networks appearing out of cache fix
 description editing for checkpoint not immediately appearing on cards

---
 modules/ui_extra_networks_checkpoints.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules/ui_extra_networks_checkpoints.py')

diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
index e73b5b1f..76780cfd 100644
--- a/modules/ui_extra_networks_checkpoints.py
+++ b/modules/ui_extra_networks_checkpoints.py
@@ -13,7 +13,7 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
         shared.refresh_checkpoints()
 
     def create_item(self, name, index=None):
-        checkpoint: sd_models.CheckpointInfo = sd_models.checkpoints_list.get(name)
+        checkpoint: sd_models.CheckpointInfo = sd_models.checkpoint_aliases.get(name)
         path, ext = os.path.splitext(checkpoint.filename)
         return {
             "name": checkpoint.name_for_extra,
@@ -24,7 +24,6 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage):
             "onclick": '"' + html.escape(f"""return selectCheckpoint({quote_js(name)})""") + '"',
             "local_preview": f"{path}.{shared.opts.samples_format}",
             "sort_keys": {'default': index, **self.get_sort_keys(checkpoint.filename)},
-
         }
 
     def list_items(self):
-- 
cgit v1.2.3