Commit Graph

343 Commits

Author SHA1 Message Date
berkybear
4c17ce4949 handle NoneType when subseed is not initialized. Set it to -1 in that case 2022-09-18 09:57:50 -07:00
AUTOMATIC
c76a616bc9 fix many paths in code breaking because Processing constructor changed 2022-09-18 19:03:37 +03:00
AUTOMATIC
ba97889137 fix tooltip not appearing for the shuffle button 2022-09-18 18:10:22 +03:00
AUTOMATIC1111
abd5cc6b2b
Merge pull request #585 from JohanAR/ui_seed_changes
Polish seed UI options
2022-09-18 17:56:47 +03:00
AUTOMATIC
e78c368eb3 prevent live previews from showing previous picture 2022-09-18 16:36:34 +03:00
Johan Aires Rastén
a96076f49c Add buttons for random and reuse seed.
Random button sets seed to -1, reuse copies the seed from the last
generated image.
2022-09-18 15:13:28 +02:00
AUTOMATIC1111
9e892d90ce
Merge pull request #651 from EyeDeck/master
Add some error handling for VRAM monitor
2022-09-18 14:35:04 +03:00
EyeDeck
46db1405df ...and make sure it can't get stuck on
in case someone sets opts.memmon_poll_rate to 0 during generation
2022-09-18 07:03:17 -04:00
EyeDeck
fabaf4bddb Add some error handling for VRAM monitor 2022-09-18 05:20:33 -04:00
AUTOMATIC
3f29aa791b altered progressbar to not rely on first progress request coming after the job has started; may help with broken progressbar some people say they have 2022-09-18 11:14:42 +03:00
AUTOMATIC
b273458d2d make inpaint at full resolution option not discard useful pixels from the image
split masking helper function from processing.py into new masking.py
2022-09-18 10:49:00 +03:00
AUTOMATIC1111
c89b1a6f3d
Merge pull request #643 from melchiar/master
fixed typos in processing.py
2022-09-18 09:00:23 +03:00
AUTOMATIC
a86c279419 script.js split work 2022-09-18 08:37:03 +03:00
Steve Eberhardt
f39b2ca088 fixed typos in processing.py 2022-09-17 22:09:52 -07:00
AUTOMATIC1111
e9a9764e00
Merge pull request #625 from bdrupieski/fix-batch-processing-color-correction
fix batch color correction
2022-09-18 07:31:01 +03:00
AUTOMATIC1111
c57ae054e9
Merge pull request #634 from Dement242/Dement242-patch-1
Fixed "CodeFormer visibility:" rounding to 2 decimals.
2022-09-18 07:30:05 +03:00
C43H66N12O12S2
18d6fe4346
..... 2022-09-18 01:21:50 +03:00
Brian Drupieski
7bc5739fe2 set loopback color corrections on each iteration 2022-09-17 18:18:30 -04:00
C43H66N12O12S2
d63dbb3acc
Move scale multiplication to the front 2022-09-18 01:05:31 +03:00
Dement242
3a050d19c6
Merge branch 'AUTOMATIC1111:master' into Dement242-patch-1 2022-09-17 23:18:56 +02:00
JashoBell
98a6644bcf Move comments to scripts.py 2022-09-17 12:43:57 -07:00
Dement242
33434fc6fc
Fixed "CodeFormer visibility:" rounding to 2 decimals. 2022-09-17 21:02:46 +02:00
AUTOMATIC
56ff118845 typo 2022-09-17 16:35:58 +03:00
AUTOMATIC
8d197b6a92 added user.css support 2022-09-17 16:28:19 +03:00
AUTOMATIC
77dcb21688 Merge remote-tracking branch 'origin/master' 2022-09-17 15:39:30 +03:00
AUTOMATIC
2f18823e69 fix for broken export for 4chan 2022-09-17 15:39:20 +03:00
AUTOMATIC1111
0d7fdb1791
Merge branch 'master' into image_info_tab 2022-09-17 14:57:10 +03:00
Tony Beeman
ba295b3268 * Fix process_images where the number of images is not a multiple of (batch_size * n_iter), which would cause us to throw an exception.
* Add a textbox option to Prompts from file (ease of use and it makes it much easier to use on a mobile device)
* Fix the fact that Prompts from file was sometimes passing an empty batch.
2022-09-17 14:55:54 +03:00
AUTOMATIC
304222ef94 X/Y plot support for switching checkpoints. 2022-09-17 13:49:36 +03:00
AUTOMATIC
99585b3514 moved progressbar to top by request 2022-09-17 12:38:15 +03:00
AUTOMATIC
247f58a5e7 add support for switching model checkpoints at runtime 2022-09-17 12:05:18 +03:00
AUTOMATIC
b8be33dad1 hide VRAM text if polling is disabled 2022-09-17 09:23:31 +03:00
EyeDeck
ed6787ca2f Add VRAM monitoring 2022-09-17 09:15:16 +03:00
jjisnow
588d6de4a8
Update ui.py
Reverse run_pnginfo for compatibility reasons
2022-09-17 16:08:56 +10:00
jjisnow
047a623f7a
Restore run_pnginfo 2022-09-17 16:07:07 +10:00
AUTOMATIC
1fc1c537c7 fix 2022-09-17 09:01:10 +03:00
AUTOMATIC
3c665b8dd6 the last PR broke saving EXiF completely for me. I don't know if it was broken already or some condition changed, but it seems like the person who originally added EXIF said, saving it with PIL may not work. I switched to using piexif to add data after the file written. 2022-09-17 08:35:52 +03:00
JJ
4f1f348b6a image.save parameter fix
* image.save takes exif as a parameter
* piexif takes the bytes as a parameter, not the exif_bytes function itself
* reduce calls to create_exif_bytes
2022-09-17 08:06:50 +03:00
JJ
de5bfdf917 image info tab
* handles exceptions if jpeg jfif data not present
* removes further non-comment related exif data.
2022-09-17 06:58:35 +10:00
AUTOMATIC
e49b1c5d73 an option to do exactly the amount of specified steps in img2img 2022-09-16 13:38:02 +03:00
AUTOMATIC
2288bc96fd fix extras tab showing original images instead of upscales 2022-09-16 12:43:24 +03:00
AUTOMATIC
d8b427f8aa remove the warning at startup related to previous PR with batch processing 2022-09-16 10:21:59 +03:00
AUTOMATIC
b8cf2ea8ea add a bit of a comment about what's being done with tensor noise 2022-09-16 10:04:07 +03:00
AUTOMATIC
83bce1a604 Merge branch 'batch-seed-attempt' 2022-09-16 09:48:46 +03:00
AUTOMATIC
87e8b9a2ab prevent replacing torch_randn globally (instead replacing k_diffusion.sampling.torch) and add a setting to disable this all 2022-09-16 09:47:03 +03:00
AUTOMATIC
b44ddcb443 Prompt editing only applies to images in first batch of desired batch size when batch count > 1 #535 2022-09-16 08:51:21 +03:00
AUTOMATIC
b153ebe3b6 fix loopback color correction to store color_correction info for initial image and use that instead of extracting from previous image in a loop #481 #541 2022-09-16 08:33:47 +03:00
ArrowM
3763837003 Add batch processing to Extras tab 2022-09-16 07:42:48 +03:00
Twizzes
deea9f4d70 Replace invalid filename chars with an underscore
... instead of removing them altogether.
This makes the prompt editing filenames [old🆕step] easier to read
2022-09-16 07:25:58 +03:00
AUTOMATIC
6452fa2fb7 Merge remote-tracking branch 'origin/master' 2022-09-15 22:31:18 +03:00
AUTOMATIC
6991f2cb27 SD upscale with Batch count>1 results broken images #512 2022-09-15 22:31:06 +03:00
OWKenobi
2ddaeb318a Update scripts.py
fixes bug #464, which happens when controls is None, which leads to args_to being None.
2022-09-15 21:08:45 +03:00
AUTOMATIC
0fde1f3eac oh hey i broke batches with this 2022-09-15 18:05:42 +03:00
AUTOMATIC
dc769e097c Merge branch 'prompt_editing' 2022-09-15 15:39:30 +03:00
AUTOMATIC
d4dc4c1c63 fix for Error Interrogating when user has garbage in text files #479 2022-09-15 15:13:06 +03:00
AUTOMATIC
d7f7378828 quantization off by default 2022-09-15 14:55:38 +03:00
C43H66N12O12S2
81baaff9b3 Respect quantization setting 2022-09-15 14:54:52 +03:00
C43H66N12O12S2
829d7150bc Add setting for quantization 2022-09-15 14:54:52 +03:00
C43H66N12O12S2
3c37c68fe0 Construct CompVisDenoiser with quantization 2022-09-15 14:54:52 +03:00
AUTOMATIC
cdaab233c4 Merge remote-tracking branch 'origin/master' 2022-09-15 14:54:33 +03:00
AUTOMATIC
6d2eb339d6 fix for failing to save 4chan downscale for large iamges 2022-09-15 14:54:29 +03:00
JJ
9611008445 exif fix for webp
* fix for odd error only in webp files whereby piexif.insert inserts the bytes correctly, but image.save inserts extra "Exif" in the image metadata which results in an error on reading
2022-09-15 14:53:06 +03:00
C43H66N12O12S2
72d7f8c761 fix typo 2022-09-15 14:14:27 +03:00
C43H66N12O12S2
7ec6282ec2 pass dtype to torch.zeros as well 2022-09-15 14:14:27 +03:00
AUTOMATIC
f2693bec08 prompt editing 2022-09-15 13:10:16 +03:00
AUTOMATIC
b28cf84c36 prevent repeating messages about too many tokens 2022-09-15 08:57:03 +03:00
EyeDeck
dfb2e830d9 Improved directory sanitization when --hide_ui_dir_config
Fixes an issue where it's still possible to write to arbitrary directories through careful use of \.. or /.. in directory patterns

...and fix the regex to work better

reeeegex
2022-09-15 07:39:57 +03:00
Steve Eberhardt
4a626f6ea6 Corrected typos in shared.py and README 2022-09-15 07:38:17 +03:00
NebulousDev
5dde56afe3 Fixed typo in text attention setting 2022-09-14 18:41:40 +03:00
AUTOMATIC
9f267af3f7 added a second style field
added the ability to use {prompt} in styles
added a button to apply style to textbox
rearranged top row for UI
2022-09-14 17:56:21 +03:00
Michoko
6153d9d9e9 Update images.py
Better code
2022-09-14 15:51:45 +03:00
Michoko
d5520d43fd Update images.py
Handles grids names. Code more robust and doesn't fail if mixed with other files.
2022-09-14 15:51:45 +03:00
Michoko
94aeb5dec9 Update images.py
Better computing of images indexes in filenames
2022-09-14 15:51:45 +03:00
Elias Oenal
3daf9cac46 Removed stray references to shared.device_codeformer. 2022-09-14 15:24:55 +03:00
Elias Oenal
26f733a026 fix for codeformer switching torch devices on metal systems. 2022-09-14 15:24:55 +03:00
AUTOMATIC
bb2732c1c7 updates for exif comments #446 2022-09-14 15:20:05 +03:00
JJ
c4e90bf689 format exif string
* UserComment needs an ID code at the start of the tag area. This is provided by piexif.helper.UserComment, otherwise an "Warning 	 Invalid EXIF text encoding for UserComment" is thrown upon reading the exif data
2022-09-14 15:14:26 +03:00
AUTOMATIC
c9430e53f6 loopback moved to scripts, added support for multiple batches, changed to honor save grids and how grids in web setting 2022-09-14 14:47:54 +03:00
AUTOMATIC
c253d6bdab do not die on failing to load script #426 2022-09-14 13:20:24 +03:00
AUTOMATIC
4c51752464 option name updates for #432 2022-09-14 11:31:49 +03:00
jtkelm2
493032a7af Update ui.py 2022-09-14 11:27:41 +03:00
jtkelm2
df81de0d2f Update ui.py 2022-09-14 11:27:41 +03:00
jtkelm2
74c5f7974c Added selected image saving 2022-09-14 11:27:41 +03:00
AUTOMATIC
6bea45d495 prevent making grid if there is no need for it #428 2022-09-14 10:34:44 +03:00
JustAnOkapi
f9f9d04b5f prevent extras from saving in dir
Extras have none of the vars used in dir names, so they cant be saved into dirs.
+grid code cleanup
2022-09-14 08:58:13 +03:00
JJ
859fff3700 add webp to file formats with exif saved 2022-09-14 08:49:00 +03:00
camenduru
f07d789b79 added cmd arg to load custom styles file 2022-09-14 08:48:42 +03:00
AUTOMATIC
9d40212485 first attempt to produce crrect seeds in batch 2022-09-13 21:49:58 +03:00
AUTOMATIC
85b97cc49c bandaid for broken ddim sampling #389 2022-09-13 20:12:24 +03:00
AUTOMATIC
950064ee96 img2img_color_correction off by default for #394 2022-09-13 20:00:19 +03:00
AUTOMATIC
29022300ba revert the breaking change in font sneaked in by the person who did EXIF #407 2022-09-13 19:53:42 +03:00
AUTOMATIC
70e72db7bd Merge remote-tracking branch 'origin/master' 2022-09-13 19:24:03 +03:00
AUTOMATIC
b6b9faa779 add support for reading saved jpeg comments 2022-09-13 19:23:55 +03:00
JJ
7a5852a4ee change np.float to np.float32
* numpy deprecation warning fix. Alternately, you could also specify float
2022-09-13 18:21:59 +03:00
JJ
27c2a0680a save the exif data upon image write 2022-09-13 18:11:46 +03:00
JJ
34cf684419 add metadata to jpg and non-png image files
* needs a piexif module install
* dumps the info in an Exif "UserComment"
* update to webui.bat
2022-09-13 18:11:46 +03:00
C43H66N12O12S2
3b1b1444d4
Complete cross attention update 2022-09-13 14:29:56 +03:00
AUTOMATIC
c84e333622 color correction option for all img2img modes #363 2022-09-13 12:51:57 +03:00
AUTOMATIC
823cf946ec Embeddings directory can't be found if running webui.py from another directory (+potential fix) #374 2022-09-13 09:42:51 +03:00
AUTOMATIC
b5a8b99d3f put safety checker into a separate file because it's already crowded in processing 2022-09-13 08:34:41 +03:00
AUTOMATIC1111
b03bc4e79a
Merge pull request #367 from GRMrGecko/nsfw_filter
Adds NSFW content filter option
2022-09-13 08:22:39 +03:00
oobabooga
3e1f9ab8b3
Fix #368 2022-09-13 01:34:35 -03:00
GRMrGecko
fc18e2d483 Adds NSFW content filter option 2022-09-12 19:15:35 -05:00
AUTOMATIC1111
fa8be8acd6
Merge pull request #356 from nnuudev/master
Swap width and height sliders in the UI
2022-09-13 00:48:36 +03:00
AUTOMATIC
db8f8dd972 Ability to save images into a folder named after the date they were created #353 2022-09-13 00:44:08 +03:00
AUTOMATIC
19a817d97d X/Y plot with denoising adds incorrect image data to individual outputs #331 2022-09-12 23:44:36 +03:00
AUTOMATIC
0de109c210 Codeformer face restoration not working: AttributeError: module 'modules.shared' has no attribute 'device_codeformer' #348 2022-09-12 23:24:54 +03:00
nnuudev
a97e2a562b Swap width and height sliders in the UI 2022-09-12 21:41:59 +02:00
AUTOMATIC
3de44fc580 Include the model name (or the SHA256 of the file) in the metadata #271 2022-09-12 20:47:46 +03:00
AUTOMATIC
c7e0e28ccd changes for #294 2022-09-12 20:09:32 +03:00
AUTOMATIC1111
11e03b9abd
Merge pull request #294 from EliasOenal/master
Fixes for mps/Metal: use of seeds, img2img, CodeFormer
2022-09-12 19:58:06 +03:00
AUTOMATIC
a655e90fbe add negative prompt to log when clicking save #249 2022-09-12 19:57:31 +03:00
AUTOMATIC
45e8fa0e07 X/Y plot can not output the final result with this error message #244 2022-09-12 19:17:02 +03:00
AUTOMATIC
482a6ce8cb [Feature Request] Save defaults for extras & keep image parameters after using extras #251 2022-09-12 18:59:53 +03:00
AUTOMATIC
843b2b64fc Instance of CUDA out of memory on a low-res batch, even with --opt-split-attention-v1 (found cause) #255 2022-09-12 18:40:06 +03:00
AUTOMATIC
75a9b1bbd9 Noisy image previews #257 2022-09-12 18:00:53 +03:00
AUTOMATIC
40f4d3ed98 [FEATURE] Save both images, (Skip_Save optional). #265 2022-09-12 17:47:36 +03:00
Elias Oenal
b7f95869b4 Refactored Metal/mps fixes. 2022-09-12 16:32:44 +02:00
C43H66N12O12S2
aaea8b4494
Update cross attention to the newest version 2022-09-12 16:48:21 +03:00
AUTOMATIC
a5a760a7d4 rename --channelslast to --opt-channelslast to be in line with other torch optimizations 2022-09-12 16:43:11 +03:00
AUTOMATIC1111
01f8de3229
Merge pull request #334 from C43H66N12O12S2/channels-last
Channels last support
2022-09-12 16:40:01 +03:00
AUTOMATIC
b70b51cc72 Allow TF32 in CUDA for increased performance #279 2022-09-12 16:34:13 +03:00
C43H66N12O12S2
8c995be44d
Add cmd option for channels last 2022-09-12 16:27:23 +03:00
AUTOMATIC
11e648f6c7 allow resizing into non-integer sizes 2022-09-12 16:17:32 +03:00
AUTOMATIC
a1305060ce Variations are not working properly #305 2022-09-12 16:00:46 +03:00
AUTOMATIC1111
264d255919
Merge pull request #329 from EyeDeck/master
Add --gradio-auth command line argument to enable Gradio authentication
2022-09-12 15:45:11 +03:00
AUTOMATIC
a4416f3585 [BUG] Not Working As Intended - create a directory with name derived from the prompt #306 2022-09-12 15:41:30 +03:00
EyeDeck
fc49844aa8
Merge branch 'master' into master 2022-09-12 08:19:14 -04:00
AUTOMATIC
372a2c3e2e [Feature Request] Please add "--share-password" for Gradio server security #315 2022-09-12 15:10:05 +03:00
EyeDeck
e3646e79aa Add --auth command line argument to enable Gradio authentication
Allows you to pass in Gradio authentication like:
`--auth username:password`
Supports multiple sets of credentials by comma-delimiting, like:
`--auth user1:pass1,user2:pass3`...
2022-09-12 08:08:41 -04:00
AUTOMATIC1111
c094f00e10
Merge branch 'master' into master 2022-09-12 13:23:58 +03:00
AUTOMATIC
ddc86f2edb --gradio-debug for collab users 2022-09-12 12:40:55 +03:00
AUTOMATIC
c50fa7a932 remove mistaken error message 2022-09-12 12:26:37 +03:00
AUTOMATIC
e68484500f Merge remote-tracking branch 'origin/master' 2022-09-12 11:55:35 +03:00
AUTOMATIC
9bb20be090 memory optimization for CLIP interrogator
changed default cfg_scale to a higher value
2022-09-12 11:55:27 +03:00
Stephan Reinwald
655ef8e8cb Added cmd arg to load custom ui settings file 2022-09-12 10:20:38 +03:00
AUTOMATIC
ab0a79cdf4 keep interrogate models not in vram by default 2022-09-12 09:00:11 +03:00
EyeDeck
e05e46aa3f
Merge branch 'master' into master 2022-09-11 18:15:30 -04:00
AUTOMATIC
303b75c149 save sd upscales as samples not grids 2022-09-12 00:20:05 +03:00
AUTOMATIC
81d91cea29 Merge remote-tracking branch 'origin/master' 2022-09-11 23:25:35 +03:00
Michoko
4535239d8a Add a samples filename format option
Adds a "samples filename format" option in the settings. This format can be defined by tags for maximum flexibility and scalability.
2022-09-11 23:25:20 +03:00
AUTOMATIC
8fb9c57ed6 add half() supporrt for CLIP interrogation 2022-09-11 23:24:24 +03:00
EyeDeck
29a2933e23 Add --hide-ui-dir-config command line flag
Adds `--hide-ui-dir-config` flag to disable editing directory configs from the web UI. This can be set to prevent users from setting the directory to somewhere they shouldn't, for public (or semi-public) interfaces.

