Commit Graph

1980 Commits (cf343a4e113fe47230b3655829e90dcb47e6e82a)

Author SHA1 Message Date
kabachuha 2fdc3fa0d9 animatediff ui preparation 2023-10-05 21:23:03 +03:00
kabachuha 1bbb9214a1 initial animatediff args filling 2023-10-05 21:11:16 +03:00
andyxr b5cc6f98c1 Added 2 missing samplers
I missed two out: DPM++ 2M SDE Karras and Restart
2023-10-01 15:29:20 +01:00
kabachuha 6e78e892a1
Merge pull request #885 from rewbs/save-cn-images-with-rest-of-output
Save ControlNet detect map images alongside rest of output
2023-09-28 15:17:51 +03:00
kabachuha f80423e672
Merge pull request #886 from rewbs/allow-parseq-to-override-fps-cadence-max-frames
Allow Parseq users to use the FPS, cadence and max_frames specified in their Parseq doc (instead of having to duplicate them).
2023-09-28 15:15:18 +03:00
andyxr 1465612f04 Added latest samplers to get_samplers_list
Deforum works with the new samplers introduced with A1111 1.6. I've brought them back and I've run animations with all of them successfully (some need more steps than others).
2023-09-26 09:54:14 +01:00
andyxr ce4ac45bb0 Fixing issue 890 - Batch mode not working
This should address issue #890
2023-09-25 14:43:35 +01:00
rewbs 745f94729b fix inverted label and info fields 2023-09-19 22:52:04 +10:00
rewbs 6e4885fe38 Allow Parseq users to use the FPS, cadence and max_frames specified in their Parseq doc (instead of having to duplicate them). 2023-09-19 22:29:40 +10:00
rewbs deb6f42bf8 remove unrelated changes 2023-09-15 16:55:55 +10:00
rewbs 59c0bd583d add some debug prints for cog issue... 2023-09-15 14:40:43 +10:00
Robin Fernandes f635a2154c
Merge pull request #879 from Wraken/automatic1111-webui
Fix api positive prompts
2023-09-15 12:23:08 +10:00
kabachuha e1cc95b6f1
use our samplers list with Ea at the 1st place 2023-09-13 15:37:15 +03:00
kabachuha 07424ebef0
set default sampler back to Euler A
for better example videos and compat
2023-09-13 11:32:45 +03:00
Wraken 8847001303 fix api positive prompts 2023-09-11 17:07:00 +02:00
andyxr cd31b6d170 Addressed issue where default value for max_models was wrong
As per Rewbs' suggestion, I fixed the code so that it's a little more inline and the default is acceptable
2023-09-11 11:30:44 +01:00
andyxr a6fc0f44b4 Fixed a defect in multi-CN support
Found another location where number of CNs was hardcoded as 5. Now addressed.
2023-09-08 10:49:23 +01:00
andyxr f0f3e173ad No of CNs in Deforum respect max CNs specified in A1111 settings
If the user sets max CNs to be less than 5, then I keep 5 as the minimum in Deforum. If they go above 5, then you get that many CNs in Deforum
2023-09-05 21:44:07 +01:00
andyxr 3d7a749d97 Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-09-04 14:55:32 +01:00
Robin Fernandes 86921f79fc
Merge pull request #869 from rewbs/rewbs/a1111-1.6-cn-hack
Workaround for 'unhashable type: 'slice' /  'No ControlNetUnit detected in args' since 1.6 upgrade, and for drop_path issue related to timm upgrade.
2023-09-04 22:03:45 +10:00
andyxr 520bd786eb WIP: Support CN max models slider value
WIP
Deforum will always have a min of 5 CN slots, and a max of whatever value is set in A1111's Settings->ControlNet->Max models slider
2023-09-03 21:38:55 +01:00
rewbs 576e337b92 Invoke either drop_path1 or drop_path – enables compatibility with more versions of timm (tested with 0.4.12 and 0.9.7) 2023-09-03 23:19:59 +10:00
rewbs 5f3ecfea41 Fix "Block' object has no attribute 'drop_path'" with newer timm libraries by invoking drop_path1. Mutate script list when using controlnet so that other scripts (e.g. seed.py) do not interfere when they have no place running alongside Deforum. 2023-09-03 22:39:33 +10:00
andyxr 66d8501b9c Added required arg to load_image
When using an overlay mask, we were calling load_image but without the required image_box arg. This was causing an exception.
2023-09-01 16:40:42 +01:00
rewbs 19fdc08a11 Workaround for 'No ControlNetUnit detected in args' since 1.6 upgrade: create a fake script_args list to satisfy controlnet. 2023-09-01 13:40:19 +10:00
andyxr 70cc1dbe1d Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-08-31 19:22:37 +01:00
kabachuha 9b36dddf72 fixup 2023-08-31 21:02:38 +03:00
kabachuha 171b7c8705 update wrap_gradio_gpu_call reference 2023-08-31 20:59:55 +03:00
kabachuha 8a6ee64c72 fix controlnet vid paths
closes #850
2023-08-17 21:27:16 +03:00
kabachuha 19023b1d87 use os realpath instead of gaslighting users 2023-08-16 23:20:27 +03:00
kabachuha bbebcff80a Merge branch 'automatic1111-webui' into pr/809 2023-08-16 21:33:42 +03:00
kabachuha 9c30e95638 add deforum_sys_extend to deforum api setup
fixes #833
2023-08-16 21:20:34 +03:00
kabachuha 083fc8dbd2 webui's scimage is 0.20.0, so don't have multichannel
fixes #808
2023-08-16 21:09:45 +03:00
kabachuha e671d848b0 remove artists names from default prompts 2023-08-16 20:49:59 +03:00
kabachuha 63373c1067 close pipelines after runs
fixes #827
2023-08-16 20:48:06 +03:00
kabachuha 80b8f5e935 settings replacement logic fixup 2023-08-13 10:26:21 +03:00
kabachuha ecdbfa1ee9 fix settings files io 2023-08-13 10:17:37 +03:00
kabachuha a5aa7825ea add traceback print on fail 2023-08-13 10:04:50 +03:00
kabachuha 742b598c05 towards a simpler demo api 2023-08-12 22:56:21 +03:00
kabachuha eb16c856ca
Merge pull request #797 from clemos/automatic1111-webui
Add filename/fieldname to syntax errors for "keyframe" fields
2023-08-12 14:57:57 +03:00
kabachuha 032c8c746e
fix args note as we now use static img, not t2i in mock mode 2023-08-12 14:50:45 +03:00
kabachuha ea04bfb9b9 Merge branch 'automatic1111-webui' into pr/797 2023-08-12 14:42:04 +03:00
kabachuha cdb805a242 when mock run, turn off depth, raft and redo 2023-08-12 14:01:35 +03:00
kabachuha 49858b8a90 don't generate initial image on dry runs
use the Deforum logo instead
2023-08-12 13:53:43 +03:00
kabachuha 3a205c9eec move process with CN out of motion preview 2023-08-12 13:37:00 +03:00
kabachuha eaee913178 Merge branch 'automatic1111-webui' into pr/759 2023-08-12 13:18:47 +03:00
kabachuha 5ad5c0106f put Deforum LLC as maintainer to be more inclusive 2023-08-12 09:52:14 +03:00
kabachuha 5f075c810a add License notices 2023-08-12 09:46:20 +03:00
kabachuha e99c95d1bc
set cadence to 1 by default
Will allow novice users to experience more surreal and astonishing transitions (with real prompt->prompt tranformation and not just a slideshow at the border frame) at a cost of doubling rendering time.

