diff --git a/CHANGELOG.md b/CHANGELOG.md index 31afb545b..fc7bbd317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - *GHSA* fixes, thanks @SSJCorpSec for reporting - custom `vae` loader - `attention` execution guard against `cpu` tensors + - downloaded diffuser model use `snapshot` path ## Update for 2026-05-13 diff --git a/modules/sd_checkpoint.py b/modules/sd_checkpoint.py index d840cba9a..eca5d4c39 100644 --- a/modules/sd_checkpoint.py +++ b/modules/sd_checkpoint.py @@ -146,7 +146,7 @@ def list_models(): checkpoint_info.register() diffusers_list = [] for repo in modelloader.load_diffusers_models(clear=True): - checkpoint_info = CheckpointInfo(repo['name'], sha=repo['hash'], folder=repo['folder']) + checkpoint_info = CheckpointInfo(repo['name'], sha=repo['hash'], folder=repo['path']) diffusers_list.append(checkpoint_info) if checkpoint_info.name is not None: checkpoint_info.register() diff --git a/modules/sd_models.py b/modules/sd_models.py index 9cd75710d..bf04df1b2 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -628,13 +628,16 @@ def load_diffuser_folder(model_type, pipeline, checkpoint_info, diffusers_load_c sd_model = diffusers.StableDiffusionXLPipeline.from_pretrained(checkpoint_info.path, cache_dir=shared.opts.diffusers_dir, **diffusers_load_config) sd_model.model_type = sd_model.__class__.__name__ except Exception as e: - err3 = e # ignore last error - log.error(f"StableDiffusionPipeline: {e}") + err3 = e if debug_load: errors.display(e, "Load StableDiffusionPipeline") - if err3 is not None: - log.error(f'Load {op}: {checkpoint_info.path} detected={err0} auto={err1} diffusion={err2} base={err3}') + if sd_model is None: + log.error(f'Load {op}: path="{checkpoint_info.path}" pipeline={pipeline.__class__.__name__} type="{model_type}"') + log.error(f'Load {op}: attempt detected: {err0}') + log.error(f'Load {op}: attempt auto: {err1}') + log.error(f'Load {op}: attempt diffusion: {err2}') + log.error(f'Load {op}: attempt base: {err3}') return None return sd_model diff --git a/wiki b/wiki index 3197892ef..c66c93381 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 3197892ef6b863fd53f1973d44ded58698b1d551 +Subproject commit c66c933812a228fc7c57e7ed8a9114fdb433f8a0