diff --git a/inference/gradio_composite_demo/README.md b/inference/gradio_composite_demo/README.md index 3582d866..d19c3a5e 100644 --- a/inference/gradio_composite_demo/README.md +++ b/inference/gradio_composite_demo/README.md @@ -41,7 +41,7 @@ pip install -r requirements.txt ## Running the code ```bash -python gradio_web_demo.py +python app.py ``` diff --git a/inference/gradio_composite_demo/app.py b/inference/gradio_composite_demo/app.py index 757b31c9..6856cade 100644 --- a/inference/gradio_composite_demo/app.py +++ b/inference/gradio_composite_demo/app.py @@ -30,7 +30,7 @@ from diffusers.image_processor import VaeImageProcessor from openai import OpenAI -import moviepy.editor as mp +from moviepy import VideoFileClip import utils from rife_model import load_rife_model, rife_inference_with_latents from huggingface_hub import hf_hub_download, snapshot_download @@ -271,9 +271,9 @@ def infer( def convert_to_gif(video_path): - clip = mp.VideoFileClip(video_path) - clip = clip.set_fps(8) - clip = clip.resize(height=240) + clip = VideoFileClip(video_path) + clip = clip.with_fps(8) + clip = clip.resized(height=240) gif_path = video_path.replace(".mp4", ".gif") clip.write_gif(gif_path, fps=8) return gif_path diff --git a/inference/gradio_composite_demo/requirements.txt b/inference/gradio_composite_demo/requirements.txt index a244fcb0..b8438920 100644 --- a/inference/gradio_composite_demo/requirements.txt +++ b/inference/gradio_composite_demo/requirements.txt @@ -15,5 +15,5 @@ gradio>=5.4.0 imageio>=2.34.2 imageio-ffmpeg>=0.5.1 openai>=1.45.0 -moviepy>=1.0.3 +moviepy>=2.0.0 pillow==9.5.0 \ No newline at end of file diff --git a/inference/gradio_web_demo.py b/inference/gradio_web_demo.py index d3a847d4..8e1e0e43 100644 --- a/inference/gradio_web_demo.py +++ b/inference/gradio_web_demo.py @@ -20,7 +20,7 @@ from diffusers.utils import export_to_video from datetime import datetime, timedelta from openai import OpenAI -import moviepy.editor as mp +from moviepy import VideoFileClip pipe = CogVideoXPipeline.from_pretrained("THUDM/CogVideoX-5b", torch_dtype=torch.bfloat16).to("cuda") @@ -117,9 +117,9 @@ def save_video(tensor): def convert_to_gif(video_path): - clip = mp.VideoFileClip(video_path) - clip = clip.set_fps(8) - clip = clip.resize(height=240) + clip = VideoFileClip(video_path) + clip = clip.with_fps(8) + clip = clip.resized(height=240) gif_path = video_path.replace(".mp4", ".gif") clip.write_gif(gif_path, fps=8) return gif_path diff --git a/requirements.txt b/requirements.txt index 1fc958ef..c21abd4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,6 @@ gradio>=5.5.0 imageio>=2.35.1 imageio-ffmpeg>=0.5.1 openai>=1.54.0 -moviepy>=1.0.3 +moviepy>=2.0.0 scikit-video>=1.1.11 -pydantic>=2.10.3 \ No newline at end of file +pydantic>=2.10.3 diff --git a/tools/llm_flux_cogvideox/gradio_page.py b/tools/llm_flux_cogvideox/gradio_page.py index 0116c19f..588c4693 100644 --- a/tools/llm_flux_cogvideox/gradio_page.py +++ b/tools/llm_flux_cogvideox/gradio_page.py @@ -12,7 +12,7 @@ from datetime import datetime, timedelta import threading import time -import moviepy.editor as mp +from moviepy import VideoFileClip torch.set_float32_matmul_precision("high") @@ -140,9 +140,9 @@ def save_video(tensor): def convert_to_gif(video_path): - clip = mp.VideoFileClip(video_path) - clip = clip.set_fps(8) - clip = clip.resize(height=240) + clip = VideoFileClip(video_path) + clip = clip.with_fps(8) + clip = clip.resized(height=240) gif_path = video_path.replace(".mp4", ".gif") clip.write_gif(gif_path, fps=8) return gif_path diff --git a/tools/replicate/cog.yaml b/tools/replicate/cog.yaml index 2de2ddbc..19d71ad3 100644 --- a/tools/replicate/cog.yaml +++ b/tools/replicate/cog.yaml @@ -26,7 +26,7 @@ build: - imageio>=2.35.1 - imageio-ffmpeg>=0.5.1 - openai>=1.45.0 - - moviepy>=1.0.3 + - moviepy>=2.0.0 - pillow==9.5.0 - pydantic==1.10.7 run: