refactor(video): rename render client to video_renderer_client (renderer-agnostic)

This commit is contained in:
Renn F
2026-07-06 02:10:25 +02:00
parent 3e55716eea
commit 563e30ca33
6 changed files with 57 additions and 53 deletions
+4 -4
View File
@@ -886,7 +886,7 @@ class Settings(BaseSettings):
description="Seconds between feature-spotlight exploration cycles.", description="Seconds between feature-spotlight exploration cycles.",
) )
# Video generation (Remotion) — a UX/UI dev authors a bespoke motion-video # Video generation (HyperFrames) — a UX/UI dev authors a bespoke motion-video
# composition per release/spotlight/on-demand trigger through the normal # composition per release/spotlight/on-demand trigger through the normal
# delivery lifecycle; a later render pass renders it to MP4 and holds the # delivery lifecycle; a later render pass renders it to MP4 and holds the
# clip as a CEO-approval draft (mirrors the X engine's held-draft shape). # clip as a CEO-approval draft (mirrors the X engine's held-draft shape).
@@ -934,10 +934,10 @@ class Settings(BaseSettings):
gt=0, gt=0,
description="Per-request timeout for outbound video-engine HTTP calls.", description="Per-request timeout for outbound video-engine HTTP calls.",
) )
remotion_base_url: str = Field( video_renderer_base_url: str = Field(
default="http://roboco-remotion:3001", default="http://roboco-video-renderer:3001",
description=( description=(
"Base URL of the remotion-renderer sidecar. The orchestrator tars " "Base URL of the video-renderer sidecar. The orchestrator tars "
"the merged motion/ source and POSTs it here; the sidecar returns " "the merged motion/ source and POSTs it here; the sidecar returns "
"MP4 bytes in the response (no cross-container shared volume)." "MP4 bytes in the response (no cross-container shared volume)."
), ),
+2 -2
View File
@@ -7696,14 +7696,14 @@ Start by:
"""Render the vertical + square cuts from the roboco project's merged """Render the vertical + square cuts from the roboco project's merged
read-clone's motion/ dir; returns {"vertical": path, "square": path}. read-clone's motion/ dir; returns {"vertical": path, "square": path}.
``render_key`` (the source task id) scopes each cut's output path.""" ``render_key`` (the source task id) scopes each cut's output path."""
from roboco.services.remotion_client import get_remotion_renderer from roboco.services.video_renderer_client import get_video_renderer
from roboco.services.workspace import get_workspace_service from roboco.services.workspace import get_workspace_service
slug = (settings.self_heal_project_slug or "roboco-api").strip() slug = (settings.self_heal_project_slug or "roboco-api").strip()
workspace = await get_workspace_service(db).ensure_read_clone(slug) workspace = await get_workspace_service(db).ensure_read_clone(slug)
motion_dir = str(workspace / "motion") motion_dir = str(workspace / "motion")
input_props = draft.get("input_props") or {} input_props = draft.get("input_props") or {}
renderer = get_remotion_renderer() renderer = get_video_renderer()
cuts: dict[str, str] = {} cuts: dict[str, str] = {}
for orientation in ("vertical", "square"): for orientation in ("vertical", "square"):
cuts[orientation] = await renderer.render( cuts[orientation] = await renderer.render(
@@ -1,4 +1,4 @@
"""RemotionRenderer — HTTP client for the remotion-renderer sidecar. """VideoRenderer — HTTP client for the video-renderer sidecar.
No cross-container shared volume: the orchestrator tars the merged motion/ No cross-container shared volume: the orchestrator tars the merged motion/
source directory from its read-clone and POSTs it to the sidecar; the sidecar source directory from its read-clone and POSTs it to the sidecar; the sidecar
@@ -7,9 +7,11 @@ this client writes to an orchestrator-local directory. The sidecar itself
stays credential-free and git-free it only ever sees a tarball plus a JSON stays credential-free and git-free it only ever sees a tarball plus a JSON
side-channel of render parameters. side-channel of render parameters.
`NullRemotionRenderer` (an unconfigured `remotion_base_url`) fails the same An unconfigured ``video_renderer_base_url`` makes :func:`get_video_renderer`
clean way an unreachable sidecar does a `RemotionRendererError`, never a return a :class:`NullVideoRenderer` whose :meth:`render` raises a typed
raw transport crash mirroring the `NullXClient` graceful-degradation shape. :class:`VideoRendererError` (never a raw transport crash) fail-fast on a
misconfigured sidecar is correct, and the render loop already handles it as a
bounded retry.
""" """
from __future__ import annotations from __future__ import annotations
@@ -30,11 +32,11 @@ from roboco.services import minio_client
log = structlog.get_logger(__name__) log = structlog.get_logger(__name__)
class RemotionRendererError(Exception): class VideoRendererError(Exception):
"""A render call failed: unconfigured sidecar, unreachable, or non-2xx.""" """A render call failed: unconfigured sidecar, unreachable, or non-2xx."""
class RemotionRenderer: class VideoRenderer:
"""Tar the composition source, POST it to the sidecar, save the MP4.""" """Tar the composition source, POST it to the sidecar, save the MP4."""
def __init__( def __init__(
@@ -66,12 +68,12 @@ class RemotionRenderer:
an earlier, not-yet-posted draft's clip. an earlier, not-yet-posted draft's clip.
Fails fast (no tar, no network attempt) when unconfigured the same Fails fast (no tar, no network attempt) when unconfigured the same
guard covers both ``NullRemotionRenderer`` and a directly-constructed guard covers both ``NullVideoRenderer`` and a directly-constructed
``RemotionRenderer(base_url="")``. ``VideoRenderer(base_url="")``.
""" """
if not self._base_url: if not self._base_url:
raise RemotionRendererError( raise VideoRendererError(
"remotion sidecar not configured (remotion_base_url unset)" "video-renderer sidecar not configured (video_renderer_base_url unset)"
) )
tar_bytes = await asyncio.to_thread(self._tar_source, source_dir) tar_bytes = await asyncio.to_thread(self._tar_source, source_dir)
mp4_bytes = await self._post( mp4_bytes = await self._post(
@@ -131,9 +133,9 @@ class RemotionRenderer:
timeout=timeout, timeout=timeout,
) )
except httpx.HTTPError as exc: except httpx.HTTPError as exc:
raise RemotionRendererError(f"render request failed: {exc}") from exc raise VideoRendererError(f"render request failed: {exc}") from exc
if not response.is_success: if not response.is_success:
raise RemotionRendererError( raise VideoRendererError(
f"render failed: HTTP {response.status_code}: {response.text[:200]}" f"render failed: HTTP {response.status_code}: {response.text[:200]}"
) )
return response.content return response.content
@@ -170,7 +172,7 @@ class RemotionRenderer:
return str(path) return str(path)
class NullRemotionRenderer(RemotionRenderer): class NullVideoRenderer(VideoRenderer):
"""No sidecar configured — inherits render()'s empty-base_url guard, so """No sidecar configured — inherits render()'s empty-base_url guard, so
every call raises immediately: no tar, no network call.""" every call raises immediately: no tar, no network call."""
@@ -178,9 +180,9 @@ class NullRemotionRenderer(RemotionRenderer):
super().__init__(base_url="") super().__init__(base_url="")
def get_remotion_renderer() -> RemotionRenderer: def get_video_renderer() -> VideoRenderer:
"""RemotionRenderer bound to settings.remotion_base_url; Null when unset.""" """VideoRenderer bound to settings.video_renderer_base_url; Null when unset."""
base_url = settings.remotion_base_url.strip() base_url = settings.video_renderer_base_url.strip()
if not base_url: if not base_url:
return NullRemotionRenderer() return NullVideoRenderer()
return RemotionRenderer(base_url=base_url) return VideoRenderer(base_url=base_url)
+1 -1
View File
@@ -178,7 +178,7 @@ def _render_completed_task(stack: E2EStack, task_id: UUID) -> None:
).scalar_one() ).scalar_one()
with ( with (
patch( patch(
"roboco.services.remotion_client.get_remotion_renderer", "roboco.services.video_renderer_client.get_video_renderer",
_FakeRenderer, _FakeRenderer,
), ),
patch( patch(
+1 -1
View File
@@ -170,7 +170,7 @@ async def _make_completed_video_task(
def _render_patches(renderer: _FakeRenderer, workspace: Any) -> Any: def _render_patches(renderer: _FakeRenderer, workspace: Any) -> Any:
return ( return (
patch( patch(
"roboco.services.remotion_client.get_remotion_renderer", "roboco.services.video_renderer_client.get_video_renderer",
lambda: renderer, lambda: renderer,
), ),
patch( patch(
@@ -1,4 +1,4 @@
"""RemotionRenderer coverage: tar/post/save happy path against a mocked httpx """VideoRenderer coverage: tar/post/save happy path against a mocked httpx
transport, plus unconfigured/unreachable graceful failure (never a crash). transport, plus unconfigured/unreachable graceful failure (never a crash).
""" """
@@ -10,11 +10,11 @@ import httpx
import pytest import pytest
from roboco.config import settings as cfg from roboco.config import settings as cfg
from roboco.services import minio_client from roboco.services import minio_client
from roboco.services.remotion_client import ( from roboco.services.video_renderer_client import (
NullRemotionRenderer, NullVideoRenderer,
RemotionRenderer, VideoRenderer,
RemotionRendererError, VideoRendererError,
get_remotion_renderer, get_video_renderer,
) )
@@ -44,7 +44,7 @@ async def test_render_posts_tar_and_saves_mp4(
transport = httpx.MockTransport(handler) transport = httpx.MockTransport(handler)
http_client = httpx.AsyncClient(transport=transport) http_client = httpx.AsyncClient(transport=transport)
renderer = RemotionRenderer(base_url="http://fake-remotion", client=http_client) renderer = VideoRenderer(base_url="http://fake-video-renderer", client=http_client)
path = await renderer.render( path = await renderer.render(
source_dir=str(source), source_dir=str(source),
@@ -55,7 +55,7 @@ async def test_render_posts_tar_and_saves_mp4(
) )
await http_client.aclose() await http_client.aclose()
assert captured["url"] == "http://fake-remotion/render" assert captured["url"] == "http://fake-video-renderer/render"
assert str(captured["content_type"]).startswith("multipart/form-data") assert str(captured["content_type"]).startswith("multipart/form-data")
body = captured["body"] body = captured["body"]
assert isinstance(body, bytes) assert isinstance(body, bytes)
@@ -84,9 +84,9 @@ async def test_render_non_success_response_raises_clear_error(
transport = httpx.MockTransport(handler) transport = httpx.MockTransport(handler)
http_client = httpx.AsyncClient(transport=transport) http_client = httpx.AsyncClient(transport=transport)
renderer = RemotionRenderer(base_url="http://fake-remotion", client=http_client) renderer = VideoRenderer(base_url="http://fake-video-renderer", client=http_client)
with pytest.raises(RemotionRendererError, match="500"): with pytest.raises(VideoRendererError, match="500"):
await renderer.render( await renderer.render(
source_dir=str(source), source_dir=str(source),
composition_id="Intro", composition_id="Intro",
@@ -109,9 +109,9 @@ async def test_render_unreachable_sidecar_raises_clear_error(
transport = httpx.MockTransport(handler) transport = httpx.MockTransport(handler)
http_client = httpx.AsyncClient(transport=transport) http_client = httpx.AsyncClient(transport=transport)
renderer = RemotionRenderer(base_url="http://fake-remotion", client=http_client) renderer = VideoRenderer(base_url="http://fake-video-renderer", client=http_client)
with pytest.raises(RemotionRendererError, match="render request failed"): with pytest.raises(VideoRendererError, match="render request failed"):
await renderer.render( await renderer.render(
source_dir=str(source), source_dir=str(source),
composition_id="Intro", composition_id="Intro",
@@ -127,8 +127,8 @@ async def test_unconfigured_renderer_raises_without_network_call(
tmp_path: Path, tmp_path: Path,
) -> None: ) -> None:
source = _make_source(tmp_path) source = _make_source(tmp_path)
renderer = RemotionRenderer(base_url="") renderer = VideoRenderer(base_url="")
with pytest.raises(RemotionRendererError, match="not configured"): with pytest.raises(VideoRendererError, match="not configured"):
await renderer.render( await renderer.render(
source_dir=str(source), source_dir=str(source),
composition_id="Intro", composition_id="Intro",
@@ -141,8 +141,8 @@ async def test_unconfigured_renderer_raises_without_network_call(
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_null_renderer_raises_without_network_call(tmp_path: Path) -> None: async def test_null_renderer_raises_without_network_call(tmp_path: Path) -> None:
source = _make_source(tmp_path) source = _make_source(tmp_path)
renderer = NullRemotionRenderer() renderer = NullVideoRenderer()
with pytest.raises(RemotionRendererError, match="not configured"): with pytest.raises(VideoRendererError, match="not configured"):
await renderer.render( await renderer.render(
source_dir=str(source), source_dir=str(source),
composition_id="Intro", composition_id="Intro",
@@ -152,21 +152,23 @@ async def test_null_renderer_raises_without_network_call(tmp_path: Path) -> None
) )
def test_get_remotion_renderer_returns_null_when_unset( def test_get_video_renderer_returns_null_when_unset(
monkeypatch: pytest.MonkeyPatch, monkeypatch: pytest.MonkeyPatch,
) -> None: ) -> None:
monkeypatch.setattr(cfg, "remotion_base_url", "") monkeypatch.setattr(cfg, "video_renderer_base_url", "")
renderer = get_remotion_renderer() renderer = get_video_renderer()
assert isinstance(renderer, NullRemotionRenderer) assert isinstance(renderer, NullVideoRenderer)
def test_get_remotion_renderer_returns_real_client_when_set( def test_get_video_renderer_returns_real_client_when_set(
monkeypatch: pytest.MonkeyPatch, monkeypatch: pytest.MonkeyPatch,
) -> None: ) -> None:
monkeypatch.setattr(cfg, "remotion_base_url", "http://roboco-remotion:3001") monkeypatch.setattr(
renderer = get_remotion_renderer() cfg, "video_renderer_base_url", "http://roboco-video-renderer:3001"
assert isinstance(renderer, RemotionRenderer) )
assert not isinstance(renderer, NullRemotionRenderer) renderer = get_video_renderer()
assert isinstance(renderer, VideoRenderer)
assert not isinstance(renderer, NullVideoRenderer)
@pytest.mark.asyncio @pytest.mark.asyncio
@@ -196,7 +198,7 @@ async def test_save_puts_to_minio_when_configured(
transport = httpx.MockTransport(handler) transport = httpx.MockTransport(handler)
http_client = httpx.AsyncClient(transport=transport) http_client = httpx.AsyncClient(transport=transport)
renderer = RemotionRenderer(base_url="http://fake-remotion", client=http_client) renderer = VideoRenderer(base_url="http://fake-video-renderer", client=http_client)
try: try:
path = await renderer.render( path = await renderer.render(
@@ -244,7 +246,7 @@ async def test_save_swallows_minio_put_failure(
try: try:
# _save is a sync @staticmethod; call it directly (no httpx needed). # _save is a sync @staticmethod; call it directly (no httpx needed).
path = RemotionRenderer._save( path = VideoRenderer._save(
b"fake-mp4-bytes", render_key="task-88", orientation="square" b"fake-mp4-bytes", render_key="task-88", orientation="square"
) )
finally: finally: