vision-agent 0.2.124__py3-none-any.whl → 0.2.126__py3-none-any.whl

vision_agent/agent/vision_agent_coder.py

@@ -173,7 +173,7 @@ def pick_plan(
 
     if verbosity == 2:
         _print_code("Initial code and tests:", code)
-        _LOGGER.info(f"Initial code execution result:\n{tool_output.text()}")
+        _LOGGER.info(f"Initial code execution result:\n{tool_output_str}")
 
     log_progress(
         {

vision_agent/tools/tools.py

@@ -12,7 +12,6 @@ from uuid import UUID
 import cv2
 import numpy as np
 import requests
-from moviepy.editor import ImageSequenceClip
 from PIL import Image, ImageDraw, ImageEnhance, ImageFont
 from pillow_heif import register_heif_opener  # type: ignore
 from pytube import YouTube  # type: ignore
@@ -35,7 +34,6 @@ from vision_agent.tools.tools_types import (
     ODResponseData,
     PromptTask,
 )
-from vision_agent.utils import extract_frames_from_video
 from vision_agent.utils.exceptions import FineTuneModelIsNotReady
 from vision_agent.utils.execute import FileSerializer, MimeType
 from vision_agent.utils.image_utils import (
@@ -44,13 +42,17 @@ from vision_agent.utils.image_utils import (
     convert_to_b64,
     denormalize_bbox,
     encode_image_bytes,
-    frames_to_bytes,
     get_image_size,
     normalize_bbox,
     numpy_to_bytes,
     rle_decode,
     rle_decode_array,
 )
+from vision_agent.utils.video import (
+    extract_frames_from_video,
+    frames_to_bytes,
+    video_writer,
+)
 
 register_heif_opener()
 
@@ -1513,17 +1515,14 @@ def save_video(
         "/tmp/tmpvideo123.mp4"
     """
     if fps <= 0:
-        _LOGGER.warning(f"Invalid fps value: {fps}. Setting fps to 4 (default value).")
-        fps = 4
-    with ImageSequenceClip(frames, fps=fps) as video:
-        if output_video_path:
-            f = open(output_video_path, "wb")
-        else:
-            f = tempfile.NamedTemporaryFile(suffix=".mp4", delete=False)  # type: ignore
-        video.write_videofile(f.name, codec="libx264")
-        f.close()
-        _save_video_to_result(f.name)
-    return f.name
+        raise ValueError(f"fps must be greater than 0 got {fps}")
+
+    if output_video_path is None:
+        output_video_path = tempfile.NamedTemporaryFile(delete=False).name
+
+    output_video_path = video_writer(frames, fps, output_video_path)
+    _save_video_to_result(output_video_path)
+    return output_video_path
 
 
 def _save_video_to_result(video_uri: str) -> None:
@@ -1820,7 +1819,6 @@ def overlay_counting_results(
 
 FUNCTION_TOOLS = [
     owl_v2,
-    extract_frames,
     ocr,
     clip,
     vit_image_classification,
@@ -1841,6 +1839,7 @@ FUNCTION_TOOLS = [
 ]
 
 UTIL_TOOLS = [
+    extract_frames,
     save_json,
     load_image,
     save_image,
@@ -1856,7 +1855,7 @@ TOOLS = FUNCTION_TOOLS + UTIL_TOOLS
 TOOLS_DF = get_tools_df(TOOLS)  # type: ignore
 TOOL_DESCRIPTIONS = get_tool_descriptions(TOOLS)  # type: ignore
 TOOL_DOCSTRING = get_tool_documentation(TOOLS)  # type: ignore
-TOOLS_INFO = get_tools_info(TOOLS)  # type: ignore
+TOOLS_INFO = get_tools_info(FUNCTION_TOOLS)  # type: ignore
 UTILITIES_DOCSTRING = get_tool_documentation(
     [
         save_json,

vision_agent/utils/__init__.py

@@ -7,4 +7,4 @@ from .execute import (
     Result,
 )
 from .sim import AzureSim, OllamaSim, Sim, load_sim, merge_sim
-from .video import extract_frames_from_video
+from .video import extract_frames_from_video, video_writer

vision_agent/utils/image_utils.py

@@ -2,14 +2,12 @@
 
 import base64
 import io
-import tempfile
 from importlib import resources
 from io import BytesIO
 from pathlib import Path
 from typing import Dict, List, Tuple, Union
 
 import numpy as np
-from moviepy.editor import ImageSequenceClip
 from PIL import Image, ImageDraw, ImageFont
 from PIL.Image import Image as ImageType
 
@@ -90,24 +88,6 @@ def rle_decode_array(rle: Dict[str, List[int]]) -> np.ndarray:
     return binary_mask
 
 
-def frames_to_bytes(
-    frames: List[np.ndarray], fps: float = 10, file_ext: str = "mp4"
-) -> bytes:
-    r"""Convert a list of frames to a video file encoded into a byte string.
-
-    Parameters:
-        frames: the list of frames
-        fps: the frames per second of the video
-        file_ext: the file extension of the video file
-    """
-    with tempfile.NamedTemporaryFile(delete=True) as temp_file:
-        clip = ImageSequenceClip(frames, fps=fps)
-        clip.write_videofile(temp_file.name + f".{file_ext}", fps=fps, codec="libx264")
-        with open(temp_file.name + f".{file_ext}", "rb") as f:
-            buffer_bytes = f.read()
-    return buffer_bytes
-
-
 def b64_to_pil(b64_str: str) -> ImageType:
     r"""Convert a base64 string to a PIL Image.
 

vision_agent/utils/video.py

@@ -1,19 +1,15 @@
 import base64
 import logging
-import math
-import os
 import tempfile
-from concurrent.futures import ProcessPoolExecutor, as_completed
-from typing import List, Tuple, cast
+from functools import lru_cache
+from typing import List, Optional, Tuple
 
 import cv2
 import numpy as np
-from moviepy.video.io.VideoFileClip import VideoFileClip
-from tqdm import tqdm
+from decord import VideoReader  # type: ignore
 
 _LOGGER = logging.getLogger(__name__)
 # The maximum length of the clip to extract frames from, in seconds
-_CLIP_LENGTH = 30.0
 
 
 def play_video(video_base64: str) -> None:
@@ -47,19 +43,52 @@ def play_video(video_base64: str) -> None:
         cv2.destroyAllWindows()
 
 
+def video_writer(
+    frames: List[np.ndarray], fps: float = 1.0, filename: Optional[str] = None
+) -> str:
+    if filename is None:
+        filename = tempfile.NamedTemporaryFile(delete=False, suffix=".mp4").name
+
+    fourcc = cv2.VideoWriter_fourcc(*"mp4v")  # type: ignore
+    height, width = frames[0].shape[:2]
+    writer = cv2.VideoWriter(filename, fourcc, fps, (width, height))
+    for frame in frames:
+        writer.write(cv2.cvtColor(frame, cv2.COLOR_RGB2BGR))
+    writer.release()
+    return filename
+
+
+def frames_to_bytes(
+    frames: List[np.ndarray], fps: float = 10, file_ext: str = ".mp4"
+) -> bytes:
+    r"""Convert a list of frames to a video file encoded into a byte string.
+
+    Parameters:
+        frames: the list of frames
+        fps: the frames per second of the video
+        file_ext: the file extension of the video file
+    """
+    with tempfile.NamedTemporaryFile(delete=True, suffix=file_ext) as temp_file:
+        video_writer(frames, fps, temp_file.name)
+
+        with open(temp_file.name, "rb") as f:
+            buffer_bytes = f.read()
+    return buffer_bytes
+
+
+# WARNING: this cache is cache is a little dangerous because if the underlying video
+# contents change but the filename remains the same it will return the old file contents
+# but for vision agent it's unlikely to change the file contents while keeping the
+# same file name and the time savings are very large.
+@lru_cache(maxsize=8)
 def extract_frames_from_video(
-    video_uri: str, fps: float = 0.5, motion_detection_threshold: float = 0.0
+    video_uri: str, fps: float = 1.0
 ) -> List[Tuple[np.ndarray, float]]:
     """Extract frames from a video
 
     Parameters:
-        video_uri: the path to the video file or a video file url
-        fps: the frame rate per second to extract the frames
-        motion_detection_threshold: The threshold to detect motion between
-            changes/frames. A value between 0-1, which represents the percentage change
-            required for the frames to be considered in motion. For example, a lower
-            value means more frames will be extracted. A non-positive value will disable
-            motion detection and extract all frames.
+        video_uri (str): the path to the video file or a video file url
+        fps (float): the frame rate per second to extract the frames
 
     Returns:
         a list of tuples containing the extracted frame and the timestamp in seconds.
@@ -67,149 +96,12 @@ def extract_frames_from_video(
             from the start of the video. E.g. 12.125 means 12.125 seconds from the start of
             the video. The frames are sorted by the timestamp in ascending order.
     """
-    with VideoFileClip(video_uri) as video:
-        video_duration: float = video.duration
-        num_workers = os.cpu_count()
-        clip_length: float = min(video_duration, _CLIP_LENGTH)
-        start_times = list(range(0, math.ceil(video_duration), math.ceil(clip_length)))
-        assert start_times, f"No frames to extract from the input video: {video_uri}"
-        segment_args = [
-            {
-                "video_uri": video_uri,
-                "start": start,
-                "end": (
-                    start + clip_length if i < len(start_times) - 1 else video_duration
-                ),
-                "fps": fps,
-                "motion_detection_threshold": motion_detection_threshold,
-            }
-            for i, start in enumerate(start_times)
-        ]
-        if (
-            cast(float, segment_args[-1]["end"])
-            - cast(float, segment_args[-1]["start"])
-            < 1
-        ):
-            # If the last segment is less than 1s, merge it with the previous segment
-            # This is to avoid the failure of the last segment extraction
-            assert (
-                len(segment_args) > 1
-            ), "Development bug - Expect at least 2 segments."
-            segment_args[-2]["end"] = video_duration
-            segment_args.pop(-1)
-        _LOGGER.info(
-            f"""Created {len(segment_args)} segments from the input video  {video_uri} of length {video.duration}s, with clip size: {clip_length}s and {num_workers} workers.
-            Segments: {segment_args}
-            """
-        )
-        frames = []
-        with tqdm(total=len(segment_args)) as pbar:
-            with ProcessPoolExecutor(max_workers=num_workers) as executor:
-                futures = [
-                    executor.submit(_extract_frames_by_clip, **kwargs)  # type: ignore
-                    for kwargs in segment_args
-                ]
-                for future in as_completed(futures):
-                    result = future.result()
-                    frames.extend(result)
-                    pbar.update(1)
-        frames.sort(key=lambda x: x[1])
-        _LOGGER.info(f"Extracted {len(frames)} frames from video {video_uri}")
-        return frames
-
-
-def _extract_frames_by_clip(
-    video_uri: str,
-    start: int = 0,
-    end: float = -1,
-    fps: int = 2,
-    motion_detection_threshold: float = 0.06,
-) -> List[Tuple[np.ndarray, float]]:
-    """Extract frames from a video clip with start and end time in seconds.
-
-    Parameters:
-        video_uri: the path to the video file or a video file url
-        start: the start time (in seconds) of the clip to extract
-        end: the end time (in seconds, up to millisecond level precision) of the clip to extract, if -1, extract the whole video
-        fps: the frame rate to extract the frames
-        motion_detection_threshold: the threshold to detect the motion between frames
-    """
-    with VideoFileClip(video_uri) as video:
-        source_fps = video.fps
-        if end <= 0:
-            end = video.duration
-        _LOGGER.info(
-            f"Extracting frames from video {video_uri} ({video.duration}s) with start={start}s and end={end}s"
-        )
-        clip = video.subclip(start, end)
-        processable_frames = int(clip.duration * fps)
-        _LOGGER.info(
-            f"Extracting frames from video clip of length {clip.duration}s with FPS={fps} and start_time={start}s. Total number of frames in clip: {processable_frames}"
-        )
-        frames = []
-        total_count, skipped_count = 0, 0
-        prev_processed_frame = None
-        pbar = tqdm(
-            total=processable_frames, desc=f"Extracting frames from clip {start}-{end}"
-        )
-        for i, frame in enumerate(clip.iter_frames(fps=fps, dtype="uint8")):
-            total_count += 1
-            pbar.update(1)
-            if motion_detection_threshold > 0:
-                curr_processed_frame = _preprocess_frame(frame)
-                # Skip the frame if it is similar to the previous one
-                if prev_processed_frame is not None and _similar_frame(
-                    prev_processed_frame,
-                    curr_processed_frame,
-                    threshold=motion_detection_threshold,
-                ):
-                    skipped_count += 1
-                    continue
-                prev_processed_frame = curr_processed_frame
-            ts = round(clip.reader.pos / source_fps, 3)
-            frames.append((frame, ts))
-
-        _LOGGER.info(
-            f"""Finished!
-                Frames extracted: {len(frames)}
-                Extracted frame timestamp: {[f[1] for f in frames]}
-                Total processed frames: {total_count}
-                Skipped frames:  {skipped_count}
-                Scan FPS: {fps}
-                Clip start time: {start}s, {clip.pos}
-                Clip end time: {end}s
-                Clip duration: {clip.duration}s
-                Clip total frames: {clip.duration * source_fps}
-                Video duration: {video.duration}s
-                Video FPS: {video.fps}
-                Video total frames: {video.reader.nframes}"""
-        )
-        return frames
-
-
-def _preprocess_frame(frame: np.ndarray) -> np.ndarray:
-    # Convert to grayscale
-    frame = cv2.cvtColor(frame, cv2.COLOR_BGR2GRAY)
-    frame = cv2.GaussianBlur(src=frame, ksize=(5, 5), sigmaX=0)
-    return frame
-
-
-def _similar_frame(
-    prev_frame: np.ndarray, curr_frame: np.ndarray, threshold: float
-) -> bool:
-    """Detect two frames are similar or not
-
-    Parameters:
-        threshold: similarity threshold, a value between 0-1, the percentage change that is considered a different frame.
-    """
-    # calculate difference and update previous frame TODO: don't assume the processed image is cached
-    diff_frame = cv2.absdiff(src1=prev_frame, src2=curr_frame)
-    # Only take different areas that are different enough (>20 / 255)
-    thresh_frame = cv2.threshold(
-        src=diff_frame, thresh=20, maxval=255, type=cv2.THRESH_BINARY
-    )[1]
-    change_percentage = cv2.countNonZero(thresh_frame) / (
-        curr_frame.shape[0] * curr_frame.shape[1]
-    )
-    _LOGGER.debug(f"Image diff: {change_percentage}")
-    return change_percentage < threshold
+    vr = VideoReader(video_uri)
+    orig_fps = vr.get_avg_fps()
+    if fps > orig_fps:
+        fps = orig_fps
+
+    s = orig_fps / fps
+    samples = [(int(i * s), int(i * s) / orig_fps) for i in range(int(len(vr) / s))]
+    frames = vr.get_batch([s[0] for s in samples]).asnumpy()
+    return [(frames[i, :, :, :], samples[i][1]) for i in range(len(samples))]

{vision_agent-0.2.124.dist-info → vision_agent-0.2.126.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vision-agent
-Version: 0.2.124
+Version: 0.2.126
 Summary: Toolset for Vision Agent
 Author: Landing AI
 Author-email: dev@landing.ai
@@ -12,9 +12,9 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: anthropic (>=0.31.0,<0.32.0)
 Requires-Dist: e2b (>=0.17.2a50,<0.18.0)
 Requires-Dist: e2b-code-interpreter (==0.0.11a37)
+Requires-Dist: eva-decord (>=0.6.1,<0.7.0)
 Requires-Dist: ipykernel (>=6.29.4,<7.0.0)
 Requires-Dist: langsmith (>=0.1.58,<0.2.0)
-Requires-Dist: moviepy (>=1.0.0,<2.0.0)
 Requires-Dist: nbclient (>=0.10.0,<0.11.0)
 Requires-Dist: nbformat (>=5.10.4,<6.0.0)
 Requires-Dist: numpy (>=1.21.0,<2.0.0)

{vision_agent-0.2.124.dist-info → vision_agent-0.2.126.dist-info}/RECORD

@@ -3,7 +3,7 @@ vision_agent/agent/__init__.py,sha256=FRwiux1FGvGccetyUCtY46KP01fQteqorm-JtFepov
 vision_agent/agent/agent.py,sha256=2cjIOxEuSJrqbfPXYoV0qER5ihXsPFCoEFJa4jpqan0,597
 vision_agent/agent/agent_utils.py,sha256=22LiPhkJlS5mVeo2dIi259pc2NgA7PGHRpcbnrtKo78,1930
 vision_agent/agent/vision_agent.py,sha256=WM1_o0VAQokAKlDr-0lpFxCRwUm_eFfFNWP-wSNjo7s,11180
-vision_agent/agent/vision_agent_coder.py,sha256=ujctkpmQkX2C6YXjlp7VLZFqSB00xwkGe-9swA8Gv8s,34240
+vision_agent/agent/vision_agent_coder.py,sha256=_2QQd_nTGojkk2ZOiMevVCY6-eUA9q1QdCWH7-Noq4w,34237
 vision_agent/agent/vision_agent_coder_prompts.py,sha256=Rg7-Ih7oFgFbHFFno0EHpaZEgm0SYj_nTdqqdp21YLo,11246
 vision_agent/agent/vision_agent_prompts.py,sha256=K1nLo3XKQ-IqCom1TRwh3cMoGZNxNwEgZqf3uJ6eL18,7221
 vision_agent/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,16 +18,16 @@ vision_agent/tools/__init__.py,sha256=T8Hi5aHf4J2QJDoPRvu5fxbiqMpAY-1Gi2EFIhJbf3
 vision_agent/tools/meta_tools.py,sha256=KeGiw2OtY8ARpGbtWjoNAoO1dwevt7LbCupaJX61MkE,18929
 vision_agent/tools/prompts.py,sha256=V1z4YJLXZuUl_iZ5rY0M5hHc_2tmMEUKr0WocXKGt4E,1430
 vision_agent/tools/tool_utils.py,sha256=62NVlojPMf9MuJ-3yJEcrB3mzmOxN2HrNQzzjVa-FZg,7527
-vision_agent/tools/tools.py,sha256=xT-lDC3NCdltK0_CDTOOiU8B2YhlIdzFhuSbvRVFBI8,65545
+vision_agent/tools/tools.py,sha256=Y6BTLFoueLtjId2qG06UyZwCQA_TTA6uFxPkxzhRI50,65396
 vision_agent/tools/tools_types.py,sha256=rLpCUODPY0yI65SLOTJOxfHFfqWM3WjOq-AYX25Chjk,2356
-vision_agent/utils/__init__.py,sha256=pWk0ktvR4aUEhuEIzSLM9kSgW4WDVqptdvOTeGLkJ6M,230
+vision_agent/utils/__init__.py,sha256=7fMgbZiEwbNS0fBOS_hJI5PuEYBblw36zLi_UjUzvj4,244
 vision_agent/utils/exceptions.py,sha256=booSPSuoULF7OXRr_YbC4dtKt6gM_HyiFQHBuaW86C4,2052
 vision_agent/utils/execute.py,sha256=gc4R_0BKUrZyhiKvIxOpYuzQPYVWQEqxr3ANy1lJAw4,27037
-vision_agent/utils/image_utils.py,sha256=lhdvRWMbQmMMLTmJGI1dFjzNeQSLfPYJEsAkq5Ydj3Y,11476
+vision_agent/utils/image_utils.py,sha256=zTTOJFOieMzwIquTFnW7T6ssx9o6XfoZ0Unqyk7GJrg,10746
 vision_agent/utils/sim.py,sha256=ebE9Cs00pVEDI1HMjAzUBk88tQQmc2U-yAzIDinnekU,5572
 vision_agent/utils/type_defs.py,sha256=BE12s3JNQy36QvauXHjwyeffVh5enfcvd4vTzSwvEZI,1384
-vision_agent/utils/video.py,sha256=rNmU9KEIkZB5-EztZNlUiKYN0mm_55A_2VGUM0QpqLA,8779
-vision_agent-0.2.124.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vision_agent-0.2.124.dist-info/METADATA,sha256=mDvhJytcxFZW_B18Vkn4egk4HJ8UHYl6YQhEJHQAbPk,12255
-vision_agent-0.2.124.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-vision_agent-0.2.124.dist-info/RECORD,,
+vision_agent/utils/video.py,sha256=oM3sdQVGGI3xwrCN2GKt9otzDb0SPW-JUo5SABxTVl4,3847
+vision_agent-0.2.126.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vision_agent-0.2.126.dist-info/METADATA,sha256=4O_OuQh5yhJ8unzNtfU4E_0RNykXxkbdjkiGPAXi9Ek,12258
+vision_agent-0.2.126.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+vision_agent-0.2.126.dist-info/RECORD,,