Skip to content

Commit 5780776

Browse files
DN6DN6
authored
Make prompt_2 optional in Flux Pipelines (#12073)
* update * update
1 parent f19421e commit 5780776

13 files changed

+13
-13
lines changed

‎src/diffusers/pipelines/flux/pipeline_flux.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ def _get_clip_prompt_embeds(
310310
def encode_prompt(
311311
self,
312312
prompt: Union[str, List[str]],
313-
prompt_2: Union[str, List[str]],
313+
prompt_2: Optional[Union[str, List[str]]] = None,
314314
device: Optional[torch.device] = None,
315315
num_images_per_prompt: int = 1,
316316
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_control.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def _get_clip_prompt_embeds(
324324
def encode_prompt(
325325
self,
326326
prompt: Union[str, List[str]],
327-
prompt_2: Union[str, List[str]],
327+
prompt_2: Optional[Union[str, List[str]]] = None,
328328
device: Optional[torch.device] = None,
329329
num_images_per_prompt: int = 1,
330330
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ def _get_clip_prompt_embeds(
335335
def encode_prompt(
336336
self,
337337
prompt: Union[str, List[str]],
338-
prompt_2: Union[str, List[str]],
338+
prompt_2: Optional[Union[str, List[str]]] = None,
339339
device: Optional[torch.device] = None,
340340
num_images_per_prompt: int = 1,
341341
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ def _get_clip_prompt_embeds(
374374
def encode_prompt(
375375
self,
376376
prompt: Union[str, List[str]],
377-
prompt_2: Union[str, List[str]],
377+
prompt_2: Optional[Union[str, List[str]]] = None,
378378
device: Optional[torch.device] = None,
379379
num_images_per_prompt: int = 1,
380380
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_controlnet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ def _get_clip_prompt_embeds(
341341
def encode_prompt(
342342
self,
343343
prompt: Union[str, List[str]],
344-
prompt_2: Union[str, List[str]],
344+
prompt_2: Optional[Union[str, List[str]]] = None,
345345
device: Optional[torch.device] = None,
346346
num_images_per_prompt: int = 1,
347347
prompt_embeds: Optional[torch.FloatTensor] = None,

‎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
@@ -335,7 +335,7 @@ def _get_clip_prompt_embeds(
335335
def encode_prompt(
336336
self,
337337
prompt: Union[str, List[str]],
338-
prompt_2: Union[str, List[str]],
338+
prompt_2: Optional[Union[str, List[str]]] = None,
339339
device: Optional[torch.device] = None,
340340
num_images_per_prompt: int = 1,
341341
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def _get_clip_prompt_embeds(
346346
def encode_prompt(
347347
self,
348348
prompt: Union[str, List[str]],
349-
prompt_2: Union[str, List[str]],
349+
prompt_2: Optional[Union[str, List[str]]] = None,
350350
device: Optional[torch.device] = None,
351351
num_images_per_prompt: int = 1,
352352
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_fill.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ def prepare_mask_latents(
419419
def encode_prompt(
420420
self,
421421
prompt: Union[str, List[str]],
422-
prompt_2: Union[str, List[str]],
422+
prompt_2: Optional[Union[str, List[str]]] = None,
423423
device: Optional[torch.device] = None,
424424
num_images_per_prompt: int = 1,
425425
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_img2img.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def _get_clip_prompt_embeds(
333333
def encode_prompt(
334334
self,
335335
prompt: Union[str, List[str]],
336-
prompt_2: Union[str, List[str]],
336+
prompt_2: Optional[Union[str, List[str]]] = None,
337337
device: Optional[torch.device] = None,
338338
num_images_per_prompt: int = 1,
339339
prompt_embeds: Optional[torch.FloatTensor] = None,

‎src/diffusers/pipelines/flux/pipeline_flux_inpaint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def _get_clip_prompt_embeds(
337337
def encode_prompt(
338338
self,
339339
prompt: Union[str, List[str]],
340-
prompt_2: Union[str, List[str]],
340+
prompt_2: Optional[Union[str, List[str]]] = None,
341341
device: Optional[torch.device] = None,
342342
num_images_per_prompt: int = 1,
343343
prompt_embeds: Optional[torch.FloatTensor] = None,

0 commit comments

Comments
 (0)