podojo-cli 1.28.0__tar.gz → 1.30.0__tar.gz

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to the Podojo CLI will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com),
 and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [1.30.0] - 2026-10-31
+
+### Added
+- `showreel create --subtitles` burns English subtitles into clips from
+  non-English sessions. English clips stay as they are, and so do clips from
+  sessions transcribed before subtitles were available; both are listed at the
+  end. Subtitled clips sit above a caption band, so captions don't cover the UI.
+
+### Changed
+- `showreel create` checks that ffmpeg has the filters it needs and also finds
+  Homebrew's `ffmpeg-full`. The plain `ffmpeg` formula no longer has text
+  support, so install `ffmpeg-full` if title cards fail.
+
+## [1.29.0] - 2026-10-30
+
+### Added
+- `follow_up_style` on AI interviews: `guide` (the default) only covers
+  `probe_for`, so answers are easier to compare; `participant` explores what each
+  person brings up, then any gaps in `probe_for`. `podojo aiinterviews example` explains when to use each.
+
 ## [1.28.0] - 2026-10-29
 
 ### Added

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/CLAUDE.md

@@ -8,7 +8,7 @@ CLI tool for the Podojo user research platform. Part of the Podojo multi-repo ar
 - Typer for CLI framework
 - httpx for HTTP client
 - Rich for terminal output
-- ffmpeg for video editing (system dependency, install via `brew install ffmpeg`)
+- ffmpeg for video editing (system dependency, install via `brew install ffmpeg-full`; the plain formula has no text filters)
 
 ## Usage
 

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: podojo-cli
-Version: 1.28.0
+Version: 1.30.0
 Summary: CLI for the Podojo user research platform
 Project-URL: Homepage, https://github.com/podojo/cli-podojo
 Project-URL: Source, https://github.com/podojo/cli-podojo
@@ -53,7 +53,7 @@ pip install podojo-cli
 
 Requires Python 3.11+. Some commands need extra tooling:
 