However, the default rabbit video is already quite short, so I don't thing there will be much of an impact in this regard
2023-08-09 19:53:14 +03:00
andyxr 8f44e390ee Merge branch 'automatic1111-webui' of https://github.com/andyxr/sd-webui-deforum into automatic1111-webui 2023-08-05 08:12:14 +01:00
andyxr 182589ccaf
Tidy up some info text
Tweaked some of the info text and labels to read slightly better.
2023-08-05 07:14:35 +01:00
rewbs 5ce6eee9fa Allow tests to run properly on github. 2023-08-02 20:59:18 +10:00
rewbs 517a14e817 Add broader set of tests and API improvements, including job cancellation 2023-08-01 14:10:28 +10:00
rewbs 67d0dc9c11 remove bad path from test file 2023-07-31 13:58:39 +10:00
rewbs 0c6001e8d6 Ensure tests can still run if deforum settings in a1111 settings screen have never been saved 2023-07-31 13:46:34 +10:00
rewbs c01e57d926 Initial test framework 2023-07-31 13:24:26 +10:00
rewbs 2b54cfd3e5 Merge branch 'origin/automatic1111-webui' into andyxr/automatic1111-webui 2023-07-28 16:00:22 +10:00
Robin Fernandes 02a13cf9e6
Merge pull request #807 from rewbs/parseq-guided-images
Allow Parseq to control guided images schedules
2023-07-28 14:19:30 +10:00
Robin Fernandes 943a10ad3b
Update args.py - undo unrelated max value change. 2023-07-28 13:56:39 +10:00
rewbs 6682572d96 Fix case when preview option has never been set. 2023-07-27 23:00:52 +10:00
Robin Fernandes 0fafce9c57 Don't skip creating preview video if the preview frame is a cadence frame (create it on the next generation frame) 2023-07-21 23:48:00 +10:00
Robin Fernandes c9a71471ba api for listing batches 2023-07-20 08:48:53 +10:00
Robin Fernandes 45f5abc96c Rudimentary status tracking. 2023-07-20 01:12:19 +10:00
Robin Fernandes 8a9ffdd333 Improve API implementation (don't run on a separate port); add CLI options to run&done a list of settings files on startup. 2023-07-19 23:22:23 +10:00
Robin Fernandes 2abee0b90e Messing around with an API to trigger deforum runs with settings supplied in the request. 2023-07-19 19:19:13 +10:00
andyxr cadb7808a9 Added option to delete all inputframes
In Output tab, users can now choose to not only delete frames, but delete all inputframes, including those created by ControlNet
2023-07-08 11:33:36 +01:00
Tomislav Teskac 53a4fbec8d Added init_image_box 2023-07-07 00:00:15 +02:00
rewbs c3a3b13afc Don't pollute list of managed/unmanaged fields with internal attributes. 2023-07-05 11:32:01 +10:00
rewbs 71917cab9e Add support for Parseq to control guided images schedules. 2023-07-05 10:59:57 +10:00
hithereai 43273d8cc2 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/796 2023-07-02 19:56:40 +03:00
rewbs 39cf10db68 Video preview improvements: don't render video on last frames (final video is being rendered anyway); in concurrent mode, detect case where previous preview is still rendering and skip the current render. 2023-06-29 06:27:33 +10:00
clemos 27c9de8014 add filename/fieldname to syntax errors for keyframes 2023-06-27 11:25:06 +02:00
rewbs d2705e2edf Fixed missed variable inlining in upscale invocation 2023-06-27 14:19:27 +10:00
rewbs 9cedc48739 Add optional preview video render which generates the vid every N frames (either sync or async. Minor: improve error message if hybrid video finds no frames to use. Minor: include 2D centre transform x/y in the console log along side other anim params. 2023-06-26 19:34:15 +10:00
rewbs 78a7f3e7e3 Fix remaining references to looper in test. 2023-06-16 15:30:47 +10:00
rewbs bec0817b72 Simplify PR #790 to include only changes to enable controlnet to be controlled by Parseq (not guided images). 2023-06-16 15:21:15 +10:00
rewbs 9805c3ff57 Add support for Parseq to control ControlNet and Guided Images. 2023-06-16 00:23:02 +10:00
kabachuha ec32a08e2b
make the default bunny more vibrant
to see better how colormatch works
2023-06-07 00:46:44 +03:00
hithereai 3af9d691b9 fix interpolation of uploaded images 2023-06-03 17:01:42 +03:00
hithereai f1949377d6 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/759 2023-06-03 11:52:44 +03:00
hithereai a9c182f999 fix masks v2 2023-06-03 11:52:15 +03:00
hithereai 99f6bd6fa3 temp revert mask fix to fix setting issue 2023-06-03 11:45:48 +03:00
hithereai d8719c0437 fix masks not working properly 2023-06-03 11:30:27 +03:00
hithereai 80d1f3256e fix interpolation of vids/ pics outside of deforum run 2023-06-02 17:48:53 +03:00
hithereai 9d0650490f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/759 2023-06-01 14:16:57 +03:00
rewbs 5a4b5aedd9 Add motion preview mode, which only invokes stable diffusion for the init image if required, then does all transforms excluding diffusion, adding a reference rectangle instead of diffusion. 2023-06-01 14:23:53 +10:00
rewbs b7ec9cd7fd Correctly move interpolated, upscaled video file with RIFE. 2023-05-30 15:47:32 +10:00
hithereai 759234156f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/745 2023-05-25 21:00:24 +03:00
hithereai eea614a2de Update args.py 2023-05-25 20:59:19 +03:00
hithereai 5efb3d8efb critical upscaling fix (for all users) 2023-05-25 20:58:06 +03:00
hithereai 2f7d4c74c2 label name change p1 2023-05-25 20:19:40 +03:00
rewbs f1a6c9c017 Allow frame interpolation to use the upscaled images, if available (so you can do generate -> upscale -> interpolate in one go) 2023-05-24 15:41:43 +10:00
hithereai 0ed7c4c847
fix width / height vals 2023-05-23 13:01:06 +03:00
hithereai ae426f6707
fix aspect ratio (25 to 1) 2023-05-23 03:01:02 +03:00
hithereai e6698a995e fix saving loading of settings 2023-05-22 14:21:35 +03:00
hithereai b4dc18153e Merge remote-tracking branch 'upstream/automatic1111-webui' into refactor-1.2 2023-05-22 00:24:23 +03:00
hithereai 39c6689a01
tiny fix 2023-05-21 22:38:01 +03:00
hithereai 78ed48f9dc semantics 2023-05-21 22:33:33 +03:00
hithereai 8889ff3a1b revive non-working clipseg model 2023-05-21 19:06:22 +03:00
hithereai af633932ea Update prompt.py 2023-05-21 18:27:27 +03:00