Directories are still read from config.json, so the server admin can still set them in the web UI and then relaunch with the hide flag, or edit the config manually.

Also:
- fix OptionInfo `component_args` keyword argument not being read if `component` isn't also set
- ensure that hidden settings aren't still read from the web UI (otherwise they could still be changed by tampering with the interface)
2022-09-11 16:00:42 -04:00
Elias Oenal
5dc05c0d0d Implemented workaround to allow the use of seeds with the mps/metal backend. Fixed img2img's use of unsupported precision float64 with mps backend. 2022-09-11 21:11:02 +02:00
Elias Oenal
2920ca7892 CodeFormer does not support mps/metal backend, implemented fallback to cpu backend. 2022-09-11 21:10:21 +02:00
cryzed
cacd14bee8 Only create backup if path exists 2022-09-11 21:23:49 +03:00
cryzed
5fbed65236 Add support for saving styles with negative prompts 2022-09-11 20:56:34 +03:00
AUTOMATIC
f194457229 CLIP interrogator 2022-09-11 18:48:36 +03:00
JohannesGaessler
13008bab90 Fixed prompt_style type hints: int -> str 2022-09-11 12:39:09 +03:00
AUTOMATIC
f185874418 [Feature Request] Save defaults for extras & keep image parameters after using extras #251 2022-09-11 11:31:16 +03:00