-- `showreel` requires [`ffmpeg`](https://ffmpeg.org/) on your `PATH` (`brew install ffmpeg`).
+- `showreel` requires [`ffmpeg`](https://ffmpeg.org/) with text support (`brew install ffmpeg-full`; the plain `ffmpeg` formula leaves it out).
 - `synth` requires the optional `synth` extra: `pip install 'podojo-cli[synth]'` then `playwright install chromium`.
 
 ## Authentication
@@ -100,12 +100,17 @@ podojo transcripts download "Checkout Redesign" <batch-id> -o transcript.txt
 podojo videos list "Checkout Redesign"
 podojo videos download <batch-id> -o clip.mp4
 podojo showreel create clips.json -o showreel.mp4
+podojo showreel create clips.json -o showreel.mp4 --subtitles
 ```
 
 The showreel `clips.json` is a list of clips, each with `batch_id`,
 `participant`, `country`, `topic`, `start`, and `end` (`MM:SS` or `HH:MM:SS`).
 Each clip gets an auto-generated title card.
 
+`--subtitles` burns English subtitles into clips from non-English sessions,
+translated on every run. English clips stay as they are, and so do clips from
+sessions transcribed before subtitles were available; both are listed at the end.
+
 ### Unmoderated user tests
 
 ```bash

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/README.md

@@ -21,7 +21,7 @@ pip install podojo-cli
 
 Requires Python 3.11+. Some commands need extra tooling:
 
-- `showreel` requires [`ffmpeg`](https://ffmpeg.org/) on your `PATH` (`brew install ffmpeg`).
+- `showreel` requires [`ffmpeg`](https://ffmpeg.org/) with text support (`brew install ffmpeg-full`; the plain `ffmpeg` formula leaves it out).
 - `synth` requires the optional `synth` extra: `pip install 'podojo-cli[synth]'` then `playwright install chromium`.
 
 ## Authentication
@@ -68,12 +68,17 @@ podojo transcripts download "Checkout Redesign" <batch-id> -o transcript.txt
 podojo videos list "Checkout Redesign"
 podojo videos download <batch-id> -o clip.mp4
 podojo showreel create clips.json -o showreel.mp4
+podojo showreel create clips.json -o showreel.mp4 --subtitles
 ```
 
 The showreel `clips.json` is a list of clips, each with `batch_id`,
 `participant`, `country`, `topic`, `start`, and `end` (`MM:SS` or `HH:MM:SS`).
 Each clip gets an auto-generated title card.
 
+`--subtitles` burns English subtitles into clips from non-English sessions,
+translated on every run. English clips stay as they are, and so do clips from
+sessions transcribed before subtitles were available; both are listed at the end.
+
 ### Unmoderated user tests
 
 ```bash

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "podojo-cli"
-version = "1.28.0"
+version = "1.30.0"
 description = "CLI for the Podojo user research platform"
 readme = "README.md"
 license = "MIT"

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/src/podojo_cli/client.py

@@ -87,6 +87,20 @@ class PodojoClient:
         r.raise_for_status()
         return r.json()
 
+    # Non-English clips wait for the server to translate them, retried once on
+    # failure.
+    SUBTITLES_TIMEOUT = httpx.Timeout(120.0)
+
+    def get_subtitles(self, batch_id: str, start: str, end: str) -> dict:
+        r = httpx.post(
+            f"{self.base_url}/videos/{batch_id}/subtitles",
+            json={"start": start, "end": end},
+            headers=self._headers(),
+            timeout=self.SUBTITLES_TIMEOUT,
+        )
+        r.raise_for_status()
+        return r.json()
+
     def list_usertests(self, skip: int = 0, limit: int = 50) -> dict:
         r = httpx.get(
             f"{self.base_url}/usertests",

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/src/podojo_cli/commands/aiinterviews.py

@@ -34,7 +34,8 @@ EXAMPLE_YAML = """\
 #
 # Optional fields: language (en or de, default en), project_name, overview,
 #                  decision, screening_questions, welcome_message,
-#                  rejection_message, live, collect_contact, max_responses
+#                  rejection_message, live, collect_contact, follow_up_style,
+#                  max_responses
 #
 # Each question:
 #   text            (required) the main question, asked verbatim-ish in order
@@ -103,6 +104,13 @@ welcome_message: >
 # incentive screen after the interview (default: true). Set false to skip it.
 # collect_contact: false
 
+# Optional: what the interviewer's follow-ups go after (default: guide).
+#   guide        only covers probe_for, so answers are easier to compare. Best for
+#                benchmarks and concept comparisons.
+#   participant  explores what each person brings up, then any gaps in probe_for.
+#                Best for understanding reasons and finding what you didn't expect.
+# follow_up_style: participant
+
 # Optional: close the interview automatically once this many participants have
 # completed a session (default: unlimited). The interview goes off live and new
 # visitors see "not available"; participants already mid-conversation still
@@ -189,6 +197,10 @@ def validate_ai_interview_data(data: dict) -> list[str]:
     ):
         errors.append("'max_responses' must be a positive integer")
 
+    follow_up_style = data.get("follow_up_style")
+    if follow_up_style is not None and follow_up_style not in ("guide", "participant"):
+        errors.append("'follow_up_style' must be 'guide' or 'participant'")
+
     questions = data.get("questions")
     if questions is not None:
         if not isinstance(questions, list):

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/src/podojo_cli/commands/showreel.py

@@ -10,17 +10,37 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, DownloadColumn
 
 from ..client import PodojoClient
-from ..video.showreel import extract_clip, make_title_card, concatenate
+from ..video.showreel import concatenate, extract_clip, has_filters, make_title_card, write_subtitles
+from .usertests import _format_api_error
 
 app = typer.Typer(help="Generate video showreels")
 console = Console()
 
+# Homebrew's ffmpeg-full has the text filters but isn't linked onto the PATH
+FFMPEG_FULL_PATHS = (
+    "/opt/homebrew/opt/ffmpeg-full/bin/ffmpeg",
+    "/usr/local/opt/ffmpeg-full/bin/ffmpeg",
+)
 
-def _check_ffmpeg():
-    if shutil.which("ffmpeg") is None:
-        console.print("[red]Error:[/red] ffmpeg not found. Install it with: brew install ffmpeg")
+
+def _check_ffmpeg(filters: tuple[str, ...] = ("drawtext",)):
+    """Puts the first ffmpeg that has the filters on the PATH for this run."""
+    installed = [path for path in map(shutil.which, ("ffmpeg", *FFMPEG_FULL_PATHS)) if path]
+    if not installed:
+        console.print("[red]Error:[/red] ffmpeg not found. Install it with: brew install ffmpeg-full")
         raise typer.Exit(1)
 
+    for path in installed:
+        if has_filters(path, filters):
+            os.environ["PATH"] = f"{os.path.dirname(path)}{os.pathsep}{os.environ['PATH']}"
+            return
+
+    console.print(
+        f"[red]Error:[/red] your ffmpeg lacks the {', '.join(filters)} filters. "
+        "Install the full build with: brew install ffmpeg-full"
+    )
+    raise typer.Exit(1)
+
 
 def _download_video(url: str, dest: Path):
     with httpx.stream("GET", url, follow_redirects=True) as r:
@@ -39,10 +59,36 @@ def _download_video(url: str, dest: Path):
                 progress.update(task, advance=len(chunk))
 
 
+def _fetch_subtitles(client: PodojoClient, clips: list[dict]) -> tuple[list[list[dict]], list[str]]:
+    """The cues of each clip plus the clips left without subtitles. Runs before
+    any video is downloaded, so a failed translation stops early."""
+    console.print(f"\nFetching subtitles for {len(clips)} clip(s)…")
+    subtitles, skipped = [], []
+
+    for clip in clips:
+        label = f"{clip['participant']} — {clip['topic']}"
+        try:
+            result = client.get_subtitles(clip["batch_id"], clip["start"], clip["end"])
+        except httpx.HTTPStatusError as e:
+            if e.response.status_code != 409:
+                console.print(f"[red]Error:[/red] {_format_api_error(e)}")
+                raise typer.Exit(1)
+            subtitles.append([])
+            skipped.append(f"{label}: transcribed before subtitles were available")
+            continue
+
+        subtitles.append(result["cues"])
+        if result["language"] == "en":
+            skipped.append(f"{label}: already in English")
+
+    return subtitles, skipped
+
+
 @app.command("create")
 def create_showreel(
     clips_json: Path = typer.Argument(help="Path to clips JSON file"),
     output: Path = typer.Option("showreel.mp4", "-o", "--output", help="Output .mp4 path"),
+    subtitles: bool = typer.Option(False, "--subtitles", help="Burn English subtitles into non-English clips"),
 ):
     """Create a video showreel from a clips JSON config.
 
@@ -53,8 +99,12 @@ def create_showreel(
       topic      - short description of what the clip shows
       start      - clip start time (MM:SS or HH:MM:SS)
       end        - clip end time (MM:SS or HH:MM:SS)
+
+    With --subtitles, clips from non-English sessions get English subtitles.
+    English clips stay as they are, and so do clips from sessions transcribed
+    before subtitles were available; both are listed at the end.
     """
-    _check_ffmpeg()
+    _check_ffmpeg(("drawtext", "ass") if subtitles else ("drawtext",))
 
     with open(clips_json, encoding="utf-8") as f:
         clips = json.load(f)
@@ -67,6 +117,8 @@ def create_showreel(
     output = output.resolve()
     output.parent.mkdir(parents=True, exist_ok=True)
 
+    clip_cues, skipped = _fetch_subtitles(client, clips) if subtitles else ([[] for _ in clips], [])
+
     with tempfile.TemporaryDirectory(prefix="podojo-showreel-") as tmp:
         tmp = Path(tmp)
 
@@ -85,7 +137,7 @@ def create_showreel(
         parts: list[str] = []
         console.print(f"\nProcessing {len(clips)} clip(s)…")
 
-        for i, clip in enumerate(clips, 1):
+        for i, (clip, cues) in enumerate(zip(clips, clip_cues), 1):
             participant = clip["participant"]
             country = clip["country"]
             topic = clip["topic"]
@@ -97,7 +149,11 @@ def create_showreel(
             clip_dst = str(tmp / f"_clip_{i:02d}.mp4")
 
             make_title_card(participant, country, topic, title_dst)
-            extract_clip(src, clip["start"], clip["end"], clip_dst)
+            subtitles_path = None
+            if cues:
+                subtitles_path = str(tmp / f"_subtitles_{i:02d}.ass")
+                write_subtitles(cues, subtitles_path)
+            extract_clip(src, clip["start"], clip["end"], clip_dst, subtitles_path)
 
             parts.extend([title_dst, clip_dst])
 
@@ -106,3 +162,8 @@ def create_showreel(
 
     size_mb = os.path.getsize(output) / (1024 * 1024)
     console.print(f"\n[green]Done![/green] {output} ({size_mb:.1f} MB)")
+
+    if skipped:
+        console.print(f"\n[yellow]{len(skipped)} clip(s) without subtitles:[/yellow]")
+        for line in skipped:
+            console.print(f"  {line}", markup=False)

podojo_cli-1.30.0/src/podojo_cli/video/showreel.py

@@ -0,0 +1,118 @@
+"""FFmpeg-based showreel generation from a list of clips."""
+
+import os
+import subprocess
+from pathlib import Path
+
+WIDTH = 1280
+HEIGHT = 720
+FPS = 30
+# Subtitled clips leave a band below the picture, so captions never cover the UI
+CAPTION_BAND = 100
+AUDIO_OPTS = ["-c:a", "aac", "-ac", "1", "-ar", "16000", "-b:a", "64k"]
+TITLE_DURATION = 4
+ASS_HEADER = f"""[Script Info]
+ScriptType: v4.00+
+PlayResX: {WIDTH}
+PlayResY: {HEIGHT}
+WrapStyle: 0
+
+[V4+ Styles]
+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
+Style: Default,Helvetica,30,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,0,2,60,60,12,1
+
+[Events]
+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+"""
+
+
+def _video_opts(picture_height: int, extra_filter: str = "") -> list[str]:
+    scale_pad = f"scale=-2:{picture_height},pad={WIDTH}:{HEIGHT}:(ow-iw)/2:0:color=0x1a1a2e"
+    return [
+        "-c:v", "libx264", "-preset", "medium", "-crf", "18",
+        "-vf", f"{scale_pad}{extra_filter}", "-r", str(FPS), "-pix_fmt", "yuv420p",
+    ]
+
+
+def _run(cmd):
+    result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, timeout=300)
+    if result.returncode != 0:
+        raise RuntimeError(f"ffmpeg failed:\n{result.stderr[-800:]}")
+
+
+def has_filters(ffmpeg: str, filters: tuple[str, ...]) -> bool:
+    result = subprocess.run(
+        [ffmpeg, "-hide_banner", "-filters"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, timeout=30,
+    )
+    available = {line.split()[1] for line in result.stdout.splitlines() if len(line.split()) > 1}
+    return all(name in available for name in filters)
+
+
+def _ass_time(ms: int) -> str:
+    cs = ms // 10
+    return f"{cs // 360000}:{cs // 6000 % 60:02d}:{cs // 100 % 60:02d}.{cs % 100:02d}"
+
+
+def _ass_text(text: str) -> str:
+    return " ".join(text.replace("\\", "/").replace("{", "(").replace("}", ")").split())
+
+
+def write_subtitles(cues: list[dict], dst: str):
+    with open(dst, "w", encoding="utf-8") as f:
+        f.write(ASS_HEADER)
+        for cue in cues:
+            start, end = _ass_time(cue["start_ms"]), _ass_time(cue["end_ms"])
+            f.write(f"Dialogue: 0,{start},{end},Default,,0,0,0,,{_ass_text(cue['text'])}\n")
+
+
+def extract_clip(src: str, start: str, end: str, dst: str, subtitles: str | None = None):
+    if subtitles:
+        path = Path(subtitles).as_posix().replace(":", "\\:")
+        video_opts = _video_opts(HEIGHT - CAPTION_BAND, f",ass='{path}'")
+    else:
+        video_opts = _video_opts(HEIGHT)
+    _run([
+        "ffmpeg", "-y", "-ss", start, "-to", end, "-i", src,
+        *video_opts, *AUDIO_OPTS, dst,
+    ])
+
+
+def make_title_card(participant: str, country: str, topic: str, dst: str):
+    def esc(t):
+        return t.replace(":", "\\:").replace("'", "'\\''")
+
+    vf = (
+        f"drawtext=text='{esc(participant)}':fontsize=48:fontcolor=white:"
+        f"x=(w-text_w)/2:y=(h/2)-80:font=Helvetica,"
+        f"drawtext=text='{esc(country)}':fontsize=32:fontcolor=0xBBBBBB:"
+        f"x=(w-text_w)/2:y=(h/2)-20:font=Helvetica,"
+        f"drawtext=text='{esc(topic)}':fontsize=36:fontcolor=0x34D399:"
+        f"x=(w-text_w)/2:y=(h/2)+40:font=Helvetica"
+    )
+
+    _run([
+        "ffmpeg", "-y",
+        "-f", "lavfi", "-i", f"color=c=0x1a1a2e:s={WIDTH}x{HEIGHT}:d={TITLE_DURATION}:r={FPS}",
+        "-f", "lavfi", "-i", "anullsrc=r=16000:cl=mono",
+        "-t", str(TITLE_DURATION),
+        "-vf", vf,
+        "-c:v", "libx264", "-preset", "medium", "-crf", "18",
+        "-pix_fmt", "yuv420p",
+        *AUDIO_OPTS,
+        "-shortest",
+        dst,
+    ])
+
+
+def concatenate(parts: list[str], output: str):
+    concat_list = os.path.join(os.path.dirname(output), "_concat.txt")
+    with open(concat_list, "w", encoding="utf-8") as f:
+        for p in parts:
+            f.write(f"file '{os.path.abspath(p)}'\n")
+
+    _run([
+        "ffmpeg", "-y", "-f", "concat", "-safe", "0", "-i", concat_list,
+        "-c", "copy", output,
+    ])
+
+    os.remove(concat_list)

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/tests/test_aiinterviews.py

@@ -435,6 +435,20 @@ def test_validate_max_responses(runner, tmp_path):
     assert result.exit_code == 0
 
 
+def test_validate_follow_up_style(runner, tmp_path):
+    yaml_file = tmp_path / "ok.yaml"
+    yaml_file.write_text(VALID_AI_INTERVIEW_YAML + "follow_up_style: guide\n")
+    assert runner.invoke(app, ["aiinterviews", "validate", str(yaml_file)]).exit_code == 0
+
+
+def test_validate_rejects_an_unknown_follow_up_style(runner, tmp_path):
+    yaml_file = tmp_path / "bad.yaml"
+    yaml_file.write_text(VALID_AI_INTERVIEW_YAML + "follow_up_style: freeform\n")
+    result = runner.invoke(app, ["aiinterviews", "validate", str(yaml_file)])
+    assert result.exit_code != 0
+    assert "follow_up_style" in result.output
+
+
 def test_validate_max_responses_must_be_positive(runner, tmp_path):
     yaml_file = tmp_path / "interview.yaml"
     yaml_file.write_text(VALID_AI_INTERVIEW_YAML + "max_responses: 0\n")

podojo_cli-1.30.0/tests/test_showreel.py

@@ -0,0 +1,247 @@
+import json
+import os
+from pathlib import Path
+from unittest.mock import patch, MagicMock
+
+import pytest
+import typer
+
+from podojo_cli.commands.showreel import FFMPEG_FULL_PATHS, _check_ffmpeg
+from podojo_cli.main import app
+from podojo_cli.video.showreel import extract_clip, has_filters, write_subtitles
+
+
+CLIPS = [
+    {
+        "batch_id": "batch-1",
+        "participant": "P01 — Alice",
+        "country": "UK",
+        "topic": "Confused by checkout",
+        "start": "01:00",
+        "end": "01:30",
+    }
+]
+
+
+def test_create_showreel(runner, httpx_mock, tmp_path):
+    clips_file = tmp_path / "clips.json"
+    clips_file.write_text(json.dumps(CLIPS))
+    output_file = tmp_path / "out.mp4"
+
+    httpx_mock.add_response(
+        url="http://test.local/api/v1/videos/batch-1",
+        json={"url": "http://storage.test/video.mp4", "filename": "video.mp4"},
+    )
+    httpx_mock.add_response(
+        url="http://storage.test/video.mp4",
+        content=b"fake-video-bytes",
+    )
+
+    with (
+        patch("podojo_cli.commands.showreel.make_title_card") as mock_title,
+        patch("podojo_cli.commands.showreel.extract_clip") as mock_clip,
+        patch("podojo_cli.commands.showreel.concatenate") as mock_concat,
+        patch("podojo_cli.commands.showreel._check_ffmpeg"),
+        patch("os.path.getsize", return_value=1024 * 1024),
+    ):
+        result = runner.invoke(app, ["showreel", "create", str(clips_file), "-o", str(output_file)])
+
+    assert result.exit_code == 0, result.output
+    mock_title.assert_called_once_with("P01 — Alice", "UK", "Confused by checkout", mock_title.call_args[0][3])
+    mock_clip.assert_called_once()
+    mock_concat.assert_called_once()
+
+
+def test_create_showreel_missing_ffmpeg(runner, tmp_path):
+    clips_file = tmp_path / "clips.json"
+    clips_file.write_text(json.dumps(CLIPS))
+
+    import shutil
+    with patch.object(shutil, "which", return_value=None):
+        result = runner.invoke(app, ["showreel", "create", str(clips_file)])
+
+    assert result.exit_code != 0
+
+
+SUBTITLES_URL = "http://test.local/api/v1/videos/batch-1/subtitles"
+CUES = [{"start_ms": 1200, "end_ms": 4300, "text": "I couldn't find the field"}]
+
+
+def _mock_video(httpx_mock):
+    httpx_mock.add_response(
+        url="http://test.local/api/v1/videos/batch-1",
+        json={"url": "http://storage.test/video.mp4", "filename": "video.mp4"},
+    )
+    httpx_mock.add_response(url="http://storage.test/video.mp4", content=b"fake-video-bytes")
+
+
+def _create(runner, tmp_path, *args):
+    clips_file = tmp_path / "clips.json"
+    clips_file.write_text(json.dumps(CLIPS))
+
+    with (
+        patch("podojo_cli.commands.showreel.make_title_card"),
+        patch("podojo_cli.commands.showreel.extract_clip") as mock_clip,
+        patch("podojo_cli.commands.showreel.write_subtitles") as mock_write,
+        patch("podojo_cli.commands.showreel.concatenate"),
+        patch("podojo_cli.commands.showreel._check_ffmpeg") as mock_check,
+        patch("os.path.getsize", return_value=1024 * 1024),
+    ):
+        result = runner.invoke(app, ["showreel", "create", str(clips_file), "-o", str(tmp_path / "out.mp4"), *args])
+
+    return result, mock_clip, mock_write, mock_check
+
+
+def test_subtitles_are_fetched_before_the_video_and_burned_in(runner, httpx_mock, tmp_path):
+    httpx_mock.add_response(url=SUBTITLES_URL, json={"language": "de", "cues": CUES})
+    _mock_video(httpx_mock)
+
+    result, mock_clip, mock_write, mock_check = _create(runner, tmp_path, "--subtitles")
+
+    assert result.exit_code == 0, result.output
+    mock_check.assert_called_once_with(("drawtext", "ass"))
+    first = httpx_mock.get_requests()[0]
+    assert str(first.url) == SUBTITLES_URL
+    assert json.loads(first.content) == {"start": "01:00", "end": "01:30"}
+    subtitles_path = mock_clip.call_args.args[4]
+    mock_write.assert_called_once_with(CUES, subtitles_path)
+    assert "without subtitles" not in result.output
+
+
+def test_no_subtitles_requested_makes_no_subtitles_call(runner, httpx_mock, tmp_path):
+    _mock_video(httpx_mock)
+
+    result, mock_clip, mock_write, mock_check = _create(runner, tmp_path)
+
+    assert result.exit_code == 0, result.output
+    mock_check.assert_called_once_with(("drawtext",))
+    assert SUBTITLES_URL not in [str(r.url) for r in httpx_mock.get_requests()]
+    assert mock_clip.call_args.args[4] is None
+    mock_write.assert_not_called()
+
+
+def test_english_clip_is_left_alone_and_listed(runner, httpx_mock, tmp_path):
+    httpx_mock.add_response(url=SUBTITLES_URL, json={"language": "en", "cues": []})
+    _mock_video(httpx_mock)
+
+    result, mock_clip, mock_write, _ = _create(runner, tmp_path, "--subtitles")
+
+    assert result.exit_code == 0, result.output
+    assert mock_clip.call_args.args[4] is None
+    mock_write.assert_not_called()
+    assert "1 clip(s) without subtitles" in result.output
+    assert "already in English" in result.output
+
+
+def test_silent_clip_is_not_listed_as_skipped(runner, httpx_mock, tmp_path):
+    httpx_mock.add_response(url=SUBTITLES_URL, json={"language": "de", "cues": []})
+    _mock_video(httpx_mock)
+
+    result, mock_clip, _, _ = _create(runner, tmp_path, "--subtitles")
+
+    assert result.exit_code == 0, result.output
+    assert mock_clip.call_args.args[4] is None
+    assert "without subtitles" not in result.output
+
+
+def test_older_session_is_left_alone_and_listed(runner, httpx_mock, tmp_path):
+    httpx_mock.add_response(url=SUBTITLES_URL, status_code=409, json={"detail": "no word timings"})
+    _mock_video(httpx_mock)
+
+    result, mock_clip, _, _ = _create(runner, tmp_path, "--subtitles")
+
+    assert result.exit_code == 0, result.output
+    assert mock_clip.call_args.args[4] is None
+    assert "transcribed before subtitles were available" in result.output
+
+
+def test_failed_translation_stops_before_any_video_is_downloaded(runner, httpx_mock, tmp_path):
+    httpx_mock.add_response(url=SUBTITLES_URL, status_code=502, json={"detail": "Translating the subtitles failed"})
+
+    result, mock_clip, _, _ = _create(runner, tmp_path, "--subtitles")
+
+    assert result.exit_code == 1
+    assert "Translating the subtitles failed" in result.output
+    assert len(httpx_mock.get_requests()) == 1
+    mock_clip.assert_not_called()
+
+
+def test_write_subtitles(tmp_path):
+    path = tmp_path / "clip.ass"
+
+    write_subtitles([
+        {"start_ms": 1230, "end_ms": 62_050, "text": "Hello [PERSON_NAME], {odd}\\text\nüber"},
+        {"start_ms": 3_600_000, "end_ms": 3_601_000, "text": "Later"},
+    ], str(path))
+
+    lines = path.read_text(encoding="utf-8").splitlines()
+    assert "PlayResX: 1280" in lines
+    assert lines[-2:] == [
+        "Dialogue: 0,0:00:01.23,0:01:02.05,Default,,0,0,0,,Hello [PERSON_NAME], (odd)/text über",
+        "Dialogue: 0,1:00:00.00,1:00:01.00,Default,,0,0,0,,Later",
+    ]
+
+
+def test_extract_clip_without_subtitles_keeps_the_full_picture():
+    with patch("podojo_cli.video.showreel._run") as mock_run:
+        extract_clip("in.mp4", "00:10", "00:20", "out.mp4")
+
+    cmd = mock_run.call_args.args[0]
+    assert cmd[cmd.index("-vf") + 1] == "scale=-2:720,pad=1280:720:(ow-iw)/2:0:color=0x1a1a2e"
+
+
+def test_extract_clip_with_subtitles_leaves_a_band_for_them():
+    with patch("podojo_cli.video.showreel._run") as mock_run:
+        extract_clip("in.mp4", "00:10", "00:20", "out.mp4", "C:/tmp/clip.ass")
+
+    cmd = mock_run.call_args.args[0]
+    assert cmd[cmd.index("-vf") + 1] == (
+        "scale=-2:620,pad=1280:720:(ow-iw)/2:0:color=0x1a1a2e,ass='C\\:/tmp/clip.ass'"
+    )
+
+
+def test_has_filters_reads_the_filter_list():
+    listing = """Filters:
+  T.. = Timeline support
+ T.C drawtext          V->V       Draw text on top of video frames using libfreetype library.
+ TSC overlay           VV->V      Overlay a video source on top of the input.
+"""
+    with patch("subprocess.run", return_value=MagicMock(stdout=listing)):
+        assert has_filters("ffmpeg", ("drawtext",))
+        assert not has_filters("ffmpeg", ("drawtext", "ass"))
+
+
+def _which(*installed):
+    return lambda name: name if name in installed else None
+
+
+def test_check_ffmpeg_keeps_a_capable_ffmpeg(monkeypatch):
+    monkeypatch.setenv("PATH", "/usr/bin")
+    with (
+        patch("shutil.which", side_effect=_which("ffmpeg")),
+        patch("podojo_cli.commands.showreel.has_filters", return_value=True),
+    ):
+        _check_ffmpeg()
+
+
+def test_check_ffmpeg_falls_back_to_ffmpeg_full(monkeypatch):
+    monkeypatch.setenv("PATH", "/usr/bin")
+    full = FFMPEG_FULL_PATHS[0]
+    with (
+        patch("shutil.which", side_effect=_which("ffmpeg", full)),
+        patch("podojo_cli.commands.showreel.has_filters", side_effect=lambda path, filters: path == full),
+    ):
+        _check_ffmpeg(("drawtext", "ass"))
+
+    assert os.environ["PATH"].startswith(os.path.dirname(full))
+
+
+def test_check_ffmpeg_explains_missing_filters(capsys):
+    with (
+        patch("shutil.which", side_effect=_which("ffmpeg")),
+        patch("podojo_cli.commands.showreel.has_filters", return_value=False),
+        pytest.raises(typer.Exit),
+    ):
+        _check_ffmpeg(("drawtext", "ass"))
+
+    assert "brew install ffmpeg-full" in capsys.readouterr().out

{podojo_cli-1.28.0 → podojo_cli-1.30.0}/uv.lock

@@ -438,7 +438,7 @@ wheels = [
 
 [[package]]
 name = "podojo-cli"
-version = "1.28.0"
+version = "1.30.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

podojo_cli-1.28.0/src/podojo_cli/video/showreel.py

@@ -1,69 +0,0 @@
-"""FFmpeg-based showreel generation from a list of clips."""
-
-import os
-import subprocess
-
-WIDTH = 1280
-HEIGHT = 720
-FPS = 30
-SCALE_PAD = f"scale=-2:{HEIGHT},pad={WIDTH}:{HEIGHT}:(ow-iw)/2:0:color=0x1a1a2e"
-VIDEO_OPTS = [
-    "-c:v", "libx264", "-preset", "medium", "-crf", "18",
-    "-vf", SCALE_PAD, "-r", str(FPS), "-pix_fmt", "yuv420p",
-]
-AUDIO_OPTS = ["-c:a", "aac", "-ac", "1", "-ar", "16000", "-b:a", "64k"]
-TITLE_DURATION = 4
-
-
-def _run(cmd):
-    result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, timeout=300)
-    if result.returncode != 0:
-        raise RuntimeError(f"ffmpeg failed:\n{result.stderr[-800:]}")
-
-
-def extract_clip(src: str, start: str, end: str, dst: str):
-    _run([
-        "ffmpeg", "-y", "-ss", start, "-to", end, "-i", src,
-        *VIDEO_OPTS, *AUDIO_OPTS, dst,
-    ])
-
-
-def make_title_card(participant: str, country: str, topic: str, dst: str):
-    def esc(t):
-        return t.replace(":", "\\:").replace("'", "'\\''")
-
-    vf = (
-        f"drawtext=text='{esc(participant)}':fontsize=48:fontcolor=white:"
-        f"x=(w-text_w)/2:y=(h/2)-80:font=Helvetica,"
-        f"drawtext=text='{esc(country)}':fontsize=32:fontcolor=0xBBBBBB:"
-        f"x=(w-text_w)/2:y=(h/2)-20:font=Helvetica,"
-        f"drawtext=text='{esc(topic)}':fontsize=36:fontcolor=0x34D399:"
-        f"x=(w-text_w)/2:y=(h/2)+40:font=Helvetica"
-    )
-
-    _run([
-        "ffmpeg", "-y",
-        "-f", "lavfi", "-i", f"color=c=0x1a1a2e:s={WIDTH}x{HEIGHT}:d={TITLE_DURATION}:r={FPS}",
-        "-f", "lavfi", "-i", "anullsrc=r=16000:cl=mono",
-        "-t", str(TITLE_DURATION),
-        "-vf", vf,
-        "-c:v", "libx264", "-preset", "medium", "-crf", "18",
-        "-pix_fmt", "yuv420p",
-        *AUDIO_OPTS,
-        "-shortest",
-        dst,
-    ])
-
-
-def concatenate(parts: list[str], output: str):
-    concat_list = os.path.join(os.path.dirname(output), "_concat.txt")
-    with open(concat_list, "w", encoding="utf-8") as f:
-        for p in parts:
-            f.write(f"file '{os.path.abspath(p)}'\n")
-
-    _run([
-        "ffmpeg", "-y", "-f", "concat", "-safe", "0", "-i", concat_list,
-        "-c", "copy", output,
-    ])
-
-    os.remove(concat_list)

podojo_cli-1.28.0/tests/test_showreel.py

@@ -1,57 +0,0 @@
-import json
-from pathlib import Path
-from unittest.mock import patch, MagicMock
-
-from podojo_cli.main import app
-
-
-CLIPS = [
-    {
-        "batch_id": "batch-1",
-        "participant": "P01 — Alice",
-        "country": "UK",
-        "topic": "Confused by checkout",
-        "start": "01:00",
-        "end": "01:30",
-    }
-]
-
-
-def test_create_showreel(runner, httpx_mock, tmp_path):
-    clips_file = tmp_path / "clips.json"
-    clips_file.write_text(json.dumps(CLIPS))
-    output_file = tmp_path / "out.mp4"
-
-    httpx_mock.add_response(
-        url="http://test.local/api/v1/videos/batch-1",
-        json={"url": "http://storage.test/video.mp4", "filename": "video.mp4"},
-    )
-    httpx_mock.add_response(
-        url="http://storage.test/video.mp4",
-        content=b"fake-video-bytes",
-    )
-
-    with (
-        patch("podojo_cli.commands.showreel.make_title_card") as mock_title,
-        patch("podojo_cli.commands.showreel.extract_clip") as mock_clip,
-        patch("podojo_cli.commands.showreel.concatenate") as mock_concat,
-        patch("podojo_cli.commands.showreel._check_ffmpeg"),
-        patch("os.path.getsize", return_value=1024 * 1024),
-    ):
-        result = runner.invoke(app, ["showreel", "create", str(clips_file), "-o", str(output_file)])
-
-    assert result.exit_code == 0, result.output
-    mock_title.assert_called_once_with("P01 — Alice", "UK", "Confused by checkout", mock_title.call_args[0][3])
-    mock_clip.assert_called_once()
-    mock_concat.assert_called_once()
-
-
-def test_create_showreel_missing_ffmpeg(runner, tmp_path):
-    clips_file = tmp_path / "clips.json"
-    clips_file.write_text(json.dumps(CLIPS))
-
-    import shutil
-    with patch.object(shutil, "which", return_value=None):
-        result = runner.invoke(app, ["showreel", "create", str(clips_file)])
-
-    assert result.exit_code != 0