diff --git a/README.ZH_CN.md b/README.ZH_CN.md index 1d01b3b..9bb0f46 100644 --- a/README.ZH_CN.md +++ b/README.ZH_CN.md @@ -63,6 +63,7 @@ git clone https://github.com/yolain/ComfyUI-Easy-Use **v1.2.4** +- 支持 `model_override`,`vae_override`,`clip_override` 可以在 `easy fullLoader` 中单独输入 - 增加 `easy saveImageLazy` - 增加 `easy loadImageForLoop` - 增加 `easy isFileExist` diff --git a/README.md b/README.md index 0d14c50..30d5d59 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ Double-click install.bat to install the required dependencies **v1.2.4** +- Support `model_override`,`vae_override`,`clip_override` can be input separately to `easy fullLoader` - Added `easy saveImageLazy` - Added `easy loadImageForLoop` - Added `easy isFileExist` diff --git a/py/libs/loader.py b/py/libs/loader.py index f98c836..d170429 100644 --- a/py/libs/loader.py +++ b/py/libs/loader.py @@ -445,19 +445,19 @@ class easyLoader: ckpt_name_1 = node["inputs"]["ckpt_name_1"] model, clip, vae, clip_vision = self.load_checkpoint(ckpt_name_1) can_load_lora = False - # Load models elif model_override is not None and clip_override is not None and vae_override is not None: model = model_override clip = clip_override vae = vae_override - elif model_override is not None: - raise Exception(f"[ERROR] clip or vae is missing") - elif vae_override is not None: - raise Exception(f"[ERROR] model or clip is missing") - elif clip_override is not None: - raise Exception(f"[ERROR] model or vae is missing") else: model, clip, vae, clip_vision = self.load_checkpoint(ckpt_name, config_name) + if model_override is not None: + model = model_override + if vae_override is not None: + vae = vae_override + elif clip_override is not None: + clip = clip_override + if optional_lora_stack is not None and can_load_lora: for lora in optional_lora_stack: