Skip to content

Commit d2cd0bf

Browse files
committed
add if TextualInversionLoaderMixin to all flux pipelines
1 parent 2ac6898 commit d2cd0bf

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

src/diffusers/pipelines/flux/pipeline_flux_controlnet.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from ...image_processor import PipelineImageInput, VaeImageProcessor
2828
from ...loaders import FluxLoraLoaderMixin, FromSingleFileMixin
2929
from ...models.autoencoders import AutoencoderKL
30-
from ...models.controlnet_flux import FluxControlNetModel, FluxMultiControlNetModel
30+
from ...models.controlnet_flux import FluxControlNetModel, FluxMultiControlNetModel, TextualInversionLoaderMixin
3131
from ...models.transformers import FluxTransformer2DModel
3232
from ...schedulers import FlowMatchEulerDiscreteScheduler
3333
from ...utils import (
@@ -234,6 +234,9 @@ def _get_t5_prompt_embeds(
234234
prompt = [prompt] if isinstance(prompt, str) else prompt
235235
batch_size = len(prompt)
236236

237+
if isinstance(self, TextualInversionLoaderMixin):
238+
prompt = self.maybe_convert_prompt(prompt, self.tokenizer)
239+
237240
text_inputs = self.tokenizer_2(
238241
prompt,
239242
padding="max_length",
@@ -277,6 +280,9 @@ def _get_clip_prompt_embeds(
277280
prompt = [prompt] if isinstance(prompt, str) else prompt
278281
batch_size = len(prompt)
279282

283+
if isinstance(self, TextualInversionLoaderMixin):
284+
prompt = self.maybe_convert_prompt(prompt, self.tokenizer)
285+
280286
text_inputs = self.tokenizer(
281287
prompt,
282288
padding="max_length",

src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from ...image_processor import PipelineImageInput, VaeImageProcessor
1414
from ...loaders import FluxLoraLoaderMixin, FromSingleFileMixin
1515
from ...models.autoencoders import AutoencoderKL
16-
from ...models.controlnet_flux import FluxControlNetModel, FluxMultiControlNetModel
16+
from ...models.controlnet_flux import FluxControlNetModel, FluxMultiControlNetModel, TextualInversionLoaderMixin
1717
from ...models.transformers import FluxTransformer2DModel
1818
from ...schedulers import FlowMatchEulerDiscreteScheduler
1919
from ...utils import (

src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from ...image_processor import PipelineImageInput, VaeImageProcessor
1515
from ...loaders import FluxLoraLoaderMixin, FromSingleFileMixin
1616
from ...models.autoencoders import AutoencoderKL
17-
from ...models.controlnet_flux import FluxControlNetModel, FluxMultiControlNetModel
17+
from ...models.controlnet_flux import FluxControlNetModel, FluxMultiControlNetModel, TextualInversionLoaderMixin
1818
from ...models.transformers import FluxTransformer2DModel
1919
from ...schedulers import FlowMatchEulerDiscreteScheduler
2020
from ...utils import (

src/diffusers/pipelines/flux/pipeline_flux_img2img.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from transformers import CLIPTextModel, CLIPTokenizer, T5EncoderModel, T5TokenizerFast
2121

2222
from ...image_processor import PipelineImageInput, VaeImageProcessor
23-
from ...loaders import FluxLoraLoaderMixin
23+
from ...loaders import FluxLoraLoaderMixin, TextualInversionLoaderMixin
2424
from ...models.autoencoders import AutoencoderKL
2525
from ...models.transformers import FluxTransformer2DModel
2626
from ...schedulers import FlowMatchEulerDiscreteScheduler

src/diffusers/pipelines/flux/pipeline_flux_inpaint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from transformers import CLIPTextModel, CLIPTokenizer, T5EncoderModel, T5TokenizerFast
2222

2323
from ...image_processor import PipelineImageInput, VaeImageProcessor
24-
from ...loaders import FluxLoraLoaderMixin
24+
from ...loaders import FluxLoraLoaderMixin, TextualInversionLoaderMixin
2525
from ...models.autoencoders import AutoencoderKL
2626
from ...models.transformers import FluxTransformer2DModel
2727
from ...schedulers import FlowMatchEulerDiscreteScheduler

0 commit comments

Comments
 (0)