Commit Graph

78 Commits

Author SHA1 Message Date
AUTOMATIC1111 32547f2721
Merge branch 'master' into xygrid_infotext_improvements 2023-01-04 18:57:14 +03:00
AUTOMATIC ef27a18b6b Hires fix rework 2023-01-02 19:42:10 +03:00
MMaker 492052b5df
feat: Add upscale latent, VAE, styles to X/Y plot
Adds upscale latent space for hires., VAE, and Styles as new axis options to the X/Y plot.
2022-12-18 10:47:02 -05:00
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
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
byzod 9cc48fee48
fix scripts ignores file format settings for grids 2022-11-06 10:15:02 +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
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 49533eed9e XY grid correctly re-assignes model when config changes 2022-10-20 16:01:27 -07: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
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
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
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
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
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 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
RnDMonkey b99a4f769f fixed expression error in condition 2022-10-01 14:26:12 -07:00