feat: v1.6.0 Phase 1 — schemas, CSRF rotation, GPU context, FFmpeg cache

SysAdminDoc · SysAdminDoc · commit 9ec409ff2b3e · 2026-03-24T16:59:16.000-04:00
New modules:
- opencut/schemas.py — 15 dataclass response schemas (JobResponse,
  SilenceResult, LoudnessMatchResult, ColorMatchResult, AutoZoomResult,
  MulticamResult, ChaptersResult, RepeatDetectResult, SearchResult,
  DeliverableResult, BeatMarkersResult, ExportMarkersResult, IndexResult,
  UpdateCheckResult). All have to_dict() with None filtering. Prevents
  the field-name mismatch bug class that caused ~40 bugs in batches 30-32.

- opencut/gpu.py — GPUContext context manager for automatic VRAM cleanup.
  register() tracks models, __exit__ does del + torch.cuda.empty_cache().
  check_vram(min_gb) for preflight. get_device() for cuda/cpu detection.
  All torch imports defensive (try/except). Replaces 46 scattered
  try/finally/del/empty_cache patterns across 12 core modules.

Security:
- CSRF token rotation with 1-hour TTL. Rotating pool of up to 10 tokens.
  New tokens generated when oldest passes half-life. require_csrf accepts
  any non-expired token (grace window). Constant-time comparison via
  hmac.compare_digest. Replaces static token that was valid forever.

Performance:
- FFmpeg/FFprobe path caching — get_ffmpeg_path() and get_ffprobe_path()
  do shutil.which() once and cache. All run_ffmpeg(), FFmpegCmd.build(),
  get_video_info() use cached paths. Pre-warmed on server startup after
  PATH is configured.
diff --git a/Install.ps1 b/Install.ps1
@@ -155,7 +155,7 @@ Write-Host "  \___/| .__/ \___|_| |_|\____\__,_|\__|" -ForegroundColor Cyan
 Write-Host "       |_|                               " -ForegroundColor Cyan
 Write-Host ""
 Write-Host "  Open Source Video Editing Automation" -ForegroundColor DarkGray
