Merge branch 'main' into cogview3-plus

Author: a-r-r-o-w

src/diffusers/pipelines/flux/pipeline_flux_controlnet.py

@@ -202,6 +202,8 @@ def __init__(
         ],
     ):
         super().__init__()
+        if isinstance(controlnet, (list, tuple)):
+            controlnet = FluxMultiControlNetModel(controlnet)
 
         self.register_modules(
             vae=vae,

src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py

@@ -214,6 +214,8 @@ def __init__(
         ],
     ):
         super().__init__()
+        if isinstance(controlnet, (list, tuple)):
+            controlnet = FluxMultiControlNetModel(controlnet)
 
         self.register_modules(
             vae=vae,

src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py

@@ -216,6 +216,8 @@ def __init__(
         ],
     ):
         super().__init__()
+        if isinstance(controlnet, (list, tuple)):
+            controlnet = FluxMultiControlNetModel(controlnet)
 
         self.register_modules(
             scheduler=scheduler,