1580158
/
automatic
mirror of https://github.com/vladmandic/automatic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,867 Commits
3 Branches
29 Tags
109 MiB
Commit Graph

704 Commits (f5c037a7350a8a778e412ced3e53fec8dccb60ce)

Author SHA1 Message Date
Vladimir Mandic 3437132817 update refiner start/end 2023-07-26 20:49:24 -04:00
Vladimir Mandic 33d05fc447 fix upscalers 2023-07-26 15:01:57 -04:00
Vladimir Mandic 75b017e4d1 fix img2img 2023-07-26 14:33:58 -04:00
Vladimir Mandic cd68b342ff fix hires and early parse enabled sections 2023-07-26 13:48:02 -04:00
Vladimir Mandic 62bc9482e6 update themes 2023-07-26 12:47:04 -04:00
Vladimir Mandic c5b089cbb6 major ui simplification 2023-07-26 11:39:58 -04:00
Vladimir Mandic 2a259a8455 fix metadata 2023-07-25 22:02:25 -04:00
Vladimir Mandic 6c02e6a2eb add operations to metadata 2023-07-25 12:28:13 -04:00
Vladimir Mandic aa62f6d8d4 fix refiner batch size 2023-07-25 07:53:47 -04:00
Vladimir Mandic 567faeb751 diffusers img2img and inpaint 2023-07-22 15:39:41 -04:00
Vladimir Mandic dd1d4bcffa fix secondary sampler 2023-07-21 10:20:53 -04:00
Vladimir Mandic a3ab302f51 fix extensions reset 2023-07-20 09:52:21 -04:00
Vladimir Mandic 46709ee391 fix image metadata and diffuser search 2023-07-18 20:41:47 -04:00
Vladimir Mandic 926a0fde1a diffusers code refactoring and exception handling 2023-07-17 12:22:51 -04:00
Vladimir Mandic 7a859cdb18 update diffuser samplers and refiner workflows 2023-07-16 12:56:55 -04:00
Vladimir Mandic e2b33b81d3 fix diffusers samplers 2023-07-15 22:40:03 -04:00
Disty0 f773c782fa ipex cleanup 2023-07-16 01:39:40 +03:00
Vladimir Mandic 5e2fb4d60c fix enable_hr 2023-07-15 07:17:50 -04:00
Vladimir Mandic 02eac9fad3 minor fixes 2023-07-14 20:22:34 -04:00
Vladimir Mandic 8b24efe1b5 rework diffusers args as and introduce second pass as replacement for hires 2023-07-14 15:00:46 -04:00
Disty0 558b71f088 Fix img2img and hires for IPEX 2023-07-14 02:21:52 +03:00
Disty0 d4c9d752f4 Fix latent antialias with IPEX 2023-07-13 23:13:44 +03:00
Vladimir Mandic fdb76ddf12 model load exception handling 2023-07-13 10:45:58 -04:00
Vladimir Mandic fd1adf73c1
Merge pull request #1648 from Kubuxu/feat/unet-dtype 
Use float16 for image processing, use dummy attention head to enable spd flash-attention and memory-efficient attention
 2023-07-13 08:08:38 -04:00
