Commit Graph

357 Commits

Author SHA1 Message Date
AUTOMATIC ff0e17174f rework hires prompts/sampler code to among other things support different extra networks in first/second pass
rework quoting for infotext items that have commas in them to use json (should be backwards compatible except for cases where it didn't work previously)
add some locals from processing function into the Processing class as fields
2023-05-18 20:16:09 +03:00
AUTOMATIC 5ec2c294ee Merge remote-tracking branch 'InvincibleDude/improved-hr-conflict-test' into hires-fix-ext 2023-05-18 17:57:16 +03:00
AUTOMATIC 44c37f94e1 add messages about Loras that failed to load to UI 2023-05-18 16:36:30 +03:00
AUTOMATIC 9fd6c1e343 move some settings to the new Optimization page
add slider for token merging for img2img
rework StableDiffusionProcessing to have the token_merging_ratio field
fix a bug with applying png optimizations for live previews when they shouldn't be applied
2023-05-17 20:22:54 +03:00
Aarni Koskela 315f109427 Copy s_min_uncond to Processed
Should fix #10416
2023-05-17 10:26:32 +03:00
AUTOMATIC a61cbef02c add second_order field to sampler config 2023-05-16 12:36:15 +03:00
AUTOMATIC cdac5ace14 suppress ENSD infotext for samplers that don't use it 2023-05-16 11:54:02 +03:00
papuSpartan c2fdb44880 fix for img2img 2023-05-13 11:11:02 -05:00
papuSpartan ac83627a31 heavily simplify 2023-05-13 10:23:42 -05:00
papuSpartan 55e52c878a remove command line option 2023-05-13 09:24:56 -05:00
papuSpartan 75b3692920 Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into tomesd 2023-05-11 22:40:17 -05:00
Aarni Koskela 49a55b410b Autofix Ruff W (not W605) (mostly whitespace) 2023-05-11 20:29:11 +03:00
AUTOMATIC f741a98bac imports cleanup for ruff 2023-05-10 08:43:42 +03:00
AUTOMATIC 96d6ca4199 manual fixes for ruff 2023-05-10 08:25:25 +03:00
Aarni Koskela 3ba6c3c83c Fix up string formatting/concatenation to f-strings where feasible 2023-05-09 22:25:39 +03:00
AUTOMATIC ab4ab4e595 add version to infotext, footer and console output when starting 2023-05-08 15:23:49 +03:00
papuSpartan e960781511 fix maximum downsampling option 2023-05-03 13:12:43 -05:00
papuSpartan f08ae96115 resolve merge conflicts and swap to dev branch for now 2023-05-03 02:21:50 -05:00
w-e-w 0d1ef296b9 checkpoint override enhancement 2023-05-01 05:22:53 +09:00
AUTOMATIC1111 e7d624574d
Merge branch 'dev' into master 2023-04-29 16:41:01 +03:00
AUTOMATIC 7428fb5176 add is_hr_pass field for processing 2023-04-29 16:28:51 +03:00
AUTOMATIC 1d11e89698 rework Negative Guidance minimum sigma to work with AND, add infotext and copypaste parameters support 2023-04-29 15:57:09 +03:00
AUTOMATIC1111 3591eefedf
Merge pull request #9177 from devNegative-asm/master
(Optimization) Option to remove negative conditioning at low sigma values
2023-04-29 14:38:25 +03:00
AUTOMATIC1111 32c3b97669
Merge pull request #9628 from catboxanon/patch/9092
Fix image mask/composite for weird resolutions
2023-04-29 13:21:32 +03:00
AUTOMATIC1111 d6a3988b86
Merge pull request #9669 from catboxanon/patch/sampler-schedule-fix
Fix prompt schedule for second order samplers
2023-04-29 12:56:57 +03:00
AUTOMATIC 5fe0dd79be rename CPU RNG to RNG source in settings, add infotext and parameters copypaste support to RNG source 2023-04-29 11:29:37 +03: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
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
papuSpartan 1c11062603 add token merging options to infotext when necessary. Bump tomesd
version
2023-04-10 03:41:05 -05:00
gk d609f6030e Add [batch_number] and [generation_number] filename patterns 2023-04-07 21:04:46 +09:00
For Sure b3593d0997 Add support for saving init images in img2img 2023-04-06 19:42:26 +03:00
papuSpartan 5c8e53d5e9 Allow different merge ratios to be used for each pass. Make toggle cmd flag work again. Remove ratio flag. Remove warning about controlnet being incompatible 2023-04-04 02:26:44 -05:00
papuSpartan c707b7df95 remove excess condition 2023-04-01 23:47:10 -05:00
papuSpartan a609bd56b4 Transition to using settings through UI instead of cmd line args. Added feature to only apply to hr-fix. Install package using requirements_versions.txt 2023-04-01 22:18:35 -05:00
devdn 42082e8a32 performance increase 2023-03-28 20:56:01 -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
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
InvincibleDude f5e4436453
Merge branch 'master' into improved-hr-conflict-test 2023-03-14 16:55:59 +03:00
high_byte 4d26c7da57 initialize extra_network_data before use 2023-03-13 17:37:29 +02: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
InvincibleDude f6e2737840
Negative prompt fix 2023-03-10 12:13:55 +00:00