Commit Graph

318 Commits

Author SHA1 Message Date
AUTOMATIC 65995a2ea3 possible fix for #7804 2023-02-19 18:31:51 +03:00
AUTOMATIC1111 7202213358
Merge pull request #7571 from mezotaken/int_loop
Optionally append interrogated prompt in loopback script
2023-02-19 14:23:31 +03:00
AUTOMATIC1111 cfc9849f3f
Merge branch 'master' into 6866-fix-hires-prompt-matrix 2023-02-19 12:30:58 +03:00
AUTOMATIC1111 d99bd04b3f
Merge pull request #7568 from Klace/XYZ-ImageCFG
Add Image CFG Scale to XYZ Grid
2023-02-19 12:29:26 +03:00
AUTOMATIC 48d171bbb3 fix incorrectly named args for gr.Slider in prompt matrix and xyz grid 2023-02-19 12:25:05 +03:00
AUTOMATIC 66cfd1dcfc Expose xyz_grid's values to other extensions for #7721 2023-02-19 11:45:04 +03:00
space-nuko 79ffb9453f Add UniPC sampler settings 2023-02-10 05:27:05 -08:00
Vladimir Repin 7dd23973f7 Optionally append interrogated prompt in loopback script 2023-02-06 00:28:31 +03:00
Kyle 67303fd5fc Img2Img Only
Will still show up as an option with regular img2img models, but outputs no changes.
2023-02-05 15:34:26 -05:00
Kyle c8109f0dea Add Image CFG Scale to XYZ Grid 2023-02-05 15:18:18 -05:00
EllangoK 0ca1a64cfc adds grid margins to xyz plot and prompt matrix 2023-02-05 03:44:56 -05:00
Vladimir Repin 982295aee5 Fix img2imgalt after samplers separation 2023-02-04 01:50:38 +03:00
Francesco Manzali 5afd9e82c3 Use the real images size, not the process
- Use the width/height of the first image in processed.images
- No more need for rounding in prompt_matrix
2023-02-01 21:16:52 +01:00
AUTOMATIC1111 226d840e84
Merge pull request #7334 from EllangoK/master
X/Y/Z plot now saves sub grids if opts.grid_save and honors draw_legend
2023-02-01 16:30:28 +03:00
Francesco Manzali 17b24e45e8 Fix prompt matrix #rows/#cols when using hires
- images.draw_prompt_matrix() should be called with the final width/height
  of the generated images, after upscaling.
  Otherwise, the number of rows/cols computed in images.draw_grid_annotations
  will increase by the upscaling factor.
- Round the number of cols/rows in images.draw_grid_annotations, since
  the final images width may be a bit less than the required
  hr_upscale_to_x/y
2023-01-31 18:58:36 +01:00
Yevhenii Hurin 1e2b10d2dc Cleanup changes made by formatter 2023-01-29 17:14:46 +02:00
Yevhenii Hurin 5997457fd4 Compact options UI for Prompt Matrix 2023-01-29 16:23:29 +02:00
Yevhenii Hurin edabd92729 Add delimiter selector to the Prompt Matrix script 2023-01-29 16:05:59 +02:00
Yevhenii Hurin 7c53f81caf Prompt selector for Prompt Matrix script 2023-01-29 15:29:03 +02:00
EllangoK fb58fa6240 xyz plot now saves sub grids if opts.grid_save
also fixed no draw legend for z grid
2023-01-28 15:37:01 -05:00
AUTOMATIC1111 91c8d0dcfc
Merge pull request #7231 from EllangoK/master
Fixes X/Y/Z Plot parameters not being restored from images
2023-01-28 18:45:38 +03:00
EllangoK 32d389ef0f changes remaining text from X/Y -> X/Y/Z 2023-01-27 14:04:23 -05:00
EllangoK a6a5bfb155 deepcopy pc.styles, allows for multiple style axis 2023-01-27 13:48:39 -05: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
EllangoK 4d634dc592 adds components to infotext_fields
allows for loading script params
2023-01-26 00:18:41 -05:00
EllangoK ec8774729e swaps xyz axes internally if one costs more 2023-01-24 02:53:35 -05:00
EllangoK e46bfa5a9e handling sub grids and merging into one 2023-01-24 02:24:32 -05:00
EllangoK 9fc354e130 implements most of xyz grid script 2023-01-24 02:22:40 -05:00
EllangoK d30ac02f28 renamed xy to xyz grid
this is mostly just so git can detect it properly
2023-01-24 02:21:32 -05:00
AUTOMATIC1111 97ba01a213
Merge pull request #7081 from EllangoK/xy-hires
Adds Hires Steps to X/Y Plot, and updates step calculation
2023-01-23 15:24:11 +03:00
AUTOMATIC1111 663353098e
Merge pull request #7031 from EllangoK/master
Fixes various button overflowing UI and compact checkbox
2023-01-23 15:22:06 +03:00
AUTOMATIC b5230197a6 rework extras tab to use script system 2023-01-23 09:24:43 +03:00
EllangoK 8a3f85c4cc adds hires steps to x/y plot and fixes total_steps calculation 2023-01-22 17:08:08 -05:00
EllangoK 5560150fda aligns the axis buttons in x/y plot 2023-01-21 16:58:45 -05:00
Vladimir Repin e5520232e8 make current_axis_options class variable 2023-01-22 00:06:06 +03:00
Vladimir Repin ac2eb97db9 fix auto fill and repair separate axisoptions 2023-01-21 22:43:37 +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
AUTOMATIC 924e222004 add option to show/hide warnings
removed hiding warnings from LDSR
fixed/reworked few places that produced warnings
2023-01-18 23:04:24 +03:00
AUTOMATIC e0e8005009 make StableDiffusionProcessing class not hold a reference to shared.sd_model object 2023-01-16 23:09:08 +03:00
AUTOMATIC 55947857f0 add a button for XY Plot to fill in available values for axes that support this 2023-01-16 17:36:56 +03:00
AUTOMATIC1111 d073637e10
Merge pull request #6803 from space-nuko/xy-grid-performance-improvement
Optimize XY grid to run slower axes fewer times
2023-01-16 16:14:41 +03:00
AUTOMATIC1111 fcbe0f35fb
Merge pull request #6802 from space-nuko/xy-grid-swap-axes-button
Add swap axes button for XY Grid
2023-01-16 11:50:49 +03:00
AUTOMATIC 972f578507 fix problems related to checkpoint/VAE switching in XY plot 2023-01-16 09:27:59 +03:00
space-nuko 2144c2eb7f Add swap axes button for XY Grid 2023-01-15 21:41:58 -08:00
space-nuko 029260b4ca Optimize XY grid to run slower axes fewer times 2023-01-15 21:40:57 -08:00
space-nuko f202ff1901 Make XY grid cancellation much faster 2023-01-15 19:43:34 -08:00
AUTOMATIC a5bbcd2153 fix bug with "Ignore selected VAE for..." option completely disabling VAE election
rework VAE resolving code to be more simple
2023-01-14 19:56:09 +03:00
AUTOMATIC 69781031e7 simplify expression in prompts from file script 2023-01-14 16:45:39 +03:00
Zaprudin Aleksey d753a9df95 fix progress bar behavior for "Prompts from file or textbox" script 2023-01-13 22:25:33 +05:00
noodleanon eadd1bf06a
allow sdupscale to accept upscaler name 2023-01-05 21:22:04 +00:00
AUTOMATIC f8d0cf6a6e rework #6329 to remove duplicate code and add prevent tab names for showing in ids for scripts that only exist on one tab 2023-01-05 12:08:11 +03:00
me f185baeb28 Refactor elem_prefix as function elem_id 2023-01-05 09:29:07 +01:00
me c3109fa18a Adjusted prefix from i2i/t2i to txt2img and img2img and removed those prefixes from img exclusive scripts 2023-01-05 08:27:09 +01:00
me 5851bc839b Add element ids for script components and a few more in ui.py 2023-01-04 22:14:30 +01: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
AUTOMATIC1111 32547f2721
Merge branch 'master' into xygrid_infotext_improvements 2023-01-04 18:57:14 +03:00
AUTOMATIC 4dbde228ff make it possible to use fractional values for SD upscale. 2023-01-02 20:01:16 +03:00
AUTOMATIC ef27a18b6b Hires fix rework 2023-01-02 19:42:10 +03:00
AUTOMATIC c6f347b81f fix ruined SD upscale 2022-12-25 09:47:34 +03:00
Yuval Aboulafia 3bf5591efe fix F541 f-string without any placeholders 2022-12-24 21:35:29 +02:00
AUTOMATIC1111 e9bf62da8b
Merge pull request #5699 from DavidVorick/prompts-from-file
Improve prompts-from-file script to support negative prompts and sampler-by-name
2022-12-24 11:16:08 +03:00
AUTOMATIC1111 fac92610d2
Merge pull request #5753 from calvinballing/master
Fix various typos
2022-12-24 09:58:28 +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
Jim Hays c0355caefe Fix various typos 2022-12-14 21:01:32 -05:00
David Vorick 27c0504bc4
add support for prompts, negative prompts, and sampler-by-name in text file script 2022-12-13 12:03:16 -05:00
AUTOMATIC1111 854bb0b56c
Merge pull request #5179 from kaneda2004/master
Update SD Upscaler to include user selectable Scale Factor
2022-12-10 13:28:45 +03:00
AUTOMATIC 7dab7c9759 repair #5438 2022-12-10 11:20:43 +03:00
David Vorick fa6478796a
allow randomized seeds in prompt_matrix 2022-12-05 00:21:37 -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
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