Commit Graph

374 Commits

Author SHA1 Message Date
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
hlky
17b471f960
Delete config.yaml 2022-09-01 19:20:18 +01:00
Alex Volkov
77202ab5f2 Added sponsor links for urgent help for some folks who can't wait
Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>
2022-09-01 12:19:31 -06:00
hlky
e525b22201
Update config.yaml 2022-09-01 19:08:29 +01:00
hlky
f8e34b1dd8
Update config.yaml 2022-09-01 19:07:45 +01:00
hlky
3ea787b5d7
Merge branch 'master' of https://github.com/hlky/stable-diffusion-webui 2022-09-01 18:58:06 +01:00
hlky
decd31ca92
Can't run batches more than 10 after latest commits #218 2022-09-01 18:58:02 +01:00
devilismyfriend
678578c99d
[Image lab] Send to lab button (#444)
* 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

Co-authored-by: dr3amer <91037083+dr3am37@users.noreply.github.com>
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-01 18:48:51 +01:00
hlky
e1d08e7a87
'dict' and 'str' #221 2022-09-01 18:10:43 +01:00
hlky
511690911b
#441 2022-09-01 16:24:20 +01:00
hlky
1922a44334
Dupe fix 2022-09-01 15:31:16 +01:00
altryne
45fafec68a
[Big update] - Dynamic params, Ui rehaul, mobile fixes, and simplification of the txt2img tab (#421)
* Merge with master

* params in prompt WIP

Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>

* Added highligted text output, added copy and pastable dynamic params

Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>

* Fixes with working repo

Signed-off-by: altryne <altryne@gmail.com>

* some fixes

Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>
Signed-off-by: altryne <altryne@gmail.com>
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-01 14:18:17 +01:00
devilismyfriend
a447938cde
[updates] Image Tab (#433)
* 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

Co-authored-by: dr3amer <91037083+dr3am37@users.noreply.github.com>
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-01 12:56:11 +01:00
hlky
72f1c29601
Update README.md 2022-09-01 12:13:26 +01:00
hlky
2d9272664e
Conflict fix 2022-09-01 11:56:20 +01:00
hlky
e1e1d50a94
Revert "Run model on cpu if there is only cpu (#399)"
This reverts commit 277cc46646.
2022-09-01 11:50:19 +01:00
hlky
66dac9bcf9
conflict fix 2022-09-01 11:49:29 +01:00
jQubz
277cc46646
Run model on cpu if there is only cpu (#399)
* Run model on cpu if there is only cpu

* Still working on CPU support

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-01 11:41:16 +01:00
M
869047589f
webui: alphabetize arguments (#428)
* webui: alphabetize arguments

* update to the latest arg list
2022-09-01 11:36:27 +01:00
Joshua Kimsey
8212768e76
Fixed ports not opening on 7860 (#414)
* Fixed ports not opening on 7860

Fixed the issue where, after a crash or quick relaunch, SD would not use the same port. It will now wait for 7860 to reopen before launching the webui again.

* Added ability to choose custom port at launch

Added a parser argument to allow users to choose a custom port at launch. Default is still 7860. Also ensured that error messages associated with a port not being available will reflect what port is actually being checked.

* Moved parser argument for port to be under the share parser argument

Moved the port parser argument to be directly under the share parser argument for consistency.

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-01 11:34:33 +01:00
Kevin Gibbons
deed4e9171
direct feature requests to the discussion tab (#395) 2022-09-01 11:33:14 +01:00
devilismyfriend
1f22b0f5aa
[Feature] Image Processing tab (#401)
* 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

Co-authored-by: dr3amer <91037083+dr3am37@users.noreply.github.com>
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-01 11:32:11 +01:00
Thomas Mello
773aa60e8a
refactor: python js interface (#381)
* refactor js interface

* rename call_SD to call_JS

* add invocation example to call_JS

* serialize args before passing them to js

* allow override of x
2022-09-01 11:11:22 +01:00
altryne
8212d8e5de
fixes [CHORE] - add codeowners file for altryne on /frontend #386 (#387)
Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>

Signed-off-by: Alex Volkov <alex.volkov@fundbox.com>
2022-08-31 20:39:04 +01:00
willlllllio
fe746ce7c1
fix endless sleep with optimized and batchsize (#384)
currently will endless loop in the while: time.sleep(1) part on 2nd iteration of for loop.
move back to cpu should only be ran once afterwards not [batchsize] times.

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-08-31 19:37:27 +01:00
_nderscore
c00233220e
fix: add guard against subprompt weights adding up to zero + colon escaping support (#380)
* fix: add guard against subprompt weights adding up to zero

* feat: add support for backslash-escaped colon character in prompts

Co-authored-by: _nderscore <_@_._>
2022-08-31 19:31:13 +01:00
hlky
fecac5c242
Update frontend.py 2022-08-31 14:59:38 +01:00
hlky
89328b5da0
#370 2022-08-31 14:59:09 +01:00
hlky
7754880f55
#234 2022-08-31 14:34:50 +01:00
hlky
341c13a4de
#172 2022-08-31 14:17:57 +01:00
hlky
dffdaaaf77
#354 + playground.py update 2022-08-31 13:58:49 +01:00
oc013
cfc9f00a93
Add comment about jpg samples toggle in webui config (#352) 2022-08-31 05:10:48 +01:00
hlky
5059c2780e
txt2img width height 2022-08-31 03:25:32 +01:00
JuanRising
4ec2d328db Add dimensions info (aspect ratio and pixel count) 2022-08-31 03:22:40 +01:00
hlky
7fb25b25a4
Update FUNDING.yml 2022-08-31 00:06:47 +01:00
JohannesGaessler
c295420293 Set YAML dump width to 10000 2022-08-30 23:17:57 +01:00
_nderscore
b647ecaa92 fix: minor painterro integration fixes 2022-08-30 23:13:51 +01:00