Commit Graph

48 Commits

Author SHA1 Message Date
M
20adc46b75
webui: detect scoped-down GPU environment (#993)
* webui: detect scoped-down GPU environment

check if we're using a scoped-down GPU environment (pynvml does not listen to CUDA_VISIBLE_DEVICES) so that we can measure memory on the correct GPU

* remove unnecessary import
2022-09-11 04:41:29 +03:00
Thomas Mello
d6f4796c35
fix: sampler name in GoBig #988 2022-09-11 01:52:51 +03:00
xaedes
008af2d8ff
Perform masked image restoration for GFPGAN, RealESRGAN, fixing #947
* Perform masked image restoration when using GFPGAN or RealESRGAN, fixing #947.
Also fixes bug in image display when using masked image restoration with RealESRGAN.

When the image is upscaled using RealESRGAN the image restoration can not use the
original image because it has wrong resolution. In this case the image restoration
will restore the non-regenerated parts of the image with an RealESRGAN upscaled
version of the original input image.

Modifications from GFPGAN or color correction in (un)masked parts are also restored
to the original image by mask blending.

* Update scripts/webui.py

Co-authored-by: Thomas Mello <work.mello@gmail.com>
2022-09-10 18:37:42 +03:00
ZeroCool
24ddbdc811
Merge branch 'sd-webui:dev' into dev 2022-09-10 07:42:59 -07:00
ZeroCool940711
80b00810ef - Improved the progress bar for the txt2vid tab, it now shows more information during generation.
- Changed the guidance_scale variable to be cfg_scale.
2022-09-10 07:42:20 -07:00
ZeroCool940711
527d18e1c6 Added two new scripts that will be used for the new implementation of the txt2vid tab which uses the latest version of the diffusers library. 2022-09-10 07:38:57 -07:00
Soul-Burn
3e9cdb1dcb Better support for large batches in optimized mode 2022-09-10 15:25:13 +01:00
ZeroCool940711
2795dfb8ab Changed the scheduler for the txt2vid tab back to LMS, for now we can only use that. 2022-09-09 19:51:28 -07:00
ZeroCool940711
f5df32efb7 Removed old files from a split test we deed that are not needed anymore, we plan to do the split differently. 2022-09-09 19:47:43 -07:00
ZeroCool940711
249e2dd74f Fixed an issue with the txt2vid model. 2022-09-09 19:43:51 -07:00
Thomas Mello
f8a6a4eba8
fix: lost imports from #921 2022-09-10 01:54:19 +03:00
Michael Hearn
002dca063d Image transparency is used as mask for inpainting 2022-09-09 18:28:40 -04:00
xaedes
07062941c7
add img2img option for color correction. (#936)
color correction is already used for loopback to prevent color drift with the first image as correction target.
the option allows to use the color correction even without loopback mode.
it helps keeping the colors similar to the input image.
2022-09-10 00:44:30 +03:00
xaedes
f6aa2c64eb
Add mask_restore to restore images based on mask, fixing #665 (#898)
* Add mask_restore option to give users the option to restore images based on mask, fixing #665.

Before commit c73fdd78  (Implement masking during sampling to improve blending, #308)
image mask was applied after sampling, resulting in masked parts that are not regenerated
to actually stay the same.
Since c73fdd78 the masked img2img will change the whole image, even in masked areas.
It gives better looking results at first glance, but will result in image degredation when
applied a few times. See issue #665.

In the workflow of using repeated masked img2img, users may want to use this options to keep the parts
of image they actually want to keep without image degradation. A final masked img2img or whole image img2img with mask_restore disabled
will give the better blending of "Implement masking during sampling".

* revert changes of a7be43ba in change_image_editor_mode

* fix ui_functions.change_image_editor_mode by adding gr.update to the end of the list it returns

* revert inserted newlines and whitespaces to match format of previous code

* improve caption of new option mask_restore

"Only modify regenerated parts of image"

* fix ui_functions.change_image_editor_mode by adding gr.update to the end of the list it returns

an old copy of the function exists in webui.py, this superflous function mistakenly was changed by the earlier commit b6a9e16b

* remove unused functions that are near duplicates of functions in ui_functions.py
2022-09-10 00:07:14 +03:00
Thomas Mello
16d2941619
fix: filename format parameter (#923) 2022-09-09 22:11:57 +03:00
VulumeCode
1422b35ac6
Tiling parameter (#911)
* tiling

* default to False
2022-09-09 20:33:04 +03:00
Michoko
4d76d6742c
Add filename formatting argument (#908)
* Update webui.py

Filename formatting argument

* Update scripts/webui.py

Co-authored-by: Thomas Mello <work.mello@gmail.com>
2022-09-09 20:20:59 +03:00
cobryan05
9d95449624
Metadata cleanup - Maintain metadata within UI (#845)
* Metadata cleanup - Maintain metadata within UI

This commit, when combined with Gradio 3.2.1b1+, maintains image
metadata as an image is passed throughout the UI. For example,
if you generate an image, send it to Image Lab, upscale it, fix faces,
and then drag the resulting image back in to Image Lab, it will still
remember the image generation parameters.

When the image is saved, the metadata will be stripped from it if
save-metadata is not enabled. If the image is saved by *dragging*
out of the UI on to the filesystem it may maintain its metadata.

Note: I have ran into UI responsiveness issues with upgrading Gradio.
Seems there may be some Gradio queue management issues. *Without* the
gradio update this commit will maintain current functionality, but
will not keep meetadata when dragging an image between UI components.

* Move ImageMetadata into its own file

Cleans up webui, enables webui_streamlit et al to use it as well.

* Fix typo
2022-09-09 19:27:21 +03:00
Logan zoellner
754e530d70 when in outcrop mode, mask added regions and fill in with voroni noise for better outpainting 2022-09-09 10:13:38 -04:00
ZeroCool940711
61b3ca7014 Merge remote-tracking branch 'origin/dev' into dev 2022-09-09 03:44:25 -07:00
ZeroCool940711
22b84afc87 Improvements to the txt2vid tab. 2022-09-09 03:30:43 -07:00
Tony Beeman
7d987cc922 Add info and stats to img2img 2022-09-09 01:33:28 -07:00
Tony Beeman
28d8827331 Display Info and Stats when render is complete, similar to what Gradio shows. 2022-09-09 01:33:28 -07:00
Tony Beeman
771a68e3e5 Fixed the path in webui_streamlit.py 2022-09-09 01:03:34 -07:00
Tony Beeman
ca8ee265cd Made sure img2txt and img2img checkboxes respect YAML defaults 2022-09-08 23:50:33 -07:00
Tony Beeman
5ea27f3d0c Streamlit: Allow user defaults to be specified in a userconfig_streamlit.yaml file. 2022-09-08 22:58:25 -07:00
hlky
5a10bdbd47
proposed streamlit code organization changes
I want people of all skill levels to be able to contribute
This is one way the code could be split up with the aim of making it easy to understand and contribute especially for people on the lower end of the skill spectrum
All i've done is split things, I think renaming and reorganising is still needed
2022-09-08 17:57:38 +01:00
ZeroCool940711
e6027fe306 Added num_inference_steps to config file and fixed incorrectly calls to the config file from the txt2vid tab calling txt2img instead. 2022-09-08 05:51:22 -07:00
ZeroCool940711
ed84e1f1d8 - Added option to select custom models instead of just using the default one, if you want to use a custom model just place your .ckpt file in "models/custom" and the UI will detect it and let you switch between stable diffusion and your custom model, make sure to give the filename a proper name that is easy to distinguish from other models because that name will be used on the UI.
- Implemented basic Text To Video tab, will continue to improve it as it is really basic right now.
- Improved the model loading, you now should see less frequently errors about it not been loaded correctly.
2022-09-08 05:33:45 -07:00
Hafiidz
0e30d4fdd9 separate css to external file 2022-09-08 10:10:03 +08:00
ZeroCool940711
c0e02742e3 Added try and except block to handle basic errors like StopException which is raised by streamlit when you hit the stop button and KeyError which happens also when stopping the generation because it tries to check the model at the end which is not loaded at that time, this can be ignored and so thats the reason for the exception. 2022-09-07 18:03:39 -07:00
ZeroCool940711
1d4351ce91 Added option to set default sampler name from config file, will be useful for those wanting to change the default sampler and have it persist even when closing the UI and opening it again. 2022-09-07 16:58:19 -07:00
Thomas Mello
a81671d673
fix: stack overflow during recursion call (#784) 2022-09-07 22:14:46 +03:00
Thomas Mello
388a765162 fix: regex escape characters 2022-09-07 18:05:16 +03:00
Hafiidz
432ebdad29 added auto conversion for 4 channel PNG to RGB 2022-09-07 14:29:49 +08:00
Hafiidz
03a3c149ba added placeholder text similar to gradio 2022-09-07 13:32:23 +08:00
ZeroCool
ed2daf81ba
Merge branch 'sd-webui:dev' into dev 2022-09-06 20:21:05 -07:00
ZeroCool940711
5b79864d43 Moved streamlit files to their proper location, before they were incorrectly added to the repository root folder. 2022-09-06 20:20:29 -07:00
hlky
38737341da
Merge branch 'master' into dev 2022-09-07 03:09:33 +01:00
hlky
3b490df708
img2img fixed 2022-09-07 03:08:29 +01:00
hlky
cf754f9fe6
Revert "Revert "img2img-fix (#717)""
This reverts commit bf08b617d4.
2022-09-07 02:56:27 +01:00
hlky
06df5a5697
Revert "img2img fixes"
This reverts commit e66eddc621.
2022-09-07 02:56:23 +01:00
hlky
e66eddc621
img2img fixes 2022-09-07 02:35:01 +01:00
hlky
bf08b617d4
Revert "img2img-fix (#717)"
This reverts commit 70d4b1ca2a.
2022-09-07 01:45:15 +01:00
hlky
70d4b1ca2a
img2img-fix (#717) 2022-09-07 00:48:13 +01:00
hlky
f28255466b
#715 #699 #698 #663 #625 #617 #611 #604 (#716)
* Update README.md

* Add sampler name to metadata (#695)

Co-authored-by: EliEron <example@example.com>

* old-dev-merge

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>
2022-09-07 00:43:51 +01:00
EliEron
d86e945ca2
Add sampler name to metadata (#695)
Co-authored-by: EliEron <example@example.com>
2022-09-07 00:33:47 +01:00
hlky
010b27ce9a
Repo merge (#712)
* repo-merge

* cutdown size

* Create setup.py

* webui.cmd

* ldm

* Update environment.yaml

* Update environment.yaml
2022-09-06 23:50:14 +01:00