From 6572a78c5125a3470d5e9d7f7c4eb6c81ffaaa11 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 24 Aug 2025 09:27:45 -0400 Subject: [PATCH] update changelog and cleanup Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 1 + modules/ui_extra_networks_checkpoints.py | 9 ++------- modules/ui_extra_networks_lora.py | 5 +---- modules/ui_extra_networks_vae.py | 5 +---- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac8439512..80acae580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - update `requirements` - **UI** - improved image scaling in img2img and control interfaces + - add base model type to networks display, thanks @Artheriax - **Fixes** - normalize path hanlding when deleting images - fix hidden model tags in networks display diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py index e95ecd727..7041157f8 100644 --- a/modules/ui_extra_networks_checkpoints.py +++ b/modules/ui_extra_networks_checkpoints.py @@ -63,13 +63,8 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage): } record["info"] = self.find_info(checkpoint.filename) record["description"] = self.find_description(checkpoint.filename, record["info"]) - - # Base model extraction - record["version"] = ( - record["info"].get("modelVersions", [{}])[0].get("baseModel", "N/A") - if record["info"] else "N/A" - ) - + record["version"] = record["info"].get("modelVersions", [{}])[0].get("baseModel", "N/A") if record["info"] else "N/A" + except Exception as e: shared.log.debug(f'Networks error: type=model file="{name}" {e}') return record diff --git a/modules/ui_extra_networks_lora.py b/modules/ui_extra_networks_lora.py index 8ff0ecd5a..2bdff7c08 100644 --- a/modules/ui_extra_networks_lora.py +++ b/modules/ui_extra_networks_lora.py @@ -97,10 +97,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage): "metadata": json.dumps(l.metadata, indent=4) if l.metadata else None, "mtime": mtime, "size": size, - "version": ( # Base model extraction - (info.get("modelVersions", [{}])[0].get("baseModel") or l.sd_version or "N/A") - if info else (l.sd_version or "N/A") - ), + "version": info.get("modelVersions", [{}])[0].get("baseModel", l.sd_version) if info else l.sd_version, "info": info, "description": self.find_description(l.filename, info), "tags": self.get_tags(l, info), diff --git a/modules/ui_extra_networks_vae.py b/modules/ui_extra_networks_vae.py index 4e9143b39..78b6d8d5c 100644 --- a/modules/ui_extra_networks_vae.py +++ b/modules/ui_extra_networks_vae.py @@ -31,10 +31,7 @@ class ExtraNetworksPageVAEs(ui_extra_networks.ExtraNetworksPage): "size": size, "info": info, "description": self.find_description(filename, info), - "version": ( # Base model extraction - info.get("modelVersions", [{}])[0].get("baseModel", "N/A") - if info else "N/A" - ), + "version": info.get("modelVersions", [{}])[0].get("baseModel", "N/A") if info else "N/A", } yield record except Exception as e: