OTVision 0.6.10__tar.gz → 0.6.12__tar.gz

{otvision-0.6.10 → otvision-0.6.12}/.github/workflows/test.yml

@@ -22,9 +22,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Run Python Tests
-        uses: platomo/test-python-app-action@v2
+        uses: platomo/test-python-app-action@v3
         timeout-minutes: 60
         with:
           py-version: ${{ matrix.py }}
           package-path: OTVision
           ffmpeg-required: True
+          uv-sync-args: "--extra inference_cpu"

{otvision-0.6.10 → otvision-0.6.12}/.pre-commit-config.yaml

@@ -14,6 +14,10 @@ repos:
       - id: requirements-txt-fixer
       - id: check-executables-have-shebangs
       - id: detect-private-key
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.8.11
+    hooks:
+      - id: uv-lock
   - repo: local
     hooks:
       - id: update-type-stubs

{otvision-0.6.10 → otvision-0.6.12}/OTVision/version.py

@@ -1,4 +1,4 @@
-__version__ = "v0.6.10"
+__version__ = "v0.6.12"
 
 
 def otdet_version() -> str:

{otvision-0.6.10 → otvision-0.6.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.10
+Version: 0.6.12
 Summary: OTVision is a core module of the OpenTrafficCam framework to perform object detection and tracking.
 Project-URL: Homepage, https://opentrafficcam.org/
 Project-URL: Documentation, https://opentrafficcam.org/overview/
@@ -26,20 +26,22 @@ Requires-Dist: more-itertools==10.7.0
 Requires-Dist: moviepy==1.0.3
 Requires-Dist: numpy==1.26.4; sys_platform == 'win32'
 Requires-Dist: numpy==2.1.1; sys_platform != 'win32'
-Requires-Dist: opencv-python==4.10.0.84
+Requires-Dist: opencv-python-headless==4.10.0.84
 Requires-Dist: pandas==2.2.3
 Requires-Dist: pyyaml==6.0.2
-Requires-Dist: torch==2.7.1
-Requires-Dist: torchvision==0.22.1
 Requires-Dist: tqdm==4.67.1
 Requires-Dist: ujson==5.10.0
-Requires-Dist: ultralytics==8.3.159
-Provides-Extra: cuda
-Requires-Dist: tensorrt-cu12-bindings==10.12.0.36; (sys_platform != 'darwin') and extra == 'cuda'
-Requires-Dist: tensorrt-cu12-libs==10.12.0.36; (sys_platform != 'darwin') and extra == 'cuda'
-Requires-Dist: tensorrt==10.12.0.36; (sys_platform != 'darwin') and extra == 'cuda'
-Requires-Dist: torch; extra == 'cuda'
-Requires-Dist: torchvision; extra == 'cuda'
+Provides-Extra: inference-cpu
+Requires-Dist: torch==2.7.1; extra == 'inference-cpu'
+Requires-Dist: torchvision==0.22.1; extra == 'inference-cpu'
+Requires-Dist: ultralytics==8.3.159; extra == 'inference-cpu'
+Provides-Extra: inference-cuda
+Requires-Dist: tensorrt-cu12-bindings==10.12.0.36; (sys_platform != 'darwin') and extra == 'inference-cuda'
+Requires-Dist: tensorrt-cu12-libs==10.12.0.36; (sys_platform != 'darwin') and extra == 'inference-cuda'
+Requires-Dist: tensorrt==10.12.0.36; (sys_platform != 'darwin') and extra == 'inference-cuda'
+Requires-Dist: torch==2.7.1; extra == 'inference-cuda'
+Requires-Dist: torchvision==0.22.1; extra == 'inference-cuda'
+Requires-Dist: ultralytics==8.3.159; extra == 'inference-cuda'
 Description-Content-Type: text/markdown
 
 # OTVision
@@ -48,22 +50,25 @@ Description-Content-Type: text/markdown
 [![Tests](https://github.com/OpenTrafficCam/OTVision/actions/workflows/test.yml/badge.svg?tag=latest)](https://github.com/OpenTrafficCam/OTVision/actions/workflows/test.yml?query=tag%3Alatest)
 [![Tests](https://github.com/OpenTrafficCam/OTVision/actions/workflows/build-release.yml/badge.svg)](https://github.com/OpenTrafficCam/OTVision/actions/workflows/build-release.yml)
 
-OTVision is a core module of the [OpenTrafficCam framework](https://github.com/OpenTrafficCam) designed to detect and track objects (road users) in videos recorded by [OTCamera](https://github.com/OpenTrafficCam/OTCamera) or other camera systems. The resulting trajectories can be used for traffic analysis using [OTAnalytics](https://github.com/OpenTrafficCam/OTAnalytics).
+OTVision is a core module of the [OpenTrafficCam framework](https://github.com/OpenTrafficCam)
+designed to detect and track objects (road users) in videos recorded by
+[OTCamera](https://github.com/OpenTrafficCam/OTCamera) or other camera systems.
+The resulting trajectories can be used for traffic analysis using [OTAnalytics](https://github.com/OpenTrafficCam/OTAnalytics).
 
 ## Features
 
 - **Video Conversion**: Convert video files (h264 to mp4) with options to set frame rate and rotation
 - **Object Detection**: Detect road users in videos using state-of-the-art YOLO models
 - **Object Tracking**: Track detected objects through video frames using IOU-based tracking algorithms
-- **Coordinate Transformation**: Transform pixel coordinates to real-world UTM coordinates
 
 ## Requirements
 
 ### System Requirements
 
-- Python 3.12 or higher
+- Python 3.12
+- [uv for dependency management](https://docs.astral.sh/uv/)
 - CUDA-capable GPU (recommended for faster processing)
-- Dependencies listed in [requirements.txt](requirements.txt)
+- ffmpeg (optional for video conversion)
 
 ## Installation
 
@@ -73,9 +78,9 @@ Pre-built releases are available on GitHub for easy installation:
 
 1. Go to the [OTVision Releases page](https://github.com/OpenTrafficCam/OTVision/releases) on GitHub
 2. Download the appropriate release for your platform:
-   - **Windows**: Choose between `otvision-win.zip` (standard) or `otvision-win-cuda.zip` (with CUDA support)
-   - **Linux**: Choose between `otvision-linux.zip` (standard) or `otvision-linux-cuda.zip` (with CUDA support)
-   - **macOS**: Choose `OTVision-macos.zip`
+   - **Windows**: Choose between `OTVision-win-{vX.Y.Z}.zip` (standard) or `OTVision-win-cuda-{vX.Y.Z}.zip` (with CUDA support)
+   - **Linux**: Choose between `OTVision-linux-{vX.Y.Z}.zip` (standard) or `OTVision-linux-cuda-{vX.Y.Z}.zip` (with CUDA support)
+   - **macOS**: Choose `OTVision-macos-{vX.Y.Z}.zip`
 3. Extract the downloaded ZIP file
 4. Run the installation script:
    - On Windows: Double-click `install.cmd`
@@ -131,7 +136,7 @@ OTVision provides several command-line scripts for different functionalities:
 Convert video files (e.g., h264 to mp4):
 
 ```bash
-python convert.py --paths /path/to/videos/*.h264 --input-fps 20.0 --rotation 0
+uv run convert.py --paths /path/to/videos/*.h264 --input-fps 20.0 --rotation 0
 ```
 
 ### Object Detection
@@ -139,7 +144,7 @@ python convert.py --paths /path/to/videos/*.h264 --input-fps 20.0 --rotation 0
 Detect objects in videos:
 
 ```bash
-python detect.py --paths /path/to/videos/*.mp4 --weights yolov8s
+uv run detect.py --paths /path/to/videos/*.mp4 --weights yolov8s
 ```
 
 ### Object Tracking
@@ -147,7 +152,7 @@ python detect.py --paths /path/to/videos/*.mp4 --weights yolov8s
 Track detected objects:
 
 ```bash
-python track.py --paths /path/to/detections/*.otdet
+uv run track.py --paths /path/to/detections/*.otdet
 ```
 
 ### Coordinate Transformation
@@ -155,7 +160,7 @@ python track.py --paths /path/to/detections/*.otdet
 Transform pixel coordinates to UTM coordinates:
 
 ```bash
-python transform.py --paths /path/to/tracks/*.ottrk --refpts-file /path/to/reference_points.json
+uv run transform.py --paths /path/to/tracks/*.ottrk --refpts-file /path/to/reference_points.json
 ```
 
 ### Configuration
@@ -163,7 +168,7 @@ python transform.py --paths /path/to/tracks/*.ottrk --refpts-file /path/to/refer
 OTVision can be configured using a YAML configuration file. A default configuration is provided in `user_config.otvision.yaml`. You can specify a custom configuration file using the `--config` option:
 
 ```bash
-python detect.py --config /path/to/custom_config.yaml
+uv run detect.py --config /path/to/custom_config.yaml
 ```
 
 ## Documentation

{otvision-0.6.10 → otvision-0.6.12}/README.md

@@ -4,22 +4,25 @@
 [![Tests](https://github.com/OpenTrafficCam/OTVision/actions/workflows/test.yml/badge.svg?tag=latest)](https://github.com/OpenTrafficCam/OTVision/actions/workflows/test.yml?query=tag%3Alatest)
 [![Tests](https://github.com/OpenTrafficCam/OTVision/actions/workflows/build-release.yml/badge.svg)](https://github.com/OpenTrafficCam/OTVision/actions/workflows/build-release.yml)
 
-OTVision is a core module of the [OpenTrafficCam framework](https://github.com/OpenTrafficCam) designed to detect and track objects (road users) in videos recorded by [OTCamera](https://github.com/OpenTrafficCam/OTCamera) or other camera systems. The resulting trajectories can be used for traffic analysis using [OTAnalytics](https://github.com/OpenTrafficCam/OTAnalytics).
+OTVision is a core module of the [OpenTrafficCam framework](https://github.com/OpenTrafficCam)
+designed to detect and track objects (road users) in videos recorded by
+[OTCamera](https://github.com/OpenTrafficCam/OTCamera) or other camera systems.
+The resulting trajectories can be used for traffic analysis using [OTAnalytics](https://github.com/OpenTrafficCam/OTAnalytics).
 
 ## Features
 
 - **Video Conversion**: Convert video files (h264 to mp4) with options to set frame rate and rotation
 - **Object Detection**: Detect road users in videos using state-of-the-art YOLO models
 - **Object Tracking**: Track detected objects through video frames using IOU-based tracking algorithms
-- **Coordinate Transformation**: Transform pixel coordinates to real-world UTM coordinates
 
 ## Requirements
 
 ### System Requirements
 
-- Python 3.12 or higher
+- Python 3.12
+- [uv for dependency management](https://docs.astral.sh/uv/)
 - CUDA-capable GPU (recommended for faster processing)
-- Dependencies listed in [requirements.txt](requirements.txt)
+- ffmpeg (optional for video conversion)
 
 ## Installation
 
@@ -29,9 +32,9 @@ Pre-built releases are available on GitHub for easy installation:
 
 1. Go to the [OTVision Releases page](https://github.com/OpenTrafficCam/OTVision/releases) on GitHub
 2. Download the appropriate release for your platform:
-   - **Windows**: Choose between `otvision-win.zip` (standard) or `otvision-win-cuda.zip` (with CUDA support)
-   - **Linux**: Choose between `otvision-linux.zip` (standard) or `otvision-linux-cuda.zip` (with CUDA support)
-   - **macOS**: Choose `OTVision-macos.zip`
+   - **Windows**: Choose between `OTVision-win-{vX.Y.Z}.zip` (standard) or `OTVision-win-cuda-{vX.Y.Z}.zip` (with CUDA support)
+   - **Linux**: Choose between `OTVision-linux-{vX.Y.Z}.zip` (standard) or `OTVision-linux-cuda-{vX.Y.Z}.zip` (with CUDA support)
+   - **macOS**: Choose `OTVision-macos-{vX.Y.Z}.zip`
 3. Extract the downloaded ZIP file
 4. Run the installation script:
    - On Windows: Double-click `install.cmd`
@@ -87,7 +90,7 @@ OTVision provides several command-line scripts for different functionalities:
 Convert video files (e.g., h264 to mp4):
 
 ```bash
-python convert.py --paths /path/to/videos/*.h264 --input-fps 20.0 --rotation 0
+uv run convert.py --paths /path/to/videos/*.h264 --input-fps 20.0 --rotation 0
 ```
 
 ### Object Detection
@@ -95,7 +98,7 @@ python convert.py --paths /path/to/videos/*.h264 --input-fps 20.0 --rotation 0
 Detect objects in videos:
 
 ```bash
-python detect.py --paths /path/to/videos/*.mp4 --weights yolov8s
+uv run detect.py --paths /path/to/videos/*.mp4 --weights yolov8s
 ```
 
 ### Object Tracking
@@ -103,7 +106,7 @@ python detect.py --paths /path/to/videos/*.mp4 --weights yolov8s
 Track detected objects:
 
 ```bash
-python track.py --paths /path/to/detections/*.otdet
+uv run track.py --paths /path/to/detections/*.otdet
 ```
 
 ### Coordinate Transformation
@@ -111,7 +114,7 @@ python track.py --paths /path/to/detections/*.otdet
 Transform pixel coordinates to UTM coordinates:
 
 ```bash
-python transform.py --paths /path/to/tracks/*.ottrk --refpts-file /path/to/reference_points.json
+uv run transform.py --paths /path/to/tracks/*.ottrk --refpts-file /path/to/reference_points.json
 ```
 
 ### Configuration
@@ -119,7 +122,7 @@ python transform.py --paths /path/to/tracks/*.ottrk --refpts-file /path/to/refer
 OTVision can be configured using a YAML configuration file. A default configuration is provided in `user_config.otvision.yaml`. You can specify a custom configuration file using the `--config` option:
 
 ```bash
-python detect.py --config /path/to/custom_config.yaml
+uv run detect.py --config /path/to/custom_config.yaml
 ```
 
 ## Documentation

{otvision-0.6.10 → otvision-0.6.12}/install.cmd

@@ -9,11 +9,10 @@ if "x%PYTHON_VERSION:3.12=%"=="x%PYTHON_VERSION%" (
 
 REM Check if uv is available globally, if not install it
 where uv >nul 2>nul
-if errorlevel neq 0 (
+if %errorlevel% neq 0 (
     echo uv not found globally, installing uv...
     powershell -ExecutionPolicy Bypass -Command "& {irm https://astral.sh/uv/install.ps1 | iex}"
     set "PATH=%USERPROFILE%\.cargo\bin;%PATH%"
 )
 
-uv venv .venv
-uv sync --python .venv%
+uv sync --extra inference_cpu --no-dev

{otvision-0.6.10 → otvision-0.6.12}/install.sh

@@ -13,8 +13,6 @@ echo "Install OTVision."
 
 echo "$DIR"
 cd "$DIR" || exit
-WORKING_DIR=$(pwd)
-VENV="$WORKING_DIR"/.venv
 
 # Check if uv is available globally, if not install it
 if ! command -v uv &>/dev/null; then
@@ -23,5 +21,4 @@ if ! command -v uv &>/dev/null; then
   export PATH="$HOME/.cargo/bin:$PATH"
 fi
 
-uv venv "$VENV"
-uv sync --python "$VENV"
+uv sync --extra inference_cpu --no-dev

{otvision-0.6.10 → otvision-0.6.12}/install_cuda.cmd

@@ -9,11 +9,10 @@ if "x%PYTHON_VERSION:3.12=%"=="x%PYTHON_VERSION%" (
 
 REM Check if uv is available globally, if not install it
 where uv >nul 2>nul
-if errorlevel neq 0 (
+if %errorlevel% neq 0 (
     echo uv not found globally, installing uv...
     powershell -ExecutionPolicy Bypass -Command "& {irm https://astral.sh/uv/install.ps1 | iex}"
     set "PATH=%USERPROFILE%\.cargo\bin;%PATH%"
 )
 
-uv venv .venv
-uv sync --extra cuda --python .venv
+uv sync --extra inference_cuda --no-dev

{otvision-0.6.10 → otvision-0.6.12}/install_cuda.sh

@@ -13,8 +13,6 @@ echo "Install OTVision."
 
 echo "$DIR"
 cd "$DIR" || exit
-WORKING_DIR=$(pwd)
-VENV="$WORKING_DIR"/.venv
 
 # Check if uv is available globally, if not install it
 if ! command -v uv &>/dev/null; then
@@ -23,5 +21,4 @@ if ! command -v uv &>/dev/null; then
   export PATH="$HOME/.cargo/bin:$PATH"
 fi
 
-uv venv "$VENV"
-uv sync --extra cuda --python "$VENV"
+uv sync --extra inference_cuda --no-dev

otvision-0.6.12/install_dev.cmd

@@ -0,0 +1,5 @@
+echo Install OTVision development environment.
+call install.cmd
+
+uv sync --extra inference_cpu
+uv run pre-commit install --install-hooks

otvision-0.6.12/install_dev.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+echo "Install OTVision development environment."
+
+WORKING_DIR=$(pwd)
+
+bash "$WORKING_DIR"/install.sh
+
+uv sync --extra inference_cpu
+uv run pre-commit install --install-hooks

{otvision-0.6.10 → otvision-0.6.12}/pyproject.toml

@@ -33,14 +33,11 @@ dependencies = [
     "moviepy==1.0.3",
     "numpy==2.1.1; sys_platform != 'win32'",
     "numpy==1.26.4; sys_platform == 'win32'",
-    "opencv-python==4.10.0.84",
+    "opencv-python-headless==4.10.0.84",
     "pandas==2.2.3",
     "PyYAML==6.0.2",
-    "torch==2.7.1",
-    "torchvision==0.22.1",
     "tqdm==4.67.1",
     "ujson==5.10.0",
-    "ultralytics==8.3.159",
 ]
 
 [dependency-groups]
@@ -60,12 +57,18 @@ dev = [
 ]
 
 [project.optional-dependencies]
-cuda = [
-    "torch",
-    "torchvision",
+inference_cpu = [
+    "torch==2.7.1",
+    "torchvision==0.22.1",
+    "ultralytics==8.3.159",
+]
+inference_cuda = [
+    "torch==2.7.1",
+    "torchvision==0.22.1",
     "tensorrt==10.12.0.36; sys_platform != 'darwin'",
     "tensorrt-cu12-bindings==10.12.0.36; sys_platform != 'darwin'",
     "tensorrt-cu12-libs==10.12.0.36; sys_platform != 'darwin'",
+    "ultralytics==8.3.159",
 ]
 [project.urls]
 Homepage = "https://opentrafficcam.org/"
@@ -121,25 +124,35 @@ name = "tensorrt-cu12-bindings"
 name = "tensorrt-cu12-libs"
 
 [tool.uv]
-default-groups = []
 environments = [
     "sys_platform == 'win32'",
     "sys_platform == 'darwin'",
     "sys_platform == 'linux'",
 ]
+conflicts = [
+    [
+        { extra = "inference_cpu" },
+        { extra = "inference_cuda" },
+    ],
+]
+
 
 [tool.uv.sources]
 torch = [
-  { index = "pytorch-cpu", marker = "sys_platform == 'darwin'" },
-  { index = "pytorch-cu128", marker = "sys_platform != 'darwin'" , extra = "cuda" }
+    { index = "pytorch-cu128", marker = "sys_platform != 'darwin'" , extra = "inference_cuda" },
+    { index = "pytorch-cpu", marker = "sys_platform == 'darwin'" },
+    { index = "pytorch-cpu", marker = "sys_platform == 'linux'", extra="inference_cpu" },
+    { index = "pytorch-cpu", marker = "sys_platform == 'win32'", extra="inference_cpu" }
 ]
 torchvision = [
-  { index = "pytorch-cpu", marker = "sys_platform == 'darwin'" },
-  { index = "pytorch-cu128", marker = "sys_platform != 'darwin'" , extra = "cuda" }
+    { index = "pytorch-cu128", marker = "sys_platform != 'darwin'" , extra = "inference_cuda" },
+    { index = "pytorch-cpu", marker = "sys_platform == 'darwin'" },
+    { index = "pytorch-cpu", marker = "sys_platform == 'linux'", extra="inference_cpu" },
+    { index = "pytorch-cpu", marker = "sys_platform == 'win32'", extra="inference_cpu" }
 ]
-tensorrt = { index = "tensorrt", extra = "cuda" }
-tensorrt-cu12-bindings = { index = "tensorrt", extra = "cuda" }
-tensorrt-cu12-libs = { index = "tensorrt", extra = "cuda" }
+tensorrt = { index = "tensorrt", extra = "inference_cuda" }
+tensorrt-cu12-bindings = { index = "tensorrt", extra = "inference_cuda" }
+tensorrt-cu12-libs = { index = "tensorrt", extra = "inference_cuda" }
 
 [[tool.uv.index]]
 name = "pytorch-cpu"