Remove vidutil dependency

Author: Ruben Cronie

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ fail_fast: false
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.4.0
     hooks:
       - id: mixed-line-ending
         args:
@@ -24,7 +24,7 @@ repos:
         args: ["--remove"]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.9.3
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort (python)
@@ -38,7 +38,7 @@ repos:
         types: [ pyi ]
 
   - repo: https://github.com/psf/black
-    rev: 21.7b0
+    rev: 23.3.0
     hooks:
       - id: black
         language_version: python3.9

.python-version

@@ -26,3 +26,33 @@ include_trailing_comma = true
 lines_after_imports = 2
 known_first_party = []
 known_third_party = []
+
+[tool.poetry]
+name = "project-util"
+version = "0.1.0"
+description = ""
+authors = ["Ruben Cronie <rubencronie@gmail.com>"]
+readme = "README.md"
+packages = [{include = "src"}]
+
+[tool.poetry.dependencies]
+python = "^3.9"
+numpy = "^1.22.4"
+opencv-contrib-python = "4.5.5.64"
+pillow = "9.1.1"
+loguru = "^0.6.0"
+boto3 = "^1.26.104"
+python-dotenv = "^1.0.0"
+fastapi-utils = "^0.2.1"
+
+
+[tool.poetry.group.dev.dependencies]
+black = "^23.3.0"
+isort = "^5.12.0"
+pre-commit = "^3.2.1"
+pyfakefs = "^5.2.0"
+pytest = "^7.2.2"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

poetry.lock

@@ -0,0 +1,36 @@
+import os
+from os.path import abspath, isdir, isfile, join
+from pathlib import Path
+from typing import List, Union
+
+import cv2
+from numpy import ndarray
+
+
+def list_images(path: Union[str, Path], extensions=None) -> List[Path]:
+    if not extensions:
+        extensions = [".png", ".jpg", ".jpeg", ".tif", ".tiff"]
+    if not isdir(path):
+        raise ValueError(f"{path} is not a directory")
+    paths = sorted(
+        [
+            abspath(join(path, f))
+            for f in os.listdir(path)
+            if not f.startswith(".")
+            and isfile(join(path, f))
+            and Path(f).suffix in extensions
+        ],
+        key=str.lower,
+    )
+    return [Path(p) for p in paths]
+
+
+def load_images(paths: List[Union[str, Path]]) -> List[ndarray]:
+    frames = []
+    for p in paths:
+        if isinstance(p, Path):
+            frames.append(cv2.imread(p.as_posix()))
+        else:
+            frames.append(cv2.imread(p))
+
+    return frames

pyproject.toml

@@ -8,10 +8,10 @@
 import numpy as np
 from loguru import logger
 from PIL import Image
-from vidutil.encoder import VideoEncoder
 
 from project_util.blueprint.blueprint import Blueprint
 from project_util.constants import FILE_SYSTEM, S3
+from project_util.image_utils import list_images, load_images
 from project_util.services.s3 import S3Client
 
 
@@ -88,10 +88,10 @@ def get_file_names(self):
 
     def load_images(self) -> List[np.ndarray]:
         # Candidate for moving to an image-specific project lib
-        paths = VideoEncoder.list_images(self.path)
+        paths = list_images(self.path)
         logger.debug(f"Project path: {self.path}")
         logger.debug(f"Loading image paths: {paths}")
-        return VideoEncoder.load_images(paths)
+        return load_images(paths)
 
     def _require_backend(self, backend):
         if self._backend != backend:
@@ -206,38 +206,6 @@ def _save_blueprint_to_s3(self, bucket, path):
             path=path,
         )
 
-    def export_frames_as_video(
-        self,
-        name: str,
-        target_project: TProject = None,
-        fps: int = 24,
-        codec: Union[str, int] = "mp4v",
-    ) -> None:
-        """
-        Exports images in current folder as a video file. You can add .mp4 as an
-        extension in the name param.
-        :param codec: fourcc code
-        :param name: file name to export
-        :return:
-        """
-        # Candidate for moving to a video-specific project lib
-        self._require_backend(FILE_SYSTEM)
-        self.ensure_project_dir()
-        if target_project:
-            target_path = target_project.path
-        else:
-            target_path = self.path
-
-        frames = self.load_images()
-        if frames:
-            logger.debug(f"Video shape: {frames[0].shape[1::-1]}")
-        VideoEncoder.save(
-            path=join(target_path, name),
-            frames=frames,
-            fps=fps,
-            codec=codec,
-        )
-
     def ensure_project_dir(self):
         if not self._project_dir.exists():
             self._make_project_dir()