Commit Graph

1481 Commits (f783821d8a2366514eeed366010d2e2bbc489cb0)

Author SHA1 Message Date
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
kabachuha b5055fe7d0 fix frame_idx not being passed into prepare_prompt
Pointed out in https://github.com/deforum-art/sd-webui-deforum/pull/610

Co-Authored-By: ali42 <7451075+ali42@users.noreply.github.com>
2023-05-06 15:34:30 +03:00
hithereai 5d346c259a Merge remote-tracking branch 'upstream/automatic1111-webui' into tests0505 2023-05-05 19:28:39 +03:00
hithereai 24afbf815a fix saving setting file with quotes around it (as loading already works) 2023-05-05 16:50:43 +03:00
hithereai e3eba88c12 support quotes around file name in load setting file box 2023-05-05 16:31:46 +03:00
hithereai 707e628df4 final py3d fix 2023-05-05 13:30:30 +03:00
hithereai 589719e5cb fix clipseg import, all should work now 2023-05-05 13:27:51 +03:00
hithereai 17d222ee4c fix py3d import error (more commits to come) 2023-05-05 13:18:36 +03:00
hithereai 852ed27753 print depth tensor min max in dev mode 2023-05-05 03:28:41 +03:00
hithereai 879a7b8433 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/664 2023-05-04 23:23:53 +03:00
hithereai 39a40e915f temporarily remove midas3.1beitlarge
since it causes some problems with extreme 3d movement and depth prediction. will return when it's fixed
2023-05-04 23:20:56 +03:00
reallybigname 03f54a3768 FIXED optical flow cadence
Properly normalized the optical flow field before warping and after warping based on width and height.  Now, because the range of the values are between -1 and 1 (usually much smaller), the flow doesn't get corrupted by the grid_sample for 3D or the warpPerspective for 2D anymore. So, I was able to remove all workarounds and just fix the abs to rel and rel to abs functions.
2023-05-04 12:37:34 -07:00
hithereai eeb3003112 Merge remote-tracking branch 'upstream/automatic1111-webui' into DepthV2Tests 2023-05-04 13:16:38 +03:00
hithereai 92985dc197 clean up 2023-05-04 13:12:35 +03:00
hithereai 39ed1512ee feature: add controlnet guidance start/ end schedules 2023-05-04 03:50:03 +03:00
hithereai 44076c6c2d bugfix 2023-05-04 00:59:27 +03:00
hithereai ad048ff0f3 Add CN sch for guidance start/end - initial commit untested 2023-05-04 00:57:43 +03:00
hithereai 44d5cafe55 fix model reload after keep in vram set to false (but the model is still in vram) 2023-05-04 00:50:02 +03:00
hithereai 95919a5fac update default depth alg in depth.py, had old value in there 2023-05-03 23:58:58 +03:00
hithereai c4d69cc13e set default 3d depth alg to 'Midas-3-Hybrid' 2023-05-03 23:33:16 +03:00
hithereai fb2a97057e shorten and align params order in depth.initialize func 2023-05-03 23:31:30 +03:00
hithereai 901ff15488 print depth normalization data to cli only in Dev mode 2023-05-03 23:17:24 +03:00
hithereai eb71241d72 split depth initialize two 2 funcs + better leres cli print 2023-05-03 22:57:10 +03:00
hithereai 4b9548fc68 bump version+
and credits in info accord
2023-05-03 21:42:33 +03:00
hithereai a1de5338bb add dynamic msg to gradio ui about leres license 2023-05-03 19:11:11 +03:00
hithereai 530bb80224 update that cli msg again 2023-05-03 18:49:49 +03:00
hithereai 096729cbea update adabins error cli msg 2023-05-03 18:49:19 +03:00
hithereai 692aac9ee6 auto-hide midas/zoe weight param when not in legacy 3d mode(l) 2023-05-03 15:58:46 +03:00
hithereai a3c48cabad add missing import 2023-05-03 15:54:19 +03:00
hithereai b8e78908f8 rename legacy modes to have an (old) at their end 2023-05-03 15:30:41 +03:00
hithereai e4943b1a51 add comment on midas models in anim.py 2023-05-03 14:31:12 +03:00
reallybigname 26ea16b0ce updated transform_image_3d_new
removed excess options, removed dev code, cleaned up code, ready for production.
- removed depth tensor autocontrast options
- made equalization a part of the normalization process (not an optional arg now)
- removed my mechanism for 0-based normalization. Decided it wasn't any better. Maybe worse... mostly similar.
- cracked open a bottle of champagne on this function's hull

also added a file for the first steps of making an auto-navigation module to be used in the future inside the transform_image_3d function!  It generates a rotation matrix based on greatest or least depth in the tensor, instead of using animation keys.
2023-05-03 04:15:54 -07:00
hithereai 772d4392d1 Merge remote-tracking branch 'upstream/automatic1111-webui' into DepthV2Tests 2023-05-03 14:14:06 +03:00
hithereai 2091e239b0 feature: control net scheduling of weights 2023-05-03 13:30:12 +03:00
hithereai b6c631e6c7 add legacy zoe+adabins mode 2023-05-03 06:53:08 +03:00
hithereai 9279d8c0f6 print to cli what midas model was actually loaded 2023-05-03 03:49:03 +03:00
hithereai 95ac505f02 add midas beit large 3.1 version too 2023-05-03 03:46:12 +03:00
hithereai 2b81316a10 Depth V2 - RBN changes included 2023-05-03 02:38:24 +03:00
hithereai ed35a9c946 tidying up - deduplicate some download-model code 2023-05-02 19:43:36 +03:00
hithereai 6a00408535 remove old adabins code and logic 2023-05-02 19:14:37 +03:00
hithereai 24c5b79abe Merge remote-tracking branch 'upstream/automatic1111-webui' into Depth-Revise-V1 2023-05-02 18:29:36 +03:00
hithereai 87f78d54bd tiny CN changes to align with their latest changes 2023-05-02 18:28:43 +03:00
hithereai 28969fa4ce add auto-download of the LeRes model (for future use) 2023-05-02 18:12:20 +03:00
hithereai d38260b13f add future medvram support to LeRes depth 2023-05-02 12:00:39 +03:00
hithereai 33e37a3591 more cleaning 2023-05-02 11:52:08 +03:00
hithereai 0348eb683c some cleanups 2023-05-02 11:45:52 +03:00
hithereai 876e594068 reflect change of use_zoe_depth --> depth_algorithm in deprc utils 2023-05-02 11:42:21 +03:00
hithereai 8bb3a1b7d4 cleanup of not-needed code 2023-05-02 11:06:40 +03:00
hithereai 3f0d474b28 return kabas changes to prompt and fixed seed 2023-05-02 10:44:21 +03:00
hithereai cbdfa5dc3c Depth Revise Part 1 2023-05-02 04:51:25 +03:00
kabachuha 4b51be881c add nsfw, nude to default negative prompts 2023-05-01 17:34:36 +03:00
hithereai 59b8f0da03
Update consistency_check.py 2023-05-01 03:12:44 +03:00
hithereai 6dd1adc3e4 add comment about usage 2023-05-01 03:03:45 +03:00
hithereai 40d26a9705 remove commented code as it can be found in the link inside the file 2023-05-01 03:02:48 +03:00
hithereai 0e9176f0c1 take gradio's ui arg values from da. instead of setting them manually 2023-04-30 21:29:25 +03:00
hithereai f976c8d2fd reorder imports at hybrid_video.py 2023-04-30 21:26:56 +03:00
hithereai dde01b3915 remove commented unused imports from render.py 2023-04-30 21:24:49 +03:00
hithereai 7041917c2e deduplicate - use a loop gor gradio.change stuff 2023-04-30 21:19:22 +03:00
reallybigname eec4c7a348 quick fix for progress bar during cadence
makes progress advance smoothly during cadence rather than skipping ahead suddenly after cadence completes

left line commented for state.current_image, since I'm not sure what that variable actually does. It doesn't update the preview when I try it, even when turning up the speed of preview updates in auto1111.  But, if we decide to make a preview mechanism or need that state var for cadence, it can just be uncommented.  It matches the format of the one in the main non-cadence loop.
2023-04-29 23:31:19 -07:00
reallybigname 352a8fdb07 Consistency flow masks & fixed Frames to Video
added consistency flow masks
- there is now an option to use flow consistency masks and an attached option for consistency mask blur, defaulted to 2.
- if you save extra frames, it also save consistency masks now
- you can see the effect on the flow in the flow outputs as well
- it doesn't work as great with cadence because you see afterimages, but if you up the blur it can be a little better.

