fix, feat: canvas followups 15 #6919
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
psychedelicious
requested review from
blessedcoolant,
maryhipp,
hipsterusername and
brandonrising
as code owners
github-actions
bot
added
python
hipsterusername
approved these changes
Sep 23, 2024
…yer currently selected Also clean up some jank w/ the handling of accepting staging images - there was this no-op action & a listener for it... should just be a simple callback.
Need to destroy the progress image and staging image when we finish with them.
We need to ensure the getQueueCountsByDestination query is sync'd, invalidating its tags as queue items complete. Unfortunately it's 2 extra network requests per queue item.
Previously the setting was `showOnlyRasterLayersWhileStaging`. This has been renamed to `isolatedStagingPreview`. Works the same. Also added `isolatedFilteringPreview` an `isolatedTransformingPreview`. These work the same way, but they isolate the current selected layer. There are toggles in the canvas settings popover _and_ the filter/transform popups (same setting).
- Use consistent logic for all model type handlers - Fix bug where we could select invalid upscaling models (not sure how this hadn't caused problems...) - Add logging for each action - Only reset models when there is a change to be made - skip dispatching actions when there would be no change made to state
This serves no purpose and complicates bbox size handling.
- Update canvas slice's to track the current base model architecture instead of just the optimal dimension. This lets us derive both optimal dimension _and_ grid size for the currently selected model. - Update all bbox size utilities to use derived grid size instead of hardcoded values of 8 or 64 - Review every damned instance of the number 8 in the whole frontend and update the ones that need to use the grid size - Update the invoke button blocking logic to check against scaled bbox size, unless scaling is disabled. - Update the invoke button blocking to say if it's width or height that is invalid and if its bbox or scaled, for both FLUX and the T2I adapter constraints
hipsterusername
force-pushed
the
psyche/canvas-followups-15
branch
from
a9f6eab
to
92c28b1
Compare
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
Fixes
Enhancements
Tidy
Internal
Related Issues / Discussions
discord/offline discussions
QA Instructions
The big change is the reworked bbox constraints. It should be very difficult (hopefully impossible) to end up with a invalid width/height for FLUX or SD models, regardless of how you fiddle with bbox or model settings. If you do somehow end up with an invalid w/h, the invoke tooltip now is much more descriptive, saying whether it's the width or height that is invalid, and if its the bbox or scaled bbox.
T2I adapter does not have special handling, just better alerting in the invoke tooltip.
Merge Plan
n/a
Checklist