Commit Graph

362 Commits

Author SHA1 Message Date
William Moorehouse 006791c13d Fix grabbing the model name for infotext 2022-10-09 14:49:15 +03:00
William Moorehouse d6d10a37bf Added extended model details to infotext 2022-10-09 14:49:15 +03:00
AUTOMATIC bd833409ac additional changes for saving pnginfo for #1803 2022-10-09 13:10:15 +03:00
frostydad ef93acdc73 remove line break 2022-10-09 11:09:17 +03:00
frostydad 03e570886f Fix incorrect sampler name in output 2022-10-09 11:09:17 +03:00
AUTOMATIC 050a6a798c support loading .yaml config with same name as model
support EMA weights in processing (????)
2022-10-08 23:26:48 +03:00
Aidan Holland 432782163a chore: Fix typos 2022-10-08 22:42:30 +03:00
AUTOMATIC 3b2141c5fb add 'Ignore last layers of CLIP model' option as a parameter to the infotext 2022-10-08 22:21:15 +03:00
MrCheeze 5f85a74b00 fix bug where when using prompt composition, hijack_comments generated before the final AND will be dropped 2022-10-08 15:48:04 +03:00
AUTOMATIC 4999eb2ef9 do not let user choose his own prompt token count limit 2022-10-08 14:25:47 +03:00
Trung Ngo 00117a07ef check specifically for skipped 2022-10-08 13:40:39 +03:00
Trung Ngo 786d9f63aa Add button to skip the current iteration 2022-10-08 13:40:39 +03:00
AUTOMATIC 706d5944a0 let user choose his own prompt token count limit 2022-10-08 13:38:57 +03:00
Milly 1cc36d170a Added job_timestamp to Processed
So `[job_timestamp]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
Milly 070b7d60cf Added styles to Processed
So `[styles]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
AUTOMATIC dbc8a4d351 add generation parameters to images shown in web ui 2022-10-06 20:27:50 +03:00
Jairo Correa b66aa334a9 Merge branch 'master' into fix-vram 2022-10-06 13:41:37 -03:00
AUTOMATIC 5993df24a1 integrate the new samplers PR 2022-10-06 14:12:52 +03:00
AUTOMATIC 5f24b7bcf4 option to let users select which samplers they want to hide 2022-10-06 12:08:59 +03:00
AUTOMATIC c26732fbee added support for AND from https://energy-based-model.github.io/Compositional-Visual-Generation-with-Composable-Diffusion-Models/ 2022-10-05 23:16:27 +03:00
Jairo Correa 82380d9ac1 Removing parts no longer needed to fix vram 2022-10-04 22:31:40 -03:00
Jairo Correa 1f50971fb8 Merge branch 'master' into fix-vram 2022-10-04 19:53:52 -03:00
Rae Fu 90e911fd54 prompt_parser: allow spaces in schedules, add test, log/ignore errors
Only build the parser once (at import time) instead of for each step.

