During Krea-2 image generation, a crash occurs in do_controlnet_step because the controlnet path passes incorrect arguments to the model forward callback. The original code attempts to modify sample_model_input but never actually calls the model forward, and the callback signature is inconsistent. This leads to a TypeError and crash.
Fix
Added a None-check on control_data to avoid iterating over None.
Built cross_attention_kwargs containing the controlnet residuals and conditioning settings.
Call model_forward_callback with the correct arguments, including a fallback for callbacks that don't accept cross_attention_kwargs.
Return the updated sample from the method.
This ensures ControlNet steps work for models like Krea-2 that expect the proper conditioning format.
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
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_step because the controlnet path passes incorrect arguments to the model forward callback. The original code attempts to modify sample_model_input but never actually calls the model forward, and the callback signature is inconsistent. This leads to a TypeError and crash.
Fix
This ensures ControlNet steps work for models like Krea-2 that expect the proper conditioning format.
Closes #9444