Commit Graph

1760 Commits (91df0fa852ca03c27d21fc9d02482c6d3e9e85bb)

Author SHA1 Message Date
hithereai 251ccc6f9f add DEBUG_MODE 2023-04-07 18:57:48 +03:00
hithereai 0b308c610f add option to use old aspect ratio formula 2023-04-07 18:04:08 +03:00
hithereai ecea6f5774 better interpolation ui width separation 2023-04-07 16:46:21 +03:00
hithereai 1c4b609377 remove unused code 2023-04-07 15:41:10 +03:00
hithereai 1293a8f9b1 better ui text 2023-04-07 15:14:48 +03:00
hithereai 8a971d33b8 better ui text 2023-04-07 15:14:17 +03:00
hithereai a3c6fdfe0f add ui info for optical_flow_cadence 2023-04-07 15:13:16 +03:00
hithereai ed1ff82340 auto-hide Cadence flow factor schedule 2023-04-07 15:11:07 +03:00
hithereai a828c0c4b4 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529 2023-04-07 15:05:46 +03:00
hithereai d86a602d1b fix neg and pos prompts in batch mode 2023-04-07 13:58:38 +03:00
hithereai 51f3ca1524 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529 2023-04-07 07:51:20 +03:00
hithereai 83fc4a1159 add info to ui param 2023-04-07 05:01:44 +03:00
hithereai 5e3df5f7b4 better ui text 2023-04-07 04:57:53 +03:00
hithereai 9915d47c63 small fix 2023-04-07 04:36:27 +03:00
hithereai a68c6744b6 fix missing vid_args of load_args 2023-04-07 04:28:50 +03:00
hithereai 72d43f7750 bmode_p1 2023-04-07 04:22:46 +03:00
hithereai ab727f81c5 cleaning 2023-04-07 03:30:23 +03:00
hithereai 7a99e75d52 more ui changes 2023-04-07 03:27:02 +03:00
hithereai 196372804c tiny ui updates 2023-04-07 03:23:08 +03:00
reallybigname d9457fc442 Changed hybrid_use_init_image feature to work with online images 2023-04-06 09:31:23 -07:00
reallybigname 9828461001 Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui 2023-04-06 09:15:23 -07:00
reallybigname 067b39b031 Made hybrid_use_init_image option override the args.use_init_image in args,py
This change prevents the args.init_image from being changes to None in args.py is hybrid_use_init_image is on.
2023-04-06 09:14:57 -07:00
hithereai a4e4e7ca22 add comments 2023-04-06 16:04:10 +03:00
hithereai 8eac754421 print to printf fix 2023-04-06 12:50:16 +03:00
hithereai a4fa0cff3f decapitalize a word in gr.info 2023-04-06 07:22:18 +03:00
hithereai c5982e6811 clean 2023-04-06 06:57:45 +03:00
hithereai 283690dc00 deduplicate gradio code 2023-04-06 06:57:19 +03:00
hithereai 09eb44e235 Merge branch 'fix_interp_ffmpeg' into pr/529 2023-04-06 06:49:07 +03:00
hithereai 2a65bda4f2 remove old commented line 2023-04-06 06:48:25 +03:00
hithereai 52576bdd36 more ui updates 2023-04-05 23:44:40 +03:00
hithereai 1dbb26fb1c ui updates 2023-04-05 22:57:54 +03:00
hithereai 9b670291af add deprecation updates 2023-04-05 22:33:31 +03:00
reallybigname bf536d87a0 Fixed accidental newb error is not 'None'
I was using: is not 'None'
instead of: != 'None'

Ugh...
2023-04-05 11:45:06 -07:00
reallybigname 69990993fe Hybrid Image, new flow factor schedules, optical flow guidance
new option to use init image as hybrid video
- you can use all normal compositing stuff with that mode.
- you can't use optical flow, because it's not a video - but - if there are already video frames in the directory, well - you should be able to still use flow and ransac modes, although I haven't tested that

changed Optical flow redo to a selection of optical flow type with None as default
- added Redo flow factor schedule
- made optical flow redo look nicer by warping the same image that it is using to compare to prev_img, then it goes in for final generation
changed Optical flow cadence to a selection of optical flow type with None as default
- added cadence flow factor schedule

Added flow guidance from last flow
- no UI change - it just works by default with hybrid motion optical flow types. It just uses the last flow as guidance, so it's a minor difference, but a little better temporal coherence on flow

