Commit Graph

410 Commits

Author SHA1 Message Date
Thomas Mello
0dffc3918d fix: advanced editor (#827), close #811
refactor js_Call hook to take all gradio arguments
2022-09-08 16:09:10 +03:00
hlky
a00d827cd8
Dev merge (#819)
* #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>

* img2img-fix (#717)

* Revert "img2img-fix (#717)"

This reverts commit 70d4b1ca2a.

* img2img fixes

* Revert "img2img fixes"

This reverts commit e66eddc621.

* Revert "Revert "img2img-fix (#717)""

This reverts commit bf08b617d4.

* img2img fixed

* - Removed duplicated calls to save_sample.
- Change variables and arguments to be more self-explanatory and easier to understand what they do.

* Moved streamlit files to their proper location, before they were incorrectly added to the repository root folder.

* Added retry dependency for the streamlit version.

* Added .cmd file for easy running and updating the streamlit version of the UI.

* Removed duplicated entry for streamlit on the environment.yaml file.

* Removed some unnecessary lines from the the webui_streamlit.cmd file.

* add gfpgan folder to gitignore, auto gen by imglab

* added placeholder text similar to gradio

* added auto conversion for 4 channel PNG to RGB

* fix: regex escape characters

* Update Readme links to sd-webui when appropriate (#781)

* Update link to sd-webui when appropriate

* added LDSR instruction per devilismyfriend guide

* fix: stack overflow during recursion call (#784)

* 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.

* 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.

* separate css to external file

* Added "git pull" and "git stash" to the commands run by the cmd scripts when launching the UI, this should make it so people who use it can automatically update the code from the repo and be up to date without manually using those commands everytime.

* resolve conflict with master

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>
Co-authored-by: ZeroCool <ZeroCool940711@users.noreply.github.com>
Co-authored-by: ZeroCool940711 <alejandrogilelias940711@gmail.com>
Co-authored-by: Hafiidz <3688500+Hafiidz@users.noreply.github.com>
Co-authored-by: Thomas Mello <work.mello@gmail.com>
2022-09-08 11:41:04 +01:00
Thomas Mello
688cb0d038
update README with correct URLs (#786)
Co-Authored-By: Hafiidz <3688500+Hafiidz@users.noreply.github.com>
2022-09-07 23:28:17 +03:00
hlky
490bbbc103
Img2img dev (#736)
* #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>

* img2img-fix (#717)

* Revert "img2img-fix (#717)"

This reverts commit 70d4b1ca2a.

* img2img fixes

* Revert "img2img fixes"

This reverts commit e66eddc621.

* Revert "Revert "img2img-fix (#717)""

This reverts commit bf08b617d4.

* img2img fixed

* feat: bring back Crop mode, formatting

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>
Co-authored-by: Thomas Mello <work.mello@gmail.com>
2022-09-07 20:19:00 +01:00
Mr. Gecko
2b1ac8daf7
Remove .bashrc modification from webui.sh (#735) 2022-09-07 04:04:11 +01:00
Mr. Gecko
d04a6ade6f
Add webui.sh for linux people not wanting docker version (#723) 2022-09-07 03:28:46 +01:00
shayne
02f55e0cef
make entrypoint.sh executable (#729)
docker compose up fails early because entrypoint.sh is not
executable, important under ~Linux
2022-09-07 03:28:06 +01:00
shayne
91c3b4d8db
Add .env_docker.example with previous values (#730)
docker compose up fails without it
2022-09-07 03:27:48 +01:00
hlky
f077e34677
Update environment.yaml 2022-09-07 02:10:13 +01:00
hlky
b3e5a486dd
Update environment.yaml 2022-09-07 02:06:17 +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
58c92228cd
Update README.md 2022-09-07 00:11:56 +01:00
hlky
e625b199bc
Update environment.yaml 2022-09-06 23:51:55 +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
ZeroCool
78ad3c3445
Added a progress bar and updated the Image-to-image tab. (#652)
* Added a progress bar as well as some extra info to know how the generation is going without having to check the console every time.

* - Updated the Image-to-image tab, it is now working at a basic level.
- Disabled RealESRGAN by default for the Image-to-Image tab as it is not working right now.
2022-09-05 04:53:52 +01:00
hlky
75a7ef77f0
img2img test 2022-09-05 00:05:00 +01:00
ZeroCool
daf6519a9e
Implemented the basic layout for the Image-to-Image tab on the UI. (#640)
* Fixed the K Diffusion samplers not working as they had different callbacks than the DDIM and PLMS samplers, also removed some unnecessary code that was left over and are no longer needed now that we can use the K diffusion samplers directly.

* The GFPGAN and RealESRGAN checkboxes on the Advanced tab are no longer shown if said models are not available.

* - Implemented the basic layout for the Image-to-Image tab on the UI.
- Fixed the condition that checked if the GFPGAN and RealESRGAN models were present on their folders, it was previously checking if the folder existed instead of the model files inside of it.
- Removed the Basic tab from the Text-to-Image tab and changed the Advanced tab to be an expander, the basic tab was not actually been used on the streamlit version of the UI.
2022-09-04 22:36:19 +01:00
jjisnow
cc2da24c9e
update webui.yaml (#597)
* reflects newer state of the advanced menu
2022-09-04 21:44:43 +01:00
ZeroCool
46df6f9c36
The GFPGAN and RealESRGAN checkboxes on the Advanced tab are no longer shown if said models are not available. (#609)
* Fixed the K Diffusion samplers not working as they had different callbacks than the DDIM and PLMS samplers, also removed some unnecessary code that was left over and are no longer needed now that we can use the K diffusion samplers directly.

* The GFPGAN and RealESRGAN checkboxes on the Advanced tab are no longer shown if said models are not available.
2022-09-04 10:39:46 +01:00
hlky
e5e1663457
Revert load settings/tkinter 2022-09-04 01:46:17 +01:00
Thomas Mello
435d152c24
fix mask generation (#600) 2022-09-04 01:28:15 +01:00
cobryan05
d8a323ebc6
JobManager: Print true exception callstack (#590)
* JobManager: Print true exception callstack

* Allow empty prompts

Bug #564

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-04 00:21:46 +01:00
Thomas Mello
7b352ad038
Update webui_playground.py (#596)
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-04 00:20:49 +01:00
ZeroCool
3e336344ea
Fixed the K Diffusion samplers not working as they had different callbacks than the DDIM and PLMS samplers, also removed some unnecessary code that was left over and are no longer needed now that we can use the K diffusion samplers directly. (#594) 2022-09-04 00:20:05 +01:00
hlky
797136e1bd
k-diff 2022-09-03 21:02:41 +01:00
hlky
a21ce57de2
space/indent 2022-09-03 20:59:14 +01:00
ZeroCool
93b3a47a74
Changed the way the image preview is updated on the UI (#583)
* Removing the need for a custom streamlit fork, as we are not using nested columns this is no longer needed.

* Moved the embeddings to the config file and changed the Ui so it only needs to call `defaults.general.fp` to get it.

* Changed the way the image preview is updated on the UI to now use the proper callback from the DDIM and PLMS samplers, for that reason we no longer need to have the code for those samplers inside the webui_streamlit.py file.
2022-09-03 20:35:36 +01:00
Hans Raaf
75905871db
Enhanced support for variants (#574)
* Enhanced support for variants

I played a lot with variants and wanted to keep track of them by
extending the filename with the variant amount and variant seed.

While doing that, I found that currently, if you give a variant seed and
an image seed and generate more than one image, you end up with the
same image for all runs.

I used increasing variants with the same variant seed for creating
movies that show how a variant is increasingly deviating. I think
those are fascinating and added functionality to WebGUI.

If you now set a seed for the image and the variant and generate more
than one image, it will increase the variant amount by the initial
amount every step. So you can easily make a series of growing variants
and have them fully reproducible.

I hope I made sense :)

* Using the main seed for filenames on moving variants with same seed
2022-09-03 18:24:10 +01:00
hlky
1212bd9b4c
#561 #456 (again) 2022-09-03 12:41:44 +01:00
hlky
14412f5489
Update sync.yml 2022-09-03 10:10:02 +01:00
devilismyfriend
de95a09593
[Various Changes] GoBig fixes, model loading unloading and more (#553)
* added image lab

* first release

model loading/unloading and save procedure added, commented out unused code from frontend

* bug fixes

Changed the image output to a gallery to display multiple items

Fixed results not showing up in output

Fixed RealESRGAN 2x mode not working and hard coded the default value for the reload.

* added GoBig model check

* added LDSR load check

* removed global statements, added model loader/unloader function

* fixed optimized mode

* update

* update

Added send to lab button
Added a print out if latent-diffusion folder isn't found

* brought back the fix faces and upscale in generation tab

* uncommenting img lab flag

* added LDSR instructions

* default imgProcessorTask set to false

* exposed LDSR settings to lab

users need to reclone the LDSR repo to use them.

* Update frontend.py

moving some stuff around to make them more coherent

* restored upscale and fix faces to img2img

* added notice section

* fixed gfpgan/upscaled pictures not showing in 2img interfaces

* send to lab button now sends info as well

* uncommented dimension info update

* added increment buttons to sampler for that k_euler_a action

* image lab settings toggle on and off with selection

* removed wip settings panel

* better model loading handling and removed increment buttons

* explaining

* disabled SD unloading in image lab upscaling with realesgan and face fix

* fixed a conflict with image lab

Co-authored-by: dr3amer <91037083+dr3am37@users.noreply.github.com>
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 09:07:17 +01:00
hlky
b61b453a02
esrgan gpu id 2022-09-03 09:04:38 +01:00
Michael Walker
b0c1ac9f7b
Add helper script for local development to replicate the github sync action. Also updated README for basic usage instructions / local development tips. (#549)
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:41:08 +01:00
cobryan05
6a1a97e31e
Image Lab: Display Png metadata (#528)
This adds a text box to Image Lab that displays the metadata
of any PNG files dropped on it. Can be used to read the info
saved with --save-metadata

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:40:02 +01:00
EyeDeck
9b07031570
Fix some things breaking when "Save individual images" is unticked (#503)
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:37:35 +01:00
Dave Nicponski
03998f0dfb
Fix readme doc typo (#502)
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:35:55 +01:00
Joshua Kimsey
9dc6aa4804
Changed relauncher.py to have easier to set arguments for users, added --inbrowser as an argument choice (#494)
* Changed relauncher.py to have easier to set arguments for users, added inbrowser as an argument choice

Changed `relauncher.py` to have easier to set argument parameters for users to change. No longer is editing the main `os.system`  string needed. Now, users can choose to set some of the commonly used arguments (totally open to more additions here) to be True or False, with an added area for users to enter their own custom arguments as desired.

This really should make it easier for users to toggle what parameters they wish to launch with, and prevents them from needing to edit the main launch string for the `webui.py` file.

Addition changes to `relauncher.py` include increasing the relaunch time from 0.5 seconds to 1 second, to allow for easier program closing from the Terminal.

Changed `webui.py` to now include an  `--inbrowser` argument to open the interface automatically in a user's default browser. The default is set to `False`. Gradio params have also now been alphabetised. A notice was given to users waiting for port 7860 to open that it may take upwards of 60 seconds to become available.

* Added comments to describe what the changeable common arguments in relauncher.py do

* Changed relauncher.py to fit with requested changes

Added timeout for relauncher loop

Changed inbrowser argument variable to be more understandable

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:35:25 +01:00
Thomas Mello
66aca5c946
update webui_playground, formatting (#474)
* update webui_playground

* replace unsplash with placeimg

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:34:27 +01:00
cobryan05
b969428590
Job Manager feature - view images before all are complete, cancel ongoing generations (#460)
* Add max-jobs command line argument

Adds a new command line argument, max-jobs, which will set the number
of concurrent jobs the gradio queue will allow. When set to more than
the default of 1 the gradio UI will be able to process additional
UI commands at the same time.

* JobManager: initial txt2img implementation

Initial implementation of JobManager, applied to txt2img.
Adds 'refresh' and 'cancel' buttons to the UI. These are useful when
generating images with large batch counts. The 'refresh' button will
update the gallery with the currently-generated images, and the cancel
button will cause the generation to stop after the current iteration.

The new job manager can be disabled with the parameter
  --no-job-manager

* JobManager: Add status update text

* JobManager: Replace wrapped inputs as well

* JobManager: Per-session unique keys

* JobManager: Pre and Post call funcs, UI updates

Added pre- and post- function call 'dummy objects' to allow updating
the UI before and after a generate run. Update the visuals of the
buttons and status text in these new functions.

* JobManager: enforce maximum jobs

* JobManager: Move 'call' func code block

It just makes more sense between _pre and _post.

* JobManager: Add session management

Adds support for multiple browser sessions.
A single session cannot run the same job twice.

If there are no available jobs when Generate is clicked, the
generation aborts. It does *not* queue.

* JobManager: add session maintenance

Addded the ability for one session to stop all concurrent sessions,
and to free memory from any 'finished' sessions for which the
browser has been closed (as the images will be stored until the
browser does a final 'refresh' after the job finishes, which will
never happen if the browser closed)

* JobManager: Add img2img support

This *should* add JobManager to img2img, but it is untested
since img2img is broken for me even without my changes.

* Fixed img2img functionality on this pr

* Revert "Fixed img2img functionality on this pr"

This reverts commit 649b1e8e65.

* Img2Img: Fix 'image editor' options not visible

* Fix Img2Img Job Manager integration

* Img2Img UI: Move JobManager above Image Actions

It is helpful if it is on the screen when you hit generate, so
you can notice the button light up when generation starts.

* Improve job status text

* JobManager: Free available job on exception

* JobManager: Add queueing

Adds a simple queueing system to JobManager. If max-jobs concurrent
jobs are already active then any subsequent jobs will block until
a slot frees up.

Note: The UI does not give great feedback to this. The JobManager
status box will say "Loading..."

* JobManager: Fix queue accidentally LIFO

Queues should really be first in, first out.

* JobManager: add draw_gradio_ui function

Reduces a lot of boilerplate code in frontend.py

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:30:07 +01:00
TingTingin
e35fcb911f
Added abilty to log prompts and info to one file instead of several (#476)
* Added abilty to log prompts and info to one file instead of several

This is my first pull request be gentle I made changes so instead of having several files with prompts with one for each file you can just have one file with the prompt info I also made sure the prompts would work with params in prompts

* Add files via upload

* Fixed Image to image not working

* Add files via upload

* Revert "Add files via upload"

This reverts commit bb10b632bf.

* updated log

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-03 08:24:26 +01:00
Johannes Gäßler
4af33ccda9
Load txt2img setting from files or clipboard (#436)
Functional restore defaults

From file, non-working paste

Working paste settings
2022-09-03 08:24:03 +01:00
hlky
320ea01d11
#466 2022-09-01 22:12:53 +01:00
Thomas Mello
6a054b3615
remove batch_size from img2img (#468) 2022-09-01 22:03:12 +01:00
hlky
561fb3b8ce
#456 fix 2022-09-01 20:27:28 +01:00
hlky
c18c8b690f
#456 2022-09-01 20:20:09 +01:00
hlky
216a84b3a6
Update config.yml 2022-09-01 19:27:57 +01:00
altryne
bacf203bbe
Added altryne's specifications 2022-09-01 12:23:23 -06:00
Alex Volkov
56ecd836ff Merge branch 'master' of github.com:hlky/stable-diffusion-webui
Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>
2022-09-01 12:21:41 -06:00
Alex Volkov
da83bad4f4 ugh
Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>
2022-09-01 12:21:07 -06:00
hlky
56136cbb13
Update config.yml 2022-09-01 19:20:38 +01:00