Spaces:

moonlantern1
/

clipforge

Sleeping

App Files Files Community

moonlantern1 commited on 11 days ago

Commit

f14fa4b

verified ·

1 Parent(s): c86f8a6

Fix caption edge clipping and real clip previews

Browse files

Files changed (4) hide show

app.py +15 -4
src/humeo/cutter.py +39 -14
src/humeo/layout_vision.py +31 -9
src/humeo/pipeline.py +14 -10

app.py CHANGED Viewed

@@ -210,12 +210,18 @@ def _duration_label(path: Path) -> str:
 def _publish_files(job: Job) -> None:
     for path in sorted(job.output_dir.glob("short_*.mp4")):
-        if path.name not in job.clips and path.is_file():
             job.clips[path.name] = ClipFile(
                 name=path.name,
                 url=f"/api/jobs/{job.id}/files/{path.name}",
-                duration=_duration_label(path),
             )
 def _validate_credentials() -> None:
@@ -552,7 +558,9 @@ INDEX_HTML = r"""<!DOCTYPE html>
   .clip-card { border-radius: var(--radius); overflow: hidden; cursor: pointer; background: var(--white); border: 1px solid var(--border); box-shadow: 0 2px 10px rgba(42,31,14,0.06); transition: all 0.2s; animation: clipAppear 0.5s ease both; }
   .clip-card:hover { transform: translateY(-3px); box-shadow: 0 8px 24px rgba(42,31,14,0.13); }
   @keyframes clipAppear { from { opacity: 0; transform: scale(0.9) translateY(10px); } to { opacity: 1; transform: scale(1) translateY(0); } }
-  .clip-thumb { aspect-ratio: 9/16; display: flex; align-items: center; justify-content: center; position: relative; overflow: hidden; }
   .clip-play { width: 44px; height: 44px; background: rgba(255,255,255,0.88); border-radius: 50%; display: flex; align-items: center; justify-content: center; font-size: 1.1rem; z-index: 2; box-shadow: 0 2px 12px rgba(0,0,0,0.2); transition: transform 0.2s; }
   .clip-card:hover .clip-play { transform: scale(1.1); }
   .clip-meta { padding: 10px 12px; } .clip-num { font-size: 0.72rem; color: var(--ink-muted); text-transform: uppercase; letter-spacing: 0.08em; font-weight: 500; }
@@ -889,7 +897,10 @@ INDEX_HTML = r"""<!DOCTYPE html>
     const grid = document.getElementById('clips-grid');
     const card = document.createElement('div');
     card.className = 'clip-card';
-    card.innerHTML = `<div class="clip-thumb thumb-${idx % 10}"><div class="clip-play">▶</div></div><div class="clip-meta"><div class="clip-num">Clip ${idx + 1}</div><div class="clip-dur">${clip.duration || '0:00'}</div><a class="clip-download" href="${clip.url}" download onclick="event.stopPropagation()">Download</a></div>`;
     card.onclick = () => openModal(idx);
     grid.appendChild(card);
   }

 def _publish_files(job: Job) -> None:
     for path in sorted(job.output_dir.glob("short_*.mp4")):
+        if not path.is_file():
+            continue
+        duration = _duration_label(path)
+        existing = job.clips.get(path.name)
+        if existing is None:
             job.clips[path.name] = ClipFile(
                 name=path.name,
                 url=f"/api/jobs/{job.id}/files/{path.name}",
+                duration=duration,
             )
+        elif existing.duration == "0:00" and duration != "0:00":
+            existing.duration = duration
 def _validate_credentials() -> None:
   .clip-card { border-radius: var(--radius); overflow: hidden; cursor: pointer; background: var(--white); border: 1px solid var(--border); box-shadow: 0 2px 10px rgba(42,31,14,0.06); transition: all 0.2s; animation: clipAppear 0.5s ease both; }
   .clip-card:hover { transform: translateY(-3px); box-shadow: 0 8px 24px rgba(42,31,14,0.13); }
   @keyframes clipAppear { from { opacity: 0; transform: scale(0.9) translateY(10px); } to { opacity: 1; transform: scale(1) translateY(0); } }
+  .clip-thumb { aspect-ratio: 9/16; display: flex; align-items: center; justify-content: center; position: relative; overflow: hidden; background:#000; }
+  .clip-thumb video { width:100%; height:100%; object-fit:cover; display:block; background:#000; }
+  .clip-thumb::after { content:""; position:absolute; inset:0; background:linear-gradient(180deg, rgba(0,0,0,0.02), rgba(0,0,0,0.18)); pointer-events:none; }
   .clip-play { width: 44px; height: 44px; background: rgba(255,255,255,0.88); border-radius: 50%; display: flex; align-items: center; justify-content: center; font-size: 1.1rem; z-index: 2; box-shadow: 0 2px 12px rgba(0,0,0,0.2); transition: transform 0.2s; }
   .clip-card:hover .clip-play { transform: scale(1.1); }
   .clip-meta { padding: 10px 12px; } .clip-num { font-size: 0.72rem; color: var(--ink-muted); text-transform: uppercase; letter-spacing: 0.08em; font-weight: 500; }
     const grid = document.getElementById('clips-grid');
     const card = document.createElement('div');
     card.className = 'clip-card';
+    card.innerHTML = `<div class="clip-thumb"><video src="${clip.url}#t=0.2" muted playsinline preload="metadata"></video><div class="clip-play">▶</div></div><div class="clip-meta"><div class="clip-num">Clip ${idx + 1}</div><div class="clip-dur">${clip.duration || '0:00'}</div><a class="clip-download" href="${clip.url}" download onclick="event.stopPropagation()">Download</a></div>`;
+    const preview = card.querySelector('video');
+    card.addEventListener('mouseenter', () => { preview.play().catch(() => {}); });
+    card.addEventListener('mouseleave', () => { preview.pause(); preview.currentTime = 0.2; });
     card.onclick = () => openModal(idx);
     grid.appendChild(card);
   }

src/humeo/cutter.py CHANGED Viewed

@@ -18,13 +18,14 @@ from humeo.transcript_align import (
 logger = logging.getLogger(__name__)
-_NATIVE_HIGHLIGHT_FONT_NAME = "Arial"
 _NATIVE_HIGHLIGHT_PURPLE = "&H00F65C8B"
 _NATIVE_HIGHLIGHT_LEAD_SEC = 0.06
 _NATIVE_HIGHLIGHT_MIN_DWELL_SEC = 0.16
 _NATIVE_HIGHLIGHT_MIN_VALID_WORD_SEC = 0.035
 _NATIVE_HIGHLIGHT_MAX_VALID_WORD_SEC = 1.65
-_NATIVE_HIGHLIGHT_MAX_LINE_WIDTH_RATIO = 0.92
 _NATIVE_HIGHLIGHT_ROUNDING_OVERRIDE = r"\blur3.0"
 _NATIVE_HIGHLIGHT_STOPWORDS = {
     "a",
@@ -207,10 +208,24 @@ def _should_render_native_highlight_group(words) -> bool:
     return any(token.lower() not in _NATIVE_HIGHLIGHT_STOPWORDS for token in cleaned)
-def _native_highlight_font_path() -> Path | None:
-    windows_fonts = Path(os.environ.get("WINDIR", r"C:\Windows")) / "Fonts"
-    for filename in ("arialbd.ttf", "Arialbd.ttf", "ARIALBD.TTF", "arial.ttf"):
-        path = windows_fonts / filename
         if path.is_file():
             return path
     return None
@@ -448,7 +463,14 @@ def _format_native_highlight_ass(
     line_height = max(font_size, _text_height(font) + 6)
     line_gap = max(8, int(round(font_size * 0.08)))
     bottom_anchor = play_res_y - margin_v
-    max_line_width = play_res_x * _NATIVE_HIGHLIGHT_MAX_LINE_WIDTH_RATIO
     header = (
         "[Script Info]\n"
@@ -496,7 +518,10 @@ def _format_native_highlight_ass(
                 continue
             line_text = " ".join(word.word for word in line_words)
             line_top = block_top + line_idx * (line_height + line_gap)
-            line_left = (play_res_x - _text_width(font, line_text)) / 2.0
             events.append(
                 "Dialogue: 1,"
                 f"{_fmt_ass_time(cue_start)},{_fmt_ass_time(cue_end)},Base,,0,0,0,,"
@@ -587,12 +612,12 @@ def generate_ass(
         prefer_break_on_punctuation = True
         min_words_before_break = 5
     elif render_theme == RenderTheme.NATIVE_HIGHLIGHT:
-        cue_words = 8
-        cue_sec = 2.4
-        cue_font_size = max(font_size, 86)
-        cue_margin_v = max(margin_v, 300)
-        prefer_break_on_punctuation = True
-        min_words_before_break = 4
     aligned_words = aligned.words
     if render_theme == RenderTheme.NATIVE_HIGHLIGHT and repair_word_timings:

 logger = logging.getLogger(__name__)
+_NATIVE_HIGHLIGHT_FONT_NAME = "League Spartan"
 _NATIVE_HIGHLIGHT_PURPLE = "&H00F65C8B"
 _NATIVE_HIGHLIGHT_LEAD_SEC = 0.06
 _NATIVE_HIGHLIGHT_MIN_DWELL_SEC = 0.16
 _NATIVE_HIGHLIGHT_MIN_VALID_WORD_SEC = 0.035
 _NATIVE_HIGHLIGHT_MAX_VALID_WORD_SEC = 1.65
+_NATIVE_HIGHLIGHT_MAX_LINE_WIDTH_RATIO = 0.74
+_NATIVE_HIGHLIGHT_SAFE_MARGIN_X = 96
 _NATIVE_HIGHLIGHT_ROUNDING_OVERRIDE = r"\blur3.0"
 _NATIVE_HIGHLIGHT_STOPWORDS = {
     "a",
     return any(token.lower() not in _NATIVE_HIGHLIGHT_STOPWORDS for token in cleaned)
+def _native_highlight_font_path() -> Path | None:
+    try:
+        import humeo_core
+        bundled = (
+            Path(humeo_core.__file__).resolve().parent
+            / "assets"
+            / "fonts"
+            / "LeagueSpartan-Bold.ttf"
+        )
+        if bundled.is_file():
+            return bundled
+    except Exception:
+        pass
+    windows_fonts = Path(os.environ.get("WINDIR", r"C:\Windows")) / "Fonts"
+    for filename in ("arialbd.ttf", "Arialbd.ttf", "ARIALBD.TTF", "arial.ttf"):
+        path = windows_fonts / filename
         if path.is_file():
             return path
     return None
     line_height = max(font_size, _text_height(font) + 6)
     line_gap = max(8, int(round(font_size * 0.08)))
     bottom_anchor = play_res_y - margin_v
+    safe_margin_x = min(
+        int(round(play_res_x * 0.12)),
+        max(24, _NATIVE_HIGHLIGHT_SAFE_MARGIN_X),
+    )
+    max_line_width = min(
+        play_res_x * _NATIVE_HIGHLIGHT_MAX_LINE_WIDTH_RATIO,
+        play_res_x - (safe_margin_x * 2),
+    )
     header = (
         "[Script Info]\n"
                 continue
             line_text = " ".join(word.word for word in line_words)
             line_top = block_top + line_idx * (line_height + line_gap)
+            line_width = _text_width(font, line_text)
+            centered_left = (play_res_x - line_width) / 2.0
+            max_left = play_res_x - safe_margin_x - line_width
+            line_left = max(float(safe_margin_x), min(centered_left, max_left))
             events.append(
                 "Dialogue: 1,"
                 f"{_fmt_ass_time(cue_start)},{_fmt_ass_time(cue_end)},Base,,0,0,0,,"
         prefer_break_on_punctuation = True
         min_words_before_break = 5
     elif render_theme == RenderTheme.NATIVE_HIGHLIGHT:
+        cue_words = 6
+        cue_sec = 2.0
+        cue_font_size = max(font_size, 86)
+        cue_margin_v = max(margin_v, 300)
+        prefer_break_on_punctuation = True
+        min_words_before_break = 3
     aligned_words = aligned.words
     if render_theme == RenderTheme.NATIVE_HIGHLIGHT and repair_word_timings:

src/humeo/layout_vision.py CHANGED Viewed

@@ -4,10 +4,11 @@ from __future__ import annotations
 import base64
 import hashlib
-import json
-import logging
-import os
-import struct
 import subprocess
 from collections.abc import Iterable
 from io import BytesIO
@@ -145,6 +146,21 @@ def _json_object_from_vision_response(raw: object) -> dict[str, Any]:
         for item in raw:
             if isinstance(item, dict):
                 return item
     raise TypeError(f"Expected vision JSON object, got {type(raw).__name__}")
@@ -1319,7 +1335,7 @@ def _call_vision_json(keyframe_path: str, model_name: str, prompt: str) -> dict[
         )
         if not response.text:
             raise RuntimeError("Gemini vision returned empty response")
-        return _json_object_from_vision_response(json.loads(response.text))
     client = OpenAI(
         api_key=resolve_openrouter_api_key(),
@@ -1345,7 +1361,7 @@ def _call_vision_json(keyframe_path: str, model_name: str, prompt: str) -> dict[
     text = _openai_message_text(response.choices[0].message.content)
     if not text:
         raise RuntimeError("OpenRouter vision returned empty response")
-    return _json_object_from_vision_response(json.loads(text))
 def _call_gemini_vision(keyframe_path: str, model_name: str) -> dict[str, Any]:
@@ -1496,9 +1512,15 @@ def _apply_layout_hint_fallbacks(
         raw = raw_by_clip.get(clip_id)
         if instr is None or raw is None or "error" not in raw:
             continue
-        if instr.layout != LayoutKind.SIT_CENTER:
-            continue
-        instructions[clip_id] = instr.model_copy(update={"layout": hint})
         updated_raw = dict(raw)
         updated_raw["layout"] = hint.value
         updated_raw["layout_hint_fallback"] = hint.value

 import base64
 import hashlib
+import json
+import logging
+import os
+import re
+import struct
 import subprocess
 from collections.abc import Iterable
 from io import BytesIO
         for item in raw:
             if isinstance(item, dict):
                 return item
+    if isinstance(raw, str):
+        text = raw.strip()
+        if text.startswith("```"):
+            text = re.sub(r"^```(?:json)?\s*", "", text, flags=re.IGNORECASE)
+            text = re.sub(r"\s*```$", "", text)
+        text = "".join(ch if ch >= " " or ch in "\r\n\t" else " " for ch in text)
+        starts = [idx for idx in (text.find("{"), text.find("[")) if idx >= 0]
+        if starts:
+            decoder = json.JSONDecoder()
+            for start in sorted(starts):
+                try:
+                    parsed, _ = decoder.raw_decode(text[start:])
+                except json.JSONDecodeError:
+                    continue
+                return _json_object_from_vision_response(parsed)
     raise TypeError(f"Expected vision JSON object, got {type(raw).__name__}")
         )
         if not response.text:
             raise RuntimeError("Gemini vision returned empty response")
+        return _json_object_from_vision_response(response.text)
     client = OpenAI(
         api_key=resolve_openrouter_api_key(),
     text = _openai_message_text(response.choices[0].message.content)
     if not text:
         raise RuntimeError("OpenRouter vision returned empty response")
+    return _json_object_from_vision_response(text)
 def _call_gemini_vision(keyframe_path: str, model_name: str) -> dict[str, Any]:
         raw = raw_by_clip.get(clip_id)
         if instr is None or raw is None or "error" not in raw:
             continue
+        if instr.layout != LayoutKind.SIT_CENTER:
+            continue
+        if hint == LayoutKind.SPLIT_CHART_PERSON:
+            updated_raw = dict(raw)
+            updated_raw["layout_hint_fallback_rejected"] = hint.value
+            updated_raw["layout_hint_rejected_reason"] = "vision_failed_without_regions"
+            raw_by_clip[clip_id] = updated_raw
+            continue
+        instructions[clip_id] = instr.model_copy(update={"layout": hint})
         updated_raw = dict(raw)
         updated_raw["layout"] = hint.value
         updated_raw["layout_hint_fallback"] = hint.value

src/humeo/pipeline.py CHANGED Viewed

@@ -79,17 +79,21 @@ _PRESENTATION_REFERENCE_RE = re.compile(
 def _split_chart_person_to_center(instruction: LayoutInstruction) -> LayoutInstruction:
     return instruction.model_copy(
-        update={
-            "layout": LayoutKind.SIT_CENTER,
-            "zoom": max(float(instruction.zoom), _NATIVE_HIGHLIGHT_SPLIT_TO_CENTER_MIN_ZOOM),
-            "split_chart_region": None,
-            "split_person_region": None,
-            "split_second_chart_region": None,
-            "split_second_person_region": None,
-            "chart_x_norm": 0.0,
-            "top_band_ratio": 0.5,
-        }
     )

 def _split_chart_person_to_center(instruction: LayoutInstruction) -> LayoutInstruction:
+    updates = {
+        "layout": LayoutKind.SIT_CENTER,
+        "zoom": max(float(instruction.zoom), _NATIVE_HIGHLIGHT_SPLIT_TO_CENTER_MIN_ZOOM),
+        "person_tracking": [],
+        "split_chart_region": None,
+        "split_person_region": None,
+        "split_second_chart_region": None,
+        "split_second_person_region": None,
+        "chart_x_norm": 0.0,
+        "top_band_ratio": 0.5,
+    }
+    if instruction.split_person_region is not None:
+        updates["person_x_norm"] = float(instruction.split_person_region.center_x)
     return instruction.model_copy(
+        update=updates
     )