Commit Graph

300 Commits

Author SHA1 Message Date
AUTOMATIC1111 ce049c471b
Merge pull request #4368 from byzod/master
fix #3451 scripts ignores file format settings for grids
2022-12-03 10:31:08 +03:00
kaneda2004 950d9c739e Update SD Upscaler to include user selectable Scale Factor 2022-11-28 12:29:49 -08:00
kaneda2004 91226829f8 Update SD Upscaler to include user selectable Scale Factor 2022-11-28 12:28:22 -08:00
kaneda2004 0202547696 Update SD Upscaler to include user selectable Scale Factor 2022-11-28 12:24:53 -08:00
AUTOMATIC 10923f9b3a calculate dictionary for sampler names only once 2022-11-27 13:43:10 +03:00
AUTOMATIC 40ca34b837 fix for broken sampler selection in img2img and xy plot #4860 #4909 2022-11-27 13:17:39 +03:00
AUTOMATIC cdc8020d13 change StableDiffusionProcessing to internally use sampler name instead of sampler index 2022-11-19 12:01:51 +03:00
Liam 81f2575df9 updating the displayed generation info when user clicks images in the gallery. feature request 4415 2022-11-09 15:24:31 -05:00
byzod 9cc48fee48
fix scripts ignores file format settings for grids 2022-11-06 10:15:02 +08:00
byzod 4796db85b5
ignores file format settings for grids 2022-11-06 10:12:57 +08:00
AUTOMATIC 4dd898b8c1 do not mess with components' visibility for scripts; instead create group components and show/hide those; this will break scripts that create invisible components and rely on UI but the earlier i make this change the better 2022-11-04 08:38:19 +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
AUTOMATIC 55688c4880 rename the seed option from #4146 2022-11-02 07:02:45 +03:00
Keith Dreibelbis 315bd7c9e8 prompts_from_file: allow random seeds to be preserved for the list of prompts 2022-11-01 19:45:35 -07:00
random-thoughtss f3f2ffd448
Merge branch 'AUTOMATIC1111:master' into master 2022-10-27 11:19:12 -07:00
Tony Beeman 99d728b5b1 Add Iterate Button and Improve PFF UI 2022-10-26 13:26:35 +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 7613ea12f2 Fixed img2imgalt after inpainting update 2022-10-22 19:36:57 +03:00
AUTOMATIC 3d898044e5 batch_size does not affect job count 2022-10-21 17:26:30 +03:00
AUTOMATIC a7aa00d46a Merge remote-tracking branch 'mk2/outpainting-mk2-batch-out' 2022-10-21 17:22:47 +03:00
wywywywy 1fc278bcc6
Fixed job count & single-output grid 2022-10-21 02:38:24 +01:00
random_thoughtss 49533eed9e XY grid correctly re-assignes model when config changes 2022-10-20 16:01:27 -07:00
wywywywy 18df060c3e
Fixed outpainting_mk2 output cropping 2022-10-20 16:16:09 +01:00
wywywywy 91efe138b3
Implemented batch_size logic in outpainting_mk2 2022-10-20 16:02:32 +01:00
wywywywy 4281f255d5
Implemented batch count logic to Outpainting mk2 2022-10-20 15:31:09 +01:00
Greg Fuller cccc5a20fc Safeguard setting restore logic against exceptions
also useful for keeping settings cache and restore logic together, and nice for code reuse (other third party scripts can import this class)
2022-10-17 08:43:41 +03:00
AUTOMATIC 7d6042b908 update for commandline args for btch prompts to parse string properly 2022-10-15 12:00:31 +03:00
AUTOMATIC1111 f42e0aae6d
Merge branch 'master' into master 2022-10-15 10:47:26 +03:00
space-nuko a8f7722e4e Fix XY-plot steps if highres fix is enabled 2022-10-14 14:26:38 -07:00
AUTOMATIC 989a552de3 remove the other Denoising 2022-10-14 22:04:08 +03:00
Naeaeaeaeae 4cc37e4cdf [xy_grid.py] add option denoising_strength 2022-10-14 22:03:33 +03:00
RnDMonkey 02382f7ce4 regression in xy_grid Var. seed fixing 2022-10-14 22:02:21 +03:00
AUTOMATIC 354ef0da3b add hypernetwork multipliers 2022-10-13 20:12:37 +03:00
aoirusann e548fc4aca [img2imgalt] Make sampler's override be optional 2022-10-13 18:03:17 +03:00
aoirusann a4170875b0 [img2imgalt] Add `override` in UI for convenience.
Some params in img2imgalt are fixed,
such as `Sampling method` and  `Denosing Strength`.
And some params should be matched with those in decode, such as `steps`.
2022-10-13 18:03:17 +03:00
Greg Fuller 8711c2fe01 Fix metadata contents 2022-10-13 13:25:29 +03:00
Greg Fuller 94c01aa356 draw_xy_grid provides the option to also return lone images 2022-10-13 13:25:29 +03:00
Milly 2fffd4bddc xy_grid: Refactor confirm functions 2022-10-12 10:40:10 +03:00
Milly 7dba1c07cb xy_grid: Confirm that hypernetwork options are valid before starting 2022-10-12 10:40:10 +03:00
Milly 2d006ce16c xy_grid: Find hypernetwork by closest name 2022-10-12 10:40:10 +03:00
aoirusann f421f2af2d [img2imgalt] Fix seed & Allow batch. 2022-10-12 10:03:46 +03:00
AUTOMATIC 5ba23cb41f change default for XY plot's Y to Nothing. 2022-10-11 17:28:17 +03:00
AUTOMATIC 873efeed49 rename hypernetwork dir to hypernetworks to prevent clash with an old filename that people who use zip instead of git clone will have 2022-10-11 15:51:30 +03:00
AUTOMATIC dce7fc902a Merge remote-tracking branch 'origin/master' 2022-10-11 15:00:16 +03:00
AUTOMATIC 530103b586 fixes related to merge 2022-10-11 14:53:02 +03:00
DepFA 1a0a6a84c3
add incorrect start word guard to xy_grid (#2259) 2022-10-11 11:59:56 +01:00
DepFA a8490e4019
revert sr warning 2022-10-11 11:42:41 +01:00
Rory Grieve 4b460fcb1a
Reset init img in loopback at start of each batch (#2214)
Before a new batch would use the last image from the previous batch. Now
each batch will use the original image for the init image at the start of the
batch.
2022-10-11 11:23:47 +01:00
aperullo 255be75d30
Error if prompt missing SR token to prevent mis-gens (#2209) 2022-10-11 11:16:57 +01:00
AUTOMATIC 5da1ba0e91 remove batch size restriction from X/Y plot 2022-10-10 21:24:11 +03:00
Fampai 84ddd44113 Clip skip variable name change breaks x/y plot script. This fixes that 2022-10-09 22:31:23 +03:00
AUTOMATIC 45bf9a6264 added clip skip to XY plot 2022-10-09 18:58:55 +03:00
AUTOMATIC 2c52f4da7f fix broken samplers in XY plot 2022-10-09 15:01:42 +03:00
AUTOMATIC 542a3d3a4a fix btoken hypernetworks in XY plot 2022-10-09 14:33:22 +03:00
Brendan Byrd a65a45272e Don't change the seed initially if "Keep -1 for seeds" is checked
Fixes #1049
2022-10-09 12:43:56 +03:00
Jesse Williams d74c38108f Confirm that options are valid before starting
When using the 'Sampler' or 'Checkpoint' options, if one of the entered
names has a typo, an error will only be thrown once the `draw_xy_grid`
loop reaches that name. This can waste a lot of time for large grids
with a typo near the end of a list, since the script needs to start over
and re-generate any earlier images to finish making the grid.

Also fixing typo in variable name in `draw_xy_grid`.
2022-10-09 12:39:18 +03:00
Tony Beeman 86cb16886f Pull Request Code Review Fixes 2022-10-09 11:16:38 +03:00
Tony Beeman e2930f9821 Fix for Prompts_from_file showing extra textbox. 2022-10-09 11:16:38 +03:00
frostydad 03e570886f Fix incorrect sampler name in output 2022-10-09 11:09:17 +03:00
AUTOMATIC bad7cb29ce added support for hypernetworks (???) 2022-10-07 10:17:52 +03:00
AUTOMATIC 1069ec49a3 revert back to using list comprehension rather than list and map 2022-10-06 20:16:21 +03:00
DepFA 82eb8ea452 Update xy_grid.py
split vals not 's' from tests
2022-10-06 18:09:49 +03:00
DepFA fd9e049168 strip() split comma delimited lines 2022-10-06 18:09:49 +03:00
DepFA efa61d3168 use csv.reader 2022-10-06 18:09:49 +03:00
DepFA 5d0e6ab856 Allow escaping of commas in xy_grid 2022-10-06 18:09:49 +03:00
AUTOMATIC 5993df24a1 integrate the new samplers PR 2022-10-06 14:12:52 +03:00
C43H66N12O12S2 c1a068ed0a Create alternate_sampler_noise_schedules.py 2022-10-06 13:42:21 +03:00
Jocke a93c3ffbfd Outpainting mk2, prevent generation of a completely random image every time even when global seed is static 2022-10-06 11:23:47 +03:00
AUTOMATIC 556c36b960 add hint, refactor code for #1607 2022-10-04 09:18:00 +03:00
DoTheSneedful 56371153b5 XY plot prompt order simplify logic 2022-10-04 08:56:01 +03:00
DoTheSneedful 1a6d40db35 Fix token ordering in prompt order XY plot 2022-10-04 08:56:01 +03:00
DoTheSneedful 1c5604791d Add a prompt order option to XY plot script 2022-10-04 08:56:01 +03:00
RnDMonkey fe6e2362e8
Update xy_grid.py
Changed XY Plot infotext value keys to not be so generic.
2022-10-02 22:04:28 -07:00
Jocke 2ef69df9a7 Prevent upscaling when None is selected for SD upscale 2022-10-02 21:46:32 +03:00
RnDMonkey b99a4f769f fixed expression error in condition 2022-10-01 14:26:12 -07:00
RnDMonkey eba0c29dbc Updated xy_grid infotext formatting, parser regex 2022-10-01 13:56:29 -07:00
shirase-0 0e77ee24b0 Removed unnecessary library call and added some comments 2022-10-02 00:57:29 +10:00
shirase-0 27fbf3de4a Added tag parsing for prompts from file 2022-10-02 00:43:24 +10:00
DepFA 3f417566b0 Delete alternate_sampler_noise_schedules.py 2022-10-01 08:08:50 +03:00
DepFA bd4fc6633f add script alternate_sampler_noise_schedules 2022-10-01 08:08:50 +03:00
RnDMonkey cf141157e7 Added X/Y plot parameters to extra_generation_params 2022-09-30 22:02:29 -07:00
RnDMonkey 70931652a4 [xy_grid] made -1 seed fixing apply to Var. seed too 2022-09-30 18:02:46 -07:00
AUTOMATIC 84e97a98c5 features updates
unused code removed from outpainting mk2
2022-10-01 00:38:48 +03:00
C43H66N12O12S2 828d6cce72 fix sd_upscale 2022-09-30 12:19:49 +03:00
DepFA f710ba11b9 use closest match checkpoint method 2022-09-30 07:37:05 +03:00
Nick Renieris 498515e7a1 scripts/xy_grid: Handle edge-case with non-empty axis values
Fixes bug where if Type is Nothing and axis values are filled out (from ie. previously using another Type), it will still needlessly run it N times (with identical results).
2022-09-29 21:18:29 +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
DepFA 76d6f7b407 Add DDIM Eta to txt2img in xy_grid 2022-09-27 09:30:45 +03:00
DepFA fc2aa6b8f3 Add extra sampler params to xy_grid 2022-09-27 09:30:45 +03:00
DepFA 175baaaca2 xy_grid - Show blank cells when grid is incomplete 2022-09-27 09:06:44 +03:00
Martin Cairns 258a2d4f06 Add option to img2imgalt.py to use sigma adjustment instead of original method for #736 2022-09-27 08:53:35 +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
C43H66N12O12S2 19fc3e8279 credit parlance-zz as they requested it 2022-09-23 01:42:55 +03: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 06186582ad prevent outpainting mk2 from breaking on different image resolutions. 2022-09-21 15:40:31 +03:00
AUTOMATIC b9674e2900 add extra generation params 2022-09-20 19:07:09 +03:00
AUTOMATIC 422d17487f [BUG] HighRes fix Feature Breaks Scripts #706 2022-09-19 18:23:51 +03: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
Brian Drupieski 2dbc9c5903 only set loopback color corrections if corrections enabled 2022-09-17 18:20:43 -04:00
Brian Drupieski cf70528bce remove whitespace 2022-09-17 18:19:21 -04:00
Brian Drupieski 7bc5739fe2 set loopback color corrections on each iteration 2022-09-17 18:18:30 -04:00
JashoBell 98a6644bcf Move comments to scripts.py 2022-09-17 12:43:57 -07:00
JashoBell d2c7ad2fec Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into Base 2022-09-17 11:16:35 -07:00
Brian Drupieski 663af7c1c8 fix batch color correction 2022-09-17 13:57:01 -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 140f893153 process all values for x/y plot right away to error out if any are bad before any processing begins 2022-09-17 14:55:40 +03:00
AUTOMATIC 304222ef94 X/Y plot support for switching checkpoints. 2022-09-17 13:49:36 +03:00
JashoBell 5a797a5612 Basic explanation for custom_code.py template 2022-09-16 14:06:21 -07:00
AUTOMATIC 2ee9fc8eb8 new outpainting script 2022-09-16 22:18:30 +03:00
AUTOMATIC b64994b973 added original negative prompt to img2img alt 2022-09-16 19:24:48 +03:00
Elias Sundqvist a441cd563a Reduce code duplication 2022-09-16 10:19:13 +03:00
Elias Sundqvist 2aec11d263 Add randomness and denoising strength support to alternative img2img 2022-09-16 10:19:13 +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 7fe00d0840 [Bug] Alternative img2img error #508 2022-09-15 22:39:46 +03:00
Rickey Bowers Jr 874651e4d2 match one based numbering or other batches 2022-09-15 18:56:52 +03:00
AUTOMATIC d51847c184 fix caching for img2imgalt 2022-09-14 19:41:55 +03:00
DepFA e16d762800 add draw legend toggle 2022-09-14 15:33:37 +03:00
DepFA 35229d9488 Add square bracket range+count syntax 2022-09-14 15:33:37 +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 f6aa0cdb0b Overall progress incorrect with X/Y plot and batch count > 1 #441 2022-09-14 13:08:05 +03:00
AUTOMATIC 928b246c9e [FEATURE REQUEST] Script settings should also be written to the text files #437 2022-09-14 11:08:36 +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 afbb3504da Prompts from file not working #379 2022-09-13 09:41:38 +03:00
AUTOMATIC 095830e1e8 Prompts from file. How to? #248 2022-09-12 19:13:03 +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 9c48383608 initial work on img2imgalt 2022-09-12 01:55:34 +03:00
AUTOMATIC 8fb9c57ed6 add half() supporrt for CLIP interrogation 2022-09-11 23:24:24 +03:00
AUTOMATIC 22faf30c0b add script for batch file processing 2022-09-10 08:45:55 +03:00
AUTOMATIC ee8a6fa89f Images in Prompt Matrix grid using different seeds. #208 2022-09-10 08:29:12 +03:00
AUTOMATIC a5316bbf63 add missing reqs from PR
add missing check to autoinstall that will install fonts for existing users
remove unusaed line from another PR
2022-09-09 23:45:44 +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 efde17e839 i will also fix floating point significant digits 2022-09-09 18:05:43 +03:00
AUTOMATIC b1707553cf added resize seeds and variation seeds features 2022-09-09 17:54:04 +03:00
AUTOMATIC 41434ba3cd make X/Y plot's S/R apply to negative prompt as well. 2022-09-09 08:58:31 +03:00
AUTOMATIC 795d49aa24 MAde poor man's outpainting do less extra useless work. 2022-09-07 19:22:45 +03:00
AUTOMATIC 700c47a674 big improvements to inpainting and outpainting 2022-09-07 17:00:51 +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 db6db585eb added direction option for outpainting 2022-09-06 14:21:10 +03:00
AUTOMATIC 66a9ca9d00 fixes for incorrect progressbar 2022-09-06 12:34:15 +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 836b646374 moved images to 2022-09-04 13:08:06 +03:00
AUTOMATIC b99a47b12d save grids created by scripts 2022-09-04 03:38:24 +03:00
AUTOMATIC 7350c71259 added poor man's inpainting script 2022-09-04 01:29:43 +03:00
AUTOMATIC af133859f0 fix for sampler not working in X/Y plot script 2022-09-03 21:50:33 +03:00
AUTOMATIC 592334f322 scripts 2022-09-03 19:32:45 +03:00