fix: Handle ControlNet conditioning args correctly in do_controlnet_step (closes #9444) - #9469
Open
botbikamordehai2-sketch wants to merge 1 commit into
Conversation
botbikamordehai2-sketch
requested review from
JPPhoto,
Pfannkuchensack,
blessedcoolant,
dunkeroni and
lstein
as code owners
August 6, 2026 11:27
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
During Krea-2 image generation, a crash occurs in
do_controlnet_stepbecause the controlnet path passes incorrect arguments to the model forward callback. The original code attempts to modifysample_model_inputbut never actually calls the model forward, and the callback signature is inconsistent. This leads to a TypeError and crash.Fix
control_datato avoid iterating over None.cross_attention_kwargscontaining the controlnet residuals and conditioning settings.model_forward_callbackwith the correct arguments, including a fallback for callbacks that don't acceptcross_attention_kwargs.samplefrom the method.This ensures ControlNet steps work for models like Krea-2 that expect the proper conditioning format.
Closes #9444