Upgrade moviepy to v2.2.1 and refactor for API changes

- Update `requirements.txt` to include `moviepy==2.2.1`, add explicit version constraints for `numpy`, `pytest`, `librosa`, and `soundfile`.
- Replace deprecated methods (`resize`, `subclip`, `crop`, etc.) with updated alternatives (`resized`, `subclipped`, `cropped`, etc.) across `shorts.py`.
- Adjust `iter_frames` to use the `logger` parameter instead of `progress_bar`.
- Update imports to use the `moviepy` namespace directly instead of submodules to align with the new `moviepy` API changes.
- Refactor tests in `test_shorts.py` to accommodate library updates.

Author: artryazanov

requirements.txt

@@ -1,12 +1,11 @@
 gtts==2.5.3
-moviepy==1.0.3
+librosa==0.11.0
+moviepy==2.2.1
+numpy==1.26.4
 opencv-python==4.10.0.84
+pytest==8.4.2
 python-dotenv==1.0.1
 random2==1.0.1
 scenedetect==0.6.2
 scipy==1.11.4
-numpy>=1.21
-pytest>=7.0
-
-librosa
-soundfile
+soundfile==0.13.1

shorts.py

@@ -22,8 +22,7 @@
 
 import numpy as np
 from dotenv import load_dotenv
-from moviepy.editor import CompositeVideoClip, VideoFileClip
-import moviepy.video.fx.crop as crop_vid
+from moviepy import CompositeVideoClip, VideoFileClip
 from scipy.ndimage import gaussian_filter
 from scenedetect import SceneManager, open_video
 from scenedetect.detectors import ContentDetector
@@ -209,12 +208,7 @@ def compute_video_action_profile(
 
     prev_gray: np.ndarray | None = None
 
-    # Sequential frame reading is much cheaper than random access get_frame(t)
-    # Compatibility with different MoviePy versions: 'progress_bar' arg may not exist.
-    try:
-        frame_iter = clip.iter_frames(fps=eff_fps, dtype="uint8", progress_bar=False)
-    except TypeError:
-        frame_iter = clip.iter_frames(fps=eff_fps, dtype="uint8")
+    frame_iter = clip.iter_frames(fps=eff_fps, dtype="uint8", logger="bar")
 
     for idx, frame in enumerate(frame_iter):
         t = idx / eff_fps
@@ -455,17 +449,15 @@ def crop_clip(
 
     if current_ratio > target_ratio:
         new_width = round(height * ratio_w / ratio_h)
-        return crop_vid.crop(
-            clip,
+        return clip.cropped(
             width=new_width,
             height=height,
             x_center=width * x_center,
             y_center=height * y_center,
         )
 
     new_height = round(width / ratio_w * ratio_h)
-    return crop_vid.crop(
-        clip,
+    return clip.cropped(
         width=width,
         height=new_height,
         x_center=width * x_center,
@@ -542,7 +534,7 @@ def get_final_clip(
 ) -> VideoFileClip:
     """Prepare a clip ready for rendering."""
 
-    result_clip = clip.subclip(start_point, start_point + final_clip_length)
+    result_clip = clip.subclipped(start_point, start_point + final_clip_length)
 
     width, height = result_clip.size
     target_ratio = config.target_ratio_w / config.target_ratio_h
@@ -557,22 +549,22 @@ def get_final_clip(
 
     width, height = result_clip.size
     bg_w, bg_h = select_background_resolution(width)
-    result_clip = result_clip.resize(width=bg_w)
+    result_clip = result_clip.resized(width=bg_w)
 
     if width >= height:
-        background_clip = clip.subclip(start_point, start_point + final_clip_length)
+        background_clip = clip.subclipped(start_point, start_point + final_clip_length)
         background_clip = crop_clip(background_clip, 1, 1, config.x_center, config.y_center)
-        background_clip = background_clip.resize(width=720, height=720)
-        background_clip = background_clip.fl_image(blur)
-        background_clip = background_clip.resize(width=bg_w, height=bg_w)
-        result_clip = CompositeVideoClip([background_clip, result_clip.set_position("center")])
+        background_clip = background_clip.resized(width=720, height=720)
+        background_clip = background_clip.image_transform(blur)
+        background_clip = background_clip.resized(width=bg_w, height=bg_w)
+        result_clip = CompositeVideoClip([background_clip, result_clip.with_position("center")])
     elif width / 9 < height / 16:
-        background_clip = clip.subclip(start_point, start_point + final_clip_length)
+        background_clip = clip.subclipped(start_point, start_point + final_clip_length)
         background_clip = crop_clip(background_clip, 9, 16, config.x_center, config.y_center)
-        background_clip = background_clip.resize(width=720, height=1280)
-        background_clip = background_clip.fl_image(blur)
-        background_clip = background_clip.resize(width=bg_w, height=bg_h)
-        result_clip = CompositeVideoClip([background_clip, result_clip.set_position("center")])
+        background_clip = background_clip.resized(width=720, height=1280)
+        background_clip = background_clip.image_transform(blur)
+        background_clip = background_clip.resized(width=bg_w, height=bg_h)
+        result_clip = CompositeVideoClip([background_clip, result_clip.with_position("center")])
 
     return result_clip
 

tests/test_shorts.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from unittest.mock import MagicMock
 
-from moviepy.editor import ColorClip
+from moviepy import ColorClip
 
 # Ensure the project root is on the import path.
 import sys
@@ -263,7 +263,7 @@ class VideoStub:
         def __init__(self, *_args, **_kwargs):
             self.duration = 4.0
             self.fps = 30  # source fps
-        def iter_frames(self, fps=2.0, dtype="uint8", progress_bar=False):
+        def iter_frames(self, fps=2.0, dtype="uint8", logger=None):
             # Yield exactly int(duration*fps) frames
             n = int(self.duration * fps)
             for i in range(n):