Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-01 18:46:53 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,130 Commits 3 Branches 34 Tags
fa6b438e267a8d863a8f1e79df2aeba4fcc9619b
Commit Graph

252 Commits

Author SHA1 Message Date
Vladimir Mandic 1fd4139cf4 post merge cleanup 2023-03-12 09:39:38 -04:00
Vladimir Mandic 696af5dc07 Merge pull request #49 from AUTOMATIC1111/master 
merge from upstream
 2023-03-12 08:56:09 -04:00
high_byte 5ed5e95fb8 add face restoration option to xyz_grid 2023-03-12 03:29:07 +02:00
Vladimir Mandic 116dfaaaad update fastapi 2023-03-11 12:08:19 -05:00
Vladimir Mandic 592da583d6 Merge pull request #48 from AUTOMATIC1111/master 
merge from upstream
 2023-03-11 11:06:52 -05:00
Vladimir Mandic 90ebc08d9d premerge cleanup 2023-03-11 11:06:43 -05: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
Vladimir Mandic e17012f86c Merge pull request #47 from AUTOMATIC1111/master 
merge from upstream
 2023-03-11 08:41:32 -05: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
Vladimir Mandic 86e89e5446 Merge pull request #46 from AUTOMATIC1111/master 
merge from upstream
 2023-03-11 08:02:09 -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 a52b31e993 fix xyz grid 2023-03-10 11:23:30 -05:00
Vladimir Mandic 1226028b9c fix silly math error 2023-03-10 11:21:48 -05:00
Vladimir Mandic 2dabba9190 Merge pull request #40 from space-nuko/unipc 
integrate unipc sampler
 2023-03-10 09:57:24 -05:00
Vladimir Mandic e8766b4975 Merge pull request #42 from DejitaruJin/xyz-order-fix 
xyz grid order fix
 2023-03-10 09:53:31 -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 f2232a785e update 2023-02-27 18:09:19 -05:00
Vladimir Mandic 3c6459154f add check for resulting image size 2023-02-27 17:28:04 -05:00
Vladimir Mandic 1f714beccb Merge pull request #38 from AUTOMATIC1111/master 
sync branches
 2023-02-26 10:35:20 -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
Vladimir Mandic 54ab13502f Merge pull request #37 from AUTOMATIC1111/master 
sync forks
 2023-02-19 10:11:25 -05: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
Vladimir Mandic 08c3caec1e Merge pull request #35 from AUTOMATIC1111/master 
sync branches
 2023-02-05 07:03:27 -05:00
EllangoK 0ca1a64cfc adds grid margins to xyz plot and prompt matrix 2023-02-05 03:44:56 -05:00
Vladimir Mandic e9952c9c95 major update 2023-02-04 17:01:24 -05:00
Vladimir Mandic a4a76ce642 update ui 2023-02-04 14:45:34 -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