Vladimir Mandic f100e66122 fix refiner prompt 2023-07-13 07:59:43 -04:00
Kubuxu a966a0d5ad Use float16 for image processing, force dtype_vae for encoding 2023-07-12 22:12:03 +01:00
Vladimir Mandic 5c8ead7be0 update diffusers 2023-07-12 15:35:41 -04:00
Vladimir Mandic ec99bad021 enable backend switching on-the-fly 2023-07-11 15:55:02 -04:00
Vladimir Mandic 6d277305f6 update processing 2023-07-11 11:40:53 -04:00
Vladimir Mandic 75a8c1f9d0 enable basic img2img 2023-07-10 11:44:52 -04:00
Vladimir Mandic a16eee1504 bugfix release 2023-07-09 10:06:47 -04:00
Vladimir Mandic 89a7ea6a3f overal quality fixes 2023-07-08 09:49:41 -04:00
Vladimir Mandic bf84ee8168 update diffusers 2023-07-07 12:48:27 -04:00
Vladimir Mandic 1c22722c8c enable sampler swap for diffusers 2023-07-07 10:10:53 -04:00
Vladimir Mandic 3e4ca0095e fix compile 2023-07-07 10:05:32 -04:00
Vladimir Mandic 3e1a6a96d0 add additional pipelines 2023-07-07 09:38:19 -04:00
Vladimir Mandic 7e11ff2b34 add sdxl support 2023-07-06 19:26:43 -04:00
Vladimir Mandic 2524b6659c double package install pass 2023-07-04 16:04:22 -04:00
Vladimir Mandic 18ef9e6fd7 redo diffusers scheduler 2023-07-04 13:07:05 -04:00
Vladimir Mandic b216a35ddd update diffusers and extra networks 2023-07-04 09:28:48 -04:00
Vladimir Mandic 8241e33868 major diffusers update 2023-07-03 16:48:03 -04:00
Vladimir Mandic a2caafe4df initial diffusers merge into dev 2023-07-02 14:04:54 -04:00
Vladimir Mandic c80b1ebc36 stricter lint rules 2023-06-27 10:28:47 -04:00
Vladimir Mandic e9f4ba0215 guard against empty values 2023-06-17 20:41:49 -04:00
Vladimir Mandic 8749067510 cleanup 2023-06-16 16:18:15 -04:00
Vladimir Mandic 0ddf613b49 jumbo merge part two 2023-06-14 11:23:02 -04:00
Vladimir Mandic 1d9e490ef9 ruff linting fixes 2023-06-13 12:22:39 -04:00
Vladimir Mandic cb307399dd jumbo merge 2023-06-13 11:59:56 -04:00
Disty0 eaeb5453b8 Fix show_progress_type 2023-06-07 21:16:11 +03:00
Vladimir Mandic aaa0d46286 update installer and add sd_model_dict 2023-06-07 13:26:21 -04:00
Vladimir Mandic 63ca5c17e7 add extensions profiling 2023-06-04 12:14:05 -04:00
Vladimir Mandic 549c02a874 minor fixes 2023-06-03 10:37:02 -04:00
cool-bigdogs-tshirt 3889e5a5b0 add new VAE encoding strategy during HR fix 2023-06-02 19:35:57 -05:00
Vladimir Mandic d25b020f61 update 2023-06-02 12:29:21 -04:00
Vladimir Mandic 251dc341f9 restruct html/js and cleanup 2023-06-01 17:44:15 -04:00
Vladimir Mandic 02c9640fa5 enhance image saving 2023-06-01 15:44:38 -04:00
Vladimir Mandic 364df7036e redo progressbar 2023-06-01 11:43:28 -04:00
Vladimir Mandic c39553c4ed fix ensd 2023-05-30 16:50:36 -04:00
Vladimir Mandic b664991633 update samplers 2023-05-30 12:18:22 -04:00
Vladimir Mandic 5f1fd7bd66 update common ui 2023-05-29 13:43:03 -04:00
Vladimir Mandic 54257dd226 refactoring for pylint 2023-05-28 17:09:58 -04:00
Vladimir Mandic efd3810860 diffusers merge 2023-05-26 22:42:03 -04:00
Vladimir Mandic cb62c2f6ad fix plms fallback 2023-05-25 13:25:26 -04:00
Vladimir Mandic d36b16d03f refactor api auth 2023-05-23 14:31:22 -04:00
Vladimir Mandic ea0780339a fixes 2023-05-21 08:17:36 -04:00
Vladimir Mandic f8f81f86e6 update prompt parser and image size 2023-05-20 13:12:50 -04:00
Vladimir Mandic 794b23cc2b add parser to infotext 2023-05-19 16:56:08 -04:00
Vladimir Mandic df65e8e30a update clip skip and attention normalization 2023-05-18 22:16:24 -04:00
Vladimir Mandic 0ccda9bc8b jumbo patch 2023-05-17 14:15:55 -04:00
Vladimir Mandic 85d67d6331 add interrupt to processing 2023-05-14 12:13:44 -04:00
Vladimir Mandic a2485cf7ef update 2023-05-12 21:12:24 -04:00
Vladimir Mandic 62dda471a3 process images in threads 2023-05-12 14:21:26 -04:00
Vladimir Mandic 1943bfea88 use cudnn workaround 2023-05-11 22:24:12 -04:00
Vladimir Mandic 1288aec459 correct metadata before/after 2023-05-09 09:09:31 -04:00
Vladimir Mandic 2af0e0c8a1 change temp files to image files 2023-05-08 09:27:50 -04:00
Vladimir Mandic 41182009cb switch some cmdopts to opts 2023-05-08 09:27:50 -04:00
Vladimir Mandic 1360c6422a add fp16 test 2023-05-08 09:27:50 -04:00
Vladimir Mandic c470f39913 merge fixes 2023-05-04 16:55:41 -04:00
Vladimir Mandic 865c0bc7a3 merge from upstream 2023-05-04 07:51:38 -04:00
Disty0 8171d57c36 Remove unnecessary IPEX imports 2023-05-04 02:34:34 +03:00
Vladimir Mandic cb4cff3929 redesign logging 2023-05-02 13:57:16 -04:00
Vladimir Mandic dedd3ffafb fix script api 2023-04-30 20:08:44 -04:00
Disty0 de8d0bef9f More patches and Import IPEX after Torch 2023-04-30 18:19:37 +03:00
Disty0 b075d3c8fd Intel ARC Support 2023-04-30 15:13:56 +03:00
Vladimir Mandic ba50dbbdbf add memory monitor 2023-04-29 17:36:45 -04:00
Vladimir Mandic 408147d9c4 critical fix 2023-04-29 13:25:20 -04:00
Vladimir Mandic cd580866a7 fix awalys on script args 2023-04-29 12:37:36 -04:00
Vladimir Mandic 4e05d95ee0 fix prompts from file 2023-04-29 08:58:32 -04:00
cool-bigdogs-tshirt a78ce0a3ca xyz override for latent upscaler fallback 2023-04-28 22:32:01 -05:00
cool-bigdogs-tshirt 9a09b2eef3 attempt at unipc latent upscaling 
i should have taken linear algebra before i dropped out...
 2023-04-28 20:41:05 -05:00
