Commit Graph

280 Commits

Author SHA1 Message Date
AUTOMATIC1111 9860a6acda
Merge pull request #8326 from DejitaruJin/xyz-order-fix
Xyz order fix
2023-03-11 13:51:35 +03:00
space-nuko ac38ad7e60 Merge remote-tracking branch 'origin/master' into unipc 2023-03-10 19:42:46 -05:00
Vladimir Mandic 1226028b9c
fix silly math error 2023-03-10 11:21:48 -05:00
DejitaruJin c8b52c7975
Short-circuit error handling 2023-03-04 19:32:09 -05:00
DejitaruJin eb29ff211a
Add files via upload 2023-03-04 16:06:40 -05:00
DejitaruJin fe7d7dfd5a
Add files via upload 2023-03-04 15:40:35 -05:00
DejitaruJin 2ba880704b
Add files via upload 2023-03-04 13:00:27 -05:00
DejitaruJin 2d9635cce5
Fix display and save order for X/Y/Z Grid script 2023-03-04 12:51:55 -05:00
Vladimir Mandic 3c6459154f
add check for resulting image size 2023-02-27 17:28:04 -05:00
112292454 2fa91cbee6
Update prompt_matrix.py
1
2023-02-23 01:55:07 +08:00
112292454 2c58d373dd
Update prompt_matrix.py
this file last commit fixed common situation when using both prompts matrix and high-res。
but if we just open matrix option,but not use ‘|’,we will only get one pic,and `processed.images[0].width, processed.images[1].height` will cause a index out of bounds exception
2023-02-22 21:40:42 +08:00
EllangoK bab972ff8a fixes newline being detected as its own entry 2023-02-20 10:16:55 -05:00
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