doctest is run by simply executing modules/prompt_parser.py
2022-10-04 20:26:15 +03:00
AUTOMATIC e1b128d8e4 do not touch p.seed/p.subseed during processing #1181 2022-10-04 17:36:39 +03:00
AUTOMATIC 52cef36f6b emergency fix for img2img 2022-10-04 16:54:31 +03:00
AUTOMATIC 6165246124 support interrupting after the previous change 2022-10-04 14:23:22 +03:00
AUTOMATIC 6c6ae28bf5 send all three of GFPGAN's and codeformer's models to CPU memory instead of just one for #1283 2022-10-04 12:32:22 +03:00
Jairo Correa ad0cc85d1f Merge branch 'master' into stable 2022-10-02 18:31:19 -03:00
AUTOMATIC 5f561ee95d Merge remote-tracking branch 'origin/master' 2022-10-02 15:49:59 +03:00
AUTOMATIC 820f1dc96b initial support for training textual inversion 2022-10-02 15:03:39 +03:00
DepFA 9de1e56e2d add sampler_noise_scheduler_override property 2022-10-01 08:08:50 +03:00
Jairo Correa ad1fbbae93 Merge branch 'master' into fix-vram 2022-09-30 18:58:51 -03:00
AUTOMATIC 9a54077d4d repair broken highres fix #1109 2022-09-30 12:26:41 +03:00
Jairo Correa c938679de7 Fix memory leak and reduce memory usage 2022-09-28 22:14:13 -03:00
AUTOMATIC 1deac2b645 do nor add log messages to saved iamge parameters 2022-09-28 18:20:30 +03:00
AUTOMATIC d64b451681 added support for automatically installing latest k-diffusion
added eta parameter to parameters output for generated images
split eta settings into ancestral and ddim (because they have different default values)
2022-09-28 18:09:06 +03:00
AUTOMATIC aea5b2510e save parameters for images when using the Save button. 2022-09-28 17:05:23 +03:00
C43H66N12O12S2 5391c0bf3e
Update processing.py 2022-09-28 05:11:03 +03:00
DepFA 4ea36a37d6 add sampler properties to StableDiffusionProcessing and Processed 2022-09-27 09:30:45 +03:00
Daniel 8dcac9ac81 Grids saving to subdirectory when setting unchecked
Fixed grids saving to subdirectory when the setting is unchecked but "save images to subdirectory" was checked.
2022-09-27 08:58:47 +03:00
AUTOMATIC 31ac0baba0 Reformat some changes from the previous commit. 2022-09-24 08:23:01 +03:00
RnDMonkey ed8b8b3b8c
Fix to XY_Grid script console progress bar and other progress bar improvements (#890)
Fix to XY_Grid script console progress bar and other progress bar improvements #890
2022-09-24 08:09:59 +03:00
Jacob Tyndall 0f77e1852f Clear no longer needed VRAM during a 'highres fix' generation created during the first sampling before doing the second (img2img) sampling. Makes it possible to use the feature on an 8GB card. 2022-09-24 07:41:59 +03:00
AUTOMATIC 1a0353675d Option to use advanced upscalers with normal img2img 2022-09-23 17:37:47 +03:00
Robin Fernandes d26d89377b Remove unnecessary duplication 2022-09-23 00:57:42 +00:00
Robin Fernandes 25eb1e3d90 Add option to save before color correction. Add suffix param when saving files, used for special saves without color correction and face restoration. 2022-09-22 20:54:50 +10:00
AUTOMATIC 91bfc71261 A big rework, just what you were secretly hoping for!
SD upscale moved to scripts
Batch processing script removed
Batch processing added to main img2img and now works with scripts
img2img page UI reworked to use tabs
2022-09-22 12:11:48 +03:00
AUTOMATIC 75dd274dd6 prevent seed extras from having effect when extras checkbox is not checked 2022-09-21 13:34:10 +03:00
AUTOMATIC 19a75d38d7 added --use-textbox-seed option to make long seeds possible from web ui 2022-09-20 20:10:01 +03:00
AUTOMATIC 06cd206107 Enable neural network upscalers for highres. fix 2022-09-20 19:32:26 +03:00
AUTOMATIC b9674e2900 add extra generation params 2022-09-20 19:07:09 +03:00
AUTOMATIC 6d7ca54a1a added highres fix feature 2022-09-19 16:42:56 +03:00
AUTOMATIC 7539f04e28 made 'reuse seed' button give you the seed/subseed of the currently selected picture rather than the first 2022-09-19 09:02:10 +03:00
AUTOMATIC 21086e60a9 Merge remote-tracking branch 'origin/master' 2022-09-18 20:55:55 +03:00
AUTOMATIC 6a28aac866 prevent black screen when seed and variation seed are the same. 2022-09-18 20:44:57 +03:00
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
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
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
Steve Eberhardt f39b2ca088 fixed typos in processing.py 2022-09-17 22:09:52 -07:00
Brian Drupieski 7bc5739fe2 set loopback color corrections on each iteration 2022-09-17 18:18:30 -04: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 247f58a5e7 add support for switching model checkpoints at runtime 2022-09-17 12:05:18 +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 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
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
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
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
AUTOMATIC 9d40212485 first attempt to produce crrect seeds in batch 2022-09-13 21:49:58 +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
AUTOMATIC c84e333622 color correction option for all img2img modes #363 2022-09-13 12:51:57 +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
GRMrGecko fc18e2d483 Adds NSFW content filter option 2022-09-12 19:15:35 -05: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 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 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
AUTOMATIC a1305060ce Variations are not working properly #305 2022-09-12 16:00:46 +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
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
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
JohannesGaessler 13008bab90 Fixed prompt_style type hints: int -> str 2022-09-11 12:39:09 +03:00
AUTOMATIC b3311a50dc fix repeating subseeds for every batch #221 2022-09-10 16:16:18 +03:00
Lukas Meller fbdec2ef20 Fix prompt matrix script 2022-09-09 23:40:03 +03:00
AUTOMATIC 86867e153f support for prompt styles
fix broken prompt matrix
2022-09-09 23:16:02 +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 0fedd50886 another change for inpainting at full resolution 2022-09-08 10:03:21 +03:00
AUTOMATIC 700c47a674 big improvements to inpainting and outpainting 2022-09-07 17:00:51 +03:00
AUTOMATIC 6a9b33c848 codeformer support 2022-09-07 12:32:28 +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 fd66199769 added preview option 2022-09-06 19:33:51 +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 a8a58dbac7 re-integrated tiling option as a UI element 2022-09-05 03:25:37 +03:00
AUTOMATIC 7350c71259 added poor man's inpainting script 2022-09-04 01:29:43 +03:00
AUTOMATIC 657074a73d option to invert mask for inpainting 2022-09-03 21:02:38 +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