Commit Graph

1437 Commits (b406184855a4e3955f0d89fdb59282b9ef9fa09d)

Author SHA1 Message Date
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 421235d9bc GitHub --> Git in cli printing 2023-03-07 23:32:52 +02:00
hithereai bbd36679e6 update old printed version in show vid section from 0.5 to 2.2 2023-03-07 23:21:56 +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 d29d975929 ui changes push 1 2023-03-07 21:47:38 +02:00
hithereai 871252a389 add compact variant to main deforum gallery column 2023-03-07 21:06:43 +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 5f1e4c64ea stop saving a sep vid sett file with animation 2023-03-07 17:24:01 +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
hithereai 7b26d2433c Merge remote-tracking branch 'upstream/automatic1111-webui' into run_diffusion_clipskip_fixes 2023-03-06 22:12:51 +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 4def24303f add try block to get opts.clip_stop_at_last_layers 2023-03-06 22:11:07 +02: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 8e313631aa better skipping video cli message 2023-03-05 20:57:00 +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 e439ebeb02 add back removal of variant=compact 2023-03-04 00:12:05 -08: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 cd6ffbbb8e return compact mode 2023-03-04 03:23:44 +02:00
hithereai 96b24b3b36 Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables 2023-03-04 03:06:59 +02:00
hithereai 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
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
hithereai 7bcaa04b75 Merge remote-tracking branch 'upstream/automatic1111-webui' into some_trials 2023-03-04 01:56:09 +02:00
hithereai ec31b65194 fix longer right side of ui 2023-03-04 01:55:12 +02: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 c8f68c78be tighter gen/interrupt buttons 2023-03-03 21:01:02 +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 ac5eec8f62 clean 2023-03-02 23:03:11 +02:00
hithereai 880dfc8758 clean some more 2023-03-02 22:57:41 +02: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
kabachuha aa7ce2baff
Merge pull request #364 from hithereai/FILM_interp
FILM Interpolation - straight after deforum run, or upload video
2023-02-23 22:59:13 +03:00
madmodder123 b74c4d5d65
Add timestring to output info
Makes it easier to grab for when you wanna enable "Resume from Timestring"
2023-02-22 17:52:32 -08: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 9becfb2449 del old comment 2023-02-20 09:44:05 +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 42412dbe75 Merge branch 'controlnet' of https://github.com/deforum-art/deforum-for-automatic1111-webui into controlnet 2023-02-20 00:24:06 +03:00
kabachuha e4069e1b79 fix input video mode laoding 2023-02-20 00:23:59 +03:00
hithereai 89d4f8b331 Merge remote-tracking branch 'upstream/automatic1111-webui' into controlnet 2023-02-19 23:12:10 +02: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
hithereai 17b82a768e add try except for rmtree of tempfolder, temp fix for guided imgs 2023-02-19 18:27:17 +02: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