Vladimir Mandic 99e3fceedb cleanup scripts 2023-04-28 13:09:34 -04:00
Vladimir Mandic 1f6261be80 jumbo patch 2023-04-27 13:12:20 -04:00
Vladimir Mandic ba02d0c2e8 fix realesrgan path, secondary sampler 2023-04-27 09:22:10 -04:00
Vladimir Mandic 6981262beb validate script_args 2023-04-25 19:02:43 -04:00
Vladimir Mandic bb438efed4 update geninfo 2023-04-25 09:53:11 -04:00
Vladimir Mandic 986bc340ca
Merge pull request #438 from Sakura-Luna/pr9295 
Add bf16 support for VAE
 2023-04-24 11:36:28 -04:00
Vladimir Mandic 5b9187d38b combo patch 2023-04-24 10:30:23 -04:00
Sakura-Luna 458a78e4de
Merge branch 'master' into pr9295 2023-04-24 13:19:57 +08:00
Vladimir Mandic d3fbd798fb add setup.log note 2023-04-22 09:30:09 -04:00
Vladimir Mandic e02415b41e
Merge pull request #255 from catboxanon/patch/9092 
Patch/9092
 2023-04-21 09:13:11 -04:00
Vladimir Mandic 5739c8892f
Merge pull request #256 from catboxanon/patch/sampler-schedule-fix 
Patch/sampler schedule fix
 2023-04-21 09:12:45 -04:00
papuSpartan 9e8dc9843c port to vlad 2023-04-21 03:18:08 -05:00
Vladimir Mandic 7939a1649d parse model preload 2023-04-20 23:19:25 -04:00
Vladimir Mandic 0e7144186d jump patch 2023-04-20 11:20:27 -04:00
catboxanon 9de7298898
Update processing.py 2023-04-16 21:06:37 -04:00
catboxanon 4d0c816303
Modify step multiplier flow 2023-04-16 20:39:45 -04:00
catboxanon 56f8a6b081
Fix sampler schedules with step multiplier 2023-04-16 20:34:52 -04:00
Vladimir Mandic ed8819b8fc lycoris, strong linting, model keyword, circular imports 2023-04-15 10:28:31 -04:00
catboxanon fbab3fc6d1
Only handle image mask if any option enabled 2023-04-14 17:24:55 -04:00
catboxanon 3af152d488
Fix image mask composite for weird resolutions 2023-04-14 17:17:14 -04:00
Vladimir Mandic 81b8294e93 switch cmdflags to settings 2023-04-12 10:40:11 -04:00
Sakura-Luna d19d227138
Add startup parameters and version check 2023-04-06 19:52:18 +08:00
Sakura-Luna 4aa115d5c1
Add bf16 support. 2023-04-02 17:28:44 +08:00
Vladimir Mandic 86b83fc956
Merge pull request #66 from AUTOMATIC1111/master 
merge from upstream
 2023-03-28 16:43:39 -04:00
AUTOMATIC 433b3ab701 Revert "Merge pull request #7931 from space-nuko/img2img-enhance" 
This reverts commit 4268759370, reversing
changes made to 1b63afbedc.
 2023-03-28 20:36:57 +03:00
AUTOMATIC1111 4268759370
Merge pull request #7931 from space-nuko/img2img-enhance 
Add `Upscale by` and `Upscaler` options to img2img
 2023-03-28 20:21:25 +03:00
AUTOMATIC1111 f1db987e6a
Merge pull request #8958 from MrCheeze/variations-model 
Add support for the unclip (Variations) models, unclip-h and unclip-l
 2023-03-28 19:39:20 +03:00
MrCheeze 8a34671fe9 Add support for the Variations models (unclip-h and unclip-l) 2023-03-25 21:03:07 -04:00
space-nuko 7ea5d395c4 Add upscaler to img2img 2023-03-25 12:52:43 -04:00
space-nuko 68999d0b15 Add upscale slider to img2img 2023-03-25 12:52:35 -04:00
Vladimir Mandic f181885f0c
Merge pull request #57 from AUTOMATIC1111/master 
merge from upstream
 2023-03-25 08:47:00 -04:00
catboxanon caf84e8233 Expose inpainting mask and composite 
For inpainting, this exposes the mask and masked composite and gives
the user the ability to display these in the web UI,
save to disk, or both.
 2023-03-22 17:51:40 +00:00
Vladimir Mandic df51949f3b
Merge pull request #53 from AUTOMATIC1111/master 
merge from upstream
 2023-03-14 07:58:58 -04:00
high_byte 4d26c7da57 initialize extra_network_data before use 2023-03-13 17:37:29 +02:00
Vladimir Mandic 86e89e5446
Merge pull request #46 from AUTOMATIC1111/master 
merge from upstream
 2023-03-11 08:02:09 -05:00
AUTOMATIC1111 da3f942ab2
Merge pull request #8017 from space-nuko/before-process-batch 
Add `before_process_batch` script callback
 2023-03-11 14:33:38 +03:00