changed hybrid composite to a selection with None as default
- now can set hybrid compositing to Normal (After Motion), Before Motion, or After Generation!
2023-04-05 11:01:54 -07:00
hithereai 7bbaa0c2a6 add comment 2023-04-05 17:54:57 +03:00
hithereai bae6792845 fix vid upscale output vid path 2023-04-05 17:53:52 +03:00
hithereai 4a710de5da change neg and pos prompt fields to use placeholders instead of gr.info 2023-04-05 14:05:07 +03:00
hithereai 9eb7629081 add safetensors example in ckpt schedule 2023-04-05 14:02:25 +03:00
hithereai d15f6269f0 add comment 2023-04-05 13:59:27 +03:00
hithereai fce0360f42 move ffmpeg settings to general webui's tab 2023-04-05 13:55:47 +03:00
hithereai 26b081c548 more info and fixed hints 2023-04-05 01:46:40 +03:00
hithereai 7d1ebd0a15 remove duplicated import 2023-04-05 01:22:05 +03:00
hithereai 63f08d0938 add pause/resume for interpolation mode as well 2023-04-04 22:08:39 +03:00
hithereai fd7a57c304 fix interrupt behavior - no longer yields errors 2023-04-04 21:55:12 +03:00
hithereai 8c9b4b08a3 stop/resume using Skip button 2023-04-04 20:28:15 +03:00
hithereai d48fb80b94 p 2023-04-01 01:20:19 +03:00
hithereai 1bfb46b47e p 2023-04-01 01:18:04 +03:00
hithereai 714e479be2 interpolation fixes and info addition p1 2023-03-31 19:14:38 +03:00
hithereai 766280e5d4
show_info_on_ui now True instead of False by default 2023-03-31 18:18:50 +03:00
hithereai 0058c04c63 organize 2023-03-31 16:45:31 +03:00
hithereai df7d60d874 Working, can add more infos for sure in a later date 2023-03-31 16:43:03 +03:00
hithereai 6dab9ee76c
Merge pull request #510 from reallybigname/automatic1111-webui
Fixed flow factor only working in integers
2023-03-30 12:10:14 +03:00
hithereai f2eefe4856 Merge remote-tracking branch 'upstream/automatic1111-webui' into blank-frames-reroll-fix 2023-03-30 12:06:26 +03:00
reallybigname 19b42e96f2 Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui 2023-03-30 02:05:32 -07:00
reallybigname 35b20e2756 Fixed flow factor only working in integers
I have no idea why I left an int() in there... I only tested integers. My bad. Now, you can do very small amounts of flow. Derp.
2023-03-30 02:03:49 -07:00
hithereai c692821521 fix frame interpolation not working for pics 2023-03-29 03:53:25 +03:00
hithereai a20d46fb8d auto hide and set to 1 if seed isn't set to random/-1 2023-03-24 22:29:41 +03:00
hithereai 010bfb2323 final probably 2023-03-24 19:06:50 +03:00
hithereai 8ab8797386 initial working 2023-03-24 18:58:15 +03:00
Joe Toch 92aa568313
fix instruction text to use %09d image file name format
just fixing typo/missed update from https://github.com/deforum-art/deforum-for-automatic1111-webui/pull/427
2023-03-22 16:36:32 -04:00
kabachuha c321e62050 fix #496 2023-03-22 19:56:44 +03:00
hithereai 6b75aa59e7
Merge pull request #490 from hithereai/option_for_consistent_settings
Add option to keep settings persistent upon relaunch of webui
2023-03-21 18:39:17 +02:00
hithereai 48cd22a9ea Final cleaning 2023-03-21 18:38:08 +02:00
rewbs 4d9f3a692c Cosmetic change only: update description of Parseq manifest to clarify that users can control which fields to override 2023-03-21 10:51:44 +11:00
hithereai 1189446ac9 Merge remote-tracking branch 'upstream/automatic1111-webui' into option_for_consistent_settings 2023-03-20 23:54:47 +02:00
hithereai 77ad8b0181 add auto-load when launching webui 2023-03-20 23:53:36 +02:00
hithereai ffd2db46f1
Merge pull request #487 from hithereai/fix_commas_in_interp_pics
Fix commas and whitespaces for frame interpolation of pics
2023-03-20 23:27:50 +02:00
hithereai 982b15bf0e clean p2 2023-03-20 20:43:33 +02:00
hithereai cb7b5fae71 part 1 (save) - complete 2023-03-20 00:23:27 +02:00
hithereai e6544f0a3d Merge remote-tracking branch 'upstream/automatic1111-webui' into blank-frames-reroll-fix 2023-03-19 22:05:16 +02:00
hithereai 490d30b093 fix commas and whitespaces for frame interpolation of pics 2023-03-19 21:46:15 +02:00
hithereai 938723913a replace commas and whitespaces with underscore 2023-03-19 21:25:33 +02:00
hithereai 97bf99d763 Merge remote-tracking branch 'upstream/automatic1111-webui' into dynamic_batch-folder_name 2023-03-19 21:22:36 +02:00
kabachuha 03723e6acf fixup for variable scope 2023-03-19 22:20:59 +03:00
kabachuha d866772ad8 wrap generate with vae failure checks 2023-03-19 22:13:49 +03:00
kabachuha 38d37a7240 move bfr to more correct place 2023-03-19 21:43:45 +03:00
kabachuha 891e7c69d3 add garbage collector runs after var deletions 2023-03-19 21:21:53 +03:00
kabachuha d60f3c3c3b
Merge pull request #474 from reallybigname/automatic1111-webui
Added Optical flow redo generation
2023-03-19 21:16:08 +03:00
reallybigname c6b8779d4a Added optical flow cadence method selection
- Uses the same variable, optical_flow_cadence but now uses "None" for disabled and has the three optical flow methods.
- Improved reporting of cadence frames to include optical flow cadence type if one is selected
2023-03-18 19:52:51 -07:00
hithereai 370e66e564 reorder and tiny bugfix 2023-03-19 03:07:08 +02:00
hithereai 525b9f0813 bugfix for midas > 1 2023-03-19 03:00:15 +02:00
hithereai 68d618e395 READY?! 2023-03-19 01:58:23 +02:00
hithereai f7ea36adc7 save --> keep name chane 2023-03-19 01:52:22 +02:00
hithereai 3f92d0a086 move keep 3d models in vram to webui's settings-->Deforum tab
Not complete yet
2023-03-19 01:51:00 +02:00
hithereai dc42df0683 update ui text 2023-03-18 21:18:16 +02:00
hithereai 799ebb2db7 auto-hide when webui launched with med or lowvram modes 2023-03-18 21:16:30 +02:00
hithereai 3cf1570656 bugfix 2023-03-18 21:03:30 +02:00
hithereai d34a6f1432 add option to keep 3d models in vram between runs 2023-03-18 20:53:00 +02:00
reallybigname 4a6315060a Removed test code.. whoops.
Sorry, I'm tired... I had added this to test something and forgot to remove, and didn't notice I commited it.
2023-03-17 12:46:36 -07:00
reallybigname c3c2a4c9ad Fixed one-off error in Redo
My most embarrassing commit.. I tested a bunch of different numbers of redos... except for 1... which caused an error and made me realize I had a one off problem... Tested 0, 1, 2, 3... working properly now. 1 redo yields 2 generations... as it should.
2023-03-17 12:38:47 -07:00
reallybigname 165a479519 made diffusion redo only color match on last one out
After testing it became obvious that part of the magic of the redo was letting the colors drift during redo... so, I just color matched on the way out, and it maintains it's cool factor, while maintaining colors!
2023-03-17 10:21:44 -07:00
reallybigname 94d21c95b7 fixed colors drifting during redo and optical flow redo
I just forgot that color would drift during repeated generations. Fixed. Now it's really consistent... and redo is incredible.
2023-03-17 09:34:46 -07:00
reallybigname 096eec4ff0 Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui 2023-03-17 08:48:57 -07:00
reallybigname 0c1440b80b Added Diffusion Redo feature
Added slider for diffusion redo.
 - llterally does a diffusion multiple extra times, feeding it back into itself. It is suggested to turn steps down if you turn redo up.
- while redoing, seed is randomized and restored
- fixed Optical Flow Redo so that it also randomizes and restores the seed, making it less muddy.
2023-03-17 08:48:55 -07:00
hithereai 70dc0b2f6b Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/474 2023-03-17 15:51:32 +02:00
hithereai 4c300276b5 Merge remote-tracking branch 'upstream/automatic1111-webui' into dynamic_batch-folder_name 2023-03-17 15:51:24 +02:00
hithereai 68017c90bc fix invert image order too 2023-03-17 15:47:52 +02:00
hithereai 3743c23ff1 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/474 2023-03-17 14:48:30 +02:00
hithereai e14b38e2b0 set default batch name to Deforum_{timestring} 2023-03-17 14:17:56 +02:00
hithereai 413f115554 FINAL 2023-03-17 14:17:00 +02:00
Jason Burbage c1a45ddfad fix: CN script_args order 2023-03-18 01:15:51 +13:00
reallybigname 649472d200 Fixed mistake
accidentally removed this crucial division! all better
2023-03-16 23:56:20 -07:00
reallybigname e1ddff8747 Hybrid Video Update
- Adds DIS Fine mode, and sets it as the new default
- Optical flow cadence and optical flow redo generation will now use DIS Fine, for pixel accuracy
- Adds flow guidance to hybrid flow. No setting needed, it just happens automatically, assisting the flow calculation by feeding in the last flow.
- Adds flow_factor_schedule for hybrid flow
- reduced some code for bordermode by setting a variable for the cv2 border mode translated from the user setting
2023-03-16 23:32:15 -07:00
hithereai 10d0b79e50 fix prompt handling 2023-03-17 03:23:40 +02:00
hithereai f0f93b68b1 remove duplicated import 2023-03-17 02:17:36 +02:00
hithereai 33b67a519a much better manual-stitch frames to video 2023-03-17 02:16:59 +02:00
hithereai 150059192a load/save setting jsons as UTF-8 encoding 2023-03-16 23:42:04 +02:00
hithereai 6b2bd26131 Add dynamic batch/folder name 2023-03-16 23:25:55 +02:00
reallybigname 3d008badbd Fixed PIL version conflict
- replaced Image,Resampling.LANCZOS with PIL.Image.LANCZOS
- had to add import PIL
- had heard of people on colab encountering this issue. Should fix both hybrid video and image/video color matching.
- tested, works fine locally, so I see no reason not to change
2023-03-16 04:45:39 -07:00
reallybigname 55aebfd032 prevent color match on strength 0 if using Video or Image color coherence
Follow up to strength 0 color match reset... prevents color match sample being replaced when strength goes to 0 if using color coherence Video or color coherence Image.
2023-03-16 02:40:07 -07:00
reallybigname e0a4337d8b Added Optical flow redo generation
Option works in 2D/3D mode
Does a disposable generation before the actual generation to get the flow between previous image and the generation.  Then, it discards that generation and warps the init_sample based on the captured flow before the actual generation happens.
- Takes twice as long (obviously)
- It can introduce smoothing, especially over time, but also adds a type of artistic consistency between frames.
- can be mixed and matched with any other modes, optical flow cadence, video, etc...
2023-03-16 01:39:41 -07:00
hithereai 8cda8dea4f Merge remote-tracking branch 'upstream/automatic1111-webui' into some_fixes_and_tests_14_03 2023-03-15 20:09:00 +02:00
hithereai 57da5bd9a6 fixes 2023-03-15 02:03:15 +02:00
hithereai f56348bac4 add deprecation vals, cut names from match frame 0 to just rgb/lab etc 2023-03-15 00:54:22 +02:00
reallybigname e0b75bee5d
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui 2023-03-14 14:40:10 -07:00
reallybigname df3071c3b4 Added color_coherence 'Image'
You can now color match against an image!
- the one caveat is that normal color matching is done with the prev_img. There is no prev_img for the 1st frame, so I had to force the color match on the output rather than the input. It makes the first frame look sharpened at times, since the histogram is forced on it.

