Lincoln Stein
d1d044aa87
actual image seed now written into web log rather than -1 ( #428 )
2022-09-07 17:56:59 -04:00
Peter Baylies
a48c03e0f4
Merge branch 'development' into development
2022-09-06 17:25:28 -04:00
Lincoln Stein
f6284777e6
Squashed commit of the following:
...
commit 7d1344282d942a33dcecda4d5144fc154ec82915
Merge: caf4ea3ebeb556ebeb556af9ff2c4b9a1bc012929cda02a6018992
2022-09-06 17:12:39 -04:00
Peter Baylies
8c8b34a889
* Update to resolve conflicts.
2022-09-05 22:57:33 -04:00
Peter Baylies
7ff94383ce
Merge branch 'development' of https://github.com/lstein/stable-diffusion into development
2022-09-05 22:57:03 -04:00
Peter Baylies
0891910cac
* Updates for thresholding and perlin noise options, added warmup for thresholding.
2022-09-05 21:40:05 -04:00
Lincoln Stein
720e5cd651
Refactoring simplet2i ( #387 )
...
* start refactoring -not yet functional
* first phase of refactor done - not sure weighted prompts working
* Second phase of refactoring. Everything mostly working.
* The refactoring has moved all the hard-core inference work into
ldm.dream.generator.*, where there are submodules for txt2img and
img2img. inpaint will go in there as well.
* Some additional refactoring will be done soon, but relatively
minor work.
* fix -save_orig flag to actually work
* add @neonsecret attention.py memory optimization
* remove unneeded imports
* move token logging into conditioning.py
* add placeholder version of inpaint; porting in progress
* fix crash in img2img
* inpainting working; not tested on variations
* fix crashes in img2img
* ported attention.py memory optimization #117 from basujindal branch
* added @torch_no_grad() decorators to img2img, txt2img, inpaint closures
* Final commit prior to PR against development
* fixup crash when generating intermediate images in web UI
* rename ldm.simplet2i to ldm.generate
* add backward-compatibility simplet2i shell with deprecation warning
* add back in mps exception, addresses @vargol comment in #354
* replaced Conditioning class with exported functions
* fix wrong type of with_variations attribute during intialization
* changed "image_iterator()" to "get_make_image()"
* raise NotImplementedError for calling get_make_image() in parent class
* Update ldm/generate.py
better error message
Co-authored-by: Kevin Gibbons <bakkot@gmail.com>
* minor stylistic fixes and assertion checks from code review
* moved get_noise() method into img2img class
* break get_noise() into two methods, one for txt2img and the other for img2img
* inpainting works on non-square images now
* make get_noise() an abstract method in base class
* much improved inpainting
Co-authored-by: Kevin Gibbons <bakkot@gmail.com>
2022-09-05 20:40:10 -04:00
thealanle
1ad2a8e567
Fix --outdir function for web ( #373 )
...
* Fix --outdir function for web
* Removed unnecessary hardcoded path
2022-09-05 20:35:04 -04:00
Kevin Gibbons
95c088b303
Revert "Add CORS headers to dream server to ease integration with third-party web interfaces" ( #371 )
...
This reverts commit 91e826e5f4
2022-09-04 22:04:14 -04:00
Lincoln Stein
3a2be621f3
Merge branch 'development' into main
2022-09-04 08:15:51 -04:00
Sebastian Aigner
91e826e5f4
Add CORS headers to dream server to ease integration with third-party web interfaces
2022-09-04 10:22:54 +02:00
Lincoln Stein
d0d95d3a2a
make initimg appear in web log
2022-09-03 14:10:31 -04:00
Lincoln Stein
a01b7bdc40
add web interface for seamless option
2022-09-03 13:43:04 -04:00
Lincoln Stein
d8c0d020eb
remove space between -V and its value in generated prompt, for consistency with other switches
2022-09-03 09:08:10 -04:00
prixt
02bee4fdb1
added --seamless tag logging to normalize_prompt
2022-09-03 16:08:03 +09:00
Kevin Gibbons
e918cb1a8a
replace list delimiters in variations syntax
2022-09-02 23:51:22 -07:00
Kevin Gibbons
4fe265735a
support generating variations
...
Co-authored-by: xra <mail@xra.dev>
2022-09-01 23:48:53 -07:00
Lincoln Stein
629ca09fda
Merge branch 'dream-m1' of github.com:toffaletti/stable-diffusion into toffaletti-dream-m1
...
* Fix conflicts with main branch changes
* Fix logic error in choose_autocast_device() that was causing crashes
on CUDA systems.
2022-09-01 17:54:01 -04:00
Jason Toffaletti
09bd9fa47e
move autocast device selection to a function
2022-08-31 22:21:14 -07:00
Lincoln Stein
28fe84177e
optionally scale initial image to fit box defined by width x height
...
* This functionality is triggered by the --fit option in the CLI (default
false), and by the "fit" checkbox in the WebGUI (default True)
* In addition, this commit contains a number of whitespace changes to
make the code more readable, as well as an attempt to unify the visual
appearance of info and warning messages.
2022-09-01 00:52:43 -04:00
Lincoln Stein
0be2351c97
Merge branch 'resolution-checker' of https://github.com/blessedcoolant/stable-diffusion into main
2022-08-31 14:43:17 -04:00
Mikhail Tishin
b622819051
Expose img2img strength parameter in Web UI ( #239 )
...
* Expose img2img strength parameter in Web UI
* Fix strength label id
Co-authored-by: Mikhail Tishin <michail.tishin@fayrix.com>
Co-authored-by: Kevin Gibbons https://github.com/bakkot
2022-08-31 11:18:32 -04:00
James Reynolds
a547c33327
check if torch.backends has mps before calling it ( #245 )
...
Co-authored-by: James Reynolds <magnsuviri@me.com>
2022-08-31 10:56:38 -04:00
Kevin Gibbons
d566ee092a
move make_grid into image_utils
2022-08-30 22:03:53 -07:00
Kevin Gibbons
b983d61e93
tweak format of "result" event in web ui
2022-08-30 22:03:53 -07:00
Kevin Gibbons
153c93bdd4
refactor pngwriter
2022-08-30 22:03:51 -07:00
Lincoln Stein
3be1cee17c
avoid crash due to dangling batch_size reference
2022-08-31 00:56:12 -04:00
Lincoln Stein
bdb0651eb2
add support for Apple hardware using MPS acceleration
2022-08-31 00:33:23 -04:00
blessedcoolant
1480ef84dc
Add Resolution Checker
2022-08-31 14:54:16 +12:00
Kevin Gibbons
1714816fe2
remove support for batch_size from dream.py ( #227 )
...
* remove dream.py support for batch_size
* expect to get a single image
2022-08-30 22:30:12 -04:00
Kevin Gibbons
8ca4d6542d
support progress for img2img ( #215 )
...
WebGUI shows progress bar when an initial image is provided.
2022-08-30 15:36:12 -04:00
Lincoln Stein
a51e18ea98
resize initial image to match requested width and height, preserving aspect ratio. Closes #210 . Closes #207 ( #214 )
2022-08-30 15:26:02 -04:00
Kevin Gibbons
5d13207aa6
webui: support cancelation
2022-08-30 08:55:40 -07:00
Lincoln Stein
186d0f9d10
Merge branch 'sw-drop' of https://github.com/bakkot/stable-diffusion into bakkot-sw-drop
2022-08-30 09:17:07 -04:00
Lincoln Stein
19e4298cf9
Merge branch 'BlueAmulet-prompt_as_dir' into main
...
This adds the frequently-requested feature of naming the output
directory after the text prompt.
2022-08-29 22:34:48 -04:00
Lincoln Stein
42ffcd7204
add the recently added commands to the readline command-line-completion list; fix command-line documentation bug, closing issue #188
2022-08-29 22:34:09 -04:00
Kevin Gibbons
18597ad1d9
fix bug in pngwriter
2022-08-29 16:33:32 -07:00
Kevin Gibbons
0173d3a8fc
stream images
2022-08-29 16:33:31 -07:00
Kevin Gibbons
a7a62d39d4
webui: hide gfpgan if not installed
2022-08-29 16:27:44 -07:00
Lincoln Stein
24ce56b3db
Merge branch 'webui-sampler-fix' into main
2022-08-29 19:25:49 -04:00
Lincoln Stein
81ad239197
Merge pull request #192 from david-ford/working-branch
...
Fix case sensitive check to be case insensitive
2022-08-29 17:48:12 -04:00
David Ford
ed38c97ed8
Removed unrelated changes and updated based on recommendation
...
Removed the changes to the index.html and .gitattributes for this PR. Will add them in separate PRs.
Applied recommended change for resolving the case issue.
2022-08-29 16:43:34 -05:00
Lincoln Stein
6fb2f1ed6e
fixes WebUI so that the selected sampler is actually applied
2022-08-29 14:06:18 -04:00
Lincoln Stein
38701a6d7b
Fix IndexError when generating grid; --grid option can now be passed on shell command line
2022-08-29 13:52:44 -04:00
David Ford
31fa92a83f
Fix case sensitive check to be case insensitive
...
Case sensitivity between os.getcwd and os.realpath can fail due to different drive letter casing. C:\ vs c:\. This change addresses that by normalizing the strings before comparing.
2022-08-29 12:46:24 -05:00
Lincoln Stein
0abfc3cac6
Merge branch 'main' of github.com:lstein/stable-diffusion into main
...
This fixes issue with grid generation.
2022-08-29 13:39:59 -04:00
Lincoln Stein
d483fcb53a
Merge pull request #166 from SMUsamaShah/patch-1
...
Bug fix in grid
2022-08-29 13:39:50 -04:00
Lincoln Stein
c7db038c96
grid is broken, needs the grid-fix PR#166 to fix
2022-08-29 13:39:20 -04:00
Lincoln Stein
4acfb76be6
correctly handle upscaling in webUI, including displaying status messages during GFPGAN/ESRGAN postprocessing
2022-08-29 12:08:18 -04:00
Lincoln Stein
fd13526454
Merge pull request #175 from bakkot/unicode
...
read/write plain text files in utf-8, not ascii
2022-08-29 07:03:55 -04:00
Lincoln Stein
7718af041c
Merge pull request #178 from lstein/dream-web-upscaling
...
FEAT: Dream web upscaling
2022-08-29 06:59:21 -04:00
tesseractcat
070795a3b4
webui: stream progress events to page
2022-08-28 21:54:10 -07:00
Kevin Gibbons
7ae79b350e
write log files in utf-8, not ascii
2022-08-28 20:00:11 -07:00
Lincoln Stein
18899be4ae
working, but there is a bug in underlying txt2png() call that is preventing upscaled images from being returned
2022-08-28 22:42:31 -04:00
blessedcoolant
b6053108c1
Merge pull request #168 from blessedcoolant/bug-fixes
...
Fixed grid image not saving
2022-08-29 13:05:53 +12:00
blessedcoolant
f0e2fa781f
Grid image not saving after recent changes has been fixed.
2022-08-29 11:29:45 +12:00
Lincoln Stein
373a2d9c32
Merge branch 'main' of github.com:lstein/stable-diffusion into main
2022-08-28 19:03:45 -04:00
Lincoln Stein
b85773f332
resolved conflicts and write properly-formatted prompt string (with sampler & upscaling) into image file
2022-08-28 19:01:45 -04:00
Lincoln Stein
ddc0e9b4d8
Merge pull request #133 from bakkot/dir-traversal
...
prevent directory traversal in the web UI
2022-08-28 18:32:12 -04:00
Lincoln Stein
8bbe7936bd
close Issue #165
2022-08-28 18:21:20 -04:00
Kevin Gibbons
9e7865704a
prevent directory traversal in the web UI
2022-08-28 14:33:30 -07:00
Lincoln Stein
ac02a775e4
moved server.py into right location
2022-08-28 17:27:43 -04:00
Lincoln Stein
ea2ee33be8
cosmetic fixup to how the outputs are reported
2022-08-28 17:06:33 -04:00
Lincoln Stein
7dfca3dcb5
moved scripts/dream_server.py into ldm/dream/server.py
2022-08-28 16:37:27 -04:00
blessedcoolant
6e49c070bb
Optimize and Improve GFPGAN and Real-ESRGAN Pipeline
2022-08-29 08:14:29 +12:00
Muhammad Usama
59be6c815d
bug fix in grid
...
In case of 6 images 3rd image was also copied to 4th box missing the last image in the grid.
2022-08-28 15:39:09 +01:00
Lincoln Stein
4f02b72c9c
prettified all the code using "blue" at the urging of @tildebyte
2022-08-26 03:15:42 -04:00
Lincoln Stein
dd670200bb
documentation tweaks for installation and running of the GFPGAN extension; now you have the ability to specify the previous image's seed with -S -1, the one before that with -S -2, and so forth
2022-08-26 02:17:14 -04:00
Lincoln Stein
f1bed52530
moved dream utilities into their own subfolder
2022-08-25 22:49:15 -04:00
