Merge branch 'dev' into allow-no-venv-install

1 files changed, 17 insertions, 15 deletions

diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py
index 8b9ab71b..76780cfd 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):

@@ -12,21 +12,23 @@ 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.checkpoint_aliases.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({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):

-        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": path,

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