Merge 5df03632a4 into ddb28b33a3

extensions-builtin/Lora/network.py

@@ -81,7 +81,7 @@ class NetworkOnDisk:
 
     def get_alias(self):
         import networks
-        if shared.opts.lora_preferred_name == "Filename" or self.alias.lower() in networks.forbidden_network_aliases:
+        if (hasattr(shared.opts, "lora_preferred_name") and shared.opts.lora_preferred_name == "Filename") or self.alias.lower() in networks.forbidden_network_aliases:
             return self.name
         else:
             return self.alias

extensions-builtin/Lora/networks.py

@@ -572,6 +572,7 @@ def list_available_networks():
     available_network_aliases.clear()
     forbidden_network_aliases.clear()
     available_network_hash_lookup.clear()
+    network_version_id_to_alias.clear()
     forbidden_network_aliases.update({"none": 1, "Addams": 1})
 
     os.makedirs(shared.cmd_opts.lora_dir, exist_ok=True)
@@ -603,11 +604,11 @@ def list_available_networks():
             try:
                 with open(json_path, "r", encoding="utf-8") as f:
                     model_json = json.load(f)
+                if "modelVersionId" in model_json:
+                    model_ver_id = str(model_json["modelVersionId"])
+                    network_version_id_to_alias[model_ver_id] = entry.get_alias()
             except (OSError, json.JSONDecodeError):
                 errors.report(f"Failed to load network json: {json_path}", exc_info=False)
-        if "modelVersionId" in model_json:
-            model_ver_id = str(model_json["modelVersionId"])
-            network_version_id_to_alias[model_ver_id] = entry.get_alias()
 
 re_network_name = re.compile(r"(.*)\s*\([0-9a-fA-F]+\)")
 

modules/infotext_utils.py

@@ -254,9 +254,7 @@ Civitai resources: [{"type":"checkpoint","modelVersionId":290640},{"type":"Image
 
     prompt_resources = []
     for resource in resources:
-        if "type" not in resource or "weight" not in resource or "modelVersionId" not in resource:
-            continue
-        if "ImageJobNetworkParams" not in resource["type"]:
+        if "weight" not in resource or "modelVersionId" not in resource:
             continue
 
         weight = resource["weight"]