up up

Author: yiyixuxu

src/diffusers/__init__.py

@@ -373,6 +373,7 @@
             "StableDiffusionXLModularPipeline",
             "WanAutoBlocks",
             "WanModularPipeline",
+            "QwenImageModularPipeline",
         ]
     )
     _import_structure["pipelines"].extend(
@@ -1012,6 +1013,7 @@
             StableDiffusionXLModularPipeline,
             WanAutoBlocks,
             WanModularPipeline,
+            QwenImageModularPipeline,
         )
         from .pipelines import (
             AllegroPipeline,

src/diffusers/guiders/classifier_free_guidance.py

@@ -14,16 +14,25 @@
 
 import math
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
+from dataclasses import dataclass
 
 import torch
 
 from ..configuration_utils import register_to_config
 from .guider_utils import BaseGuidance, rescale_noise_cfg
+from ..utils import BaseOutput
 
 
 if TYPE_CHECKING:
     from ..modular_pipelines.modular_pipeline import BlockState
 
+@dataclass
+class ClassifierFreeGuidanceOutput(BaseOutput):
+    """
+    Output class for Classifier-free guidance.
+    """
+    pred: torch.Tensor
+    pred_cond: torch.Tensor
 
 class ClassifierFreeGuidance(BaseGuidance):
     """
@@ -109,7 +118,7 @@ def forward(self, pred_cond: torch.Tensor, pred_uncond: Optional[torch.Tensor] =
         if self.guidance_rescale > 0.0:
             pred = rescale_noise_cfg(pred, pred_cond, self.guidance_rescale)
 
-        return pred, {}
+        return ClassifierFreeGuidanceOutput(pred=pred, pred_cond=pred_cond)
 
     @property
     def is_conditional(self) -> bool:

src/diffusers/modular_pipelines/__init__.py

@@ -47,6 +47,7 @@
     _import_structure["stable_diffusion_xl"] = ["StableDiffusionXLAutoBlocks", "StableDiffusionXLModularPipeline"]
     _import_structure["wan"] = ["WanAutoBlocks", "WanModularPipeline"]
     _import_structure["flux"] = ["FluxAutoBlocks", "FluxModularPipeline"]
+    _import_structure["qwenimage"] = ["QwenImageModularPipeline"]
     _import_structure["components_manager"] = ["ComponentsManager"]
 
 if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
@@ -70,6 +71,7 @@
         from .modular_pipeline_utils import ComponentSpec, ConfigSpec, InputParam, InsertableDict, OutputParam
         from .stable_diffusion_xl import StableDiffusionXLAutoBlocks, StableDiffusionXLModularPipeline
         from .wan import WanAutoBlocks, WanModularPipeline
+        from .qwenimage import QwenImageModularPipeline
 else:
     import sys
 

src/diffusers/modular_pipelines/modular_pipeline.py

@@ -56,6 +56,7 @@
         ("stable-diffusion-xl", "StableDiffusionXLModularPipeline"),
         ("wan", "WanModularPipeline"),
         ("flux", "FluxModularPipeline"),
+        ("qwenimage", "QwenImageModularPipeline"),
     ]
 )
 

src/diffusers/modular_pipelines/qwenimage/__init__.py

@@ -0,0 +1,57 @@
+from typing import TYPE_CHECKING
+
+from ...utils import (
+    DIFFUSERS_SLOW_IMPORT,
+    OptionalDependencyNotAvailable,
+    _LazyModule,
+    get_objects_from_module,
+    is_torch_available,
+    is_transformers_available,
+)
+
+
+_dummy_objects = {}
+_import_structure = {}
+
+try:
+    if not (is_transformers_available() and is_torch_available()):
+        raise OptionalDependencyNotAvailable()
+except OptionalDependencyNotAvailable:
+    from ...utils import dummy_torch_and_transformers_objects  # noqa F403
+
+    _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects))
+else:
+    _import_structure["encoders"] = ["QwenImageTextEncoderStep"]
+    _import_structure["modular_blocks"] = [
+        "ALL_BLOCKS",
+        "TEXT2IMAGE_BLOCKS",
+    ]
+    _import_structure["modular_pipeline"] = ["QwenImageModularPipeline"]
+
+if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
+    try:
+        if not (is_transformers_available() and is_torch_available()):
+            raise OptionalDependencyNotAvailable()
+    except OptionalDependencyNotAvailable:
+        from ...utils.dummy_torch_and_transformers_objects import *  # noqa F403
+    else:
+        from .encoders import (
+            QwenImageTextEncoderStep,
+        )
+        from .modular_blocks import (
+            ALL_BLOCKS,
+            TEXT2IMAGE_BLOCKS,
+        )
+        from .modular_pipeline import QwenImageModularPipeline
+else:
+    import sys
+
+    sys.modules[__name__] = _LazyModule(
+        __name__,
+        globals()["__file__"],
+        _import_structure,
+        module_spec=__spec__,
+    )
+
+    for name, value in _dummy_objects.items():
+        setattr(sys.modules[__name__], name, value)