I also fixed video color coherence
- I realized that it was never color matching on the first frame for video. You usually just wouldn't notice, since you're using the video.
- I also realized it was one frame off, fixed.
2023-03-14 14:39:44 -07:00
hithereai 280296b257 cut load_settings func in half, code length wise 2023-03-14 21:59:55 +02:00
kabachuha e3615a9fb8 bump version 2023-03-14 20:13:55 +03:00
kabachuha 2366bfdb47 use strength schedule in video input
closes #455
2023-03-14 15:24:16 +03:00
kabachuha b90bd3e580 fix CN not applying to the first frame 2023-03-14 14:59:20 +03:00
kabachuha 7dfb4d0bdf remove the strength_0_no_init msg 2023-03-14 14:52:08 +03:00
kabachuha 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
kabachuha 8f894d06b8 allow perlin for any resolution with F.interpolate 2023-03-14 14:46:10 +03:00
kabachuha 45db5db99c replace " and ' in formulae only once
thanks for @MatissesProjects 's observation
2023-03-14 13:59:27 +03:00
hithereai 75e01295bc Merge remote-tracking branch 'upstream/automatic1111-webui' into fix-matisse 2023-03-14 01:02:43 +02:00
kabachuha a1c44ef4c6 drop deprecated v1 upscaling
since it contains dependencies, broken in the latest webui update
2023-03-14 01:20:26 +03:00
kabachuha 490ccba11e fix frame index math eval 2023-03-14 00:41:28 +03:00
kabachuha 479ef445da fixup 2023-03-14 00:24:42 +03:00
kabachuha 3ae9e64f1d fix formulae parsing 2023-03-14 00:21:54 +03:00
kabachuha 07760403e1 fixup 2023-03-14 00:16:04 +03:00
kabachuha ff5e7b18ad unhardcode strength-related settings 2023-03-14 00:12:37 +03:00
kabachuha f91ffbc812 use the new preset args for the GI mode 2023-03-14 00:04:19 +03:00
kabachuha a5eced7dc1 fix keyframe number interpolation 2023-03-13 23:58:59 +03:00
kabachuha 89b46124d4 auto-set the needed args for the GI mode 2023-03-13 22:51:11 +03:00
kabachuha d4a48b1e0a re-add matisse's changes 2023-03-13 22:22:22 +03:00
kabachuha 1ce8ff4e92 update GI info 2023-03-13 20:45:47 +03:00
kabachuha 088634c286 set the default init strength to 0.8 2023-03-13 20:32:21 +03:00
kabachuha d701305bd1 add try catch to cn ui setup 2023-03-13 19:56:13 +03:00
kabachuha dc4cfedea4 link the recommended CN version 2023-03-13 19:23:30 +03:00
kabachuha d95593eac9 redirect CN problems reporting 2023-03-13 19:20:40 +03:00
kabachuha bdde26096b fixup 2023-03-13 18:55:16 +03:00
kabachuha 0476e41386 option to not overwrite input and select vid path 2023-03-13 18:50:55 +03:00
kabachuha 5351cc4132 use better color 2023-03-13 18:36:14 +03:00
kabachuha 77f1c1816c add some more notes on CN 2023-03-13 18:33:02 +03:00
kabachuha 44266999e2 remove note on img2img slider option
it's auto-disabled anyway now
2023-03-13 18:28:48 +03:00
kabachuha 4a475cccd2 move CN infotext 2023-03-13 18:28:04 +03:00
kabachuha 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
kabachuha 363e07acfe Merge branch 'automatic1111-webui' into cn-attempt-3 2023-03-13 18:22:49 +03:00
hithereai 3de256751a Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3 2023-03-13 17:19:27 +02:00
hithereai 4e827e7c81 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/452 2023-03-13 17:01:27 +02:00
kabachuha 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
kabachuha 2c10600cb4
Merge pull request #456 from hithereai/TESTS11323
less code duplication in load_args function
2023-03-13 17:48:38 +03:00
reallybigname 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
reallybigname 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
reallybigname 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
hithereai d8d851dbc5 Merge remote-tracking branch 'upstream/automatic1111-webui' into cn-attempt-3 2023-03-13 01:40:24 +02:00
hithereai f06c222ba7 Merge remote-tracking branch 'upstream/automatic1111-webui' into some_tests_12_03_23 2023-03-13 01:40:08 +02:00
hithereai e67339c837 change order to align with other new lines of code 2023-03-13 01:38:05 +02:00
hithereai 4387ab586d fix wrong cli printing when not in 3d mode 2023-03-13 01:36:06 +02:00
hithereai 67c76fbac4 clean some code 2023-03-13 01:30:16 +02:00
hithereai 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
hithereai 5d31dda542 png to jpg typo fix 2023-03-13 01:18:41 +02:00
hithereai a83626bfe1 guided imgs urls now from official deforum website 2023-03-13 01:16:27 +02:00
reallybigname 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
hithereai 39d1b524a3 anti blur amount from 0.35 to 0.1 2023-03-13 00:30:55 +02:00
hithereai e7022770d8 noise_multiplier_schedule default from 1 to 1.05 2023-03-13 00:30:28 +02:00
hithereai b00d70691d enable_noise_multiplier_scheduling = True from False 2023-03-13 00:11:51 +02:00
hithereai 791cb46e34 clean some more 2023-03-13 00:07:40 +02:00
hithereai 8415fa103a clean 2023-03-13 00:06:48 +02:00
hithereai 3dd0af8b1b clean 2023-03-13 00:05:02 +02:00
hithereai 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
hithereai ac8306c7c0 auto-hide noise_multp_sch when switching to Interp anim mode 2023-03-12 23:58:10 +02:00
hithereai 04537641de auto disable "with img2img do exactly x steps" from general settings 2023-03-12 23:50:37 +02:00
hithereai a3b1864d18 move anti blur amount to top of its section 2023-03-12 23:35:57 +02:00
hithereai 368e471dd8 clean code 2023-03-12 23:35:04 +02:00
hithereai 71e38815c6 add noise_multiplier scheduling 2023-03-12 23:29:37 +02:00
hithereai 6cb40bd43e move clip skip sch under cfg tab 2023-03-12 23:00:42 +02:00
kabachuha d8751fb3f2 Merge branch 'automatic1111-webui' into cn-attempt-3 2023-03-12 20:42:05 +03:00
kabachuha 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
kabachuha 466e64a714 fixup controlnet settings saving 2023-03-12 20:05:41 +03:00
kabachuha 652bda9e61 drop the last frame if using video mask 2023-03-12 19:13:29 +03:00
kabachuha f96c2d823e drop the last frame if using video mask 2023-03-12 19:11:25 +03:00
kabachuha 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
kabachuha caeb0204f4 fix masks not moving 2023-03-11 23:27:59 +03:00
hithereai 52500d0a0f Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask 2023-03-11 22:24:39 +02:00
kabachuha 67351f8a45 pass script args 2023-03-11 20:01:06 +03:00
kabachuha 39ef3537fd guess mode to false by default 2023-03-11 19:44:45 +03:00
kabachuha 8651591e7f improvement 2023-03-11 19:42:19 +03:00
kabachuha 370ef15cab shorten cli model name output 2023-03-11 19:41:55 +03:00
hithereai 58c7889eda easier load_args function, and shorter too 2023-03-11 18:26:58 +02:00
kabachuha d4438b56c7 fixup duplicated arg 2023-03-11 19:22:25 +03:00
kabachuha 4fd4f42a32 fixup missed scripts argument 2023-03-11 19:22:11 +03:00
kabachuha fab84e4b70 fixup empty cn mask 2023-03-11 18:49:39 +03:00
kabachuha 943023ce51 fixup 2023-03-11 18:43:42 +03:00
kabachuha eabfd505da check for CN dynamically 2023-03-11 18:43:09 +03:00
kabachuha 12ad8a7866 note to upgrade CN if you downgraded it for Dfm 2023-03-11 17:59:04 +03:00
kabachuha f2092f0695 add note about the fixed steps option 2023-03-11 17:05:08 +03:00
kabachuha 3d2116129b make all cn settings interactive 2023-03-11 16:56:33 +03:00
kabachuha 0f0674a732 use cn api in processing 2023-03-11 16:52:40 +03:00
kabachuha b8fe729fae fixup ui loading 2023-03-11 15:44:40 +03:00
kabachuha 4c5a7a910d add cn import failure patience 2023-03-11 15:44:19 +03:00
kabachuha 12d04a68c0 return cn's ui 2023-03-11 15:34:41 +03:00
kabachuha d7c9c24eb0
Merge pull request #453 from hithereai/cn_api_based_v1
CN attempt 3 — temp branch
2023-03-11 13:57:19 +03:00
kabachuha ab8650a32c
Merge pull request #447 from deforum-art/mps-depth-fix
Half depth samples on mps
2023-03-11 13:52:16 +03:00
hithereai 1d8c466900 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/452 2023-03-11 11:07:11 +02:00
reallybigname 651ddb9358 Improvement to optical flow cadence
slight changes, big improvement
2023-03-11 00:54:52 -08:00
hithereai 8b54a383e5 save deforum git commit id to setting files 2023-03-11 02:22:32 +02:00
hithereai 8ca4daa913 Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask 2023-03-11 01:10:58 +02:00
hithereai a863a85699 1 2023-03-11 00:37:30 +02:00
hithereai 11a8797f92 new video init vid and related video mask 2023-03-11 00:01:28 +02:00
hithereai adde273e67 urls now on official deforum website 2023-03-10 23:42:09 +02:00
hithereai 8e0d45cd5a gr.Tab to gr.Tabs with gr.TabItem(s) 2023-03-10 19:51:49 +02:00
hithereai a81296d64c more compact vertical ui in keyframes tab 2023-03-10 19:37:58 +02:00
hithereai 6b28bfc65b Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask 2023-03-10 19:07:54 +02:00
hithereai e82b8deb30 Merge remote-tracking branch 'upstream/automatic1111-webui' into mps-depth-fix 2023-03-10 19:07:45 +02:00
hithereai 94b85b97fb no more printing of control net import ok/error 2023-03-10 19:06:26 +02:00
kabachuha df262e4dc5 half depth samples on mps
should fix #394
2023-03-10 16:14:06 +03:00
hithereai 056dc5cb11 don't import ffmpeg location from sett files 2023-03-10 13:39:23 +02:00
hithereai 92827a64be move optical cadence to Coherence tab 2023-03-10 11:37:53 +02:00
hithereai 2de505e915 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/443 2023-03-10 11:32:21 +02:00
hithereai 7a6d814332 revert try 1 2023-03-10 09:26:17 +02:00
hithereai 37a58a556f another code clean 2023-03-10 00:04:33 +02:00
hithereai 79183f8d7c clean code 2023-03-09 23:57:35 +02:00
hithereai 7e0110a954 add cli printing before in-between cadence frames 2023-03-09 23:51:29 +02:00
hithereai cb934b4a07 clean code 2023-03-09 23:42:30 +02:00
hithereai 7d764fd10b Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/443 2023-03-09 23:26:55 +02:00
hithereai 1866371f92 Merge remote-tracking branch 'upstream/automatic1111-webui' into main-mask 2023-03-09 22:05:48 +02:00
hithereai 094c98e1ad Merge remote-tracking branch 'upstream/automatic1111-webui' into option_to_auto_delete_imgs 2023-03-09 21:48:14 +02:00
reallybigname 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
reallybigname 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
kabachuha dbb852f354 fix math tweening
broken due to max_f introduction
2023-03-09 17:17:49 +03:00
kabachuha 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
Matisse 19aeaa627d Adding max_f and math to interpolation mode 2023-03-09 00:22:03 -08:00
hithereai a13683c1cd align id var name to batch_id instead of run_id 2023-03-09 02:51:58 +02:00
hithereai 5342e83dea Merge remote-tracking branch 'upstream/automatic1111-webui' into option_to_auto_delete_imgs 2023-03-09 02:20:21 +02:00
hithereai 2aa41949f8 add an option to auto-delete imgs after video creation/s 2023-03-09 02:19:28 +02:00
Matisse c91d8b7dfe Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-08 13:24:51 -08:00
kabachuha 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
hithereai 2491e1d58d total backend rename skip vid for run all -> skip vid creation 2023-03-08 23:07:49 +02:00
hithereai 4946e0b585 rename in UI (only) skip video for run all -> skip video creation 2023-03-08 23:03:34 +02:00
hithereai 4948b76c65 add del_imgs butt to ui, initial 2023-03-08 23:02:41 +02:00
hithereai 61975f68ac add saving of pos and neg prompts to anim_run sett file 2023-03-08 22:45:33 +02:00
hithereai 6fe8927499 fix missing prompts in save_settings_from_animation_run( 2023-03-08 22:05:24 +02:00
hithereai 3d7cb423da add deforum github commit version to ui and cli 2023-03-07 23:18:04 +02:00
hithereai 33b574f776 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420 2023-03-07 21:52:36 +02:00
hithereai 2b8ab3f85a revive exporting of restore_faces param to settings 2023-03-07 20:40:13 +02:00
hithereai 517c45b484 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420 2023-03-07 19:28:07 +02:00
hithereai 2df62d8f3e final fixes and cleaning 2023-03-07 19:15:01 +02:00
hithereai 1eb345d5a0 done? handle saving when running animations 2023-03-07 18:12:16 +02:00
hithereai e088e6a609 initial and working! 2023-03-07 03:11:34 +02:00
hithereai 0f862805a6 hide upscale v1 from ui (it's not working)
might not come back
2023-03-06 23:31:20 +02:00
hithereai 62dc275037 use opts.outdir_samples for upscaling and interpolation as well (in use for animation) 2023-03-06 23:19:45 +02:00
kabachuha 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
hithereai acb9012f21 fix video input not using input frames with negative prompt present 2023-03-05 23:35:14 +02:00
hithereai 6e255f97c8 align img filenames to be of length 09.extension 2023-03-05 22:30:22 +02:00
hithereai 4e9a2a5ef0 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420 2023-03-05 21:16:11 +02:00
hithereai 91b1f64087 fix first frame sampler with sampler_sch ON 2023-03-05 20:50:37 +02:00
hithereai 6828b854f5 Revert "Merge pull request #422 from hithereai/sampler_sch_fixes"
This reverts commit 09c99d10ed, reversing
changes made to 97ab68b13b.
2023-03-05 20:15:22 +02:00
Matisse 46577bd3aa Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-05 00:25:08 -08:00
hithereai 3b7b971950 fix wrong sampler name in cli for 0 frame with sampler_sch on 2023-03-04 21:56:56 +02:00
hithereai 324a1489ba final push to the cli table 2023-03-04 18:08:52 +02:00
hithereai 0f24e404e3 code clean 2023-03-04 15:29:02 +02:00
hithereai 0d912d7655 add clipskip support for interpolation mode 2023-03-04 14:36:14 +02:00
hithereai 40d48e3678 tiny fix for sampler schedule in interp mode 2023-03-04 14:30:36 +02:00
hithereai 725f06b50e add support for steps and sampler schedueling in interpolation mode 2023-03-04 14:25:15 +02:00
hithereai e4dfc06fae clean 2023-03-04 10:46:16 +02:00
hithereai a6dadc2a6e clean 2023-03-04 10:44:56 +02:00
Matisse 177ec8aa1b Revert "Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui"
This reverts commit c14e03f0aa, reversing
changes made to 80546752b3.
2023-03-03 23:49:33 -08:00
Matisse 1e91c01f57 Revert "reimplementation of max_f and t"
This reverts commit b222ca54f9.
2023-03-03 23:48:42 -08:00
Matisse b222ca54f9 reimplementation of max_f and t 2023-03-03 23:47:45 -08:00
Matisse c14e03f0aa Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-03 23:32:24 -08:00
Matisse 80546752b3 fix for string schedules 2023-03-03 23:29:51 -08:00
hithereai 26fd9ed603 comment 2023-03-04 04:46:03 +02:00
hithereai f14b9e98a9 fix 2023-03-04 04:41:47 +02:00
hithereai 435d67fd80 much better 2023-03-04 04:39:57 +02:00
hithereai fde2ea6cf6 p 2023-03-04 04:15:47 +02:00
hithereai 37a5665363 clean 2023-03-04 04:07:38 +02:00
hithereai 415a544c94 Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables 2023-03-04 03:54:50 +02:00
hithereai 686ea3c71e Revert "Merge pull request #410 from MatissesProjects/automatic1111-webui"
This reverts commit 5ab8cb21f6, reversing
changes made to 17692459e9.
2023-03-04 03:50:57 +02:00
hithereai 9da7930ead Revert "Merge pull request #416 from MatissesProjects/automatic1111-webui"
This reverts commit 37d3e210f1, reversing
changes made to 5016fb3163.
2023-03-04 03:50:36 +02:00
hithereai 96b24b3b36 Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables 2023-03-04 03:06:59 +02:00
hithereai 1a86431098 initial 2023-03-04 03:00:39 +02:00
Matisse f4f8518906 so much for the pretty 1 liner haha 2023-03-03 16:16:47 -08:00
Matisse 007ceb6e4d fix for prompt now showing fully in cli 2023-03-03 15:42:29 -08:00
hithereai 1558d17062 initial combine cli tables to one 2023-03-04 01:39:53 +02:00
hithereai b5dc688d01 make gr.number instead of sliders 2023-03-04 00:06:57 +02:00
hithereai f54794e769 return mask_contrast_adjust and mask_brightness_adjust to UI 2023-03-03 23:48:39 +02:00
hithereai 6b582bb1d6 fix max_f not working unless it's max_f-1 in sch params 2023-03-03 21:41:51 +02:00
hithereai 99fb7236ba fix missing aspect ratio series 2023-03-03 21:31:00 +02:00
hithereai 835e676b25 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/410 2023-03-03 21:25:45 +02:00
hithereai 1c81c5235e all gr.Row() to gr.Row(variant='compact') 2023-03-03 20:48:02 +02:00
Matisse f4b99a58a3 small cleanups 2023-03-03 00:23:53 -08:00
Matisse ed38f9a202 Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-02 23:54:36 -08:00
hithereai 89408abfd9 stop saving non visible perlin params in out sett file 2023-03-02 22:55:55 +02:00
hithereai 1fe0dc5470 CLEAN 2023-03-02 22:52:04 +02:00
hithereai 39a07359c7 clean 2023-03-02 22:43:55 +02:00
hithereai d3e9e336ea CLEAN 2023-03-02 22:40:25 +02:00
hithereai 9d71f25f51 more cleaning 2023-03-02 22:35:09 +02:00
hithereai d1982f4e72 more cleaning 2023-03-02 22:32:47 +02:00
hithereai 69dceb10b9 remove @param from old vanilla notebook 2023-03-02 22:29:18 +02:00
hithereai 12bef7ce26 remove stupid old OS check 2023-03-02 22:13:36 +02:00
hithereai ce414e8dac Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 18:14:17 +02:00
hithereai 96a055f7b0 Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-03-02 18:07:52 +02:00
hithereai 03fc980a9c Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 17:37:30 +02:00
hithereai b58babd1ab
fix small UI typo: interoplation --> interpolation 2023-03-02 17:35:20 +02:00
hithereai a31a7754d1 Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-03-02 01:40:55 +02:00
hithereai e8cfb5039f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 01:39:56 +02:00
hithereai a8c39266d6 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/410 2023-03-02 01:37:51 +02:00
hithereai 19f0878d27 add transform_ prefix to the 2 new 2d-"center" params 2023-03-02 01:25:22 +02:00
Matisse 19a92fa6e2 adding back midas changes 2023-03-01 14:55:37 -08:00
Matisse 23c0863ddf attempt 2
added s & max_f. Variable schedule planner, and prompt printout uses numbers instead of variables t/60 = .6 (at t=6)
2023-03-01 14:49:05 -08:00
kabachuha 51cf6b5250
Merge pull request #405 from reallybigname/automatic1111-webui
Added aspect_ratio schedule/series
2023-03-02 00:40:22 +03:00
kabachuha 2c09c81c10
Merge pull request #404 from hithereai/off_axis_rotation_v1
Keyframable rotation axis center X/Y for 2D mode
2023-03-02 00:07:39 +03:00
rewbs 0384fa29f6 Merge branch 'automatic1111-webui' into parseq-optional-prompts 2023-03-02 06:38:48 +11:00
rewbs ebcb75a0a7 Fix 'UnboundLocalError: local variable 'parseqName' referenced before assignment'. Allow Parseq to delegate prompt management back to Deforum. Summary table in console showing who's doing what between Deforum & Parseq. Initial unit test. 2023-03-02 06:36:33 +11:00
hithereai 1a8e18e92f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/405 2023-03-01 19:00:46 +02:00
hithereai e677470fa1 typo fix 2023-03-01 18:53:56 +02:00
hithereai d2ec5cbf2a Merge remote-tracking branch 'upstream/automatic1111-webui' into off_axis_rotation_v1 2023-03-01 18:52:11 +02:00
hithereai ab461f3e53 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-03-01 18:49:27 +02:00
hithereai 4c9b8b1dca Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-03-01 18:49:16 +02:00
hithereai 83e9be7a77 Revert "Merge pull request #358 from MatissesProjects/automatic1111-webui"
This reverts commit ff7201b5a5, reversing
changes made to 6215a44d79.
2023-03-01 18:45:12 +02:00
hithereai eca026fefb print aspect ratio in cli's table if it's not static 1 for the whole animation 2023-03-01 18:12:15 +02:00
hithereai d36cef0baa row variant compact for all depth rows (tiny ui change) 2023-03-01 17:52:22 +02:00
reallybigname 5c7808d3ea Added aspect_ratio schedule/series
Added control for 3D depth aspect ratio on a schedule. Now, if you want to recreate the horrible depth aspect ratio stretching deforum used to have, YOU CAN! Or, make it opposite, or make it change, or whatever.
2023-02-28 15:52:05 -08:00
hithereai 58849a67ba change param name and add hints 2023-03-01 01:49:32 +02:00
hithereai dbfd0524dc better order in UI 2023-03-01 00:44:24 +02:00
hithereai 287eada68d working 2023-03-01 00:25:04 +02:00
hithereai 375d6d6b66 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-28 22:30:22 +02:00
hithereai f297d86a82 Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-02-28 22:30:11 +02:00
hithereai 09bda85060 done 2023-02-28 22:15:10 +02:00
George Nance 5576a20bf6
Updated Parseq section location in info accord 2023-02-28 12:58:28 -07:00
hithereai cdaf2eefbf align center of cli msg below interp buttons 2023-02-28 21:03:29 +02:00
hithereai d85020a576 better explaining text about the change 2023-02-28 20:57:34 +02:00
hithereai 7f8ed43b77 ignore slow_mo in interp-pics mode logic change 2023-02-28 20:55:53 +02:00
hithereai 25b329f25c better 2023-02-28 02:46:22 +02:00
hithereai 563a02cc06 Update args.py 2023-02-28 02:01:43 +02:00
hithereai 59b9b1cb92 clarify text 2023-02-28 02:01:04 +02:00
hithereai ac893c3420 order and clean 2023-02-28 01:50:39 +02:00
hithereai d3607cd54a clean 2023-02-28 01:41:04 +02:00
hithereai 98f2289c9a fixes 2023-02-28 01:32:48 +02:00
hithereai edbeb6e626 fixes 2023-02-28 01:22:38 +02:00
hithereai 1929c06144 p 2023-02-28 01:16:44 +02:00
hithereai a35e4da802 progress 2023-02-28 00:00:15 +02:00
hithereai 8e2dcbc83c working but not final 2023-02-27 21:53:13 +02:00
hithereai e6ba634b6b progress 2023-02-27 21:26:06 +02:00
hithereai 8fc258c1ff Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-27 20:25:06 +02:00
kabachuha 285a98f375 fix missed midas_weight in depth predict calls 2023-02-27 12:11:44 +03:00
kabachuha 74fc34e37e Revert "Revert "Merge pull request #339 from deforum-art/bad_apple!!""
This reverts commit 483a973e0a.
2023-02-27 11:56:23 +03:00
reallybigname ad9cf71cd0 Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui 2023-02-26 19:42:55 -08:00
reallybigname 882b917a9a Fixed issue where depth only worked properly at 1:1 aspect ratio
This has been an issue with Deforum as far back as I can remember... If the proportion was too wide, things would stretch unnaturally vertically, and if proportion was too thin, things would stretch horizontally.

I found that changing the aspect ratio in this function to 1, things are always correct, no matter the proportion of the image!

This is a major change to Deforum, but in all of my tests the results are much more consistent and reliable. I've tested extremes, like 3:1, 1:3, 4:1, 1:4, and everything seems even now. Tested different depth setings and FOV, and it all seems right to me now.
2023-02-26 19:42:48 -08:00
hithereai 28468ea9ab Update args.py 2023-02-27 01:30:45 +02:00
hithereai 99b9a9a458 typo 2023-02-27 01:30:06 +02:00
hithereai ce62fecb27 verify uploaded pics are of the same resolution 2023-02-27 01:29:26 +02:00
hithereai f8d22dc2ac progress 2023-02-27 01:23:15 +02:00
hithereai c96e739d17 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-27 01:05:58 +02:00
hithereai 483a973e0a Revert "Merge pull request #339 from deforum-art/bad_apple!!"
This reverts commit 6215a44d79, reversing
changes made to 27b508bd42.
2023-02-27 00:58:47 +02:00
hithereai 731a6c0151 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-26 19:05:47 +02:00
kabachuha cf0872ecae Merge branch 'automatic1111-webui' of https://github.com/MatissesProjects/deforum-extensions into pr/358 2023-02-26 18:16:05 +03:00
kabachuha 1b7a78af1d Merge branch 'automatic1111-webui' into pr/358 2023-02-26 18:15:53 +03:00
kabachuha ae50470067 fixup reference in None mode 2023-02-26 17:39:13 +03:00
kabachuha 2453c46142 don't load models on None mode 2023-02-26 15:59:06 +03:00
kabachuha c56d2f5b86 add 'None' mode to just threshold grayscale 2023-02-26 15:07:24 +03:00
kabachuha 513d6b7b65 Merge branch 'automatic1111-webui' into bad_apple!! 2023-02-26 13:57:45 +03:00
kabachuha e49c00343d Revert "args for depth norm control"
This reverts commit 5ad939713b.
2023-02-26 13:56:11 +03:00
Matisse 6297e84a98 small cleanup, seems easier to understand 2023-02-25 17:45:59 -08:00
Matisse 12d01950d8 adding max_f into prompt setup 2023-02-25 17:24:54 -08:00
Matisse f542990140 left and right side can use max_f 2023-02-25 16:47:52 -08:00
Matisse 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
Matisse 1943459b99
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui 2023-02-25 15:30:29 -08:00
hithereai 234fcfbfc9 Update args.py 2023-02-25 18:55:15 +02:00
hithereai dcb04eca0e Update args.py 2023-02-25 18:53:46 +02:00
hithereai 6bdd2063e5 Update args.py 2023-02-25 18:52:36 +02:00
hithereai b97b144d85 Update args.py 2023-02-25 18:35:58 +02:00
hithereai 2fe0bdee47 cleaning and new box for uploading pics 2023-02-25 17:49:56 +02:00
reallybigname 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
kabachuha 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
kabachuha 12c5c8b2ce add missed controlnet_args to video mask 2023-02-24 14:29:04 +03:00
hithereai 43b1e863be Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358 2023-02-23 23:11:21 +02:00
hithereai e364270bba clean 2023-02-23 23:04:03 +02:00
hithereai a9888879fe shorter code same logic 2023-02-23 23:03:49 +02:00
hithereai 88e2a3e855 fix ui auto-update of fps in upload fps 2023-02-23 23:01:01 +02:00
hithereai ad3f1e521f Merge remote-tracking branch 'upstream/automatic1111-webui' into FILM_interp 2023-02-22 21:50:31 +02:00
hithereai b925cf9a50 fix interpolation mode not running at all 2023-02-22 21:47:59 +02:00
hithereai ad9be327c6 auto-keep interp frames if calculated out vid fps > 450 2023-02-21 01:38:31 +02:00
hithereai 55d8497af8 clean 2023-02-21 01:08:24 +02:00
hithereai 4f270f9c75 clean 2023-02-21 01:01:02 +02:00
hithereai 1fd38b17b8 cleean 2023-02-21 00:52:10 +02:00
hithereai cd1cdadd3e interp x min to 2 from 1 2023-02-21 00:49:48 +02:00
hithereai 106cd0c33a clean 2023-02-21 00:45:29 +02:00
hithereai 36a1805498 getting close 2023-02-21 00:34:38 +02:00
hithereai 6a669d0a0a Update frame_interpolation.py 2023-02-21 00:24:01 +02:00
hithereai 523b70044c fixes 2023-02-21 00:13:49 +02:00
hithereai 61d88160b3 cadence minimum to 1 from 2 (wtf?!) 2023-02-20 23:55:55 +02:00
hithereai a790dd3623 fixes 2023-02-20 23:34:21 +02:00
hithereai 549d1e4843 Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME 2023-02-20 22:57:37 +02:00
hithereai 8f15d98529 Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME 2023-02-20 22:55:17 +02:00
hithereai 916dab4588 round fps in UI to maximum of .00 2023-02-20 22:55:12 +02:00
kabachuha 7eddbfe8af point to CN version used in dev process 2023-02-20 23:44:47 +03:00
kabachuha 5b1216b871 Revert "exclude leres due to complaints"
This reverts commit 147b2cbbef.
2023-02-20 23:41:04 +03:00
hithereai 22fb037d4b make rife print in green when it's done too 2023-02-20 22:40:52 +02:00
kabachuha 01abc3c736 use_init note 2023-02-20 23:33:21 +03:00
hithereai 9e952049ef Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME 2023-02-20 22:32:05 +02:00
hithereai 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
hithereai 09abbe0842 interp done in green 2023-02-20 22:30:30 +02:00
kabachuha 147b2cbbef exclude leres due to complaints
looks like it was disabled in the core ext
2023-02-20 23:24:20 +03:00
hithereai 19e0b96ddf
Merge branch 'deforum-art:automatic1111-webui' into TEST_FILM_DELME 2023-02-20 22:22:13 +02:00
hithereai 74ec003a88 better cli printing 2023-02-20 22:21:48 +02:00
kabachuha ec397f711a bump version 2023-02-20 23:18:42 +03:00
kabachuha 8371df4786 add note about models location 2023-02-20 23:18:17 +03:00
hithereai 01dd399a61 Merge remote-tracking branch 'upstream/automatic1111-webui' into TEST_FILM_DELME 2023-02-20 22:07:45 +02:00
hithereai ad005ef976 better progress bar 2023-02-20 22:04:58 +02:00
hithereai bf3ad5b357 fix ffmpeg again 2023-02-20 21:47:44 +02:00
hithereai 43f01fcf85 fix video stitching 2023-02-20 21:44:14 +02:00
hithereai c71179916e set actual fps for interp vid output 2023-02-20 21:41:19 +02:00
hithereai 1980d7c6b1 move fps param out of rife inner IF 2023-02-20 21:40:21 +02:00
kabachuha 122d12f3da fixed settings saving 2023-02-20 22:37:30 +03:00
hithereai 826dcc63b0 min 1 --> 2 2023-02-20 21:36:04 +02:00
hithereai 43ff0fac75 PRO GRESS 2023-02-20 20:03:25 +02:00
hithereai 326a4e4c39 save interpolated frames as png instead of jpg 2023-02-20 19:23:19 +02:00
hithereai 6a3366c983 progress 2023-02-20 16:06:39 +02:00
hithereai 3be2acfc69 more fixes 2023-02-20 15:31:52 +02:00
hithereai 2d548fe0cb fixes 2023-02-20 15:18:50 +02:00
kabachuha f380e89734 fix rich table 2023-02-20 15:44:36 +03:00
kabachuha 70c927f028 fix controlnet rendering first frame over and over 2023-02-20 15:34:04 +03:00
kabachuha 4203cfa944 fixup table args
fix rows x2

fixup
2023-02-20 15:30:25 +03:00
kabachuha e263fc1308 use rich table for CN params 2023-02-20 14:31:24 +03:00
kabachuha 730be340fb add missed guidance strength param 2023-02-20 14:04:22 +03:00
kabachuha 91c53263ed moved to a separate tab for less scroll 2023-02-20 14:00:23 +03:00
hithereai 192669eb88 fix 2023-02-20 12:43:24 +02:00
hithereai af874bd863 clean 2023-02-20 12:39:55 +02:00
kabachuha 8ff8f7a06d fix video input widgets not being shown 2023-02-20 13:34:40 +03:00
hithereai 678b3083f8 progress 2023-02-20 12:15:05 +02:00
hithereai 4ffd5b5fc0 progress 2023-02-20 09:54:32 +02:00
hithereai 0f9c5d0315 arg name changes to support more than just rife 2023-02-20 09:40:38 +02:00
hithereai d4f1fc9b7e Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358 2023-02-20 09:13:46 +02:00
Matisse 077c769890 resolving variables in the prompts for cli 2023-02-19 22:25:16 -08:00
Matisse b6accfe79c move parsing into class. r to seed passed 2023-02-19 22:23:02 -08:00
hithereai 3dd3f4e940 add source film file 2023-02-20 05:04:21 +02:00
hithereai d62477ce9f CN not found tiny txt change, red to Tomato, take color from css 2023-02-20 04:58:41 +02:00
hithereai e301871f45 update comment to reflect that we don't use prettytables anymoree
use rich instead
2023-02-20 04:51:52 +02:00
hithereai 160f1a677e Update inference_video.py 2023-02-20 04:16:16 +02:00
hithereai 29a61b9b76 more progress 2023-02-20 03:43:57 +02:00
hithereai ce6eba320b progress 2023-02-20 03:19:58 +02:00
hithereai 3f1d7ef621 better slider auto-change and reset 2023-02-20 02:45:27 +02:00
hithereai 4c9819ba87 change interpolators engine order 2023-02-20 02:20:06 +02:00
hithereai 108861e686 hide upload vid to interp if interp engine is None 2023-02-20 02:16:02 +02:00
hithereai f7f85f7b8b fix ui for mobile/ tiny screens 2023-02-20 02:08:22 +02:00
hithereai 5f79328811 hide slow_mo slider by default 2023-02-20 02:01:50 +02:00
hithereai 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
hithereai 91898c1c50 new shorter cli line in green 2023-02-20 00:49:38 +02:00
hithereai 929143dfe5 only Congrats word in green, rest in white
it was just too much 🎱
2023-02-20 00:32:02 +02:00
hithereai ad07f1d6b4 push enable cn button to see UI 2023-02-20 00:27:05 +02:00
hithereai 0447748812 tiny text change 2023-02-20 00:22:49 +02:00
hithereai acbc0eadbd smaller html margin 2023-02-20 00:16:25 +02:00
hithereai 8265debb12 tiny text change + add wink emoji 2023-02-20 00:08:56 +02:00
hithereai 1459d59ce2 fix CN extension url html color 2023-02-19 23:59:03 +02:00
hithereai 7d3693f922 hide scribble mode 2023-02-19 23:56:41 +02:00
hithereai db1acdf922 fix horizontal/vertical ui thingy 2023-02-19 23:47:47 +02:00
hithereai 96f45b7cca Merge branch 'controlnet' of https://github.com/deforum-art/deforum-for-automatic1111-webui into controlnet 2023-02-19 23:31:17 +02:00
hithereai d5a858bbc2 initial code order and ui fixes 2023-02-19 23:31:02 +02:00
kabachuha e4069e1b79 fix input video mode laoding 2023-02-20 00:23:59 +03:00
hithereai b7f3225710 ui progress 2023-02-19 22:39:08 +02:00
kabachuha e29a25b067 fixup another global variable 2023-02-19 23:11:46 +03:00
kabachuha 6ca3c3ccb5 at least we get past frame #2 generation 2023-02-19 23:04:21 +03:00
kabachuha 0b4363427e hacking hacks 2023-02-19 22:30:18 +03:00
kabachuha c6be7b7fa9 plan B
add backup hardcode module
2023-02-19 21:50:37 +03:00
kabachuha 206d552929 ??? 2023-02-19 21:16:15 +03:00
kabachuha e074712626 fixup imports x2 2023-02-19 20:38:09 +03:00
kabachuha 12ad4b707f import fixup 2023-02-19 20:11:07 +03:00
kabachuha fa3ed0a147 add the actual controlnet intergration 🥳 2023-02-19 20:03:05 +03:00
hithereai 6eac22dad5 Update args.py 2023-02-19 19:02:29 +02:00
hithereai ebd0f8744b initial 2023-02-19 18:54:08 +02:00
kabachuha 434b29cef4 redirect to WIP conditional processing 2023-02-19 19:40:55 +03:00
kabachuha af5171b004 unpack controlnet input vids 2023-02-19 19:26:20 +03:00
kabachuha 9d6c3fbbe9 pass controlnet args to renders 2023-02-19 18:35:09 +03:00
kabachuha acaba911a4 try to fix the layout
didn't work
2023-02-19 17:59:34 +03:00
kabachuha 6f2ff29b1e colorize detection messages 2023-02-19 17:28:29 +03:00
kabachuha 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
kabachuha 1bfd998683 put stuff in rows 2023-02-19 17:07:38 +03:00
kabachuha 636e13dbca fixup 2023-02-19 16:56:46 +03:00
kabachuha 66760d502d signal the user that they have controlnet support 2023-02-19 16:54:28 +03:00
kabachuha 361443debb forgor to actually add ui components 💀 2023-02-19 16:51:51 +03:00
kabachuha 869692b2f1 fixup loading 2023-02-19 16:43:58 +03:00
kabachuha de27a252d1 Add ControlNet UI 2023-02-19 16:40:57 +03:00
kabachuha 5ad939713b args for depth norm control 2023-02-19 14:21:53 +03:00
kabachuha cecca529d6 Merge branch 'automatic1111-webui' into bad_apple!! 2023-02-19 13:18:13 +03:00
Matisse 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
hithereai 4e54c479ba Merge remote-tracking branch 'upstream/automatic1111-webui' into low-vram-depth 2023-02-19 01:15:05 +02:00
hithereai 535cb28c3e now it works 2023-02-19 01:10:36 +02:00
kabachuha b39f14c78b Merge branch 'automatic1111-webui' into low-vram-depth 2023-02-19 02:00:54 +03:00
kabachuha 92c379223c
Revert "max_frames slider ---> txtbox" 2023-02-19 02:00:02 +03:00
kabachuha bb64f7ce6d Merge branch 'automatic1111-webui' into low-vram-depth 2023-02-19 01:29:00 +03:00
kabachuha 8044d45f47 wrap hijacking 2023-02-19 01:22:00 +03:00
kabachuha b2dc72387e ofc do these tricks only in 3D mode 2023-02-19 01:21:40 +03:00
kabachuha 7a39b4cab3 infer low vram depth mode from cmd opts 2023-02-19 01:08:41 +03:00
hithereai e1d7e4ead3 max_frames from slider to txtbox 2023-02-18 23:52:37 +02:00
kabachuha c56bdb90be fixup not halving the depth model 2023-02-19 00:43:57 +03:00
kabachuha f47d0fdb84 device fixup 2023-02-19 00:40:19 +03:00
kabachuha f830d7e8fc fixup for empty adabins 2023-02-19 00:33:52 +03:00
kabachuha 9c6bffe45b option to unload main ckpt while getting depth 2023-02-18 23:38:27 +03:00
hithereai c37bd354c5 make gifski actually visible to mac users in the ui 2023-02-18 10:35:26 +02:00
hithereai b814218734 fix apply cwd location for gifski 2023-02-17 16:16:37 +02:00
hithereai 3c60502a54 Merge branch 'add_gifski_mac_support' into general_fixes 2023-02-17 16:07:23 +02:00
hithereai f4ea718d78 gifski mac support 2023-02-17 15:58:11 +02:00
hithereai fd7247d0c6 Merge remote-tracking branch 'upstream/automatic1111-webui' into general_fixes 2023-02-17 15:29:19 +02:00
hithereai a9fb55b25d Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/350 2023-02-17 15:07:23 +02:00
hithereai bb86d9ad40 Merge remote-tracking branch 'upstream/automatic1111-webui' into general_fixes 2023-02-17 15:07:03 +02:00
hithereai 646c77fb96 add missing imports for ncnn-upscale 2023-02-17 15:02:55 +02:00
hithereai 36e1643e8b delete temp duplicated imgs once run ends 2023-02-17 14:49:21 +02:00
yyahav 813b68460d added support for running the upscaler properly on mac 2023-02-17 14:18:56 +02:00
hithereai ebc62f7d25 save duplicated imgs to OS temp folder
instead of to the deforum batch one.
2023-02-17 14:13:04 +02:00
hithereai 86fe41d33b capitalize Got a request 2023-02-17 12:55:42 +02:00
hithereai 93de2689e2 way more robust stitch frame to video initial check 2023-02-17 12:54:52 +02:00
hithereai 6a220d9680 better looking run tab's extra accordion 2023-02-17 07:22:38 +02:00
hithereai 0d15d953c5 remove prettytable, move to rich tables instead, fix subseed val now showing in tables 2023-02-17 07:17:33 +02:00
hithereai 678c0242fe fix subseed stuff not showing in ui when it needs to 2023-02-17 06:33:08 +02:00
hithereai 507f98561c REVIVE RESTORE FACES! 2023-02-17 05:59:29 +02:00
hithereai ddc5639bfa tiling ddim eta and pix2pix sch to closed accordion
with clear title of the accordion.
2023-02-17 05:29:02 +02:00
hithereai f9c8850b8a order/ clean 2023-02-17 05:15:16 +02:00
hithereai 1194a80a6a fix tran x and y visible when they shouldn't be 2023-02-17 05:10:31 +02:00
hithereai b36f7c5c3a move ffmpeg settings to closed accordion - crf preset location
cleaner and makes more sense now that we have also gif, upscaling etc
2023-02-17 04:34:32 +02:00
hithereai 97594bd883 order and cleaning 2023-02-17 04:28:06 +02:00
hithereai 44318a3fd3 finish hybrid contextual UI 2023-02-17 04:04:09 +02:00
hithereai b5b49c021e Update args.py 2023-02-17 03:18:35 +02:00
hithereai 39034c28bd more hybrid contextual ui changes 2023-02-17 02:55:20 +02:00
hithereai 6962deb263 fixes and cleaning 2023-02-17 02:07:34 +02:00
hithereai 4b9f8791fa clean 2023-02-16 22:51:10 +02:00
hithereai b6d369f784 keep imgs = true at default 2023-02-16 22:37:24 +02:00
hithereai 09e1832f41 clean 2023-02-16 22:34:24 +02:00
hithereai 0c2b94d095 CLEAN 2023-02-16 22:28:35 +02:00
hithereai a7489659f5 better cli msg 2023-02-16 22:17:26 +02:00
hithereai c6652dfe71 getting close 2023-02-16 22:06:39 +02:00
hithereai 475fa6c688 Revert "updated upscaler support for mac env"
This reverts commit 52913cc0b5.
2023-02-16 21:59:14 +02:00
yyahav 52913cc0b5 updated upscaler support for mac env 2023-02-16 21:40:08 +02:00
hithereai 67b5983109 more progress 2023-02-16 21:31:58 +02:00
hithereai 00d8008b73 progress 2023-02-16 20:18:48 +02:00
hithereai c4c2187390 remove old comment 2023-02-16 15:56:20 +02:00
hithereai 3897564fd3 fix ui not showing to mac users 2023-02-16 15:53:30 +02:00
hithereai 9b17277246 Update args.py 2023-02-16 15:51:49 +02:00
hithereai 734cfba59d ui progress on vid upload to upscale v2 2023-02-16 15:15:55 +02:00
hithereai 3eeb3925f6 fix typo 2023-02-16 15:09:02 +02:00
hithereai 2aba6600d7 fix apple xattr command 2023-02-16 15:06:33 +02:00
hithereai 1efb7eea67 new comment 2023-02-16 14:59:44 +02:00
hithereai 27cf6a40d4 apple xattr fix 2023-02-16 14:55:11 +02:00
hithereai 2cd7bf510d return mac support initial 2023-02-16 14:51:29 +02:00
hithereai f4c8b5cd11 more concise 2023-02-16 14:21:37 +02:00
hithereai f183112cf3 typo 2023-02-16 14:17:42 +02:00
hithereai e38e0c7102 Update args.py 2023-02-16 14:17:02 +02:00
hithereai ca299fb205 Update args.py 2023-02-16 13:59:05 +02:00
hithereai 8391968610 Update args.py 2023-02-16 13:46:31 +02:00