space-nuko ac38ad7e60 Merge remote-tracking branch 'origin/master' into unipc 2023-03-10 19:42:46 -05:00
Vladimir Mandic 2dabba9190
Merge pull request #40 from space-nuko/unipc 
integrate unipc sampler
 2023-03-10 09:57:24 -05:00
Vladimir Mandic 679320a764 add profiler 2023-02-28 10:04:25 -05:00
space-nuko a2d635ad13 Add before_process_batch script callback 2023-02-22 01:52:53 -08:00
AUTOMATIC 15f4b217b1 fix the a merge conflict resolve i did that entirely breaks image generation 2023-02-19 09:50:14 +03:00
AUTOMATIC1111 6911deb242
Merge branch 'master' into fix-save-params-2 2023-02-19 09:15:45 +03:00
space-nuko b20737815a Fix params.txt saving for infotexts modified by process_batch 2023-02-16 21:44:46 -08:00
space-nuko 0a4917ac40 Apply extra networks per-batch instead of per-session (fixes wildcards) 2023-02-13 03:33:28 -08:00
space-nuko fb274229b2 bug fix 2023-02-10 14:30:35 -08:00
space-nuko c88dcc20d4 UniPC does not support img2img (for now) 2023-02-10 05:00:54 -08:00
space-nuko 1253199889 Working UniPC (for batch size 1) 2023-02-10 03:30:20 -08:00
Kyle c27c0de0f7 txt2img Hires Fix 2023-02-03 19:15:32 -05:00
Kyle 6c6c6636bb Image CFG Added (Full Implementation) 
Uses separate denoiser for edit (instruct-pix2pix) models

No impact to txt2img or regular img2img

"Image CFG Scale" will only apply to instruct-pix2pix models and metadata will only be added if using such model
 2023-02-03 18:19:56 -05:00
Kyle 3b2ad20ac1 Processing only, no CFGDenoiser change 
Allows instruct-pix2pix
 2023-02-02 19:19:45 -05:00
Kyle cf0cfefe91 Revert "instruct-pix2pix support" 
This reverts commit 269833067d.
 2023-02-02 19:15:38 -05:00
Kyle 269833067d instruct-pix2pix support 2023-02-02 09:37:01 -05:00
AUTOMATIC 040ec7a80e make the program read Eta and Eta DDIM from generation parameters 2023-01-30 10:47:09 +03:00
AUTOMATIC 00dab8f10d remove Batch size and Batch pos from textinfo (goodbye) 2023-01-29 11:53:24 +03:00
AUTOMATIC1111 fecb990deb
Merge pull request #7309 from brkirch/fix-embeddings 
Fix embeddings, upscalers, and refactor `--upcast-sampling`
 2023-01-28 18:44:36 +03:00
brkirch ada17dbd7c Refactor conditional casting, fix upscalers 2023-01-28 04:16:25 -05:00
Max Audron 5eee2ac398 add data-dir flag and set all user data directories based on it 2023-01-27 14:44:30 +01:00
AUTOMATIC 7a14c8ab45 add an option to enable sections from extras tab in txt2img/img2img 
fix some style inconsistenices
 2023-01-26 23:31:32 +03:00
brkirch 10421f93c3 Fix full previews, --no-half-vae 2023-01-26 01:43:35 -05:00
AUTOMATIC d1d6ce2983 add edit_image_conditioning from my earlier edits in case there's an attempt to inegrate pix2pix properly 
this allows to use pix2pix model in img2img though it won't work well this way
 2023-01-25 23:25:25 +03:00
AUTOMATIC1111 1574e96729
Merge pull request #6510 from brkirch/unet16-upcast-precision 
Add upcast options, full precision sampling from float16 UNet and upcasting attention for inference using SD 2.1 models without --no-half
 2023-01-25 19:12:29 +03:00
AUTOMATIC 57c1baa774 change to code for live preview fix on OSX to be bit more obvious 2023-01-25 18:56:23 +03:00
brkirch e3b53fd295 Add UI setting for upcasting attention to float32 
Adds "Upcast cross attention layer to float32" option in Stable Diffusion settings. This allows for generating images using SD 2.1 models without --no-half or xFormers.

In order to make upcasting cross attention layer optimizations possible it is necessary to indent several sections of code in sd_hijack_optimizations.py so that a context manager can be used to disable autocast. Also, even though Stable Diffusion (and Diffusers) only upcast q and k, unfortunately my findings were that most of the cross attention layer optimizations could not function unless v is upcast also.
 2023-01-25 01:13:04 -05:00
brkirch 84d9ce30cb Add option for float32 sampling with float16 UNet 
This also handles type casting so that ROCm and MPS torch devices work correctly without --no-half. One cast is required for deepbooru in deepbooru_model.py, some explicit casting is required for img2img and inpainting. depth_model can't be converted to float16 or it won't work correctly on some systems (it's known to have issues on MPS) so in sd_models.py model.depth_model is removed for model.half().
 2023-01-25 01:13:02 -05:00
brkirch f64af77adc Fix different first gen with Approx NN previews 
The loading of the model for approx nn live previews can change the internal state of PyTorch, resulting in a different image. This can be avoided by preloading the approx nn model in advance.
 2023-01-23 22:49:20 -05:00
AUTOMATIC 78f59a4e01 enable compact view for train tab 
prevent  previews from ruining hypernetwork training
 2023-01-22 00:02:51 +03:00
AUTOMATIC 3deea34135 extract extra network data from prompt earlier 2023-01-21 19:36:08 +03:00
AUTOMATIC 92fb1096db make it so that extra networks are not removed from infotext 2023-01-21 16:41:25 +03:00
AUTOMATIC 40ff6db532 extra networks UI 
rework of hypernets: rather than via settings, hypernets are added directly to prompt as <hypernet:name:weight>
 2023-01-21 08:36:07 +03:00
AUTOMATIC1111 a8322ad75b
Merge pull request #6854 from EllangoK/master 
Saves Extra Generation Parameters to params.txt
 2023-01-18 23:25:56 +03:00
AUTOMATIC b186d44dcd use DDIM in hires fix is the sampler is PLMS 2023-01-18 23:20:23 +03:00
EllangoK 5e15a0b422 Changed params.txt save to after manual init call 2023-01-17 11:42:44 -05:00
AUTOMATIC e0e8005009 make StableDiffusionProcessing class not hold a reference to shared.sd_model object 2023-01-16 23:09:08 +03:00
AUTOMATIC 9991967f40 Add a check and explanation for tensor with all NaNs. 2023-01-16 22:59:46 +03:00
AUTOMATIC f9ac3352cb change hypernets to use sha256 hashes 2023-01-14 10:25:37 +03:00
space-nuko 88416ab5ff Fix extension parameters not being saved to last used parameters 2023-01-12 13:46:59 -08:00
AUTOMATIC d4fd2418ef add an option to use old hiresfix width/height behavior 
add a visual effect to inactive hires fix elements
 2023-01-09 14:57:47 +03:00
noodleanon 50e2536279
Merge branch 'AUTOMATIC1111:master' into img2img-api-scripts 2023-01-07 14:18:09 +00:00
AUTOMATIC 1a5b86ad65 rework hires fix preview for #6437: movie it to where it takes less place, make it actually account for all relevant sliders and calculate dimensions correctly 2023-01-07 09:56:37 +03:00
noodleanon b5253f0dab
allow img2img api to run scripts 2023-01-05 21:21:48 +00:00
AUTOMATIC 847f869c67 experimental optimization 2023-01-05 21:00:52 +03:00
AUTOMATIC 2e30997450 move sd_model assignment to the place where we change the sd_model 2023-01-05 10:21:17 +03:00
Philpax 83ca8dd0c9
Merge branch 'AUTOMATIC1111:master' into fix-sd-arch-switch-in-override-settings 2023-01-05 05:00:58 +01:00
AUTOMATIC 99b67cff0b make hires fix not do anything if the user chooses the second pass resolution to be the same as first pass resolution 2023-01-05 01:25:52 +03:00
AUTOMATIC bc43293c64 fix incorrect display/calculation for number of steps for hires fix in progress bars 2023-01-04 23:56:43 +03:00
AUTOMATIC 8149078094 added the option to specify target resolution with possibility of truncating for hires fix; also sampling steps 2023-01-04 22:04:40 +03:00
AUTOMATIC 097a90b88b add XY plot parameters to grid image and do not add them to individual images 2023-01-04 19:19:11 +03:00
AUTOMATIC 525cea9245 use shared function from processing for creating dummy mask when training inpainting model 2023-01-04 17:58:07 +03:00
AUTOMATIC 4d66bf2c0d add infotext to "-before-highres-fix" images 2023-01-04 17:24:46 +03:00
AUTOMATIC1111 6281c1bdb4
Merge pull request #6299 from stysmmaker/feat/latent-upscale-modes 
Add more latent upscale modes
 2023-01-04 13:47:36 +03:00
MMaker 15fd0b8bc4
Update processing.py 2023-01-04 05:12:54 -05:00
MMaker e5b7ee910e
fix: Save full res of intermediate step 2023-01-04 04:22:01 -05:00
AUTOMATIC e9fb9bb0c2 fix hires fix not working in API when user does not specify upscaler 2023-01-03 17:40:20 +03:00
AUTOMATIC ef27a18b6b Hires fix rework 2023-01-02 19:42:10 +03:00
AUTOMATIC f4535f6e4f make it so that memory/embeddings info is displayed in a separate UI element from generation parameters, and is preserved when you change the displayed infotext by clicking on gallery images 2022-12-31 23:40:55 +03:00
AUTOMATIC 4af3ca5393 make it so that blank ENSD does not break image generation 2022-12-26 10:11:28 +03:00
Philpax fa931733f6 fix(api): assign sd_model after settings change 2022-12-25 20:17:49 +11:00
AUTOMATIC1111 064f7b8fd2
Merge pull request #5718 from space-nuko/feature/save-hypernetwork-hash 
Save hypernetwork hash and fix hypernetwork parameter restoring
 2022-12-24 11:14:19 +03:00
AUTOMATIC c0a8401b5a rename the option for img2img latent upscale 2022-12-24 11:12:17 +03:00
AUTOMATIC1111 b2dbd4d698
Merge pull request #5521 from AndrewRyanChama/ryan/img2imglatentscale 
Add latent upscale option to img2img
 2022-12-24 11:10:35 +03:00
AUTOMATIC1111 7578b50ba6
Merge pull request #5873 from philpax/override-settings-restore-afterwards 
feat(api): add override_settings_restore_afterwards
 2022-12-24 10:15:04 +03:00
AUTOMATIC1111 fac92610d2
Merge pull request #5753 from calvinballing/master 
Fix various typos
 2022-12-24 09:58:28 +03:00
AUTOMATIC 9441c28c94 add an option for img2img background color 2022-12-24 09:46:35 +03:00
Philpax 22f1527fa7 feat(api): add override_settings_restore_afterwards 2022-12-20 20:36:49 +11:00
Jim Hays c0355caefe Fix various typos 2022-12-14 21:01:32 -05:00
space-nuko 7077428209 Save hypernetwork hash in infotext 2022-12-13 13:05:40 -08:00
ThereforeGames 2e8b5418e3
Improve color correction with luminosity blend 2022-12-11 18:03:36 -05:00
AUTOMATIC1111 94a35ca9d6
Merge pull request #5191 from aliencaocao/enable_checkpoint_switching_in_override_settings 
Support changing checkpoint and vae through override_settings
 2022-12-10 16:29:40 +03:00
AUTOMATIC 991e2dcee9 remove NSFW filter and its dependency; if you still want it, find it in the extensions section 2022-12-10 14:54:16 +03:00
AUTOMATIC bab91b1279 add Noise multiplier option to infotext 2022-12-10 09:51:26 +03:00
AUTOMATIC1111 8ee1acc1e4
Merge pull request #5373 from mezotaken/master 
add noise strength parameter similar to NAI
 2022-12-10 09:36:24 +03:00
Jay Smith 1ed4f0e228 Depth2img model support 2022-12-08 20:50:08 -06:00
Andrew Ryan 358a8628f6 Add latent upscale option to img2img 
Recently, the option to do latent upscale was added to txt2img highres
fix. This feature runs by scaling the latent sample of the image, and
then running a second pass of img2img.

But, in this edition of highres fix, the image and parameters cannot be
changed between the first pass and second pass. We might want to do a
fixup in img2img before doing the second pass, or might want to run the
second pass at a different resolution.

This change adds the option for img2img to perform its upscale in latent
space, rather than image space, giving very similar results to highres
fix with latent upscale.  The result is not exactly the same because
there is an additional latent -> decoder -> image -> encoder -> latent
that won't happen in highres fix, but this conversion has relatively
small losses
 2022-12-08 07:09:09 +00:00
Vladimir Repin cf3e844d1d add noise strength parameter similar to NAI 2022-12-03 18:05:47 +03:00
AUTOMATIC1111 d2e5b4edfa
Merge pull request #5251 from adieyal/bug/negative-prompt-infotext 
Fixed incorrect negative prompt text in infotext
 2022-12-03 10:21:43 +03:00
Adi Eyal a44994e2c9 Fixed incorrect negative prompt text in infotext 
Previously only the first negative prompt in all_negative_prompts was
being used for infotext. This fixes that by selecting the index-th
negative prompt
 2022-11-30 15:23:53 +02:00
Billy Cao 9a8678f61e Support changing checkpoint and vae through override_settings 2022-11-29 11:11:29 +08:00
klimaleksus 67efee33a6
Make VAE step sequential to prevent VRAM spikes 2022-11-28 16:29:43 +05:00
AUTOMATIC 40ca34b837 fix for broken sampler selection in img2img and xy plot #4860 #4909 2022-11-27 13:17:39 +03:00
AUTOMATIC1111 828438b4a1
Merge pull request #4120 from aliencaocao/enable-override-hypernet 
Enable override_settings to take effect for hypernetworks
 2022-11-20 16:49:06 +03:00
AUTOMATIC 413c077969 prevent StableDiffusionProcessingImg2Img changing image_mask field as an alternative solution to #4765 2022-11-19 13:48:59 +03:00
AUTOMATIC 617c5b486f make it possible for StableDiffusionProcessing to accept multiple different negative prompts in a batch 2022-11-19 13:23:25 +03:00
AUTOMATIC1111 e35d8b493f
Merge pull request #4778 from leppie/fix_unbounded_prompt_growth 
Fix unbounded prompt growth/determinism in scripts that loop
 2022-11-19 12:52:55 +03:00
AUTOMATIC 0d702930b0 renamed Inpainting strength infotext to Conditional mask weight, made it only appear if using inpainting model, made it possible to read the setting from it using the blue arrow button 2022-11-19 12:47:52 +03:00
AUTOMATIC1111 ff35ae9abb
Merge pull request #4679 from Eugenii10/inpaint-strength-to-infotext 
Add 'Inpainting strength' to the 'generation_params' of 'infotext' (params.txt or png chunks)
 2022-11-19 12:24:44 +03:00
AUTOMATIC cdc8020d13 change StableDiffusionProcessing to internally use sampler name instead of sampler index 2022-11-19 12:01:51 +03:00
Llewellyn Pritchard 9bbe1e3c2e Fix unbounded prompt growth scripts that loop 2022-11-16 19:19:00 +02:00
KEV 40ae95d532 Fix retrieving value for 'x/y plot' script. 2022-11-14 18:05:59 +10:00
KEV 6fa891b934 Add 'Inpainting strength' to the 'generation_params' dictionary of 'infotext' which is saved into the 'params.txt' or png chunks. 
Value appears only if 'Denoising strength' appears too.
 2022-11-14 00:25:38 +10:00
Billy Cao c13e234444
Merge branch 'master' into enable-override-hypernet 2022-11-06 16:33:08 +08:00
Billy Cao 55ca040958 Resolve conflict 2022-11-06 16:31:44 +08:00
AUTOMATIC eeb0733013 change process_one virtual function for script to process_batch, add extra args and docs 2022-11-04 11:21:40 +03:00
AUTOMATIC1111 c250d2a08f
Merge pull request #4182 from macrosoft/process_one 
Process one
 2022-11-04 11:07:05 +03:00
AUTOMATIC f674c488d9 bugfix: save image for hires fix BEFORE upscaling latent space 2022-11-04 10:45:34 +03:00
AUTOMATIC f2b69709ea move option access checking to options class out of various places scattered through code 2022-11-04 09:42:25 +03:00
random-thoughtss 243253ff4a
Merge branch 'AUTOMATIC1111:master' into master 2022-11-03 15:55:54 -07:00
Artem Zagidulin de64146ad2 add number of itter 2022-11-02 21:30:50 +03:00
Artem Zagidulin a9e979977a process_one 2022-11-02 19:05:01 +03:00
AUTOMATIC eb5e82c7dd do not unnecessarily run VAE one more time when saving intermediate image with hires fix 2022-11-02 12:45:03 +03:00
timntorres 9c67408004
Allow saving "before-highres-fix. (#4150) 
* Save image/s before doing highres fix.
 2022-11-02 12:18:21 +03:00
Jairo Correa c9148b2312 Release processing resources after it finishes 2022-11-01 21:56:47 -03:00
Billy Cao bc60768606 Enable override_settings to take effect for hypernetworks 2022-11-01 23:26:55 +08:00
Jairo Correa af758e97fa Unload sd_model before loading the other 2022-11-01 04:01:49 -03:00
random_thoughtss 71571e3f05 Replaced master branch fix with updated fix. 2022-10-30 00:35:40 -07:00
random-thoughtss 15468c9939
Merge branch 'AUTOMATIC1111:master' into master 2022-10-30 00:30:18 -07:00
AUTOMATIC 61836bd544 shorten Hypernetwork strength in infotext and omit it when it's the default value. 2022-10-30 08:48:53 +03:00
AUTOMATIC1111 470f184176
Merge pull request #3831 from timntorres/3825-save-hypernet-strength-to-info 
Save Hypernetwork strength to infotext.
 2022-10-30 08:47:18 +03:00
AUTOMATIC 05a657dd35 fix broken hires fix 2022-10-30 07:41:56 +03:00
timntorres e709afb0f7 Merge commit 'e7254746bbfbff45099db44a8d4d25dd6181877d' into 3825-save-hypernet-strength-to-info 2022-10-29 14:55:30 -07:00
random_thoughtss 39f55c3c35 Re-add explicit device move 2022-10-29 14:13:02 -07:00
AUTOMATIC 9bb6b6509a add postprocess call for scripts 2022-10-29 22:20:02 +03:00
random_thoughtss 6e2ce4e735 Added image conditioning to latent upscale. 
Only comuted  if the mask weight is not 1.0 to avoid extra memory.
Also includes some code cleanup.
 2022-10-29 10:35:51 -07:00
random_thoughtss 44ab954fab Fix latent upscale highres fix #3888 2022-10-29 10:02:56 -07:00
timntorres 2c4d203884 Revert "Explicitly state when Hypernet is none." 2022-10-29 00:36:51 -07:00
timntorres e98f72be33
Merge branch 'AUTOMATIC1111:master' into 3825-save-hypernet-strength-to-info 2022-10-29 00:31:23 -07:00
timntorres c0677b3316 Explicitly state when Hypernet is none. 2022-10-27 23:31:45 -07:00
timntorres 9e465c8aa5 Add strength to textinfo. 2022-10-27 23:03:34 -07:00
random_thoughtss 26a3fd2fe9 Highres fix works with unmasked latent. 
Also refactor the mask creation to make it more accesible.
 2022-10-27 11:27:59 -07:00
random-thoughtss f3f2ffd448
Merge branch 'AUTOMATIC1111:master' into master 2022-10-27 11:19:12 -07:00
AUTOMATIC 1e428238db add override_settings to API as an alternative to #3629 2022-10-26 11:47:17 +03:00
random_thoughtss 8b4f32779f Switch to a continous blend for cond. image. 2022-10-25 13:15:08 -07:00
random_thoughtss 605d27687f Added conditioning image masking to xy_grid. 
Use `True` and `False` to select values.
 2022-10-25 12:20:54 -07:00
random_thoughtss f9549d1cbb Added option to use unmasked conditioning image. 2022-10-25 11:14:12 -07:00
AUTOMATIC 6cbb04f7a5 fix #3517 breaking txt2img 2022-10-24 09:15:26 +03:00
Vladimir Repin f2cc3f32d5 fix whitespaces 2022-10-24 08:58:56 +03:00
Vladimir Repin 9741969325 Save properly processed image before color correction 2022-10-24 08:58:56 +03:00
Stephen 9e1a8b7734 non-implemented mask with any type 2022-10-23 09:26:56 +03:00
Stephen a7c213d0f5 [API][Feature] - Add img2img API endpoint 2022-10-23 09:26:56 +03:00
AUTOMATIC ca5a9e79dc fix for img2img color correction in a batch #3218 2022-10-22 22:06:54 +03:00
AUTOMATIC 324c7c732d record First pass size as 0x0 for #3328 2022-10-22 20:09:51 +03:00
AUTOMATIC 2b91251637 removed aesthetic gradients as built-in 
added support for extensions
 2022-10-22 12:23:58 +03:00
timntorres fccad18a59 Refer to Hypernet's name, sensibly, by its name variable. 2022-10-21 16:52:24 +03:00
AUTOMATIC df57064093 do not load aesthetic clip model until it's needed 
add refresh button for aesthetic embeddings
add aesthetic params to images' infotext
 2022-10-21 16:10:51 +03:00
AUTOMATIC bf30673f51 Fix Hypernet infotext string split bug for PR #3283 2022-10-21 10:19:25 +03:00
AUTOMATIC 4587218190 updated readme and some small stylistic changes to code 2022-10-21 09:00:39 +03:00
random_thoughtss 92a17a7a4a Made dummy latents smaller. Minor code cleanups 2022-10-20 09:45:03 -07:00
random_thoughtss aa7ff2a197 Fixed non-square highres fix generation 2022-10-19 21:46:13 -07:00
random_thoughtss c418467c03 Don't compute latent mask if were not using it. Also added support for fixed highres_fix generation. 2022-10-19 15:09:43 -07:00
random_thoughtss 8e7097d06a Added support for RunwayML inpainting model 2022-10-19 13:47:45 -07:00
timntorres 5e012e4dfa Infotext saves more specific hypernet name. 2022-10-19 20:20:25 +03:00
AUTOMATIC 5daf9cbb98 Merge remote-tracking branch 'origin/api' 2022-10-19 08:44:51 +03:00
AUTOMATIC cbf15edbf9 remove dependence on TQDM for sampler progress/interrupt functionality 2022-10-18 17:23:38 +03:00
arcticfaded f80e914ac4 example API working with gradio 2022-10-17 19:10:36 +00:00
arcticfaded 60251c9456 initial prototype by borrowing contracts 2022-10-17 11:34:22 +03:00
CookieHCl c9836279f5 Only make output dir when creating output 2022-10-16 16:36:06 +03:00
AUTOMATIC 0c5fa9a681 do not reload embeddings from disk when doing textual inversion 2022-10-16 09:09:04 +03:00
AUTOMATIC 97f0727489 add First pass size always regardless of whether it was auto chosen or specified 2022-10-15 15:47:02 +03:00
AUTOMATIC f7ca63937a bring back scale latent option in settings 2022-10-15 13:23:12 +03:00
githublsx a13af34b90 Set to -1 when seed input is none 2022-10-15 10:12:16 +03:00
AUTOMATIC 368f4cc4c7 set firstpass w/h to 0 by default and rever to old behavior when any are 0 2022-10-14 23:19:05 +03:00
AUTOMATIC e644b5a80b remove scale latent and no-crop options from hires fix 
support copy-pasting new parameters for hires fix
 2022-10-14 17:03:03 +03:00
Buckzor b382de2d77 Fixed Scale ratio problem 2022-10-14 16:47:16 +03:00
Buckzor 40d1c6e423 Option between stretch and crop for Highres. fix 2022-10-14 16:47:16 +03:00
Buckzor b2261b53ae Added first_pass_width and height as adjustable inputs to "High Res Fix" 2022-10-14 16:47:16 +03:00
Trung Ngo e72adc999b Restore last generation params 2022-10-13 12:21:20 +03:00
AUTOMATIC 39919c40dd add eta noise seed delta option 2022-10-10 20:32:44 +03:00
AUTOMATIC 8f1efdc130 --no-half-vae pt2 2022-10-10 17:03:45 +03:00
AUTOMATIC 7349088d32 --no-half-vae 2022-10-10 16:16:29 +03:00
AUTOMATIC 8d340cfb88 do not add clip skip to parameters if it's 1 or 0 2022-10-09 22:31:35 +03:00
Fampai ec2bd9be75 Fix issues with CLIP ignore option name change 2022-10-09 22:31:23 +03:00
AUTOMATIC e6e8cabe0c change up #2056 to make it work how i want it to plus make xy plot write correct values to images 2022-10-09 14:57:48 +03:00
William Moorehouse 594cbfd8fb Sanitize infotext output (for now) 2022-10-09 14:49:15 +03:00
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