Skip to content

Commit 84aef70

Browse files
committed
Optional components in AutoPipeline
1 parent 55ac1db commit 84aef70

File tree

1 file changed

+22
-4
lines changed

1 file changed

+22
-4
lines changed

src/diffusers/pipelines/auto_pipeline.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from ..configuration_utils import ConfigMixin
2121
from ..models.controlnets import ControlNetUnionModel
22-
from ..utils import is_sentencepiece_available
22+
from ..utils import is_sentencepiece_available, logging
2323
from .aura_flow import AuraFlowPipeline
2424
from .cogview3 import CogView3PlusPipeline
2525
from .controlnet import (
@@ -101,6 +101,9 @@
101101
from .wuerstchen import WuerstchenCombinedPipeline, WuerstchenDecoderPipeline
102102

103103

104+
logger = logging.get_logger(__name__)
105+
106+
104107
AUTO_TEXT2IMAGE_PIPELINES_MAPPING = OrderedDict(
105108
[
106109
("stable-diffusion", StableDiffusionPipeline),
@@ -528,7 +531,12 @@ def from_pipe(cls, pipeline, **kwargs):
528531
if k not in text_2_image_kwargs
529532
}
530533

531-
missing_modules = set(expected_modules) - set(pipeline._optional_components) - set(text_2_image_kwargs.keys())
534+
missing_modules = (
535+
set(expected_modules)
536+
- set(pipeline._optional_components)
537+
- set(text_2_image_cls._optional_components)
538+
- set(text_2_image_kwargs.keys())
539+
)
532540

533541
if len(missing_modules) > 0:
534542
raise ValueError(
@@ -838,7 +846,12 @@ def from_pipe(cls, pipeline, **kwargs):
838846
if k not in image_2_image_kwargs
839847
}
840848

841-
missing_modules = set(expected_modules) - set(pipeline._optional_components) - set(image_2_image_kwargs.keys())
849+
missing_modules = (
850+
set(expected_modules)
851+
- set(pipeline._optional_components)
852+
- set(image_2_image_cls._optional_components)
853+
- set(image_2_image_kwargs.keys())
854+
)
842855

843856
if len(missing_modules) > 0:
844857
raise ValueError(
@@ -1141,7 +1154,12 @@ def from_pipe(cls, pipeline, **kwargs):
11411154
if k not in inpainting_kwargs
11421155
}
11431156

1144-
missing_modules = set(expected_modules) - set(pipeline._optional_components) - set(inpainting_kwargs.keys())
1157+
missing_modules = (
1158+
set(expected_modules)
1159+
- set(pipeline._optional_components)
1160+
- set(inpainting_cls._optional_components)
1161+
- set(inpainting_kwargs.keys())
1162+
)
11451163

11461164
if len(missing_modules) > 0:
11471165
raise ValueError(

0 commit comments

Comments
 (0)