f3f2ffd448
Merge branch 'AUTOMATIC1111:master' into master
2022-10-27 11:19:12 -07:00
99d728b5b1
Add Iterate Button and Improve PFF UI
2022-10-26 13:26:35 +03:00
8b4f32779f
Switch to a continous blend for cond. image.
2022-10-25 13:15:08 -07:00
605d27687f
Added conditioning image masking to xy_grid.
...
Use `True` and `False` to select values.
2022-10-25 12:20:54 -07:00
7613ea12f2
Fixed img2imgalt after inpainting update
2022-10-22 19:36:57 +03:00
3d898044e5
batch_size does not affect job count
2022-10-21 17:26:30 +03:00
a7aa00d46a
Merge remote-tracking branch 'mk2/outpainting-mk2-batch-out'
2022-10-21 17:22:47 +03:00
1fc278bcc6
Fixed job count & single-output grid
2022-10-21 02:38:24 +01:00
49533eed9e
XY grid correctly re-assignes model when config changes
2022-10-20 16:01:27 -07:00
18df060c3e
Fixed outpainting_mk2 output cropping
2022-10-20 16:16:09 +01:00
91efe138b3
Implemented batch_size logic in outpainting_mk2
2022-10-20 16:02:32 +01:00
4281f255d5
Implemented batch count logic to Outpainting mk2
2022-10-20 15:31:09 +01:00
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
7d6042b908
update for commandline args for btch prompts to parse string properly
2022-10-15 12:00:31 +03:00
f42e0aae6d
Merge branch 'master' into master
2022-10-15 10:47:26 +03:00
a8f7722e4e
Fix XY-plot steps if highres fix is enabled
2022-10-14 14:26:38 -07:00
989a552de3
remove the other Denoising
2022-10-14 22:04:08 +03:00
4cc37e4cdf
[xy_grid.py] add option denoising_strength
2022-10-14 22:03:33 +03:00
02382f7ce4
regression in xy_grid Var. seed fixing
2022-10-14 22:02:21 +03:00
354ef0da3b
add hypernetwork multipliers
2022-10-13 20:12:37 +03:00
e548fc4aca
[img2imgalt] Make sampler's override be optional
2022-10-13 18:03:17 +03:00
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
8711c2fe01
Fix metadata contents
2022-10-13 13:25:29 +03:00
94c01aa356
draw_xy_grid provides the option to also return lone images
2022-10-13 13:25:29 +03:00
2fffd4bddc
xy_grid: Refactor confirm functions
2022-10-12 10:40:10 +03:00
7dba1c07cb
xy_grid: Confirm that hypernetwork options are valid before starting
2022-10-12 10:40:10 +03:00
2d006ce16c
xy_grid: Find hypernetwork by closest name
2022-10-12 10:40:10 +03:00
f421f2af2d
[img2imgalt] Fix seed & Allow batch.
2022-10-12 10:03:46 +03:00
5ba23cb41f
change default for XY plot's Y to Nothing.
2022-10-11 17:28:17 +03:00
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
dce7fc902a
Merge remote-tracking branch 'origin/master'
2022-10-11 15:00:16 +03:00
530103b586
fixes related to merge
2022-10-11 14:53:02 +03:00
1a0a6a84c3
add incorrect start word guard to xy_grid ( #2259 )
2022-10-11 11:59:56 +01:00
a8490e4019
revert sr warning
2022-10-11 11:42:41 +01:00
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
255be75d30
Error if prompt missing SR token to prevent mis-gens ( #2209 )
2022-10-11 11:16:57 +01:00
5da1ba0e91
remove batch size restriction from X/Y plot
2022-10-10 21:24:11 +03:00
84ddd44113
Clip skip variable name change breaks x/y plot script. This fixes that
2022-10-09 22:31:23 +03:00
45bf9a6264
added clip skip to XY plot
2022-10-09 18:58:55 +03:00
2c52f4da7f
fix broken samplers in XY plot
2022-10-09 15:01:42 +03:00
542a3d3a4a
fix btoken hypernetworks in XY plot
2022-10-09 14:33:22 +03:00
a65a45272e
Don't change the seed initially if "Keep -1 for seeds" is checked
...
Fixes #1049
2022-10-09 12:43:56 +03:00
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
86cb16886f
Pull Request Code Review Fixes
2022-10-09 11:16:38 +03:00
e2930f9821
Fix for Prompts_from_file showing extra textbox.
2022-10-09 11:16:38 +03:00
03e570886f
Fix incorrect sampler name in output
2022-10-09 11:09:17 +03:00
bad7cb29ce
added support for hypernetworks (???)
2022-10-07 10:17:52 +03:00
1069ec49a3
revert back to using list comprehension rather than list and map
2022-10-06 20:16:21 +03:00
82eb8ea452
Update xy_grid.py
...
split vals not 's' from tests
2022-10-06 18:09:49 +03:00
fd9e049168
strip() split comma delimited lines
2022-10-06 18:09:49 +03:00
efa61d3168
use csv.reader
2022-10-06 18:09:49 +03:00
5d0e6ab856
Allow escaping of commas in xy_grid
2022-10-06 18:09:49 +03:00
5993df24a1
integrate the new samplers PR
2022-10-06 14:12:52 +03:00
c1a068ed0a
Create alternate_sampler_noise_schedules.py
2022-10-06 13:42:21 +03:00
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
556c36b960
add hint, refactor code for #1607
2022-10-04 09:18:00 +03:00
56371153b5
XY plot prompt order simplify logic
2022-10-04 08:56:01 +03:00
1a6d40db35
Fix token ordering in prompt order XY plot
2022-10-04 08:56:01 +03:00
1c5604791d
Add a prompt order option to XY plot script
2022-10-04 08:56:01 +03:00
fe6e2362e8
Update xy_grid.py
...
Changed XY Plot infotext value keys to not be so generic.
2022-10-02 22:04:28 -07:00
2ef69df9a7
Prevent upscaling when None is selected for SD upscale
2022-10-02 21:46:32 +03:00
b99a4f769f
fixed expression error in condition
2022-10-01 14:26:12 -07:00
eba0c29dbc
Updated xy_grid infotext formatting, parser regex
2022-10-01 13:56:29 -07:00
0e77ee24b0
Removed unnecessary library call and added some comments
2022-10-02 00:57:29 +10:00
27fbf3de4a
Added tag parsing for prompts from file
2022-10-02 00:43:24 +10:00
3f417566b0
Delete alternate_sampler_noise_schedules.py
2022-10-01 08:08:50 +03:00
bd4fc6633f
add script alternate_sampler_noise_schedules
2022-10-01 08:08:50 +03:00
cf141157e7
Added X/Y plot parameters to extra_generation_params
2022-09-30 22:02:29 -07:00
70931652a4
[xy_grid] made -1 seed fixing apply to Var. seed too
2022-09-30 18:02:46 -07:00
84e97a98c5
features updates
...
unused code removed from outpainting mk2
2022-10-01 00:38:48 +03:00
828d6cce72
fix sd_upscale
2022-09-30 12:19:49 +03:00
f710ba11b9
use closest match checkpoint method
2022-09-30 07:37:05 +03:00
498515e7a1
scripts/xy_grid: Handle edge-case with non-empty axis values
...
Fixes bug where if Type is Nothing and axis values are filled out (from ie. previously using another Type), it will still needlessly run it N times (with identical results).
2022-09-29 21:18:29 +03:00
d64b451681
added support for automatically installing latest k-diffusion
...
added eta parameter to parameters output for generated images
split eta settings into ancestral and ddim (because they have different default values)
2022-09-28 18:09:06 +03:00
76d6f7b407
Add DDIM Eta to txt2img in xy_grid
2022-09-27 09:30:45 +03:00
fc2aa6b8f3
Add extra sampler params to xy_grid
2022-09-27 09:30:45 +03:00
175baaaca2
xy_grid - Show blank cells when grid is incomplete
2022-09-27 09:06:44 +03:00
258a2d4f06
Add option to img2imgalt.py to use sigma adjustment instead of original method for #736
2022-09-27 08:53:35 +03:00
31ac0baba0
Reformat some changes from the previous commit.
2022-09-24 08:23:01 +03:00
ed8b8b3b8c
Fix to XY_Grid script console progress bar and other progress bar improvements ( #890 )
...
Fix to XY_Grid script console progress bar and other progress bar improvements #890
2022-09-24 08:09:59 +03:00
19fc3e8279
credit parlance-zz as they requested it
2022-09-23 01:42:55 +03:00
91bfc71261
A big rework, just what you were secretly hoping for!
...
SD upscale moved to scripts
Batch processing script removed
Batch processing added to main img2img and now works with scripts
img2img page UI reworked to use tabs
2022-09-22 12:11:48 +03:00
06186582ad
prevent outpainting mk2 from breaking on different image resolutions.
2022-09-21 15:40:31 +03:00
b9674e2900
add extra generation params
2022-09-20 19:07:09 +03:00
422d17487f
[BUG] HighRes fix Feature Breaks Scripts #706
2022-09-19 18:23:51 +03:00
e9a9764e00
Merge pull request #625 from bdrupieski/fix-batch-processing-color-correction
...
fix batch color correction
2022-09-18 07:31:01 +03:00
2dbc9c5903
only set loopback color corrections if corrections enabled
2022-09-17 18:20:43 -04:00
cf70528bce
remove whitespace
2022-09-17 18:19:21 -04:00
7bc5739fe2
set loopback color corrections on each iteration
2022-09-17 18:18:30 -04:00
98a6644bcf
Move comments to scripts.py
2022-09-17 12:43:57 -07:00
d2c7ad2fec
Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into Base
2022-09-17 11:16:35 -07:00
663af7c1c8
fix batch color correction
2022-09-17 13:57:01 -04:00
ba295b3268
* Fix process_images where the number of images is not a multiple of (batch_size * n_iter), which would cause us to throw an exception.
...
* Add a textbox option to Prompts from file (ease of use and it makes it much easier to use on a mobile device)
* Fix the fact that Prompts from file was sometimes passing an empty batch.
2022-09-17 14:55:54 +03:00
140f893153
process all values for x/y plot right away to error out if any are bad before any processing begins
2022-09-17 14:55:40 +03:00
304222ef94
X/Y plot support for switching checkpoints.
2022-09-17 13:49:36 +03:00
5a797a5612
Basic explanation for custom_code.py template
2022-09-16 14:06:21 -07:00
2ee9fc8eb8
new outpainting script
2022-09-16 22:18:30 +03:00
b64994b973
added original negative prompt to img2img alt
2022-09-16 19:24:48 +03:00
a441cd563a
Reduce code duplication
2022-09-16 10:19:13 +03:00
2aec11d263
Add randomness and denoising strength support to alternative img2img
2022-09-16 10:19:13 +03:00
b153ebe3b6
fix loopback color correction to store color_correction info for initial image and use that instead of extracting from previous image in a loop #481 #541
2022-09-16 08:33:47 +03:00
7fe00d0840
[Bug] Alternative img2img error #508
2022-09-15 22:39:46 +03:00
874651e4d2
match one based numbering or other batches
2022-09-15 18:56:52 +03:00
d51847c184
fix caching for img2imgalt
2022-09-14 19:41:55 +03:00
e16d762800
add draw legend toggle
2022-09-14 15:33:37 +03:00
35229d9488
Add square bracket range+count syntax
2022-09-14 15:33:37 +03:00
c9430e53f6
loopback moved to scripts, added support for multiple batches, changed to honor save grids and how grids in web setting
2022-09-14 14:47:54 +03:00
f6aa0cdb0b
Overall progress incorrect with X/Y plot and batch count > 1 #441
2022-09-14 13:08:05 +03:00
928b246c9e
[FEATURE REQUEST] Script settings should also be written to the text files #437
2022-09-14 11:08:36 +03:00
f9f9d04b5f
prevent extras from saving in dir
...
Extras have none of the vars used in dir names, so they cant be saved into dirs.
+grid code cleanup
2022-09-14 08:58:13 +03:00
afbb3504da
Prompts from file not working #379
2022-09-13 09:41:38 +03:00
095830e1e8
Prompts from file. How to? #248
2022-09-12 19:13:03 +03:00
a4416f3585
[BUG] Not Working As Intended - create a directory with name derived from the prompt #306
2022-09-12 15:41:30 +03:00
9c48383608
initial work on img2imgalt
2022-09-12 01:55:34 +03:00
8fb9c57ed6
add half() supporrt for CLIP interrogation
2022-09-11 23:24:24 +03:00
22faf30c0b
add script for batch file processing
2022-09-10 08:45:55 +03:00
ee8a6fa89f
Images in Prompt Matrix grid using different seeds. #208
2022-09-10 08:29:12 +03:00
a5316bbf63
add missing reqs from PR
...
add missing check to autoinstall that will install fonts for existing users
remove unusaed line from another PR
2022-09-09 23:45:44 +03:00
fbdec2ef20
Fix prompt matrix script
2022-09-09 23:40:03 +03:00
86867e153f
support for prompt styles
...
fix broken prompt matrix
2022-09-09 23:16:02 +03:00
efde17e839
i will also fix floating point significant digits
2022-09-09 18:05:43 +03:00
b1707553cf
added resize seeds and variation seeds features
2022-09-09 17:54:04 +03:00
41434ba3cd
make X/Y plot's S/R apply to negative prompt as well.
2022-09-09 08:58:31 +03:00
795d49aa24
MAde poor man's outpainting do less extra useless work.
2022-09-07 19:22:45 +03:00
700c47a674
big improvements to inpainting and outpainting
2022-09-07 17:00:51 +03:00
a1743e4518
remove double basicr requirement
...
add seed change for anon
2022-09-07 01:44:44 +03:00
a8504157a0
some changes for outpainting to produce less seams
2022-09-07 00:58:01 +03:00
db6db585eb
added direction option for outpainting
2022-09-06 14:21:10 +03:00
66a9ca9d00
fixes for incorrect progressbar
2022-09-06 12:34:15 +03:00
395f170597
readme extras for VRAM for
...
added missing packages to requirements for #74
add support for negative numbers in X/Y plot (plus ranges) #73
changed progressbar to work properly with custom modes
2022-09-06 10:11:25 +03:00
a243bc7859
added progressbar
...
added an option to disable progressbar
added interrupt support to DDIM/PLMS
2022-09-06 02:09:01 +03:00
836b646374
moved images to
2022-09-04 13:08:06 +03:00
b99a47b12d
save grids created by scripts
2022-09-04 03:38:24 +03:00
7350c71259
added poor man's inpainting script
2022-09-04 01:29:43 +03:00
af133859f0
fix for sampler not working in X/Y plot script
2022-09-03 21:50:33 +03:00
592334f322
scripts
2022-09-03 19:32:45 +03:00
random-thoughtss