483a973e0a
Revert "Merge pull request #339 from deforum-art/bad_apple!!"
...
This reverts commit 6215a44d7927b508bd42
2023-02-27 00:58:47 +02:00
731a6c0151
Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos
2023-02-26 19:05:47 +02:00
cf0872ecae
Merge branch 'automatic1111-webui' of https://github.com/MatissesProjects/deforum-extensions into pr/358
2023-02-26 18:16:05 +03:00
1b7a78af1d
Merge branch 'automatic1111-webui' into pr/358
2023-02-26 18:15:53 +03:00
ae50470067
fixup reference in None mode
2023-02-26 17:39:13 +03:00
2453c46142
don't load models on None mode
2023-02-26 15:59:06 +03:00
c56d2f5b86
add 'None' mode to just threshold grayscale
2023-02-26 15:07:24 +03:00
513d6b7b65
Merge branch 'automatic1111-webui' into bad_apple!!
2023-02-26 13:57:45 +03:00
e49c00343d
Revert "args for depth norm control"
...
This reverts commit 5ad939713b
2023-02-26 13:56:11 +03:00
6297e84a98
small cleanup, seems easier to understand
2023-02-25 17:45:59 -08:00
12d01950d8
adding max_f into prompt setup
2023-02-25 17:24:54 -08:00
f542990140
left and right side can use max_f
2023-02-25 16:47:52 -08:00
bca9cb0cd5
fix ) not showing up on where
...
this is due to it being not appended previously, now we can!
2023-02-25 16:34:05 -08:00
1943459b99
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui
2023-02-25 15:30:29 -08:00
234fcfbfc9
Update args.py
2023-02-25 18:55:15 +02:00
dcb04eca0e
Update args.py
2023-02-25 18:53:46 +02:00
6bdd2063e5
Update args.py
2023-02-25 18:52:36 +02:00
b97b144d85
Update args.py
2023-02-25 18:35:58 +02:00
2fe0bdee47
cleaning and new box for uploading pics
2023-02-25 17:49:56 +02:00
07be6b01ed
Fixed issue that prevented resume when using video mask
...
- unsharp_mask function was calling args.mask_image when mask_image is a local var at that point
- then, I realized that the routine shouldn't even be called if the amount is 0, so I added an if amount > 0 statement.
2023-02-24 14:02:09 -08:00
f6c581e8c0
fix video mask loading
...
works with totally blank mask frames too
closes #89 and closes #281
2023-02-24 14:54:11 +03:00
12c5c8b2ce
add missed controlnet_args to video mask
2023-02-24 14:29:04 +03:00
43b1e863be
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358
2023-02-23 23:11:21 +02:00
e364270bba
clean
2023-02-23 23:04:03 +02:00
a9888879fe
shorter code same logic
2023-02-23 23:03:49 +02:00
88e2a3e855
fix ui auto-update of fps in upload fps
2023-02-23 23:01:01 +02:00
ad3f1e521f
Merge remote-tracking branch 'upstream/automatic1111-webui' into FILM_interp
2023-02-22 21:50:31 +02:00
b925cf9a50
fix interpolation mode not running at all
2023-02-22 21:47:59 +02:00
ad9be327c6
auto-keep interp frames if calculated out vid fps > 450
2023-02-21 01:38:31 +02:00
55d8497af8
clean
2023-02-21 01:08:24 +02:00
4f270f9c75
clean
2023-02-21 01:01:02 +02:00
1fd38b17b8
cleean
2023-02-21 00:52:10 +02:00
cd1cdadd3e
interp x min to 2 from 1
2023-02-21 00:49:48 +02:00
106cd0c33a
clean
2023-02-21 00:45:29 +02:00
36a1805498
getting close
2023-02-21 00:34:38 +02:00
6a669d0a0a
Update frame_interpolation.py
2023-02-21 00:24:01 +02:00
523b70044c
fixes
2023-02-21 00:13:49 +02:00
61d88160b3
cadence minimum to 1 from 2 (wtf?!)
2023-02-20 23:55:55 +02:00
a790dd3623
fixes
2023-02-20 23:34:21 +02:00
549d1e4843
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:57:37 +02:00
8f15d98529
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:55:17 +02:00
916dab4588
round fps in UI to maximum of .00
2023-02-20 22:55:12 +02:00
7eddbfe8af
point to CN version used in dev process
2023-02-20 23:44:47 +03:00
5b1216b871
Revert "exclude leres due to complaints"
...
This reverts commit 147b2cbbef
2023-02-20 23:41:04 +03:00
22fb037d4b
make rife print in green when it's done too
2023-02-20 22:40:52 +02:00
01abc3c736
use_init note
2023-02-20 23:33:21 +03:00
9e952049ef
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:32:05 +02:00
0e234cfaca
Merge branch 'TEST_FILM_DELME' of https://github.com/hithereai/deforum-for-automatic1111-webui into TEST_FILM_DELME
2023-02-20 22:30:45 +02:00
09abbe0842
interp done in green
2023-02-20 22:30:30 +02:00
147b2cbbef
exclude leres due to complaints
...
looks like it was disabled in the core ext
2023-02-20 23:24:20 +03:00
19e0b96ddf
Merge branch 'deforum-art:automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:22:13 +02:00
74ec003a88
better cli printing
2023-02-20 22:21:48 +02:00
ec397f711a
bump version
2023-02-20 23:18:42 +03:00
8371df4786
add note about models location
2023-02-20 23:18:17 +03:00
01dd399a61
Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME
2023-02-20 22:07:45 +02:00
ad005ef976
better progress bar
2023-02-20 22:04:58 +02:00
bf3ad5b357
fix ffmpeg again
2023-02-20 21:47:44 +02:00
43f01fcf85
fix video stitching
2023-02-20 21:44:14 +02:00
c71179916e
set actual fps for interp vid output
2023-02-20 21:41:19 +02:00
1980d7c6b1
move fps param out of rife inner IF
2023-02-20 21:40:21 +02:00
122d12f3da
fixed settings saving
2023-02-20 22:37:30 +03:00
826dcc63b0
min 1 --> 2
2023-02-20 21:36:04 +02:00
43ff0fac75
PRO GRESS
2023-02-20 20:03:25 +02:00
326a4e4c39
save interpolated frames as png instead of jpg
2023-02-20 19:23:19 +02:00
6a3366c983
progress
2023-02-20 16:06:39 +02:00
3be2acfc69
more fixes
2023-02-20 15:31:52 +02:00
2d548fe0cb
fixes
2023-02-20 15:18:50 +02:00
f380e89734
fix rich table
2023-02-20 15:44:36 +03:00
70c927f028
fix controlnet rendering first frame over and over
2023-02-20 15:34:04 +03:00
4203cfa944
fixup table args
...
fix rows x2
fixup
2023-02-20 15:30:25 +03:00
e263fc1308
use rich table for CN params
2023-02-20 14:31:24 +03:00
730be340fb
add missed guidance strength param
2023-02-20 14:04:22 +03:00
91c53263ed
moved to a separate tab for less scroll
2023-02-20 14:00:23 +03:00
192669eb88
fix
2023-02-20 12:43:24 +02:00
af874bd863
clean
2023-02-20 12:39:55 +02:00
8ff8f7a06d
fix video input widgets not being shown
2023-02-20 13:34:40 +03:00
678b3083f8
progress
2023-02-20 12:15:05 +02:00
4ffd5b5fc0
progress
2023-02-20 09:54:32 +02:00
0f9c5d0315
arg name changes to support more than just rife
2023-02-20 09:40:38 +02:00
d4f1fc9b7e
Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358
2023-02-20 09:13:46 +02:00
077c769890
resolving variables in the prompts for cli
2023-02-19 22:25:16 -08:00
b6accfe79c
move parsing into class. r to seed passed
2023-02-19 22:23:02 -08:00
3dd3f4e940
add source film file
2023-02-20 05:04:21 +02:00
d62477ce9f
CN not found tiny txt change, red to Tomato, take color from css
2023-02-20 04:58:41 +02:00
e301871f45
update comment to reflect that we don't use prettytables anymoree
...
use rich instead
2023-02-20 04:51:52 +02:00
160f1a677e
Update inference_video.py
2023-02-20 04:16:16 +02:00
29a61b9b76
more progress
2023-02-20 03:43:57 +02:00
ce6eba320b
progress
2023-02-20 03:19:58 +02:00
3f1d7ef621
better slider auto-change and reset
2023-02-20 02:45:27 +02:00
4c9819ba87
change interpolators engine order
2023-02-20 02:20:06 +02:00
108861e686
hide upload vid to interp if interp engine is None
2023-02-20 02:16:02 +02:00
f7f85f7b8b
fix ui for mobile/ tiny screens
2023-02-20 02:08:22 +02:00
5f79328811
hide slow_mo slider by default
2023-02-20 02:01:50 +02:00
ee4101b403
align parseq html link color to SteelBlue
...
so it looks like all other hrefs in our extension
2023-02-20 01:07:56 +02:00
91898c1c50
new shorter cli line in green
2023-02-20 00:49:38 +02:00
929143dfe5
only Congrats word in green, rest in white
...
it was just too much 🎱
2023-02-20 00:32:02 +02:00
ad07f1d6b4
push enable cn button to see UI
2023-02-20 00:27:05 +02:00
0447748812
tiny text change
2023-02-20 00:22:49 +02:00
acbc0eadbd
smaller html margin
2023-02-20 00:16:25 +02:00
8265debb12
tiny text change + add wink emoji
2023-02-20 00:08:56 +02:00
1459d59ce2
fix CN extension url html color
2023-02-19 23:59:03 +02:00
7d3693f922
hide scribble mode
2023-02-19 23:56:41 +02:00
db1acdf922
fix horizontal/vertical ui thingy
2023-02-19 23:47:47 +02:00
96f45b7cca
Merge branch 'controlnet' of https://github.com/deforum-art/deforum-for-automatic1111-webui into controlnet
2023-02-19 23:31:17 +02:00
d5a858bbc2
initial code order and ui fixes
2023-02-19 23:31:02 +02:00
e4069e1b79
fix input video mode laoding
2023-02-20 00:23:59 +03:00
b7f3225710
ui progress
2023-02-19 22:39:08 +02:00
e29a25b067
fixup another global variable
2023-02-19 23:11:46 +03:00
6ca3c3ccb5
at least we get past frame #2 generation
2023-02-19 23:04:21 +03:00
0b4363427e
hacking hacks
2023-02-19 22:30:18 +03:00
c6be7b7fa9
plan B
...
add backup hardcode module
2023-02-19 21:50:37 +03:00
206d552929
???
2023-02-19 21:16:15 +03:00
e074712626
fixup imports x2
2023-02-19 20:38:09 +03:00
12ad4b707f
import fixup
2023-02-19 20:11:07 +03:00
fa3ed0a147
add the actual controlnet intergration 🥳
2023-02-19 20:03:05 +03:00
6eac22dad5
Update args.py
2023-02-19 19:02:29 +02:00
ebd0f8744b
initial
2023-02-19 18:54:08 +02:00
434b29cef4
redirect to WIP conditional processing
2023-02-19 19:40:55 +03:00
af5171b004
unpack controlnet input vids
2023-02-19 19:26:20 +03:00
9d6c3fbbe9
pass controlnet args to renders
2023-02-19 18:35:09 +03:00
acaba911a4
try to fix the layout
...
didn't work
2023-02-19 17:59:34 +03:00
6f2ff29b1e
colorize detection messages
2023-02-19 17:28:29 +03:00
3114a3bb68
fix gradio rows
...
gradio rows don't seem to support dynamic component renamings, so hardcode them
2023-02-19 17:21:43 +03:00
1bfd998683
put stuff in rows
2023-02-19 17:07:38 +03:00
636e13dbca
fixup
2023-02-19 16:56:46 +03:00
66760d502d
signal the user that they have controlnet support
2023-02-19 16:54:28 +03:00
361443debb
forgor to actually add ui components 💀
2023-02-19 16:51:51 +03:00
869692b2f1
fixup loading
2023-02-19 16:43:58 +03:00
de27a252d1
Add ControlNet UI
2023-02-19 16:40:57 +03:00
5ad939713b
args for depth norm control
2023-02-19 14:21:53 +03:00
cecca529d6
Merge branch 'automatic1111-webui' into bad_apple!!
2023-02-19 13:18:13 +03:00
bff6324d26
added r & max_f. Variable schedule planner
...
r is a random, good for starting a guided images at a random, that you can set for the last variable like 0:(r),1:(-1),max_f-1:(-1),max_f:(r)
max_f is the max frame, this is -1 because we start at 0
2023-02-18 21:28:02 -08:00
4e54c479ba
Merge remote-tracking branch 'upstream/automatic1111-webui' into low-vram-depth
2023-02-19 01:15:05 +02:00
535cb28c3e
now it works
2023-02-19 01:10:36 +02:00
b39f14c78b
Merge branch 'automatic1111-webui' into low-vram-depth
2023-02-19 02:00:54 +03:00
92c379223c
Revert "max_frames slider ---> txtbox"
2023-02-19 02:00:02 +03:00
bb64f7ce6d
Merge branch 'automatic1111-webui' into low-vram-depth
2023-02-19 01:29:00 +03:00
8044d45f47
wrap hijacking
2023-02-19 01:22:00 +03:00
b2dc72387e
ofc do these tricks only in 3D mode
2023-02-19 01:21:40 +03:00
7a39b4cab3
infer low vram depth mode from cmd opts
2023-02-19 01:08:41 +03:00
e1d7e4ead3
max_frames from slider to txtbox
2023-02-18 23:52:37 +02:00
c56bdb90be
fixup not halving the depth model
2023-02-19 00:43:57 +03:00
f47d0fdb84
device fixup
2023-02-19 00:40:19 +03:00
f830d7e8fc
fixup for empty adabins
2023-02-19 00:33:52 +03:00
9c6bffe45b
option to unload main ckpt while getting depth
2023-02-18 23:38:27 +03:00
c37bd354c5
make gifski actually visible to mac users in the ui
2023-02-18 10:35:26 +02:00
b814218734
fix apply cwd location for gifski
2023-02-17 16:16:37 +02:00
3c60502a54
Merge branch 'add_gifski_mac_support' into general_fixes
2023-02-17 16:07:23 +02:00
f4ea718d78
gifski mac support
2023-02-17 15:58:11 +02:00
fd7247d0c6
Merge remote-tracking branch 'upstream/automatic1111-webui' into general_fixes
2023-02-17 15:29:19 +02:00
hithereai
kabachuha
Matisse
reallybigname