xyzgrid for ipadapter

CHANGELOG.md

@@ -27,6 +27,7 @@
   - ipex handle dependencies, thanks @Disty0  
   - insightface handle dependencies  
   - img2img mask blur and padding  
+  - xyz grid handle ip adapter name and scale  
   - handle extensions that install conflicting versions of packages  
     `onnxruntime`, `opencv2-python`  
 

modules/processing_class.py

@@ -114,6 +114,10 @@ class StableDiffusionProcessing:
         self.scripts_value: scripts.ScriptRunner = field(default=None, init=False)
         self.script_args_value: list = field(default=None, init=False)
         self.scripts_setup_complete: bool = field(default=False, init=False)
+        # ip adapter
+        self.ip_adapter_name = None
+        self.ip_adapter_scale = 1.0
+        self.ip_adapter_image = None
         # hdr
         self.hdr_mode=hdr_mode
         self.hdr_brightness=hdr_brightness
@@ -474,9 +478,6 @@ class StableDiffusionProcessingControl(StableDiffusionProcessingImg2Img):
         self.fidelity = 0.5
         self.mask_image = None
         self.override = None
-        self.ip_adapter_name = None
-        self.ip_adapter_scale = 1.0
-        self.ip_adapter_image = None
 
     def sample(self, conditioning, unconditional_conditioning, seeds, subseeds, subseed_strength, prompts): # abstract
         pass

scripts/ipadapter.py

@@ -23,8 +23,8 @@ class Script(scripts.Script):
     def process(self, p: processing.StableDiffusionProcessing, enabled, adapter_name, scale, image): # pylint: disable=arguments-differ
         if shared.backend != shared.Backend.DIFFUSERS:
             return
+        p.ip_adapter_image = image
         if enabled:
             p.ip_adapter_name = adapter_name
             p.ip_adapter_scale = scale
-            p.ip_adapter_image = image
             # ipadapter.apply(shared.sd_model, p, adapter_name, scale, image) # called directly from processing.process_images_inner