feat(ui): regional prompting followups 3 #6256
Merged
Conversation
This file contains 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
Trying a lot of different things as I iterated, so this is smooshed into one big commit... too hard to split it now. - Iterated on IP adapter handling and UI. Unfortunately there is an bug related to undo/redo. The IP adapter state is split across the `controlAdapters` slice and the `regionalPrompts` slice, but only the `regionalPrompts` slice supports undo/redo. If you delete the IP adapter and then undo/redo to a history state where it existed, you'll get an error. The fix is likely to merge the slices... Maybe there's a workaround. - Iterated on UI. I think the layers are OK now. - Removed ability to disable RP globally for now. It's enabled if you have enabled RP layers. - Many minor tweaks and fixes.
psychedelicious
requested review from
blessedcoolant,
maryhipp and
hipsterusername
as code owners
I'll need to think about how to fix this properly. For now, disable the check as the UI can still build fine.
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.
Summary
Trying a lot of different things as I iterated, so this is smooshed into one big commit... too hard to split it now.
controlAdaptersslice and theregionalPromptsslice, but only theregionalPromptsslice supports undo/redo. If you delete the IP adapter and then undo/redo to a history state where it existed, you'll get an error. The fix is likely to merge the slices... Maybe there's a workaround.Each layer can can up to 1 positive prompt, up to 1 negative prompt ,and any number of IP adapters. Full, Style and Composition all work.
Quick demo:
https://github.com/invoke-ai/InvokeAI/assets/4822129/0ba5c8d8-2d5d-43ec-8876-a31b01d99dad
Related Issues / Discussions
n/a
QA Instructions
n/a
Merge Plan
n/a
Checklist