better en preview matching and optimize caching

extensions-builtin/Lora/network.py

@@ -32,9 +32,8 @@ class NetworkOnDisk:
                 m[k] = v
             self.metadata = m
         self.alias = self.metadata.get('ss_output_name', self.name)
-        self.hash = None
-        self.shorthash = None
-        self.set_hash(self.metadata.get('sshs_model_hash') or hashes.sha256_from_cache(self.filename, "lora/" + self.name, use_addnet_hash=self.is_safetensors) or '')
+        # self.set_hash(self.metadata.get('sshs_model_hash') or hashes.sha256_from_cache(self.filename, "lora/" + self.name, use_addnet_hash=self.is_safetensors) or '')
+        self.set_hash(hashes.sha256_from_cache(self.filename, "lora/" + self.name) or self.metadata.get('sshs_model_hash'))
         self.sd_version = self.detect_version()
 
     def detect_version(self):
@@ -47,8 +46,8 @@ class NetworkOnDisk:
         return SdVersion.Unknown
 
     def set_hash(self, v):
-        self.hash = v
-        self.shorthash = self.hash[0:12]
+        self.hash = v or ''
+        self.shorthash = self.hash[0:8]
 
     def read_hash(self):
         if not self.hash:

extensions-builtin/Lora/networks.py

@@ -464,8 +464,9 @@ def list_available_networks():
         except OSError as e:  # should catch FileNotFoundError and PermissionError etc.
             shared.log.error(f"Failed to load network {name} from {filename} {e}")
 
+    candidates = list(files_cache.list_files(*directories, ext_filter=[".pt", ".ckpt", ".safetensors"]))
     with concurrent.futures.ThreadPoolExecutor(max_workers=shared.max_workers) as executor:
-        for fn in files_cache.list_files(*directories, ext_filter=[".pt", ".ckpt", ".safetensors"]):
+        for fn in candidates:
             executor.submit(add_network, fn)
     shared.log.info(f'LoRA networks: available={len(available_networks)} folders={len(forbidden_network_aliases)}')
 

extensions-builtin/Lora/ui_extra_networks_lora.py

@@ -17,7 +17,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
     def create_item(self, name):
         l = networks.available_networks.get(name)
         try:
-            path, _ext = os.path.splitext(l.filename)
+            # path, _ext = os.path.splitext(l.filename)
             name = os.path.splitext(os.path.relpath(l.filename, shared.cmd_opts.lora_dir))[0]
             if shared.backend == shared.Backend.ORIGINAL:
                 if l.sd_version == network.SdVersion.SDXL:
@@ -37,9 +37,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
                 "name": name,
                 "filename": l.filename,
                 "hash": l.shorthash,
-                "preview": self.find_preview(l.filename),
                 "prompt": json.dumps(f" <lora:{l.get_alias()}:{shared.opts.extra_networks_default_multiplier}>"),
-                "local_preview": f"{path}.{shared.opts.samples_format}",
                 "metadata": json.dumps(l.metadata, indent=4) if l.metadata else None,
                 "mtime": os.path.getmtime(l.filename),
                 "size": os.path.getsize(l.filename),
@@ -58,7 +56,21 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
                 tag = ' '.join(words[1:]).lower()
                 tags[tag] = words[0]
 
-            for v in info.get('modelVersions', []):  # trigger words from info json
+
+            def find_version():
+                found_versions = []
+                current_hash = l.hash[:8].upper()
+                all_versions = info.get('modelVersions', [])
+                for v in info.get('modelVersions', []):
+                    for f in v.get('files', []):
+                        if any(h.startswith(current_hash) for h in f.get('hashes', {}).values()):
+                            found_versions.append(v)
+                if len(found_versions) == 0:
+                    found_versions = all_versions
+                return found_versions
+
+            find_version()
+            for v in find_version():  # trigger words from info json
                 possible_tags = v.get('trainedWords', [])
                 if isinstance(possible_tags, list):
                     for tag_str in possible_tags:
@@ -96,12 +108,15 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
             return None
 
     def list_items(self):
+        items = []
         with concurrent.futures.ThreadPoolExecutor(max_workers=shared.max_workers) as executor:
             future_items = {executor.submit(self.create_item, net): net for net in networks.available_networks}
             for future in concurrent.futures.as_completed(future_items):
                 item = future.result()
                 if item is not None:
-                    yield item
+                    items.append(item)
+        self.update_all_previews(items)
+        return items
 
     def allowed_directories_for_previews(self):
         return [shared.cmd_opts.lora_dir, shared.cmd_opts.lyco_dir]