Commit Graph

1437 Commits (b406184855a4e3955f0d89fdb59282b9ef9fa09d)

Author SHA1 Message Date
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 7ff03f9d3c Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/529 2023-04-06 06:48:56 +03:00
hithereai 2a65bda4f2 remove old commented line 2023-04-06 06:48:25 +03:00
hithereai 30f0dbdf26 fix after-run upscale and interpolate ffmpeg issue 2023-04-06 06:45:57 +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 841214b9f1 tiny ui text change 2023-04-05 14:06:51 +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 46f457a36a change skip button name to Pause/Resume 2023-04-04 21:57:10 +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 3f3c82151e p 2023-04-01 14:22:54 +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 01a0dc488e update ui text 2023-03-21 00:01:38 +02: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 94a1905a7c fix auto-hide if in medvram or lowvram 2023-03-19 02:05:22 +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