Skip to content

Conversation

psychedelicious
Copy link
Collaborator

@psychedelicious psychedelicious commented Jun 6, 2023

Various ControlNet improvements

feat(ui): auto-select controlnet processor

  • when the controlnet model is changed, if there is a default processor for the model set, the processor is changed.
  • once a control image is selected (and processed), changing the model does not change the processor - must be manually changed see final change for updated autoprocessing

fix(ui): fix control image not used if processor type is none

fix(ui): only show loading indicator on processing control images

feat(ui): add upload to IAIDndImage
Add uploading to IAIDndImage

  • add postUploadAction arg to imageUploaded thunk, with several current valid options (set control image, set init, set nodes image, set canvas, or toast)
  • updated IAIDndImage to optionally allow click to upload

fix(ui): improve dragging activation

  • delay of 250ms
  • prevent gallery images from accidentally activating native drag and drop

feat(ui): add reset button for control image

feat(ui): make prompt not required

  • also change the placeholder text

feat(ui): enhance autoprocessing
The processor is automatically selected when model is changed.

But if the user manually changes the processor, processor settings, or disables the new Auto configure processor switch, auto processing is disabled.

The user can enable auto configure by turning the switch back on.

When auto configure is enabled, a small dot is overlaid on the expand button to remind the user that the system is not auto configuring the processor for them.

If auto configure is enabled, the processor settings are reset to the default for the selected model.

@psychedelicious psychedelicious marked this pull request as ready for review June 6, 2023 14:39
- when the controlnet model is changed, if there is a default processor for the model set, the processor is changed.
- once a control image is selected (and processed), changing the model does not change the processor - must be manually changed
Add uploading to IAIDndImage
- add `postUploadAction` arg to `imageUploaded` thunk, with several current valid options (set control image, set init, set nodes image, set canvas, or toast)
- updated IAIDndImage to optionally allow click to upload
@psychedelicious psychedelicious force-pushed the feat/ui/controlnet-tweaks branch from 77b5606 to 899e20e Compare June 6, 2023 14:40
@psychedelicious
Copy link
Collaborator Author

The upload capability currently only supports click - not drag from filesystem. Will get to that ASAP. For now, dragging an image from FS has not changed, the files just go to the assets tab of gallery.

@hipsterusername
Copy link
Member

Could see having drag from FS going to "assets" be better overall, as it kinda defaults for it to being available for historical use

@blessedcoolant
Copy link
Collaborator

A couple of things I noted in this PR:

  • Once we click upload the first image to the controlnet tab, we cannot do it again coz theres no way to remove the loaded image. After that it is just drag and drop again. Might need to add a button to remove the loaded image.
  • For the auto changing of the processors, maybe if a model that isnt mapped to a processor is picked, it should change back to none? For some processors, none actually will be the processor.

- delay of 250ms
- prevent gallery images from accidentally activating native drag and drop
If there is no control image, and the model does not have a default processor, set the processor to `none`.
- also change the placeholder text
The processor is automatically selected when model is changed.

But if the user manually changes the processor, processor settings, or disables the new `Auto configure processor` switch, auto processing is disabled.

The user can enable auto configure by turning the switch back on.

When auto configure is enabled, a small dot is overlaid on the expand button to remind the user that the system is not auto configuring the processor for them.

If auto configure is enabled, the processor settings are reset to the default for the selected model.
@psychedelicious psychedelicious enabled auto-merge (rebase) June 7, 2023 08:25
@psychedelicious psychedelicious merged commit 0a83903 into main Jun 7, 2023
@psychedelicious psychedelicious deleted the feat/ui/controlnet-tweaks branch June 7, 2023 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants