Commit Graph

401 Commits

Author SHA1 Message Date
w-e-w f4d9297127 use samplers_for_img2img for Hires sampler 2023-08-04 13:27:25 +09:00
catboxanon f7813fad1c
XYZ: Use default label format for hires sampler
If both sampler and hires sampler are used this makes the distinction more clear.
2023-08-04 00:19:30 -04:00
catboxanon 8b37734244
XYZ: Support hires sampler, cleanup 2023-08-04 00:10:14 -04:00
AUTOMATIC1111 401ba1b879 XYZ plot do not fail if an exception occurs 2023-08-01 09:22:53 +03:00
Robert Barron c4ee6d9b73 xyz_grid: allow varying the seed along an axis along with the axis's other changes 2023-07-30 03:45:02 -07:00
Robert Barron 085c903229 xyz_grid: in the legend, remove pathnames from model filenames 2023-07-30 03:35:32 -07:00
w-e-w 8941297ceb lowercase 2023-07-17 12:45:38 +09:00
w-e-w c03856bfdf reversible boolean_choice order 2023-07-17 12:45:10 +09:00
w-e-w 7870937c77 XYZ always_discard_next_to_last_sigma
Co-authored-by: Franck Mahon <franck.mahon@gmail.com>
2023-07-17 12:25:29 +09:00
Splendide Imaginarius 72815c0211 Split Outpainting MK2 mask blur into X and Y components
Fixes unexpected noise in non-outpainted borders when using MK2 script.
2023-06-09 08:37:26 +00:00
Aarni Koskela 51864790fd Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions 2023-06-02 15:07:10 +03:00
AUTOMATIC 05933840f0 rename print_error to report, use it with together with package name 2023-05-31 19:56:37 +03:00
Aarni Koskela 00dfe27f59 Add & use modules.errors.print_error where currently printing exception info by hand 2023-05-29 09:17:30 +03:00
AUTOMATIC e8e7fe11e9 updates for the noise schedule settings 2023-05-27 19:53:09 +03:00
Kohaku-Blueleaf a69b71a37f use Schedule instead of Sched 2023-05-24 20:40:37 +08:00
Kohaku-Blueleaf 4b88e24ebe improvements
See:
https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/10649#issuecomment-1561047723
2023-05-24 20:35:58 +08:00
Kohaku-Blueleaf 27962ded4a Fix ruff error 2023-05-23 23:50:19 +08:00
Kohaku-Blueleaf 78aed1fa4a Fix xyz 2023-05-23 11:47:32 +08:00
Kohaku-Blueleaf f821051443 Change karras to kdiffusion 2023-05-22 23:09:03 +08:00
Kohaku-Blueleaf e6269cba7f Add dropdown for scheduler type 2023-05-22 23:02:05 +08:00
Kohaku-Blueleaf a104879869 Add custom karras scheduler 2023-05-22 21:52:46 +08:00
w-e-w 9e90907532 xyz token merging 2023-05-16 02:02:51 +09:00
AUTOMATIC1111 1b7e787733
Merge pull request #10382 from AUTOMATIC1111/fix_xyz_checkpoint
fix xyz checkpoint
2023-05-14 19:01:36 +03:00
w-e-w a98ae89bde fix xyz checkpoint 2023-05-15 00:31:34 +09:00
AUTOMATIC d274b8297e fix broken prompts from file 2023-05-13 08:18:49 +03:00
Aarni Koskela 49a55b410b Autofix Ruff W (not W605) (mostly whitespace) 2023-05-11 20:29:11 +03:00
AUTOMATIC 8ca50f8240 fix broken prompts from file 2023-05-11 14:49:14 +03:00
AUTOMATIC 483545252f fix broken prompts from file 2023-05-11 14:24:22 +03:00
AUTOMATIC a5121e7a06 fixes for B007 2023-05-10 11:37:18 +03:00
AUTOMATIC f741a98bac imports cleanup for ruff 2023-05-10 08:43:42 +03:00
AUTOMATIC 762265eab5 autofixes from ruff 2023-05-10 07:52:45 +03:00
Aarni Koskela 3ba6c3c83c Fix up string formatting/concatenation to f-strings where feasible 2023-05-09 22:25:39 +03:00
Weiming Dong 251be61a80 Add extra `None` option for VAE 2023-05-04 07:59:52 +08:00
w-e-w cfbe68184c use override to apply checkpoint 2023-05-01 17:47:31 +09:00
AUTOMATIC1111 609b8933a2
Merge pull request #9258 from wywywywy/bug-outpainting-mk2-file-format
bug: Outpainting Mk2 & Poorman should use the SAMPLE file format to save images, not GRID file format
2023-04-29 17:23:22 +03:00
AUTOMATIC1111 725a3849d2
Merge branch 'dev' into pr/xyz-sort-001 2023-04-29 16:10:16 +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 71322400fd
Merge pull request #9392 from pangbo13/xyz-plot-dropdown
Add dropdown for X/Y/Z plot
2023-04-29 11:09:04 +03:00
AUTOMATIC1111 840d1854cd
Merge pull request #9862 from missionfloyd/extras-sliders-main
Change extras "scale to" to sliders
2023-04-29 10:07:01 +03:00
missionfloyd 84c5b0801a Update postprocessing_upscale.py 2023-04-24 20:07:24 -06:00
bluelovers c84118d70d feat(xyz): try sort Checkpoint name values 2023-04-10 05:03:02 +08:00
pangbo13 3ac5f9c471 fix axis swap and infotxt 2023-04-05 21:43:27 +08:00
pangbo13 c01dc1cb30 add dropdown for X/Y/Z plot 2023-04-05 19:22:51 +08:00
wywywywy 80b847e72d bug: poorman use sample file format not grid 2023-04-01 10:47:49 +01:00
wywywywy 9dc722bcf2 bug: outpaint-mk2 use sample file format not grid 2023-04-01 10:39:50 +01:00
missionfloyd 3ebdd2afd3 Don't return upscaling_res_switch_btn 2023-03-31 00:56:38 -06:00
missionfloyd 69ad46b047 Import switch_values_symbol 2023-03-30 23:25:39 -06:00
missionfloyd a73f3bf0cf Change extras "scale to" to sliders 2023-03-30 23:19:40 -06:00
space-nuko 79d57d02f1 Improve custom code extension
- Uses `gr.Code` component
- Includes example
- Can return out of body
2023-03-29 01:52:34 -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
space-nuko 4414d36bf6
Merge branch 'master' into img2img-enhance 2023-03-28 10:59:12 -04:00
LipeCarmel 5c7ab90a4e
loopback.py Colab compatibility and bug fix
This code (suggested by @abvgdeabvgde2 ) literally does the same thing and it does not break with Python 3.9, making it helpful for Google Colab users (me included).
fixes #8927
Also a partial fix for #8902 but it does not resolve the unresponsive UI problem faced by @Archon332
2023-03-25 14:48:22 -03:00
space-nuko 7ea5d395c4 Add upscaler to img2img 2023-03-25 12:52:43 -04:00
AUTOMATIC1111 aba5d639fb
Merge pull request #8547 from vladmandic/image-size
disable pil checks
2023-03-25 14:04:46 +03:00
AUTOMATIC1111 983d48a921
Merge pull request #8772 from mcmonkey4eva/img2img-alt-sd2-fix
Fix img2img-alternative-test script for SD v2.x
2023-03-25 12:16:09 +03:00
AUTOMATIC1111 442f710d94
Merge pull request #8799 from JaRail/master
Loopback Script Updates
2023-03-25 10:41:24 +03:00
AUTOMATIC1111 2664198584
Merge pull request #8801 from EllangoK/xyz-values
Fixes xyz extra_generation_params not being saved (previously worked)
2023-03-25 10:39:19 +03:00
AUTOMATIC 9f0da9f6ed initial gradio 3.22 support 2023-03-25 09:00:36 +03:00
James Railton a9eef1fbb1 Fix "masked content" in loopback script
The loopback script did not set masked content to original after first loop. So each loop would apply a fill, or latent mask. This would essentially reset progress each loop.

The desired behavior is to use the mask for the first loop, then continue to iterate on the results of the previous loop.
2023-03-23 10:44:25 -04:00
EllangoK e7ac09b25a fixes xyz extra_generation_params not being saved 2023-03-22 02:11:38 -04:00
James Railton 33b8539147 Loopback Script Updates
- Improved user experience. You can now pick the denoising strength of the final loop and one of three curves. Previously you picked a multiplier such as 0.98 or 1.03 to define the change to the denoising strength for each loop. You had to do a ton of math in your head to visualize what was happening. The new UX makes it very easy to understand what's going on and tweak.
- For batch sizes over 1, intermediate images no longer returned. For a batch size of 1, intermediate images from each loop will continue to be returned. When more than 1 image is returned, a grid will also be generated. Previously for larger jobs, you'd get back a mess of many grids and potentially hundreds of images with no organization. To make large jobs usable, only final images are returned.
- Added support for skipping current image. Fixed interrupt to cleanly end and return images. Previously these would throw.
- Improved tooltip descriptions
- Fix some edge cases
2023-03-21 21:07:33 -04:00
Alex "mcmonkey" Goodwin c9c692c4d9 cleanup the img2img alt file a bit 2023-03-20 15:43:01 -07:00
Alex "mcmonkey" Goodwin 05ec128ca9 fix img2img alt for SD v2.x 2023-03-20 15:42:36 -07:00
Vladimir Mandic 8179901f9c
disable pil checks 2023-03-12 09:12:54 -04:00
high_byte 5ed5e95fb8 add face restoration option to xyz_grid 2023-03-12 03:29:07 +02:00
AUTOMATIC 94ffa9fc53 emergency fix for xyz plot 2023-03-11 18:55:48 +03:00
AUTOMATIC1111 d3dd6cc01c
Merge pull request #8175 from vladmandic/image_size
adds checks for resulting image size to avoid memory issues
2023-03-11 16:45:35 +03:00
AUTOMATIC1111 ef9efb61aa
Merge pull request #7954 from EllangoK/xyz-newline
Fixes newlines within checkpoints being detected as its own entry
2023-03-11 16:37:51 +03:00
Vladimir Mandic a47c18297e
use assert instead of return 2023-03-11 08:33:55 -05:00
AUTOMATIC1111 4637116341
Merge pull request #8021 from 112292454/master
continue fix prompt_matrix.py when high-res
2023-03-11 15:59:13 +03:00
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