Merge pull request #2 from Gothos/flux-inpaint

Flux img2img

Author: Gothos

src/diffusers/__init__.py

@@ -254,6 +254,7 @@
             "CLIPImageProjection",
             "CogVideoXPipeline",
             "CycleDiffusionPipeline",
+            "FluxImg2ImgPipeline",
             "FluxInpaintPipeline",
             "FluxPipeline",
             "HunyuanDiTControlNetPipeline",
@@ -694,6 +695,7 @@
             CLIPImageProjection,
             CogVideoXPipeline,
             CycleDiffusionPipeline,
+            FluxImg2ImgPipeline,
             FluxInpaintPipeline,
             FluxPipeline,
             HunyuanDiTControlNetPipeline,

src/diffusers/loaders/single_file_utils.py

@@ -449,8 +449,6 @@ def infer_diffusers_model_type(checkpoint):
     ):
         if CHECKPOINT_KEY_NAMES["v2"] in checkpoint and checkpoint[CHECKPOINT_KEY_NAMES["v2"]].shape[-1] == 1024:
             model_type = "inpainting_v2"
-        elif CHECKPOINT_KEY_NAMES["xl_base"] in checkpoint:
-            model_type = "xl_inpaint"
         else:
             model_type = "inpainting"
 

src/diffusers/pipelines/__init__.py

@@ -124,7 +124,7 @@
         "AnimateDiffSparseControlNetPipeline",
         "AnimateDiffVideoToVideoPipeline",
     ]
-    _import_structure["flux"] = ["FluxPipeline", "FluxInpaintPipeline"]
+    _import_structure["flux"] = ["FluxPipeline", "FluxImg2ImgPipeline", "FluxInpaintPipeline"]
     _import_structure["audioldm"] = ["AudioLDMPipeline"]
     _import_structure["audioldm2"] = [
         "AudioLDM2Pipeline",
@@ -494,7 +494,7 @@
             VersatileDiffusionTextToImagePipeline,
             VQDiffusionPipeline,
         )
-        from .flux import FluxInpaintPipeline, FluxPipeline
+        from .flux import FluxImg2ImgPipeline, FluxInpaintPipeline, FluxPipeline
         from .hunyuandit import HunyuanDiTPipeline
         from .i2vgen_xl import I2VGenXLPipeline
         from .kandinsky import (

src/diffusers/pipelines/flux/__init__.py

@@ -23,6 +23,7 @@
     _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects))
 else:
     _import_structure["pipeline_flux"] = ["FluxPipeline"]
+    _import_structure["pipeline_flux_img2img"] = ["FluxImg2ImgPipeline"]
     _import_structure["pipeline_flux_inpaint"] = ["FluxInpaintPipeline"]
 if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
     try: