Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
renzhc
diffusers_dcu
Commits
5780776c
Unverified
Commit
5780776c
authored
Aug 07, 2025
by
Dhruv Nair
Committed by
GitHub
Aug 06, 2025
Browse files
Make `prompt_2` optional in Flux Pipelines (#12073)
* update * update
parent
f19421e2
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
13 additions
and
13 deletions
+13
-13
src/diffusers/pipelines/flux/pipeline_flux.py
src/diffusers/pipelines/flux/pipeline_flux.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_control.py
src/diffusers/pipelines/flux/pipeline_flux_control.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py
...diffusers/pipelines/flux/pipeline_flux_control_img2img.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py
...diffusers/pipelines/flux/pipeline_flux_control_inpaint.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_controlnet.py
src/diffusers/pipelines/flux/pipeline_flux_controlnet.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py
...pipelines/flux/pipeline_flux_controlnet_image_to_image.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py
...ers/pipelines/flux/pipeline_flux_controlnet_inpainting.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_fill.py
src/diffusers/pipelines/flux/pipeline_flux_fill.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_img2img.py
src/diffusers/pipelines/flux/pipeline_flux_img2img.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_inpaint.py
src/diffusers/pipelines/flux/pipeline_flux_inpaint.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_kontext.py
src/diffusers/pipelines/flux/pipeline_flux_kontext.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py
...diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py
+1
-1
src/diffusers/pipelines/flux/pipeline_flux_prior_redux.py
src/diffusers/pipelines/flux/pipeline_flux_prior_redux.py
+1
-1
No files found.
src/diffusers/pipelines/flux/pipeline_flux.py
View file @
5780776c
...
@@ -310,7 +310,7 @@ class FluxPipeline(
...
@@ -310,7 +310,7 @@ class FluxPipeline(
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_control.py
View file @
5780776c
...
@@ -324,7 +324,7 @@ class FluxControlPipeline(
...
@@ -324,7 +324,7 @@ class FluxControlPipeline(
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py
View file @
5780776c
...
@@ -335,7 +335,7 @@ class FluxControlImg2ImgPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSin
...
@@ -335,7 +335,7 @@ class FluxControlImg2ImgPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSin
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py
View file @
5780776c
...
@@ -374,7 +374,7 @@ class FluxControlInpaintPipeline(
...
@@ -374,7 +374,7 @@ class FluxControlInpaintPipeline(
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_controlnet.py
View file @
5780776c
...
@@ -341,7 +341,7 @@ class FluxControlNetPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleF
...
@@ -341,7 +341,7 @@ class FluxControlNetPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleF
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py
View file @
5780776c
...
@@ -335,7 +335,7 @@ class FluxControlNetImg2ImgPipeline(DiffusionPipeline, FluxLoraLoaderMixin, From
...
@@ -335,7 +335,7 @@ class FluxControlNetImg2ImgPipeline(DiffusionPipeline, FluxLoraLoaderMixin, From
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py
View file @
5780776c
...
@@ -346,7 +346,7 @@ class FluxControlNetInpaintPipeline(DiffusionPipeline, FluxLoraLoaderMixin, From
...
@@ -346,7 +346,7 @@ class FluxControlNetInpaintPipeline(DiffusionPipeline, FluxLoraLoaderMixin, From
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_fill.py
View file @
5780776c
...
@@ -419,7 +419,7 @@ class FluxFillPipeline(
...
@@ -419,7 +419,7 @@ class FluxFillPipeline(
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_img2img.py
View file @
5780776c
...
@@ -333,7 +333,7 @@ class FluxImg2ImgPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleFile
...
@@ -333,7 +333,7 @@ class FluxImg2ImgPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FromSingleFile
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_inpaint.py
View file @
5780776c
...
@@ -337,7 +337,7 @@ class FluxInpaintPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FluxIPAdapterM
...
@@ -337,7 +337,7 @@ class FluxInpaintPipeline(DiffusionPipeline, FluxLoraLoaderMixin, FluxIPAdapterM
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_kontext.py
View file @
5780776c
...
@@ -358,7 +358,7 @@ class FluxKontextPipeline(
...
@@ -358,7 +358,7 @@ class FluxKontextPipeline(
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py
View file @
5780776c
...
@@ -391,7 +391,7 @@ class FluxKontextInpaintPipeline(
...
@@ -391,7 +391,7 @@ class FluxKontextInpaintPipeline(
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
src/diffusers/pipelines/flux/pipeline_flux_prior_redux.py
View file @
5780776c
...
@@ -292,7 +292,7 @@ class FluxPriorReduxPipeline(DiffusionPipeline):
...
@@ -292,7 +292,7 @@ class FluxPriorReduxPipeline(DiffusionPipeline):
def
encode_prompt
(
def
encode_prompt
(
self
,
self
,
prompt
:
Union
[
str
,
List
[
str
]],
prompt
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Union
[
str
,
List
[
str
]],
prompt_2
:
Optional
[
Union
[
str
,
List
[
str
]]
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
device
:
Optional
[
torch
.
device
]
=
None
,
num_images_per_prompt
:
int
=
1
,
num_images_per_prompt
:
int
=
1
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
prompt_embeds
:
Optional
[
torch
.
FloatTensor
]
=
None
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment