fix: batch 33 — 3 broken features + route improvements

SysAdminDoc · SysAdminDoc · commit 06fb1131e87c · 2026-03-24T15:59:30.000-04:00
Multicam (was completely broken from CEP):
- Route now accepts "filepath" param — transcribes the file with
  Whisper to generate diarization segments on the fly when no
  pre-built segments or diarization_file provided
- CEP multicam now works: sends filepath, route auto-transcribes

UXP Full Report (was 404 — /project-report doesn't exist):
- Replaced single non-existent endpoint call with sequential calls
  to all 4 deliverables endpoints (/deliverables/vfx-sheet, adr-list,
  music-cue-sheet, asset-list)
- Fetches sequence info from UXP PProBridge when available

Search Index folder support (UXP was broken — sent folder as file):
- Route now accepts "folder" param alongside "files"
- Scans folder for media files (.mp4/.mov/.avi/.mkv/.webm/.mp3/etc)
- UXP sends folder param instead of wrapping in files array
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.4" -ForegroundColor DarkGray
+Write-Host "  Installer v1.5.5" -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.4"
+#define MyAppVersion "1.5.5"
 #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.4"
+                   ExtensionBundleVersion="1.5.5"
                    ExtensionBundleName="OpenCut">
 
     <ExtensionList>
-        <Extension Id="com.opencut.panel.main" Version="1.5.4" />
+        <Extension Id="com.opencut.panel.main" Version="1.5.5" />
     </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.4</span>
+                        <span class="settings-value">1.5.5</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.4
+   OpenCut CEP Panel - Main Controller v1.5.5
    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.4 - ULTRA PREMIUM EDITION
+   OpenCut CEP Panel v1.5.5 - 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.4</span>
+        <span class="oc-version">v1.5.5</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.4";
+const VERSION          = "1.5.5";
 
 async function detectBackend() {
   // Try ports 5679-5689 like CEP panel does
@@ -1136,7 +1136,7 @@ async function runIndexLibrary() {
 
   await JobPoller.start(
     "/search/index",
-    { files: [folder], model: "base" },
+    { folder, model: "base" },
     (pct, msg) => {
       UIController.setProgress(pct);
       UIController.setProcessingMsg(msg || "Scanning...");
@@ -1321,36 +1321,39 @@ async function runDeliverables(type) {
   );
 }
 
-/** ── FULL PROJECT REPORT ── */
+/** ── FULL PROJECT REPORT (generates all 4 deliverables) ── */
 async function runFullReport() {
   const outputDir = document.getElementById("delivOutputDir")?.value?.trim();
-  const format    = document.getElementById("reportFormat")?.value ?? "csv";
-  const include   = {
-    vfx:    document.getElementById("rptIncludeVfx")?.checked    ?? true,
-    adr:    document.getElementById("rptIncludeAdr")?.checked    ?? true,
-    music:  document.getElementById("rptIncludeMusic")?.checked  ?? true,
-    assets: document.getElementById("rptIncludeAssets")?.checked ?? true,
-  };
+  const types = ["vfx-sheet", "adr-list", "music-cue-sheet", "asset-list"];
+  const seqData = { video_tracks: [], audio_tracks: [] };
+
+  // Try to get real sequence data from UXP bridge
+  if (PProBridge.available()) {
+    const info = await PProBridge.getSequenceInfo();
+    if (info) Object.assign(seqData, info);
+  }
 
   UIController.setButtonLoading("runFullReportBtn", true);
   UIController.showProcessing("Generating full project report...");
 
-  await JobPoller.start(
-    "/project-report",
-    { output_dir: outputDir || null, format, include },
-    (pct, msg) => { UIController.setProgress(pct); UIController.setProcessingMsg(msg || "Building report..."); },
-    (result) => {
-      UIController.hideProcessing();
-      UIController.setButtonLoading("runFullReportBtn", false);
-      UIController.showToast(`Report saved: ${result.output_path ?? "done"}`, "success");
-      UIController.setStatus("Report generated.");
-    },
-    (err) => {
-      UIController.hideProcessing();
-      UIController.setButtonLoading("runFullReportBtn", false);
-      UIController.showToast(`Report error: ${err}`, "error");
-    }
-  );
+  let generated = 0;
+  let errors = 0;
+  for (const type of types) {
+    const r = await BackendClient.post(`/deliverables/${type}`, {
+      sequence_data: seqData,
+      output_dir: outputDir || null,
+    });
+    if (r.ok) generated++; else errors++;
+  }
+
+  UIController.hideProcessing();
+  UIController.setButtonLoading("runFullReportBtn", false);
+  if (errors === 0) {
+    UIController.showToast(`Generated ${generated} deliverable document(s).`, "success");
+  } else {
+    UIController.showToast(`Generated ${generated}, failed ${errors}.`, "warning");
+  }
+  UIController.setStatus(`Report: ${generated} docs generated.`);
 }
 
 // ─────────────────────────────────────────────────────────────
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.4",
+  "version": "1.5.5",
   "main": "index.html",
   "host": [
     {
diff --git a/install.py b/install.py
@@ -10,7 +10,7 @@
 import subprocess
 import platform
 
-VERS = "1.5.4"
+VERS = "1.5.5"
 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.4";
+    public const string AppVersion = "1.5.5";
     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.4</Version>
-    <FileVersion>1.5.4.0</FileVersion>
+    <Version>1.5.5</Version>
+    <FileVersion>1.5.5.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.4.0" name="OpenCut.Installer" />
+  <assemblyIdentity version="1.5.5.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.4"
+__version__ = "1.5.5"
 __author__ = "OpenCut Contributors"
 __license__ = "MIT"
diff --git a/opencut/routes/search.py b/opencut/routes/search.py
@@ -34,14 +34,32 @@
 @search_bp.route("/search/index", methods=["POST"])
 @require_csrf
 def search_index():
-    """Transcribe and index a list of files for footage search."""
+    """Transcribe and index a list of files (or scan a folder) for footage search."""
     data = request.get_json(force=True)
     files = data.get("files", [])
+    folder = data.get("folder", "").strip()
     model = data.get("model", "base")
     language = data.get("language", None)
 
+    # If folder provided, scan for media files
+    if folder and (not files or not isinstance(files, list)):
+        from opencut.security import validate_path
+        try:
+            folder = validate_path(folder)
+        except ValueError as exc:
+            return jsonify({"error": str(exc)}), 400
+        if not os.path.isdir(folder):
+            return jsonify({"error": "folder is not a directory"}), 400
+        _MEDIA_EXTS = {".mp4", ".mov", ".avi", ".mkv", ".webm", ".m4v", ".mp3", ".wav", ".flac", ".aac", ".ogg", ".m4a"}
+        files = []
+        for fname in os.listdir(folder):
+            if os.path.splitext(fname)[1].lower() in _MEDIA_EXTS:
+                files.append(os.path.join(folder, fname))
+        if not files:
+            return jsonify({"error": "No media files found in folder"}), 400
+
     if not isinstance(files, list) or not files:
-        return jsonify({"error": "files must be a non-empty list"}), 400
+        return jsonify({"error": "files or folder required"}), 400
 
     if len(files) > 100:
         return jsonify({"error": "Too many files (max 100)"}), 400
diff --git a/opencut/routes/video.py b/opencut/routes/video.py
@@ -3982,6 +3982,7 @@ def _on_progress(pct, msg=""):
 def video_multicam_cuts():
     """Generate multicam cut points from speaker diarization data."""
     data = request.get_json(force=True)
+    filepath = data.get("filepath", data.get("file", "")).strip()
     diarization_file = data.get("diarization_file", "").strip()
     segments = data.get("segments", None)
     speaker_map = data.get("speaker_map", None)
@@ -3994,9 +3995,15 @@ def video_multicam_cuts():
         if len(segments) > 50000:
             return jsonify({"error": "Too many segments (max 50000)"}), 400
 
-    # Need either segments or a diarization file
-    if not segments and not diarization_file:
-        return jsonify({"error": "diarization_file or segments required"}), 400
+    # Need either segments, a diarization file, or a media filepath to diarize
+    if not segments and not diarization_file and not filepath:
+        return jsonify({"error": "filepath, diarization_file, or segments required"}), 400
+
+    if filepath and not diarization_file and not segments:
+        try:
+            filepath = validate_filepath(filepath)
+        except ValueError as e:
+            return jsonify({"error": str(e)}), 400
 
     if diarization_file:
         try:
@@ -4017,6 +4024,30 @@ def video_multicam_cuts():
         except Exception as exc:
             return jsonify({"error": f"Could not read diarization_file: {exc}"}), 400
 
+    # If filepath given but no segments, attempt transcription with speaker diarization
+    if effective_segments is None and not diarization_file and filepath:
+        try:
+            from opencut.core.captions import check_whisper_available, transcribe
+            from opencut.utils.config import CaptionConfig
+            available, _backend = check_whisper_available()
+            if not available:
+                return jsonify({"error": "Whisper not installed. Cannot transcribe for multicam. Provide segments or diarization_file instead."}), 400
+            config = CaptionConfig(model="base", word_timestamps=True)
+            result = transcribe(filepath, config=config)
+            effective_segments = []
+            if hasattr(result, "segments"):
+                for seg in result.segments:
+                    effective_segments.append({
+                        "start": getattr(seg, "start", 0),
+                        "end": getattr(seg, "end", 0),
+                        "text": getattr(seg, "text", ""),
+                        "speaker": getattr(seg, "speaker", "SPEAKER_00"),
+                    })
+        except ImportError:
+            return jsonify({"error": "Transcription modules not available. Provide segments directly."}), 503
+        except Exception as exc:
+            return jsonify({"error": f"Transcription failed: {exc}"}), 500
+
     if not isinstance(effective_segments, list) or not effective_segments:
         return jsonify({"error": "No valid segments found"}), 400
 
diff --git a/opencut/server.py b/opencut/server.py
@@ -556,7 +556,7 @@ def run_server(host="127.0.0.1", port=5679, debug=False):
     atexit.register(_remove_pid)
 
     print("")
-    print("  OpenCut Backend Server v1.5.4")
+    print("  OpenCut Backend Server v1.5.5")
     print(f"  Listening on http://{host}:{effective_port}")
     print(f"  PID: {os.getpid()}")
     print(f"  Log file: {LOG_FILE}")
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opencut"
-version = "1.5.4"
+version = "1.5.5"
 description = "Open-source AI video editing automation for Adobe Premiere Pro - captions, audio processing, visual effects, and more"
 readme = "README.md"
 license = {text = "MIT"}
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-# OpenCut v1.5.4 Requirements
+# OpenCut v1.5.5 Requirements
 # Install: pip install -r requirements.txt
 # For GPU: pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121
 

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.4",`
	`4`	`+ "version": "1.5.5",`
`5`	`5`	`"main": "index.html",`
`6`	`6`	`"host": [`
`7`	`7`	`{`