make

Author: hlky

src/diffusers/__init__.py

@@ -274,11 +274,11 @@
             "CogView3PlusPipeline",
             "CycleDiffusionPipeline",
             "FluxControlImg2ImgPipeline",
+            "FluxControlInpaintPipeline",
             "FluxControlNetImg2ImgPipeline",
             "FluxControlNetInpaintPipeline",
             "FluxControlNetPipeline",
             "FluxControlPipeline",
-            "FluxControlInpaintPipeline",
             "FluxFillPipeline",
             "FluxImg2ImgPipeline",
             "FluxInpaintPipeline",

src/diffusers/pipelines/flux/__init__.py

@@ -25,8 +25,8 @@
     _import_structure["modeling_flux"] = ["ReduxImageEncoder"]
     _import_structure["pipeline_flux"] = ["FluxPipeline"]
     _import_structure["pipeline_flux_control"] = ["FluxControlPipeline"]
-    _import_structure["pipeline_flux_control_inpaint"] = ["FluxControlInpaintPipeline"]
     _import_structure["pipeline_flux_control_img2img"] = ["FluxControlImg2ImgPipeline"]
+    _import_structure["pipeline_flux_control_inpaint"] = ["FluxControlInpaintPipeline"]
     _import_structure["pipeline_flux_controlnet"] = ["FluxControlNetPipeline"]
     _import_structure["pipeline_flux_controlnet_image_to_image"] = ["FluxControlNetImg2ImgPipeline"]
     _import_structure["pipeline_flux_controlnet_inpainting"] = ["FluxControlNetInpaintPipeline"]

src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py

@@ -64,7 +64,7 @@
         from diffusers.models.transformers import FluxTransformer2DModel
         from transformers import T5EncoderModel
         from diffusers.utils import load_image, make_image_grid
-        from image_gen_aux import DepthPreprocessor # https://github.com/huggingface/image_gen_aux
+        from image_gen_aux import DepthPreprocessor  # https://github.com/huggingface/image_gen_aux
         from PIL import Image
         import numpy as np
 
@@ -90,7 +90,7 @@
         image = load_image("https://huggingface.co/datasets/huggingface/documentation-images/resolve/main/robot.png")
 
         head_mask = np.zeros_like(image)
-        head_mask[65:580,300:642] = 255
+        head_mask[65:580, 300:642] = 255
         mask_image = Image.fromarray(head_mask)
 
         processor = DepthPreprocessor.from_pretrained("LiheYoung/depth-anything-large-hf")
@@ -106,9 +106,9 @@
             guidance_scale=10.0,
             generator=torch.Generator().manual_seed(42),
         ).images[0]
-        make_image_grid([image, control_image, mask_image, output.resize(image.size)], rows=1, cols=4).save("output.png")
-
-
+        make_image_grid([image, control_image, mask_image, output.resize(image.size)], rows=1, cols=4).save(
+            "output.png"
+        )
         ```
 """
 
@@ -649,7 +649,7 @@ def prepare_latents(
         noise = randn_tensor(shape, generator=generator, device=device, dtype=dtype)
         latents = self.scheduler.scale_noise(image_latents, timestep, noise)
         latents = self._pack_latents(latents, batch_size, num_channels_latents, height, width)
-        return latents, noise, image_latents, latent_image_ids
+        return latents, latent_image_ids
 
     # Copied from diffusers.pipelines.controlnet_sd3.pipeline_stable_diffusion_3_controlnet.StableDiffusion3ControlNetPipeline.prepare_image
     def prepare_image(

src/diffusers/utils/dummy_torch_and_transformers_objects.py

@@ -392,7 +392,7 @@ def from_pretrained(cls, *args, **kwargs):
         requires_backends(cls, ["torch", "transformers"])
 
 
-class FluxControlNetImg2ImgPipeline(metaclass=DummyObject):
+class FluxControlInpaintPipeline(metaclass=DummyObject):
     _backends = ["torch", "transformers"]
 
     def __init__(self, *args, **kwargs):
@@ -407,7 +407,7 @@ def from_pretrained(cls, *args, **kwargs):
         requires_backends(cls, ["torch", "transformers"])
 
 
-class FluxControlNetInpaintPipeline(metaclass=DummyObject):
+class FluxControlNetImg2ImgPipeline(metaclass=DummyObject):
     _backends = ["torch", "transformers"]
 
     def __init__(self, *args, **kwargs):
@@ -422,7 +422,7 @@ def from_pretrained(cls, *args, **kwargs):
         requires_backends(cls, ["torch", "transformers"])
 
 
-class FluxControlNetPipeline(metaclass=DummyObject):
+class FluxControlNetInpaintPipeline(metaclass=DummyObject):
     _backends = ["torch", "transformers"]
 
     def __init__(self, *args, **kwargs):
@@ -437,7 +437,7 @@ def from_pretrained(cls, *args, **kwargs):
         requires_backends(cls, ["torch", "transformers"])
 
 
-class FluxControlPipeline(metaclass=DummyObject):
+class FluxControlNetPipeline(metaclass=DummyObject):
     _backends = ["torch", "transformers"]
 
     def __init__(self, *args, **kwargs):
@@ -451,7 +451,8 @@ def from_config(cls, *args, **kwargs):
     def from_pretrained(cls, *args, **kwargs):
         requires_backends(cls, ["torch", "transformers"])
 
-class FluxControlInpaintPipeline(metaclass=DummyObject):
+
+class FluxControlPipeline(metaclass=DummyObject):
     _backends = ["torch", "transformers"]
 
     def __init__(self, *args, **kwargs):