Commit Graph

377 Commits

Author SHA1 Message Date
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
AUTOMATIC 2e6153e343 Merge remote-tracking branch 'origin/master' 2022-09-11 10:25:02 +03:00
AUTOMATIC a094b3ab8e Add another instruction for workaround for #259 2022-09-11 09:54:51 +03:00
Abdullah Barhoum b5d1af11b7 Modular device management 2022-09-11 09:49:43 +03:00
Seki 065e310a3f Change "send to " 2022-09-11 09:27:58 +03:00
AUTOMATIC 06fadd2dc5 added --opt-split-attention-v1 2022-09-11 00:29:10 +03:00
AUTOMATIC 77f8a72fa8 fix a bug with error message 2022-09-11 00:26:24 +03:00
AUTOMATIC 1b963c205f fixed broken empty directory when prompt does not start with letter, this time for real 2022-09-10 16:33:45 +03:00
AUTOMATIC b3311a50dc fix repeating subseeds for every batch #221 2022-09-10 16:16:18 +03:00
AUTOMATIC 43bdbe934a enabled negative prompt by default
fixed broken empty directory when prompt does not start withl etter
2022-09-10 15:41:29 +03:00
AUTOMATIC 13eec4f3d4 changed <p> to <br> in info field to prevent double line breaks when copying
added new features to the list.
2022-09-10 14:53:38 +03:00
AUTOMATIC 4d2c0c7a72 undo CodeFormer's upscaling of images with dimensions less than 512. 2022-09-10 13:53:10 +03:00
AUTOMATIC decbbe81f5 separated options for sample and grid dir saving for #222 2022-09-10 13:36:16 +03:00
AUTOMATIC c92f2ff196 Update to cross attention from https://github.com/Doggettx/stable-diffusion #219 2022-09-10 12:06:19 +03:00
AUTOMATIC ef0cdb8a42 add batch count to sd upscale #169
fix writing empty prompt pictures to rroot directory instead of 'empty'
suppress 'Denoising strength change factor' text inimage info unless using loopback mode
2022-09-10 11:37:06 +03:00
AUTOMATIC 955f644ce1 split settings into three columns
added a different workaround for gradio mask bug with info in UI
switched to newer gradio version
2022-09-10 11:10:00 +03:00
AUTOMATIC 695c05fb30 prioritize repositories/stable-diffusion path when searching for SD 2022-09-10 10:29:19 +03:00
AUTOMATIC 6f678ec79c Emoji are not being sorted correctly #192 2022-09-10 08:45:16 +03:00
AUTOMATIC 26ce47eb6c [Feature Request] Ability to pass a custom ui-config.json via command line args #212 2022-09-10 08:18:54 +03:00
AUTOMATIC 1fcb48347d prevent styles from adding an extra comma 2022-09-10 00:51:07 +03:00
Lukas Meller fbdec2ef20 Fix prompt matrix script 2022-09-09 23:40:03 +03:00
orionaskatu 89f4bb3ca1 Cleaner condition 2022-09-09 23:27:18 +03:00
orionaskatu 79cca25704 Embed roboto 2022-09-09 23:27:18 +03:00
AUTOMATIC 86867e153f support for prompt styles
fix broken prompt matrix
2022-09-09 23:16:02 +03:00
AUTOMATIC d714ea4c41 ability to upload mask for inpainting 2022-09-09 19:43:16 +03:00
AUTOMATIC 5b6a585ae5 Merge remote-tracking branch 'origin/master' into seeds 2022-09-09 19:13:40 +03:00
David Yates 17a7477c72 Include negative prompt in parameters text file 2022-09-09 18:19:37 +03:00
AUTOMATIC b1707553cf added resize seeds and variation seeds features 2022-09-09 17:54:04 +03:00
AUTOMATIC 003b60b94e add an option to show negative prompt 2022-09-09 09:15:36 +03:00
AUTOMATIC bcb8a5eb0a change default font capitalization to possibly help linux users #157 2022-09-09 08:45:39 +03:00
AUTOMATIC1111 116a2b89c0
Merge pull request #167 from orionaskatu/patch-1
Some typos
2022-09-09 07:21:34 +03:00
AUTOMATIC1111 93524bfb73
Merge pull request #153 from SafentisFox/fix_output_display
Fix webui.bat ignoring cmd line arguments, fix output img overflowing
2022-09-09 07:19:46 +03:00
orionaskatu 764a64b02e
Some typos 2022-09-09 01:17:38 +02:00
AUTOMATIC fe4e3c2673 fix for PLMS live previews in txt2img 2022-09-08 19:34:20 +03:00
AUTOMATIC ca3861e05f fix for DDIM live previews in txt2img 2022-09-08 19:20:41 +03:00
AUTOMATIC1111 701f76b29a
Merge pull request #158 from JohannesGaessler/progress-printing
More informative progress printing
2022-09-08 18:34:45 +03:00
JohannesGaessler f211c498b9 More informative progress printing 2022-09-08 17:05:17 +02:00
AUTOMATIC1111 20b86e81c3
Merge pull request #154 from rewbs/img2img2-loopback-denoise-strength-change-factor
Turn the loopback denoising strength change factor into a parameter rather than hardcoding to 0.95. Set the default to 1.
2022-09-08 17:02:15 +03:00
AUTOMATIC ad02b249f5 add a helpful message when user puts RealESRGAN model into ESRGAN directory. 2022-09-08 15:49:47 +03:00
AUTOMATIC 62ce77e245 support for sd-concepts as alternatives for textual inversion #151 2022-09-08 15:36:50 +03:00
AUTOMATIC f5001246e2 honor tiling settings for RealESRGAN also
load scripts earlier to get errors before model loads
2022-09-08 15:19:36 +03:00
safentisAuth 6dc5cf558d Fix webui.bat ignoring cmd line arguments, fix output img overflowing 2022-09-08 15:08:23 +03:00
rewbs ed01f69542 Turn the loopback denoise strength change factor into a parameter rather than hardcoding to 0.95. Set the default to 1. 2022-09-08 12:02:06 +00:00
orionaskatu 567c1fbc1c
Port defaults to none 2022-09-08 10:42:21 +02:00
orionaskatu db92896e30
help message for ports < 1024 2022-09-08 09:47:56 +02:00
orionaskatu 5d087731a5
add --port argument to shared.py
defaults to 7860
2022-09-08 09:44:14 +02:00
AUTOMATIC 61785cef65 Merge remote-tracking branch 'origin/master' 2022-09-08 10:31:20 +03:00
AUTOMATIC 0fedd50886 another change for inpainting at full resolution 2022-09-08 10:03:21 +03:00
Robin Fernandes 21a375e6b2
Merge branch 'master' into img2img2-color-correction 2022-09-08 15:59:42 +10:00
rewbs 1e7a36fd79 Remove debug print. 2022-09-08 02:53:13 +00:00
rewbs 52e071da2a Add color correction to img2img loopback to avoid a progressive skew to magenta. Based on codedealer's PR to hlky's repo here: https://github.com/sd-webui/stable-diffusion-webui/pull/698/files. 2022-09-08 02:35:26 +00:00
fuzzytent 7045c84643 Also use alpha channel from img2img input image as mask 2022-09-07 22:37:54 +02:00
AUTOMATIC1111 296d012423
Merge pull request #108 from xeonvs/mps-support
Added support for launching on Apple Silicon M1/M2
2022-09-07 22:29:44 +03:00
xeonvs ba1124b326 directly convert list to tensor 2022-09-07 20:40:32 +02:00
xeonvs aaeeef82fa Miss device type for option --medvram 2022-09-07 18:09:30 +02:00
AUTOMATIC 700c47a674 big improvements to inpainting and outpainting 2022-09-07 17:00:51 +03:00
xeonvs 65fbefd033 Added support for launching on Apple Silicon 2022-09-07 15:58:25 +02:00
AUTOMATIC 15bb8e8057 labeling updates according to anon's feedback 2022-09-07 13:46:08 +03:00
AUTOMATIC 8dcd3e57e7 a little bit of rework for extras tab 2022-09-07 13:35:02 +03:00
AUTOMATIC 5e12c23a67 clarification for settings; another comment about copied files 2022-09-07 12:57:12 +03:00
AUTOMATIC 6a9b33c848 codeformer support 2022-09-07 12:32:28 +03:00
AUTOMATIC 6521f90fa2 add a font for google collab 2022-09-07 02:18:45 +03:00
AUTOMATIC 23ee74e9e3 fix error with --help #91 2022-09-07 02:08:11 +03:00
AUTOMATIC a1743e4518 remove double basicr requirement
add seed change for anon
2022-09-07 01:44:44 +03:00
AUTOMATIC a8504157a0 some changes for outpainting to produce less seams 2022-09-07 00:58:01 +03:00
AUTOMATIC 7ce7fb01e0 fix for live progress breaking lowvram and medvram optimizations 2022-09-06 23:10:12 +03:00
AUTOMATIC 7e5b8becf9 fix for progress bar 2022-09-06 20:26:09 +03:00
AUTOMATIC fd66199769 added preview option 2022-09-06 19:33:51 +03:00
AUTOMATIC 66a9ca9d00 fixes for incorrect progressbar 2022-09-06 12:34:15 +03:00
AUTOMATIC 5e20657146 fix grid overwriting bug 2022-09-06 11:51:34 +03:00
AUTOMATIC 3f55d9a932 collab link 2022-09-06 10:58:58 +03:00
AUTOMATIC c688d0984e some extra changes for collab compatibility 2022-09-06 10:38:02 +03:00
AUTOMATIC 395f170597 readme extras for VRAM for
added missing packages to requirements for #74
add support for negative numbers in X/Y plot (plus ranges) #73
changed progressbar to work properly with custom modes
2022-09-06 10:11:25 +03:00
AUTOMATIC a243bc7859 added progressbar
added an option to disable progressbar
added interrupt support to DDIM/PLMS
2022-09-06 02:09:01 +03:00
AUTOMATIC b6763fb884 added random artist button
added a setting for padding when doing inpaint at original resolution
2022-09-05 23:08:06 +03:00
AUTOMATIC f5563853b8 add information about batch to the image 2022-09-05 21:22:30 +03:00
AUTOMATIC 064965c466 added --listen option to make gradio listen on network requests 2022-09-05 19:37:11 +03:00
AUTOMATIC 5bb69bd915 fix for setting values for gradio sliders when users has bad data in ui-config.json 2022-09-05 19:11:29 +03:00
AUTOMATIC a8a58dbac7 re-integrated tiling option as a UI element 2022-09-05 03:25:37 +03:00
AUTOMATIC f91d0c3d19 add an option to enable tiling image generation 2022-09-05 02:16:36 +03:00
AUTOMATIC a039878c0f bugfix (thx #88443949) 2022-09-05 02:02:15 +03:00
AUTOMATIC 5bb126bd89 add split attention layer optimization from https://github.com/basujindal/stable-diffusion/pull/117 2022-09-05 01:41:20 +03:00
AUTOMATIC f299645aee ESRGAN support 2022-09-04 18:54:12 +03:00
AUTOMATIC 78278ce695 added UI config file: ui-config.json 2022-09-04 13:52:01 +03:00
AUTOMATIC 7350c71259 added poor man's inpainting script 2022-09-04 01:29:43 +03:00
AUTOMATIC b608222d25 fix for broken image saving when using non-default directory 2022-09-03 21:33:47 +03:00
AUTOMATIC 657074a73d option to invert mask for inpainting 2022-09-03 21:02:38 +03:00
AUTOMATIC e67a56dbb4 fix to make scripts that failed to compile not crash the program 2022-09-03 19:59:11 +03:00
AUTOMATIC1111 226de5e503
Merge pull request #60 from hentailord85ez/file-not-found-fix
Don't iterate over scripts if it doesn't exist
2022-09-03 19:35:28 +03:00
AUTOMATIC 592334f322 scripts 2022-09-03 19:32:45 +03:00
hentailord85ez 26404eaabf
Don't iterate over scripts if it doesn't exist 2022-09-03 17:09:14 +01:00
AUTOMATIC 595c827bd3 option to unload GFPGAN after using 2022-09-03 17:28:30 +03:00
AUTOMATIC f40617d6c4 support for scripts 2022-09-03 17:21:15 +03:00
AUTOMATIC 345028099d split codebase into multiple files; to anyone this affects negatively: sorry 2022-09-03 12:08:45 +03:00