fixed Frames to Video
- made the ffmpeg routine that Frames to Video uses able to take image files other than png.  If png, it includes the -vcodec png as normal. But, if anything else it includes vcodec libx264, which works for jpgs. (jpgs don't work if using vcodec png, so I made it switchable). I haven't tested it with other filetypes, but I bet it works with others too. The png vcodec was specific to png.
- also added two more lines of instruction for how to use the file string.

- I also changed a few ransac functions for future use. They work as normal, but now have a switching behavior if passed depth. But, I'm not passing depth to them for now.
- a few minor code var name edits in hybrid video to align code better (mostly changed matrices to M, as is often convention

- commented a bunch of unused imports in render.py
  - I'll leave it up to someone else to delete them after it's verified that everything works fine with them commented.  I searched and didn't find them in that file. VSCode showed them as gray automatically, but I also verified.
2023-04-29 22:37:49 -07:00
hithereai 1cd38479b4 support input path strings with quotes around them
to support windows built-in "copy-path" option
2023-04-29 20:33:23 +03:00
hithereai 31aacf342d don't error when fps field is getting set to '' (nothing) 2023-04-29 19:55:27 +03:00
hithereai adcb61eff0 fix vid2frames not working with extract_nth_frame properly 2023-04-29 19:03:58 +03:00
hithereai 69b607e44a download adabins from github instead of g-drive 2023-04-29 09:52:37 +03:00
hithereai cf55274f33
Update depth.py add missing comma 2023-04-28 13:06:05 +03:00
hithereai e4c454e1e9 download adabins directly from google-drive 2023-04-28 12:58:13 +03:00
hithereai 92db5b0fd7 return mask to UI, but it's broken in CN side of things (probably) 2023-04-27 21:55:52 +03:00
hithereai 2fdaa80916 update cn related stuff 2023-04-26 14:43:14 +03:00
hithereai 85d247af11 use better resnet50 model in human masking 2023-04-25 23:46:22 +03:00
hithereai 2808dc9dab replace CN's old guess mode with new control mode 2023-04-25 18:38:11 +03:00
reallybigname 2826e6d476 removed extra generation after generation for Image and Video Input
It wasn't working anyway, so I removed that mechanism and restored it to the previous behavior of just color matching after generation when using Image of Video Input.

Also cleaned up some code and added console reporting about Redo cycles.
2023-04-24 13:37:10 -07:00
reallybigname 5f3c4ac82e consolidated prompt code
saw an easy area where I could get some prompt code out of render_animation and into prompt.py
2023-04-24 11:57:40 -07:00
hithereai 58faa1d508 delete raft from deprecation utils 2023-04-22 19:35:33 +03:00
hithereai 94f0f08f47 revive missing raft and set to default too 2023-04-22 19:32:43 +03:00
hithereai c51e8e085a Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/600 2023-04-22 19:30:46 +03:00
hithereai 303ed858f9 FIX RAFT THAT NEVER WORKED 2023-04-22 19:27:45 +03:00
reallybigname 96e374844e Updates to Hybrid Video & More + Temporary Removal of RAFT
Discovered that RAFT wasn't actually working due to an issue with the function that got the flows.  There was a missing "elif".  So, the RAFT flow would get calculated and stored in the variable 'r', but then 'r' would always be overwritten by the default Farneback at the end.  We were fooling ourselves into thinking that was RAFT, when in actuality the RAFT flow is invalid and causes an error if actually used.
  - Changed function call for flow methods so that this can never happen. Now, each case returns directly.
  - Added to deprecation utils for now. We can remove the RAFT to Farneback conversion when we get RAFT working

Realignment of the way I handled frame indexes in motion routines to align everything more clearly

Major improvement to motion using prev_img during cadence!
  - added a prev_img during cadence so that there is a prev_img to refer to for the flow

Fixed color matching issue with first frame on Image and Video Init modes
  - first frame color match can't be done beforehand, so it's done afterwards. But, that normally makes for a very bad first frame. So, I added a redo for it to clean up the color matched image on first frame.

Major improvement to RANSAC
  - switched to use SIFT for feature matching instead of Lucas-Kanade
  - changed all border_mode to REFLECT_101, which matched how optical flow handled it, removed all the excess silly border_mode translations. This works much better.
2023-04-22 06:22:15 -07:00
hithereai 18c5c5aab7 set raft quality default to 50 instead of 12, fix optical flow cadence always being Farnback 2023-04-21 22:32:27 +03:00
hithereai febecd5d62 Update deforum_controlnet.py 2023-04-21 17:48:04 +03:00
hithereai a8f4d1eeb8 Update deforum_controlnet.py 2023-04-21 17:47:42 +03:00
hithereai 1c30a5f4a0 p1 initial 2023-04-21 14:13:20 +03:00