-Write-Host "  Installer v1.5.6" -ForegroundColor DarkGray
+Write-Host "  Installer v1.6.0" -ForegroundColor DarkGray
 
 $isAdmin = Test-IsAdmin
 if ($isAdmin) {
diff --git a/OpenCut.iss b/OpenCut.iss
@@ -2,7 +2,7 @@
 ; Fully self-contained installer — bundles server exe, ffmpeg, and CEP extension
 
 #define MyAppName "OpenCut"
-#define MyAppVersion "1.5.6"
+#define MyAppVersion "1.6.0"
 #define MyAppPublisher "SysAdminDoc"
 #define MyAppURL "https://github.com/SysAdminDoc/OpenCut"
 
diff --git a/extension/com.opencut.panel/CSXS/manifest.xml b/extension/com.opencut.panel/CSXS/manifest.xml
@@ -2,11 +2,11 @@
 <ExtensionManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    Version="7.0"
                    ExtensionBundleId="com.opencut.panel"
-                   ExtensionBundleVersion="1.5.6"
+                   ExtensionBundleVersion="1.6.0"
                    ExtensionBundleName="OpenCut">
 
     <ExtensionList>
-        <Extension Id="com.opencut.panel.main" Version="1.5.6" />
+        <Extension Id="com.opencut.panel.main" Version="1.6.0" />
     </ExtensionList>
 
     <ExecutionEnvironment>
diff --git a/extension/com.opencut.panel/client/index.html b/extension/com.opencut.panel/client/index.html
@@ -2943,7 +2943,7 @@ <h1 class="content-title" id="contentTitle">Cut & Clean</h1>
                     <div class="card-header"><div class="card-title">About OpenCut</div></div>
                     <div class="settings-row">
                         <span class="settings-label">Version</span>
-                        <span class="settings-value">1.5.6</span>
+                        <span class="settings-value">1.6.0</span>
                     </div>
                     <div class="about-links">
                         <a href="https://github.com/SysAdminDoc/opencut" class="about-link" target="_blank">GitHub</a>
diff --git a/extension/com.opencut.panel/client/main.js b/extension/com.opencut.panel/client/main.js
@@ -1,5 +1,5 @@
 /* ============================================================
-   OpenCut CEP Panel - Main Controller v1.5.6
+   OpenCut CEP Panel - Main Controller v1.6.0
    6-Tab Professional Toolkit
    ============================================================ */
 (function () {
diff --git a/extension/com.opencut.panel/client/style.css b/extension/com.opencut.panel/client/style.css
@@ -1,5 +1,5 @@
 /* ============================================================
-   OpenCut CEP Panel v1.5.6 - ULTRA PREMIUM EDITION
+   OpenCut CEP Panel v1.6.0 - ULTRA PREMIUM EDITION
    Next-Generation AI Editing Suite for Adobe Premiere Pro
    ============================================================ */
 
diff --git a/extension/com.opencut.uxp/index.html b/extension/com.opencut.uxp/index.html
@@ -16,7 +16,7 @@
           <path d="M4 2.5a3 3 0 00-1.76 5.43L7.33 11l-5.09 3.07A3 3 0 104.8 19.5a3 3 0 001.76-5.43L8.93 12.6 16.5 17V5L8.93 9.4 6.56 7.93A3 3 0 004 2.5z" fill="var(--accent)"/>
         </svg>
         <span class="oc-logo">OpenCut</span>
-        <span class="oc-version">v1.5.6</span>
+        <span class="oc-version">v1.6.0</span>
       </div>
       <div class="oc-header-right">
         <div class="oc-connection" id="connectionStatus" title="Backend connection status">
diff --git a/extension/com.opencut.uxp/main.js b/extension/com.opencut.uxp/main.js
@@ -23,7 +23,7 @@ const BACKEND_DEFAULT  = "http://127.0.0.1:5679";
 const BACKEND_MAX_PORT = 5689;
 const POLL_INTERVAL_MS = 1200;
 const HEALTH_CHECK_MS  = 8000;
-const VERSION          = "1.5.6";
+const VERSION          = "1.6.0";
 
 async function detectBackend() {
   // Try ports 5679-5689 like CEP panel does
diff --git a/extension/com.opencut.uxp/manifest.json b/extension/com.opencut.uxp/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "com.opencut.uxp",
   "name": "OpenCut UXP",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "main": "index.html",
   "host": [
     {
diff --git a/install.py b/install.py
@@ -10,7 +10,7 @@
 import subprocess
 import platform
 
-VERS = "1.5.6"
+VERS = "1.6.0"
 CEP_EXT = "com.opencut.panel"
 WIN_CEP_DIR = os.path.expandvars(r"%APPDATA%\Adobe\CEP\extensions")
 MAC_CEP_DIR = os.path.expanduser("~/Library/Application Support/Adobe/CEP/extensions")
diff --git a/installer/src/OpenCut.Installer/Models/AppConstants.cs b/installer/src/OpenCut.Installer/Models/AppConstants.cs
@@ -3,7 +3,7 @@ namespace OpenCut.Installer.Models;
 public static class AppConstants
 {
     public const string AppName = "OpenCut";
-    public const string AppVersion = "1.5.6";
+    public const string AppVersion = "1.6.0";
     public const string AppDisplayName = $"{AppName} v{AppVersion}";
     public const string AppPublisher = "SysAdminDoc";
     public const string AppUrl = "https://github.com/SysAdminDoc/OpenCut";
diff --git a/installer/src/OpenCut.Installer/OpenCut.Installer.csproj b/installer/src/OpenCut.Installer/OpenCut.Installer.csproj
@@ -7,8 +7,8 @@
     <RootNamespace>OpenCut.Installer</RootNamespace>
     <AssemblyName>OpenCut-Setup</AssemblyName>
     <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
-    <Version>1.5.6</Version>
-    <FileVersion>1.5.6.0</FileVersion>
+    <Version>1.6.0</Version>
+    <FileVersion>1.6.0.0</FileVersion>
     <AssemblyVersion>1.3.0.0</AssemblyVersion>
     <Company>SysAdminDoc</Company>
     <Product>OpenCut Installer</Product>
diff --git a/installer/src/OpenCut.Installer/Properties/app.manifest b/installer/src/OpenCut.Installer/Properties/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.5.6.0" name="OpenCut.Installer" />
+  <assemblyIdentity version="1.6.0.0" name="OpenCut.Installer" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
diff --git a/opencut/__init__.py b/opencut/__init__.py
@@ -5,6 +5,6 @@
 and more. Exports Premiere Pro / DaVinci Resolve / FCP XML.
 """
 
-__version__ = "1.5.6"
+__version__ = "1.6.0"
 __author__ = "OpenCut Contributors"
 __license__ = "MIT"
diff --git a/opencut/gpu.py b/opencut/gpu.py
@@ -0,0 +1,153 @@
+"""
+GPU Memory Context Manager
+
+Provides GPUContext for automatic VRAM cleanup after GPU operations,
+plus standalone helpers for device detection and VRAM checks.
+
+All torch imports are optional -- functions degrade gracefully on
+CPU-only systems.
+"""
+
+import logging
+
+logger = logging.getLogger("opencut")
+
+# ---------------------------------------------------------------------------
+# Optional torch import
+# ---------------------------------------------------------------------------
+try:
+    import torch
+    _HAS_TORCH = True
+except ImportError:
+    torch = None  # type: ignore[assignment]
+    _HAS_TORCH = False
+
+
+# ---------------------------------------------------------------------------
+# Standalone helpers
+# ---------------------------------------------------------------------------
+
+def get_device() -> str:
+    """Return 'cuda' if a CUDA GPU is available, else 'cpu'."""
+    if _HAS_TORCH and torch.cuda.is_available():
+        return "cuda"
+    return "cpu"
+
+
+def check_vram(min_gb: float = 0) -> tuple:
+    """
+    Check available and total GPU VRAM.
+
+    Args:
+        min_gb: Minimum free VRAM in GB to consider sufficient.
+                Logged as a warning if not met.
+
+    Returns:
+        (available_gb, total_gb) tuple.  Returns (0, 0) when no
+        CUDA GPU is detected or torch is unavailable.
+    """
+    if not _HAS_TORCH or not torch.cuda.is_available():
+        return (0.0, 0.0)
+
+    try:
+        free, total = torch.cuda.mem_get_info()
+        available_gb = free / (1024 ** 3)
+        total_gb = total / (1024 ** 3)
+    except Exception as exc:
+        logger.warning("Failed to query VRAM: %s", exc)
+        return (0.0, 0.0)
+
+    if min_gb > 0 and available_gb < min_gb:
+        logger.warning(
+            "Low VRAM: %.2f GB free, %.2f GB required",
+            available_gb,
+            min_gb,
+        )
+
+    return (round(available_gb, 2), round(total_gb, 2))
+
+
+# ---------------------------------------------------------------------------
+# Context manager
+# ---------------------------------------------------------------------------
+
+class GPUContext:
+    """Context manager for GPU operations.  Auto-cleans VRAM on exit.
+
+    Usage::
+
+        with GPUContext(min_vram_gb=2) as ctx:
+            model = load_model().to(ctx.device)
+            ctx.register(model)
+            result = model(input_tensor)
+        # model is deleted and VRAM is freed here
+
+    If *min_vram_gb* is set and insufficient VRAM is available, the
+    context still enters successfully but logs a warning -- callers
+    can check ``ctx.available_gb`` to decide whether to fall back to
+    CPU.
+    """
+
+    def __init__(self, min_vram_gb: float = 0, device: str = "cuda"):
+        self._requested_device = device
+        self._min_vram_gb = min_vram_gb
+        self._models = []
+        self.available_gb = 0.0
+        self.total_gb = 0.0
+
+        # Resolve actual device
+        if device == "cuda" and get_device() == "cpu":
+            self._device_str = "cpu"
+        else:
+            self._device_str = device
+
+    # ------------------------------------------------------------------
+    # Public API
+    # ------------------------------------------------------------------
+
+    @property
+    def device(self):
+        """Return a ``torch.device`` if torch is available, else the string."""
+        if _HAS_TORCH:
+            return torch.device(self._device_str)
+        return self._device_str
+
+    def register(self, *models):
+        """Track one or more models/tensors for cleanup on exit."""
+        self._models.extend(models)
+
+    # ------------------------------------------------------------------
+    # Context protocol
+    # ------------------------------------------------------------------
+
+    def __enter__(self):
+        if self._device_str == "cuda":
+            self.available_gb, self.total_gb = check_vram(self._min_vram_gb)
+            logger.info(
+                "GPUContext entered: %.2f / %.2f GB VRAM free",
+                self.available_gb,
+                self.total_gb,
+            )
+        else:
+            logger.info("GPUContext entered on CPU (no CUDA available)")
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        # Delete registered models / tensors
+        for obj in self._models:
+            try:
+                del obj
+            except Exception:
+                pass
+        self._models.clear()
+
+        # Flush CUDA cache
+        if _HAS_TORCH and torch.cuda.is_available():
+            try:
+                torch.cuda.empty_cache()
+                logger.debug("GPUContext: CUDA cache cleared")
+            except Exception as exc:
+                logger.warning("GPUContext: failed to clear CUDA cache: %s", exc)
+
+        # Do not suppress exceptions
+        return False
diff --git a/opencut/helpers.py b/opencut/helpers.py
@@ -9,6 +9,7 @@
 import json
 import logging
 import os
+import shutil
 import subprocess as _sp
 import tempfile
 import threading
@@ -17,6 +18,32 @@
 
 logger = logging.getLogger("opencut")
 
+# ---------------------------------------------------------------------------
+# FFmpeg / FFprobe Path Cache
+# ---------------------------------------------------------------------------
+_ffmpeg_path = None
+_ffprobe_path = None
+
+
+def get_ffmpeg_path() -> str:
+    """Return cached path to ffmpeg binary, resolving via shutil.which on first call."""
+    global _ffmpeg_path
+    if _ffmpeg_path is not None:
+        return _ffmpeg_path
+    found = shutil.which("ffmpeg")
+    _ffmpeg_path = found if found else "ffmpeg"
+    return _ffmpeg_path
+
+
+def get_ffprobe_path() -> str:
+    """Return cached path to ffprobe binary, resolving via shutil.which on first call."""
+    global _ffprobe_path
+    if _ffprobe_path is not None:
+        return _ffprobe_path
+    found = shutil.which("ffprobe")
+    _ffprobe_path = found if found else "ffprobe"
+    return _ffprobe_path
+
 # ---------------------------------------------------------------------------
 # OpenCut user data directory
 # ---------------------------------------------------------------------------
@@ -88,7 +115,6 @@ def check_disk_space(path: str, min_bytes: int = 500 * 1024 * 1024) -> dict:
         path: Directory or file path to check (uses its mount point).
         min_bytes: Minimum required free space in bytes (default 500 MB).
     """
-    import shutil
     try:
         check_dir = path if os.path.isdir(path) else os.path.dirname(os.path.abspath(path))
         usage = shutil.disk_usage(check_dir)
@@ -107,6 +133,8 @@ def check_disk_space(path: str, min_bytes: int = 500 * 1024 * 1024) -> dict:
 # ---------------------------------------------------------------------------
 def run_ffmpeg(cmd: list, timeout: int = 3600, stderr_cap: int = 0) -> str:
     """Run FFmpeg command, raise RuntimeError on failure. Returns stderr."""
+    if cmd and cmd[0] == "ffmpeg":
+        cmd = [get_ffmpeg_path()] + cmd[1:]
     result = _sp.run(cmd, capture_output=True, timeout=timeout)
     stderr = result.stderr.decode(errors="replace")
     if stderr_cap > 0:
@@ -148,7 +176,7 @@ def get_video_info(filepath: str) -> dict:
     """Get video width, height, fps, duration via ffprobe. Returns safe defaults on error."""
     import json as _json
     cmd = [
-        "ffprobe", "-v", "quiet", "-select_streams", "v:0",
+        get_ffprobe_path(), "-v", "quiet", "-select_streams", "v:0",
         "-show_entries", "stream=width,height,r_frame_rate,duration",
         "-show_entries", "format=duration",
         "-of", "json", filepath,
@@ -434,7 +462,7 @@ def output(self, path):
 
     def build(self):
         """Build the command list."""
-        cmd = ["ffmpeg"]
+        cmd = [get_ffmpeg_path()]
         if self._hide_banner:
             cmd.append("-hide_banner")
         if self._overwrite:
@@ -550,7 +578,7 @@ def _get_file_duration(filepath):
     if not filepath or not os.path.isfile(filepath):
         return 0
     try:
-        cmd = ["ffprobe", "-v", "error", "-show_entries", "format=duration",
+        cmd = [get_ffprobe_path(), "-v", "error", "-show_entries", "format=duration",
                "-of", "json", filepath]
         result = _sp.run(cmd, capture_output=True, text=True, timeout=10)
         data = json.loads(result.stdout)
diff --git a/opencut/schemas.py b/opencut/schemas.py
diff --git a/opencut/security.py b/opencut/security.py
diff --git a/opencut/server.py b/opencut/server.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements.txt b/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "com.opencut.uxp",`
`3`	`3`	`"name": "OpenCut UXP",`
`4`		`- "version": "1.5.6",`
	`4`	`+ "version": "1.6.0",`
`5`	`5`	`"main": "index.html",`
`6`	`6`	`"host": [`
`7`	`7`	`{`