From 649fc10e477ab3eeba2f3a41d9f73c35ba23eeb6 Mon Sep 17 00:00:00 2001 From: yolain Date: Mon, 26 Feb 2024 21:44:26 +0800 Subject: [PATCH] add:easy fullLoader added outputs items --- ComfyUI-Easy-Use.json | 5 ++++- README.en.md | 2 +- README.md | 1 + py/adv_encode.py | 1 - py/easyNodes.py | 6 +++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ComfyUI-Easy-Use.json b/ComfyUI-Easy-Use.json index 5f6913f..271ad32 100644 --- a/ComfyUI-Easy-Use.json +++ b/ComfyUI-Easy-Use.json @@ -142,7 +142,10 @@ }, "outputs": { "pipe": "节点束", - "model": "模型" + "model": "模型", + "positive": "正向条件", + "negative": "反向条件", + "latent": "潜空间" } }, "easy a1111Loader": { diff --git a/README.en.md b/README.en.md index a239faf..c1b306e 100644 --- a/README.en.md +++ b/README.en.md @@ -39,9 +39,9 @@ Usage：
## Changelog - **2024-02-26** +- `easy fullLoader` **positive**、**negative**、**latent** added to the output items - Fixed the error of SDXLClipModel in ComfyUI revision 2016[c2cb8e88] and above (the revision number was judged to be compatible with the old revision) - Fixed `easy detailerFix` generation error when batch size is greater than 1 diff --git a/README.md b/README.md index 408d265..c87a8b2 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ stage_c 与 stage_b 可以使用[checkpoints](https://huggingface.co/stabilityai **2024-02-26** +- `easy fullLoader` 增加 **positive**、**negative**、**latent** 输出项 - 修复 SDXLClipModel 在 ComfyUI 修订版本号 2016[c2cb8e88] 及以上的报错（判断了版本号可兼容老版本） - 修复 `easy detailerFix` 批次大小大于1时生成出错 diff --git a/py/adv_encode.py b/py/adv_encode.py index 66f1c94..8b58741 100644 --- a/py/adv_encode.py +++ b/py/adv_encode.py @@ -252,7 +252,6 @@ def encode_token_weights(model, token_weight_pairs, encode_func): model_management.load_model_gpu(model.patcher) return encode_func(model.cond_stage_model, token_weight_pairs) - def prepareXL(embs_l, embs_g, pooled, clip_balance): l_w = 1 - max(0, clip_balance - .5) * 2 g_w = 1 - max(0, .5 - clip_balance) * 2 diff --git a/py/easyNodes.py b/py/easyNodes.py index 4bc4456..119d4f9 100644 --- a/py/easyNodes.py +++ b/py/easyNodes.py @@ -660,8 +660,8 @@ class fullLoader: "hidden": {"prompt": "PROMPT", "my_unique_id": "UNIQUE_ID"} } - RETURN_TYPES = ("PIPE_LINE", "MODEL", "VAE", "CLIP") - RETURN_NAMES = ("pipe", "model", "vae", "clip") + RETURN_TYPES = ("PIPE_LINE", "MODEL", "VAE", "CLIP", "CONDITIONING", "CONDITIONING", "LATENT") + RETURN_NAMES = ("pipe", "model", "vae", "clip", "positive", "negative", "latent") FUNCTION = "adv_pipeloader" CATEGORY = "EasyUse/Loaders" @@ -819,7 +819,7 @@ class fullLoader: "empty_samples": samples, } } - return {"ui": {"positive": positive_wildcard_prompt, "negative": negative_wildcard_prompt}, "result": (pipe, model, vae, clip)} + return {"ui": {"positive": positive_wildcard_prompt, "negative": negative_wildcard_prompt}, "result": (pipe, model, vae, clip, positive, negative, samples)} # A1111简易加载器 class a1111Loader: