From 7038b052eeed80e571cd8d79f33a1d491acd3549 Mon Sep 17 00:00:00 2001
From: lllyasviel <lyuminzhang@outlook.com>
Date: Mon, 29 Jan 2024 20:11:04 -0800
Subject: [PATCH] i

---
 .../sd_forge_ipadapter/{ => lib_ipadapter}/IPAdapterPlus.py    | 2 +-
 .../sd_forge_ipadapter/{ => lib_ipadapter}/resampler.py        | 0
 .../sd_forge_ipadapter/scripts/forge_ipadapter.py              | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename extensions-builtin/sd_forge_ipadapter/{ => lib_ipadapter}/IPAdapterPlus.py (99%)
 rename extensions-builtin/sd_forge_ipadapter/{ => lib_ipadapter}/resampler.py (100%)

diff --git a/extensions-builtin/sd_forge_ipadapter/IPAdapterPlus.py b/extensions-builtin/sd_forge_ipadapter/lib_ipadapter/IPAdapterPlus.py
similarity index 99%
rename from extensions-builtin/sd_forge_ipadapter/IPAdapterPlus.py
rename to extensions-builtin/sd_forge_ipadapter/lib_ipadapter/IPAdapterPlus.py
index 435d9241..18d4ee51 100644
--- a/extensions-builtin/sd_forge_ipadapter/IPAdapterPlus.py
+++ b/extensions-builtin/sd_forge_ipadapter/lib_ipadapter/IPAdapterPlus.py
@@ -14,7 +14,7 @@ from PIL import Image
 import torch.nn.functional as F
 import torchvision.transforms as TT
 
-from .resampler import PerceiverAttention, FeedForward, Resampler
+from lib_ipadapter.resampler import PerceiverAttention, FeedForward, Resampler
 
 
 GLOBAL_MODELS_DIR = preprocessor_dir
diff --git a/extensions-builtin/sd_forge_ipadapter/resampler.py b/extensions-builtin/sd_forge_ipadapter/lib_ipadapter/resampler.py
similarity index 100%
rename from extensions-builtin/sd_forge_ipadapter/resampler.py
rename to extensions-builtin/sd_forge_ipadapter/lib_ipadapter/resampler.py
diff --git a/extensions-builtin/sd_forge_ipadapter/scripts/forge_ipadapter.py b/extensions-builtin/sd_forge_ipadapter/scripts/forge_ipadapter.py
index 75b10ee3..6990bb3c 100644
--- a/extensions-builtin/sd_forge_ipadapter/scripts/forge_ipadapter.py
+++ b/extensions-builtin/sd_forge_ipadapter/scripts/forge_ipadapter.py
@@ -1,6 +1,6 @@
 from modules_forge.shared import add_supported_control_model
 from modules_forge.supported_controlnet import ControlModelPatcher
-from IPAdapterPlus import IPAdapterApply
+from lib_ipadapter.IPAdapterPlus import IPAdapterApply
 
 opIPAdapterApply = IPAdapterApply()
 
@@ -30,6 +30,7 @@ class IPAdapterPatcher(ControlModelPatcher):
         return
 
     def process_before_every_sampling(self, process, cond, *args, **kwargs):
+        clip_vision, image = cond
         a = 0
         return