speedup extra networks listing

extensions-builtin/Lora/lora.py

@@ -3,7 +3,7 @@ import re
 import torch
 from typing import Union
 
-from modules import shared, devices, sd_models, errors, scripts, sd_hijack, hashes
+from modules import shared, devices, sd_models, errors, scripts, sd_hijack, hashes, cache
 
 metadata_tags_order = {"ss_sd_model_name": 1, "ss_resolution": 2, "ss_clip_skip": 3, "ss_num_train_images": 10, "ss_tag_frequency": 20}
 
@@ -78,9 +78,16 @@ class LoraOnDisk:
         self.metadata = {}
         self.is_safetensors = os.path.splitext(filename)[1].lower() == ".safetensors"
 
+        def read_metadata():
+            metadata = sd_models.read_metadata_from_safetensors(filename)
+            metadata.pop('ssmd_cover_images', None)  # those are cover images, and they are too big to display in UI as text
+
+            return metadata
+
         if self.is_safetensors:
             try:
-                self.metadata = sd_models.read_metadata_from_safetensors(filename)
+                #self.metadata = sd_models.read_metadata_from_safetensors(filename)
+                self.metadata = cache.cached_data_for_file('safetensors-metadata', "lora/" + self.name, filename, read_metadata)
             except Exception as e:
                 errors.display(e, f"reading lora {filename}")
 
@@ -91,7 +98,6 @@ class LoraOnDisk:
 
             self.metadata = m
 
-        self.ssmd_cover_images = self.metadata.pop('ssmd_cover_images', None)  # those are cover images and they are too big to display in UI as text
         self.alias = self.metadata.get('ss_output_name', self.name)
 
         self.hash = None

extensions-builtin/Lora/ui_edit_user_metadata.py

@@ -1,5 +1,4 @@
 import html
-import json
 import random
 
 import gradio as gr
@@ -64,7 +63,7 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor)
     def get_metadata_table(self, name):
         table = super().get_metadata_table(name)
         item = self.page.items.get(name, {})
-        metadata = json.loads(item.get("metadata") or '{}')
+        metadata = item.get("metadata") or {}
 
         keys = [
             ('ss_sd_model_name', "Model:"),
@@ -91,7 +90,7 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor)
         values = super().put_values_into_components(name)
 
         item = self.page.items.get(name, {})
-        metadata = json.loads(item.get("metadata") or '{}')
+        metadata = item.get("metadata") or {}
 
         tags = build_tags(metadata)
         gradio_tags = [(tag, str(count)) for tag, count in tags[0:24]]
@@ -108,7 +107,7 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor)
 
     def generate_random_prompt(self, name):
         item = self.page.items.get(name, {})
-        metadata = json.loads(item.get("metadata") or '{}')
+        metadata = item.get("metadata") or {}
         tags = build_tags(metadata)
 
         return self.generate_random_prompt_from_tags(tags)
@@ -142,7 +141,7 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor)
 
         self.edit_notes = gr.TextArea(label='Notes', lines=4)
 
-        generate_random_prompt.click(fn=self.generate_random_prompt, inputs=[self.edit_name_input], outputs=[random_prompt])
+        generate_random_prompt.click(fn=self.generate_random_prompt, inputs=[self.edit_name_input], outputs=[random_prompt], show_progress=False)
 
         def select_tag(activation_text, evt: gr.SelectData):
             tag = evt.value[0]

extensions-builtin/Lora/ui_extra_networks_lora.py

@@ -1,8 +1,8 @@
-import json
 import os
 import lora
 
 from modules import shared, ui_extra_networks
+from modules.ui_extra_networks import quote_js
 from ui_edit_user_metadata import LoraUserMetadataEditor
 
 
@@ -20,6 +20,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
 
         alias = lora_on_disk.get_alias()
 
+        # in 1.5 filename changes to be full filename instead of path without extension, and metadata is dict instead of json string
         item = {
             "name": name,
             "filename": lora_on_disk.filename,
@@ -27,17 +28,17 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
             "description": self.find_description(path),
             "search_term": self.search_terms_from_path(lora_on_disk.filename),
             "local_preview": f"{path}.{shared.opts.samples_format}",
-            "metadata": json.dumps(lora_on_disk.metadata, indent=4) if lora_on_disk.metadata else None,
+            "metadata": lora_on_disk.metadata,
             "sort_keys": {'default': index, **self.get_sort_keys(lora_on_disk.filename)},
         }
 
         self.read_user_metadata(item)
         activation_text = item["user_metadata"].get("activation text")
         preferred_weight = item["user_metadata"].get("preferred weight", 0.0)
-        item["prompt"] = json.dumps(f"<lora:{alias}:") + " + " + (str(preferred_weight) if preferred_weight else "opts.extra_networks_default_multiplier") + " + " + json.dumps(">")
+        item["prompt"] = quote_js(f"<lora:{alias}:") + " + " + (str(preferred_weight) if preferred_weight else "opts.extra_networks_default_multiplier") + " + " + quote_js(">")
 
         if activation_text:
-            item["prompt"] += " + " + json.dumps(" " + activation_text)
+            item["prompt"] += " + " + quote_js(" " + activation_text)
 
         return item