From 355c56a6714348d2b4f9d7bc6cebc78166ef0372 Mon Sep 17 00:00:00 2001 From: Erwann Millon Date: Wed, 1 May 2024 09:56:58 +0000 Subject: [PATCH 1/2] Add IPAdapterFromParamsBatch node --- IPAdapterPlus.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/IPAdapterPlus.py b/IPAdapterPlus.py index e36e831..19c2482 100644 --- a/IPAdapterPlus.py +++ b/IPAdapterPlus.py @@ -1063,6 +1063,26 @@ def INPUT_TYPES(s): CATEGORY = "ipadapter/params" +class IPAdapterFromParamsBatch(IPAdapterBatch): + @classmethod + def INPUT_TYPES(s): + return { + "required": { + "model": ("MODEL", ), + "ipadapter": ("IPADAPTER", ), + "ipadapter_params": ("IPADAPTER_PARAMS", ), + "combine_embeds": (["concat", "add", "subtract", "average", "norm average"],), + "embeds_scaling": (['V only', 'K+V', 'K+V w/ C penalty', 'K+mean(V) w/ C penalty'], ), + }, + "optional": { + "image_negative": ("IMAGE",), + "clip_vision": ("CLIP_VISION",), + } + } + + CATEGORY = "ipadapter/params" + + """ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Helpers @@ -1651,6 +1671,7 @@ def combine(self, params_1, params_2, params_3=None, params_4=None, params_5=Non "IPAdapterStyleCompositionBatch": IPAdapterStyleCompositionBatch, "IPAdapterMS": IPAdapterMS, "IPAdapterFromParams": IPAdapterFromParams, + "IPAdapterFromParamsBatch": IPAdapterFromParamsBatch, # Loaders "IPAdapterUnifiedLoader": IPAdapterUnifiedLoader, From e6e86f42a2e81b0e47ca51d3f16a26ea3f6ea014 Mon Sep 17 00:00:00 2001 From: Erwann Millon Date: Wed, 1 May 2024 10:12:18 +0000 Subject: [PATCH 2/2] add unfold batch lol --- IPAdapterPlus.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IPAdapterPlus.py b/IPAdapterPlus.py index 19c2482..8027284 100644 --- a/IPAdapterPlus.py +++ b/IPAdapterPlus.py @@ -1064,6 +1064,8 @@ def INPUT_TYPES(s): CATEGORY = "ipadapter/params" class IPAdapterFromParamsBatch(IPAdapterBatch): + def __init__(self): + self.unfold_batch = True @classmethod def INPUT_TYPES(s): return {