b90bd3e580
fix CN not applying to the first frame
2023-03-14 14:59:20 +03:00
7dfb4d0bdf
remove the strength_0_no_init msg
2023-03-14 14:52:08 +03:00
68b24d03ad
Merge pull request #469 from deforum-art/interpolate-perlin
...
allow perlin for any resolution with F.interpolate
2023-03-14 14:50:08 +03:00
8f894d06b8
allow perlin for any resolution with F.interpolate
2023-03-14 14:46:10 +03:00
45db5db99c
replace " and ' in formulae only once
...
thanks for @MatissesProjects 's observation
2023-03-14 13:59:27 +03:00
75e01295bc
Merge remote-tracking branch 'upstream/automatic1111-webui' into fix-matisse
2023-03-14 01:02:43 +02:00
a1c44ef4c6
drop deprecated v1 upscaling
...
since it contains dependencies, broken in the latest webui update
2023-03-14 01:20:26 +03:00
490ccba11e
fix frame index math eval
2023-03-14 00:41:28 +03:00
479ef445da
fixup
2023-03-14 00:24:42 +03:00
3ae9e64f1d
fix formulae parsing
2023-03-14 00:21:54 +03:00
07760403e1
fixup
2023-03-14 00:16:04 +03:00
ff5e7b18ad
unhardcode strength-related settings
2023-03-14 00:12:37 +03:00
f91ffbc812
use the new preset args for the GI mode
2023-03-14 00:04:19 +03:00
a5eced7dc1
fix keyframe number interpolation
2023-03-13 23:58:59 +03:00
89b46124d4
auto-set the needed args for the GI mode
2023-03-13 22:51:11 +03:00
d4a48b1e0a
re-add matisse's changes
2023-03-13 22:22:22 +03:00
1ce8ff4e92
update GI info
2023-03-13 20:45:47 +03:00
088634c286
set the default init strength to 0.8
2023-03-13 20:32:21 +03:00
d701305bd1
add try catch to cn ui setup
2023-03-13 19:56:13 +03:00
dc4cfedea4
link the recommended CN version
2023-03-13 19:23:30 +03:00
d95593eac9
redirect CN problems reporting
2023-03-13 19:20:40 +03:00
bdde26096b
fixup
2023-03-13 18:55:16 +03:00
0476e41386
option to not overwrite input and select vid path
2023-03-13 18:50:55 +03:00
5351cc4132
use better color
2023-03-13 18:36:14 +03:00
77f1c1816c
add some more notes on CN
2023-03-13 18:33:02 +03:00
44266999e2
remove note on img2img slider option
...
it's auto-disabled anyway now
2023-03-13 18:28:48 +03:00
4a475cccd2
move CN infotext
2023-03-13 18:28:04 +03:00
6d9033f1c9
remove the CN not found error message
...
the tab will be disactivated anyway, so we don't need the error message
2023-03-13 18:25:09 +03:00
363e07acfe
Merge branch 'automatic1111-webui' into cn-attempt-3
2023-03-13 18:22:49 +03:00
3de256751a
Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3
2023-03-13 17:19:27 +02:00
4e827e7c81
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/452
2023-03-13 17:01:27 +02:00
ee7420c320
Merge pull request #460 from hithereai/some_tests_12_03_23
...
Add noise multiplier scheduling, move clipskip location in ui, auto-disable "with img2img do exactly x steps"
2023-03-13 17:59:57 +03:00
2c10600cb4
Merge pull request #456 from hithereai/TESTS11323
...
less code duplication in load_args function
2023-03-13 17:48:38 +03:00
60fcc288e5
fix for color match sample incorrect colors
...
Once I tried some different images I realized that the color balance was RGB/BGR swapped on the color matches. Ooops! This fixes it. Perfect color matching after strength 0.
2023-03-13 06:54:04 -07:00
bb3b7bbd72
Fix for optical flow cadence on strength 0
...
I wasn't thinking about it quite right before, and I was cancelling the wrong cadence section based on strength 0. This repairs it.
It now looks at the proper strength key (from the tween frame_start_idx) to see if strength is 0 and skip optical flow cadence if it is.
Also, fixes and condenses the reporting of whether it's a cadence frame or an optical flow cadence by combining the info with the tween reporting.
2023-03-13 06:04:17 -07:00
48027d11ed
Fixed color match and optical flow on strength 0
...
I made cadence skip optical flow on frames with strength 0. This won't actually help you unless your cadence start is aligned perfectly with your strength 0.
Made strength 0 reset color match, as if it were the first frame in an animation.
I plan to make a scene change schedule, at which point I can add a strength threshold value for scene changes and replace this code.
2023-03-12 21:53:27 -07:00
d8d851dbc5
Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3
2023-03-13 01:40:24 +02:00
f06c222ba7
Merge remote-tracking branch 'upstream/automatic1111-webui' into some_tests_12_03_23
2023-03-13 01:40:08 +02:00
e67339c837
change order to align with other new lines of code
2023-03-13 01:38:05 +02:00
4387ab586d
fix wrong cli printing when not in 3d mode
2023-03-13 01:36:06 +02:00
67c76fbac4
clean some code
2023-03-13 01:30:16 +02:00
150e6a4434
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into pr/452
2023-03-13 01:22:10 +02:00
5d31dda542
png to jpg typo fix
2023-03-13 01:18:41 +02:00
a83626bfe1
guided imgs urls now from official deforum website
2023-03-13 01:16:27 +02:00
a3ed3a2a5b
Disabled optical flow cadence in 2D mode
...
I'll have to do some more work to track down a method to warp the flow properly in 2D mode. For now, optical flow cadence is a 3D only thing.
Made it say Optical flow cadence (3D only)
Made it hidden by default
Made it show when you switch to 3D mode
Made it not do the routines on the back end if not in 3D mode
2023-03-12 15:44:48 -07:00
39d1b524a3
anti blur amount from 0.35 to 0.1
2023-03-13 00:30:55 +02:00
e7022770d8
noise_multiplier_schedule default from 1 to 1.05
2023-03-13 00:30:28 +02:00
b00d70691d
enable_noise_multiplier_scheduling = True from False
2023-03-13 00:11:51 +02:00
791cb46e34
clean some more
2023-03-13 00:07:40 +02:00
8415fa103a
clean
2023-03-13 00:06:48 +02:00
3dd0af8b1b
clean
2023-03-13 00:05:02 +02:00
fa06205e73
hide entire content of noise tab when switching to interp anim mode
...
as it only does txt2img those params are doing abs nothing.
2023-03-13 00:04:01 +02:00
ac8306c7c0
auto-hide noise_multp_sch when switching to Interp anim mode
2023-03-12 23:58:10 +02:00
04537641de
auto disable "with img2img do exactly x steps" from general settings
2023-03-12 23:50:37 +02:00
a3b1864d18
move anti blur amount to top of its section
2023-03-12 23:35:57 +02:00
368e471dd8
clean code
2023-03-12 23:35:04 +02:00
71e38815c6
add noise_multiplier scheduling
2023-03-12 23:29:37 +02:00
6cb40bd43e
move clip skip sch under cfg tab
2023-03-12 23:00:42 +02:00
d8751fb3f2
Merge branch 'automatic1111-webui' into cn-attempt-3
2023-03-12 20:42:05 +03:00
6f0d30c44c
Merge pull request #442 from deforum-art/main-mask
...
Use only one mask preset in mask composition, fix video masks not moving
2023-03-12 20:22:21 +03:00
466e64a714
fixup controlnet settings saving
2023-03-12 20:05:41 +03:00
652bda9e61
drop the last frame if using video mask
2023-03-12 19:13:29 +03:00
f96c2d823e
drop the last frame if using video mask
2023-03-12 19:11:25 +03:00
60b186e664
Merge branch 'main-mask' of https://github.com/deforum-art/deforum-for-automatic1111-webui into main-mask
2023-03-11 23:28:08 +03:00
caeb0204f4
fix masks not moving
2023-03-11 23:27:59 +03:00
52500d0a0f
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-11 22:24:39 +02:00
67351f8a45
pass script args
2023-03-11 20:01:06 +03:00
39ef3537fd
guess mode to false by default
2023-03-11 19:44:45 +03:00
8651591e7f
improvement
2023-03-11 19:42:19 +03:00
370ef15cab
shorten cli model name output
2023-03-11 19:41:55 +03:00
58c7889eda
easier load_args function, and shorter too
2023-03-11 18:26:58 +02:00
d4438b56c7
fixup duplicated arg
2023-03-11 19:22:25 +03:00
4fd4f42a32
fixup missed scripts argument
2023-03-11 19:22:11 +03:00
fab84e4b70
fixup empty cn mask
2023-03-11 18:49:39 +03:00
943023ce51
fixup
2023-03-11 18:43:42 +03:00
eabfd505da
check for CN dynamically
2023-03-11 18:43:09 +03:00
12ad8a7866
note to upgrade CN if you downgraded it for Dfm
2023-03-11 17:59:04 +03:00
f2092f0695
add note about the fixed steps option
2023-03-11 17:05:08 +03:00
3d2116129b
make all cn settings interactive
2023-03-11 16:56:33 +03:00
0f0674a732
use cn api in processing
2023-03-11 16:52:40 +03:00
b8fe729fae
fixup ui loading
2023-03-11 15:44:40 +03:00
4c5a7a910d
add cn import failure patience
2023-03-11 15:44:19 +03:00
12d04a68c0
return cn's ui
2023-03-11 15:34:41 +03:00
d7c9c24eb0
Merge pull request #453 from hithereai/cn_api_based_v1
...
CN attempt 3 — temp branch
2023-03-11 13:57:19 +03:00
ab8650a32c
Merge pull request #447 from deforum-art/mps-depth-fix
...
Half depth samples on mps
2023-03-11 13:52:16 +03:00
1d8c466900
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/452
2023-03-11 11:07:11 +02:00
651ddb9358
Improvement to optical flow cadence
...
slight changes, big improvement
2023-03-11 00:54:52 -08:00
8b54a383e5
save deforum git commit id to setting files
2023-03-11 02:22:32 +02:00
8ca4daa913
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-11 01:10:58 +02:00
a863a85699
1
2023-03-11 00:37:30 +02:00
11a8797f92
new video init vid and related video mask
2023-03-11 00:01:28 +02:00
adde273e67
urls now on official deforum website
2023-03-10 23:42:09 +02:00
8e0d45cd5a
gr.Tab to gr.Tabs with gr.TabItem(s)
2023-03-10 19:51:49 +02:00
a81296d64c
more compact vertical ui in keyframes tab
2023-03-10 19:37:58 +02:00
6b28bfc65b
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-10 19:07:54 +02:00
e82b8deb30
Merge remote-tracking branch 'upstream/automatic1111-webui' into mps-depth-fix
2023-03-10 19:07:45 +02:00
94b85b97fb
no more printing of control net import ok/error
2023-03-10 19:06:26 +02:00
df262e4dc5
half depth samples on mps
...
should fix #394
2023-03-10 16:14:06 +03:00
056dc5cb11
don't import ffmpeg location from sett files
2023-03-10 13:39:23 +02:00
92827a64be
move optical cadence to Coherence tab
2023-03-10 11:37:53 +02:00
2de505e915
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/443
2023-03-10 11:32:21 +02:00
7a6d814332
revert try 1
2023-03-10 09:26:17 +02:00
37a58a556f
another code clean
2023-03-10 00:04:33 +02:00
79183f8d7c
clean code
2023-03-09 23:57:35 +02:00
7e0110a954
add cli printing before in-between cadence frames
2023-03-09 23:51:29 +02:00
cb934b4a07
clean code
2023-03-09 23:42:30 +02:00
7d764fd10b
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/443
2023-03-09 23:26:55 +02:00
1866371f92
Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask
2023-03-09 22:05:48 +02:00
094c98e1ad
Merge remote-tracking branch 'upstream/automatic1111-webui' into option_to_auto_delete_imgs
2023-03-09 21:48:14 +02:00
db003c5c97
Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui
2023-03-09 08:26:22 -08:00
0c8b8e0aff
added optical flow cadence
...
optional checkbox to include optical flow in normal cadence
-starts by getting flow between turbo_prev_image and turbo_next_image.
- after getting the flow, it warps the turbo_next_image with negative flow to match prev
- then, normal image warping during cadence happens
- then it warps the flow field to match the animation, first converting it to relative for warp, then back to absolute flow
- I calculate the flow division for each tween value and divide that by two.
- it then applies that tweened flow to the prev and next image
2023-03-09 08:25:56 -08:00
dbb852f354
fix math tweening
...
broken due to max_f introduction
2023-03-09 17:17:49 +03:00
d209157ad7
use only one mask preset
...
fixes "There is a bug where it is checking the mask_file path for no good reason, when it should only be using video masks" in #386
2023-03-09 13:11:54 +03:00
19aeaa627d
Adding max_f and math to interpolation mode
2023-03-09 00:22:03 -08:00
a13683c1cd
align id var name to batch_id instead of run_id
2023-03-09 02:51:58 +02:00
5342e83dea
Merge remote-tracking branch 'upstream/automatic1111-webui' into option_to_auto_delete_imgs
2023-03-09 02:20:21 +02:00
2aa41949f8
add an option to auto-delete imgs after video creation/s
2023-03-09 02:19:28 +02:00
c91d8b7dfe
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-08 13:24:51 -08:00
c04a714401
Merge pull request #437 from hithereai/add_extension_github_version_to_cli_and_gui
...
Add deforum github commit version/ID to ui and cli
2023-03-09 00:21:05 +03:00
2491e1d58d
total backend rename skip vid for run all -> skip vid creation
2023-03-08 23:07:49 +02:00
4946e0b585
rename in UI (only) skip video for run all -> skip video creation
2023-03-08 23:03:34 +02:00
4948b76c65
add del_imgs butt to ui, initial
2023-03-08 23:02:41 +02:00
61975f68ac
add saving of pos and neg prompts to anim_run sett file
2023-03-08 22:45:33 +02:00
6fe8927499
fix missing prompts in save_settings_from_animation_run(
2023-03-08 22:05:24 +02:00
421235d9bc
GitHub --> Git in cli printing
2023-03-07 23:32:52 +02:00
bbd36679e6
update old printed version in show vid section from 0.5 to 2.2
2023-03-07 23:21:56 +02:00
3d7cb423da
add deforum github commit version to ui and cli
2023-03-07 23:18:04 +02:00
33b574f776
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420
2023-03-07 21:52:36 +02:00
d29d975929
ui changes push 1
2023-03-07 21:47:38 +02:00
871252a389
add compact variant to main deforum gallery column
2023-03-07 21:06:43 +02:00
2b8ab3f85a
revive exporting of restore_faces param to settings
2023-03-07 20:40:13 +02:00
517c45b484
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420
2023-03-07 19:28:07 +02:00
2df62d8f3e
final fixes and cleaning
2023-03-07 19:15:01 +02:00
1eb345d5a0
done? handle saving when running animations
2023-03-07 18:12:16 +02:00
5f1e4c64ea
stop saving a sep vid sett file with animation
2023-03-07 17:24:01 +02:00
e088e6a609
initial and working!
2023-03-07 03:11:34 +02:00
0f862805a6
hide upscale v1 from ui (it's not working)
...
might not come back
2023-03-06 23:31:20 +02:00
62dc275037
use opts.outdir_samples for upscaling and interpolation as well (in use for animation)
2023-03-06 23:19:45 +02:00
7b26d2433c
Merge remote-tracking branch 'upstream/automatic1111-webui' into run_diffusion_clipskip_fixes
2023-03-06 22:12:51 +02:00
e8466b6bc2
Merge pull request #427 from hithereai/align_%09d_filenames
...
Align img filenames to be of length %09d.extension
2023-03-06 23:12:04 +03:00
4def24303f
add try block to get opts.clip_stop_at_last_layers
2023-03-06 22:11:07 +02:00
acb9012f21
fix video input not using input frames with negative prompt present
2023-03-05 23:35:14 +02:00
6e255f97c8
align img filenames to be of length 09.extension
2023-03-05 22:30:22 +02:00
4e9a2a5ef0
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420
2023-03-05 21:16:11 +02:00
8e313631aa
better skipping video cli message
2023-03-05 20:57:00 +02:00
91b1f64087
fix first frame sampler with sampler_sch ON
2023-03-05 20:50:37 +02:00
6828b854f5
Revert "Merge pull request #422 from hithereai/sampler_sch_fixes"
...
This reverts commit 09c99d10ed97ab68b13b
2023-03-05 20:15:22 +02:00
46577bd3aa
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-05 00:25:08 -08:00
3b7b971950
fix wrong sampler name in cli for 0 frame with sampler_sch on
2023-03-04 21:56:56 +02:00
324a1489ba
final push to the cli table
2023-03-04 18:08:52 +02:00
0f24e404e3
code clean
2023-03-04 15:29:02 +02:00
0d912d7655
add clipskip support for interpolation mode
2023-03-04 14:36:14 +02:00
40d48e3678
tiny fix for sampler schedule in interp mode
2023-03-04 14:30:36 +02:00
725f06b50e
add support for steps and sampler schedueling in interpolation mode
2023-03-04 14:25:15 +02:00
e4dfc06fae
clean
2023-03-04 10:46:16 +02:00
a6dadc2a6e
clean
2023-03-04 10:44:56 +02:00
e439ebeb02
add back removal of variant=compact
2023-03-04 00:12:05 -08:00
177ec8aa1b
Revert "Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui"
...
This reverts commit c14e03f0aa80546752b3
2023-03-03 23:49:33 -08:00
1e91c01f57
Revert "reimplementation of max_f and t"
...
This reverts commit b222ca54f9
2023-03-03 23:48:42 -08:00
b222ca54f9
reimplementation of max_f and t
2023-03-03 23:47:45 -08:00
c14e03f0aa
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-03 23:32:24 -08:00
80546752b3
fix for string schedules
2023-03-03 23:29:51 -08:00
26fd9ed603
comment
2023-03-04 04:46:03 +02:00
f14b9e98a9
fix
2023-03-04 04:41:47 +02:00
435d67fd80
much better
2023-03-04 04:39:57 +02:00
fde2ea6cf6
p
2023-03-04 04:15:47 +02:00
37a5665363
clean
2023-03-04 04:07:38 +02:00
415a544c94
Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables
2023-03-04 03:54:50 +02:00
686ea3c71e
Revert "Merge pull request #410 from MatissesProjects/automatic1111-webui"
...
This reverts commit 5ab8cb21f617692459e9
2023-03-04 03:50:57 +02:00
9da7930ead
Revert "Merge pull request #416 from MatissesProjects/automatic1111-webui"
...
This reverts commit 37d3e210f15016fb3163
2023-03-04 03:50:36 +02:00
cd6ffbbb8e
return compact mode
2023-03-04 03:23:44 +02:00
96b24b3b36
Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables
2023-03-04 03:06:59 +02:00
37d3e210f1
Merge pull request #416 from MatissesProjects/automatic1111-webui
...
fix for prompt not showing fully in cli
2023-03-04 03:06:30 +02:00
1a86431098
initial
2023-03-04 03:00:39 +02:00
f4f8518906
so much for the pretty 1 liner haha
2023-03-03 16:16:47 -08:00
7bcaa04b75
Merge remote-tracking branch 'upstream/automatic1111-webui' into some_trials
2023-03-04 01:56:09 +02:00
ec31b65194
fix longer right side of ui
2023-03-04 01:55:12 +02:00
007ceb6e4d
fix for prompt now showing fully in cli
2023-03-03 15:42:29 -08:00
1558d17062
initial combine cli tables to one
2023-03-04 01:39:53 +02:00
b5dc688d01
make gr.number instead of sliders
2023-03-04 00:06:57 +02:00
f54794e769
return mask_contrast_adjust and mask_brightness_adjust to UI
2023-03-03 23:48:39 +02:00
6b582bb1d6
fix max_f not working unless it's max_f-1 in sch params
2023-03-03 21:41:51 +02:00
99fb7236ba
fix missing aspect ratio series
2023-03-03 21:31:00 +02:00
835e676b25
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/410
2023-03-03 21:25:45 +02:00
c8f68c78be
tighter gen/interrupt buttons
2023-03-03 21:01:02 +02:00
1c81c5235e
all gr.Row() to gr.Row(variant='compact')
2023-03-03 20:48:02 +02:00
f4b99a58a3
small cleanups
2023-03-03 00:23:53 -08:00
ed38f9a202
Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui
2023-03-02 23:54:36 -08:00
ac5eec8f62
clean
2023-03-02 23:03:11 +02:00
880dfc8758
clean some more
2023-03-02 22:57:41 +02:00
89408abfd9
stop saving non visible perlin params in out sett file
2023-03-02 22:55:55 +02:00
1fe0dc5470
CLEAN
2023-03-02 22:52:04 +02:00
39a07359c7
clean
2023-03-02 22:43:55 +02:00
d3e9e336ea
CLEAN
2023-03-02 22:40:25 +02:00
9d71f25f51
more cleaning
2023-03-02 22:35:09 +02:00
d1982f4e72
more cleaning
2023-03-02 22:32:47 +02:00
69dceb10b9
remove @param from old vanilla notebook
2023-03-02 22:29:18 +02:00
12bef7ce26
remove stupid old OS check
2023-03-02 22:13:36 +02:00
ce414e8dac
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408
2023-03-02 18:14:17 +02:00
96a055f7b0
Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs
2023-03-02 18:07:52 +02:00
kabachuha
hithereai
reallybigname
Matisse