Commit Graph

1561 Commits (c73dcf58daf2d19e592e2d083ccf71a6fc8a7683)

Author SHA1 Message Date
hithereai b208c28433 Update args.py 2023-05-18 00:29:55 +03:00
hithereai ca90a74511 del some not needed code 2023-05-18 00:27:55 +03:00
hithereai 2a374145f6 del unused code 2023-05-18 00:24:16 +03:00
hithereai 1c3ca807ef clean 2023-05-18 00:19:33 +03:00
hithereai f6a7e424a6 Update defaults.py 2023-05-17 22:32:18 +03:00
hithereai 7b44682a48 make more sense import wise 2023-05-17 22:22:57 +03:00
hithereai 1e90fd09ef del unused code 2023-05-17 22:20:11 +03:00
hithereai 4278dc98d1 CLEAN 2023-05-17 22:13:44 +03:00
hithereai 5afb32cfa1 clean 2023-05-17 22:05:29 +03:00
hithereai 415deef52c clean/simplify return of run_deforum 2023-05-17 22:02:46 +03:00
hithereai 3d4c9372eb simplify coee by not using html_log (never actually used it) 2023-05-17 21:57:42 +03:00
hithereai e7b38ec005 del not needed plaintext_to_html func 2023-05-17 21:55:12 +03:00
hithereai 6be2f3e7a4 del unused line 2023-05-17 21:52:51 +03:00
hithereai 95f0be28e8 minimal cleaning 2023-05-17 21:50:39 +03:00
hithereai e95303fc7d add missing if not then false to opts data get 2023-05-17 21:44:00 +03:00
hithereai bf524f1205 del unused import 2023-05-17 21:41:48 +03:00
hithereai 4bef3e9486 align verrsion to 2.4 (later on need to bump further) 2023-05-17 21:40:31 +03:00
hithereai 78fa3106d4 add clarification comment 2023-05-17 21:25:54 +03:00
hithereai 9c06564837 add missing fn inputs outputs for gradio to make it aligned with rest of code 2023-05-17 21:22:09 +03:00
hithereai 982e86feab CLEANING 2023-05-17 21:16:08 +03:00
hithereai 6a8cb2b652 deduplicate some sys/paths extend code 2023-05-17 21:03:11 +03:00
hithereai 185ebac804 remove stupid p params from where they were never used 2023-05-17 15:14:40 +03:00
hithereai b0b3f52a55 Update render.py 2023-05-17 15:12:29 +03:00
hithereai ee024d4bfe Update render.py 2023-05-17 15:12:11 +03:00
hithereai c52fa4567f CLEAN SOME CODE 2023-05-17 15:02:54 +03:00
hithereai 25843a12b3 del save_sample_per_step param 2023-05-17 14:58:42 +03:00
hithereai 1acd632f48 del unused n_batch internal param 2023-05-17 14:57:12 +03:00
hithereai 8979a47ee1 del unused save_settings param
we never let the users the option to not save a .txt file, and will never do as it's prune to many support issues and crying
2023-05-17 14:50:13 +03:00
hithereai e0eafc1e91 del unused line 2023-05-17 14:46:51 +03:00
hithereai 19f5354d2b renaming to make more sense 2023-05-17 14:45:45 +03:00
hithereai f783821d8a C1 2023-05-17 14:39:16 +03:00
hithereai 7e699be8a5 Merge branch 'enable-prompt-subtitles' of https://github.com/rewbs/deforum-for-automatic1111-webui into pr/709 2023-05-16 03:38:58 +03:00
hithereai b24b2e4095 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/709 2023-05-16 03:38:57 +03:00
rewbs d10d0e45f7 Merge branch 'enable-prompt-subtitles' of https://github.com/rewbs/deforum-for-automatic1111-webui into enable-prompt-subtitles 2023-05-16 10:26:18 +10:00
rewbs 4c08b09bac Include subtitles for RIFE. 2023-05-16 10:25:32 +10:00
hithereai 96452ee39c deduplicate CN code (use more code from CN external api) 2023-05-15 23:44:51 +03:00
hithereai 1091a3e3a6 fix CN not working in Batch Mode (thanks AndyXR!) 2023-05-15 21:57:28 +03:00
hithereai 396dc5e9b2 hide cn advanced row when cn is not enabled 2023-05-15 21:50:14 +03:00
hithereai fe381cdf2b Update deforum_controlnet_gradio.py 2023-05-15 17:35:44 +03:00
hithereai 24c8d22164 call the soft-embedded subs Deforum Data instead of Track 1 2023-05-15 16:48:39 +03:00
hithereai fe76ee994a Merge branch 'enable-prompt-subtitles' of https://github.com/rewbs/deforum-for-automatic1111-webui into pr/709 2023-05-15 16:36:08 +03:00
hithereai 9912465870 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/709 2023-05-15 16:36:07 +03:00
hithereai 80f5e99f52 Update deprecation_utils.py 2023-05-15 16:34:44 +03:00
rewbs 16ed1f8796 Improve console output. Pass srt path in explicitly so subtitles are successfully added on upscaling and frame interpolation. 2023-05-15 16:02:01 +10:00
kabachuha dac0121fc9 add switch to deprecated grayish colormatch 2023-05-15 01:23:39 +03:00
kabachuha b280841d1e fix frames grayness 2023-05-15 00:50:04 +03:00
hithereai 8db020c6f7 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/709 2023-05-14 16:50:11 +03:00
hithereai f6cd9fb2b2 Align with CN 14-05 2023-05-14 16:43:09 +03:00
hithereai e2ca6c067a Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/709 2023-05-12 19:12:40 +03:00
reallybigname 1856db88b2
Makes optical flow cadence work with hybrid motion (#708)
* Revert "Merge pull request #422 from hithereai/sampler_sch_fixes"

This reverts commit 09c99d10ed, reversing
changes made to 97ab68b13b.

* more vertically compact ui

* Revert "more vertically compact ui"

This reverts commit 0826d76e2d.

* Makes optical flow cadence work with hybrid motion

this one simple change of moving the routine allows for optical flow cadence to play nicely with hybrid motion during cadence

---------

Co-authored-by: hithereai <121192995+hithereai@users.noreply.github.com>
2023-05-12 19:11:26 +03:00
hithereai 2617b8b0e8 add default values to opts.data.get (critical!) 2023-05-12 18:59:23 +03:00
rewbs 5955abb18d Better output formatting (including error cases). Include whether current frame is a cadence frame or not in the subtitles. 2023-05-12 16:35:40 +10:00
rewbs ab05c05850 Allow prompts as subtitles. Optionally embed subtitles into mp4. Fix subtitles with Parseq: use getattr() instead of __dict__ to ensure fallback to non-Parseq controlled params works correctly. 2023-05-12 11:45:33 +10:00
hithereai c3f5d8ec56 Revert "add torch2 and xformers opts to midas"
This reverts commit 9e1393261c.
2023-05-11 17:12:02 +03:00
hithereai 55298f23e5 fix 3d mode not working with depth warp disabled 2023-05-11 11:13:23 +03:00
kabachuha 8b2a87b6e2
Merge pull request #696 from Phobos97/automatic1111-webui
bugfix for wrong mask being used
2023-05-10 20:06:46 +03:00
hithereai 69e138b7f9 dont run FILM in fp16 if --no-half is used as cmd arg 2023-05-10 19:26:53 +03:00
hithereai 73ad918c78 unload FILM model from vram when done interpolating +
make model loading make more sense, a bit faster now too
2023-05-10 19:20:13 +03:00
kabachuha 713af968d6 set min thresh to 32 2023-05-10 13:22:52 +03:00
kabachuha c19b4e92e2 use bicubic interpolation for masks
instead of nearest by default to reduce pixelation
2023-05-10 13:10:02 +03:00
Phobos 17df392c25 support word-based-masking for any dimensions 2023-05-10 01:29:39 +02:00
kabachuha 01497b7b43 Merge branch 'automatic1111-webui' into pr/696 2023-05-09 23:10:26 +03:00
kabachuha 9e1393261c add torch2 and xformers opts to midas
3d mode goes brrr....
2023-05-09 22:04:13 +03:00
hithereai a678262ec0 remove old commented line 2023-05-09 18:55:47 +03:00
hithereai 8f1405ce6e make CN's weight, guidance start/stop whole 1 liner each
and add the name schedule to the actual ui param name
2023-05-09 18:54:05 +03:00
hithereai a050498053 add info to p2p cfg sch ui param 2023-05-09 18:48:25 +03:00
hithereai ccffd7435c make run tab a lil bit tidier 2023-05-09 18:47:16 +03:00
Phobos 48144bb9c1 bugfix for wrong mask being used 2023-05-09 00:59:49 +02:00
reallybigname f39acbf486 fixed frames for 0-based counting in inputframes
also removed the stupid switching behavior for max frames when using a mask??? wtf
2023-05-08 13:41:13 -07:00
hithereai 05d044f394 Merge remote-tracking branch 'upstream/automatic1111-webui' into Frame-Alignment-RBN 2023-05-08 23:36:11 +03:00
hithereai ea2d899851 fix 2023-05-08 22:27:43 +03:00
hithereai 1dfab22195 auto hide/show ddim and ancestral schedule related params in ui 2023-05-08 22:23:52 +03:00
hithereai 8bfd6b80e7 use frame_idx instead of frame_idx+1 in masks.py 2023-05-08 21:45:22 +03:00
hithereai c360360b51 add ancestral_eta_scheduling
todo: auto-show/hide in ui
2023-05-08 03:28:20 +03:00
hithereai 6095dd757c replace ddim_eta with ddim_eta_schedule
turns out ddim_eta is a global general setting param now, not passed directly as a p.ddim_eta any more. So i made it a schedule.

Todo: only show in ui if ddim is selected.
2023-05-08 02:57:45 +03:00
hithereai d1f860e1ce remove mp4_path param (not in use) 2023-05-08 01:33:55 +03:00
hithereai f72ee00ae6 add new repo name to ext finder func 2023-05-08 01:31:13 +03:00
hithereai f4bc6cd176 remove unused import 2023-05-08 00:21:21 +03:00
hithereai eea43dfee7 fix frame count error at last frame just before stitching video 2023-05-08 00:20:15 +03:00
hithereai 38de62d646 shorten func 2023-05-07 13:27:53 +03:00
hithereai 4b6106b357 fix pers_flip shown in ui if enabled before switching to interp or vid input mode 2023-05-07 13:26:10 +03:00
hithereai 89221eb639 Let CN in LP mode use init_img if use_init=True on first frame 2023-05-07 13:05:00 +03:00
hithereai d82724452f move depth warp to its own tab, change persp_flip from accord to no accord 2023-05-07 02:43:50 +03:00
hithereai 02b2f32b35 del unused code 2023-05-07 00:20:32 +03:00
hithereai b5bdc5b084 add clarifying comment on some changes with do_not_save_samples param 2023-05-07 00:00:40 +03:00
hithereai 1e31101d41 fix typo 2023-05-06 23:51:43 +03:00
hithereai 004be005a6 remove output_format param from code 2023-05-06 23:51:08 +03:00
hithereai 79610c4f44 remove filename_format param from code 2023-05-06 23:42:29 +03:00
hithereai 6807cebafa remove display_samples param from code 2023-05-06 23:41:15 +03:00
hithereai 149b9bb8f9 remove path_name_modifier and render_steps params from code 2023-05-06 23:34:02 +03:00
hithereai 6d7bdea73d delete save_samples function and param from code 2023-05-06 23:27:44 +03:00
hithereai a68ac64f0e Delete __init__.py
we don't need it
2023-05-06 23:24:18 +03:00
hithereai 3e8dd9fbe8 remove from_img2img_instead_of_link param from code 2023-05-06 22:51:07 +03:00
hithereai 344108a936 remove show_sample_per_step param from code 2023-05-06 22:50:03 +03:00
hithereai 5010c99470 remove init_c and init_latent params 2023-05-06 22:48:22 +03:00
hithereai d55a84b4c6 remove c and f params from code 2023-05-06 22:45:07 +03:00
hithereai 7a1d1d6fdb don't save outdir param to setting files
we don't use it as it is, but I didn't want to remove it from the code at that stage.
2023-05-06 22:35:30 +03:00
hithereai fde93501f4 auto-hide input vid/img fields if loopback is enabled
and fix single pic input
2023-05-06 20:31:19 +03:00
hithereai fde7553728 fix wrong alignment of frame numbers 2023-05-06 20:22:31 +03:00
hithereai c30582ff2e add loopback mode to deforum's controlnet 2023-05-06 19:44:34 +03:00