davinci-cli 1.0.1__py3-none-any.whl

davinci_cli/__init__.py

@@ -0,0 +1,3 @@
+"""davinci-cli — DaVinci Resolve CLI & MCP server, agent-first design."""
+
+__version__ = "1.0.1"

davinci_cli/cli.py

@@ -0,0 +1,109 @@
+"""CLI エントリポイント。
+
+エントリポイント名は 'dr' に統一。'cli' は使わない。
+グローバルエラーハンドリングは DavinciCLIGroup.invoke() オーバーライドで実装。
+各コマンドに手動でデコレータを付ける必要はない。
+
+exit_code は core/exceptions.py の定義を参照する:
+  1: ResolveNotRunningError
+  2: ProjectNotOpenError / ProjectNotFoundError
+  3: ValidationError
+  4: DavinciEnvironmentError
+  5: EditionError
+"""
+
+from __future__ import annotations
+
+import json
+
+import click
+
+from davinci_cli.core.exceptions import DavinciCLIError
+from davinci_cli.core.logging import setup_logging
+
+
+class DavinciCLIGroup(click.Group):
+    """カスタム Click Group — invoke オーバーライドでグローバルエラーハンドリング。"""
+
+    def invoke(self, ctx: click.Context) -> None:
+        try:
+            super().invoke(ctx)
+        except DavinciCLIError as exc:
+            error_response = {
+                "error": str(exc),
+                "error_type": type(exc).__name__,
+                "exit_code": exc.exit_code,
+            }
+            click.echo(json.dumps(error_response, ensure_ascii=False))
+            ctx.exit(exc.exit_code)
+        except click.exceptions.ClickException:
+            raise  # Click の UsageError/BadParameter 等はそのまま伝播
+        except Exception as exc:
+            error_response = {
+                "error": str(exc),
+                "error_type": type(exc).__name__,
+                "exit_code": 1,
+            }
+            click.echo(json.dumps(error_response, ensure_ascii=False))
+            ctx.exit(1)
+
+
+@click.group(cls=DavinciCLIGroup)
+@click.version_option()
+@click.option(
+    "--pretty",
+    is_flag=True,
+    default=False,
+    help="Human-readable output (TTY only)",
+)
+@click.option(
+    "--verbose",
+    "-v",
+    is_flag=True,
+    default=False,
+    help="Enable verbose logging (INFO level)",
+)
+@click.option(
+    "--debug",
+    is_flag=True,
+    default=False,
+    help="Enable debug logging (DEBUG level)",
+)
+@click.pass_context
+def dr(ctx: click.Context, pretty: bool, verbose: bool, debug: bool) -> None:
+    """DaVinci Resolve CLI — agent-first interface."""
+    ctx.ensure_object(dict)
+    ctx.obj["pretty"] = pretty
+    ctx.obj["verbose"] = verbose
+    ctx.obj["debug"] = debug
+
+    setup_logging(verbose=verbose, debug=debug)
+
+
+def _register_commands() -> None:
+    from davinci_cli.commands import (
+        clip,
+        color,
+        deliver,
+        gallery,
+        mcp_cmd,
+        media,
+        project,
+        schema,
+        system,
+        timeline,
+    )
+
+    dr.add_command(system.system)
+    dr.add_command(schema.schema)
+    dr.add_command(project.project)
+    dr.add_command(timeline.timeline)
+    dr.add_command(clip.clip)
+    dr.add_command(color.color)
+    dr.add_command(media.media)
+    dr.add_command(deliver.deliver)
+    dr.add_command(gallery.gallery)
+    dr.add_command(mcp_cmd.mcp)
+
+
+_register_commands()

davinci_cli/commands/beat_markers.py

@@ -0,0 +1,239 @@
+"""dr timeline marker beats — BPMベースのマーカー自動配置。
+
+BPM と音価を指定して、指定クリップの範囲に等間隔マーカーを配置する。
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+import click
+from pydantic import BaseModel
+
+from davinci_cli.core.connection import get_resolve
+from davinci_cli.core.exceptions import ProjectNotOpenError, ValidationError
+from davinci_cli.decorators import dry_run_option, json_input_option
+from davinci_cli.output.formatter import output
+from davinci_cli.schema_registry import register_schema
+
+# 音価 → 1拍あたりの倍率マッピング
+NOTE_VALUE_MAP: dict[str, float] = {
+    "1/1": 4.0,  # 全音符 = 4拍
+    "1/2": 2.0,  # 2分音符 = 2拍
+    "1/4": 1.0,  # 4分音符 = 1拍
+    "1/8": 0.5,  # 8分音符 = 0.5拍
+    "1/16": 0.25,  # 16分音符 = 0.25拍
+}
+
+
+def _calculate_beat_frames(
+    bpm: float,
+    note_value: str,
+    fps: float,
+    start_frame: int,
+    end_frame: int,
+) -> list[int]:
+    """BPM・音価・FPSからマーカーを打つべきフレーム一覧を計算する。
+
+    誤差蓄積防止: 各フレームは start_frame + round(i * interval) で計算。
+    累積加算（frame += interval）は使わない。
+    """
+    beats_per_note = NOTE_VALUE_MAP[note_value]
+    # 1音価あたりの秒数
+    seconds_per_beat = (60.0 / bpm) * beats_per_note
+    # 1音価あたりのフレーム数（浮動小数点）
+    frames_per_beat = seconds_per_beat * fps
+
+    frames: list[int] = []
+    i = 0
+    while True:
+        frame = start_frame + round(i * frames_per_beat)
+        if frame > end_frame:
+            break
+        frames.append(frame)
+        i += 1
+    return frames
+
+
+# --- Pydantic Models ---
+
+
+class BeatMarkerInput(BaseModel):
+    bpm: float
+    clip_index: int
+    note_value: str = "1/4"
+    color: str = "Blue"
+    name: str = ""
+    duration: int = 1
+
+
+class BeatMarkerOutput(BaseModel):
+    added_count: int | None = None
+    requested_count: int | None = None
+    failed_frames: list[int] | None = None
+    bpm: float | None = None
+    note_value: str | None = None
+    color: str | None = None
+    clip_name: str | None = None
+    frames: list[int] | None = None
+    dry_run: bool | None = None
+    action: str | None = None
+    count: int | None = None
+
+
+# --- Helper ---
+
+
+def _get_current_project() -> Any:
+    resolve = get_resolve()
+    pm = resolve.GetProjectManager()
+    project = pm.GetCurrentProject()
+    if project is None:
+        raise ProjectNotOpenError()
+    return project
+
+
+def _collect_clips(tl: Any) -> list[tuple[dict[str, Any], Any]]:
+    """タイムラインから全クリップを収集する。"""
+    clips: list[tuple[dict[str, Any], Any]] = []
+    for track_type in ["video", "audio"]:
+        track_count = tl.GetTrackCount(track_type)
+        for track_idx in range(1, track_count + 1):
+            track_clips = tl.GetItemListInTrack(track_type, track_idx) or []
+            for clip_item in track_clips:
+                info = {
+                    "index": len(clips),
+                    "name": clip_item.GetName(),
+                    "start": clip_item.GetStart(),
+                    "end": clip_item.GetEnd(),
+                    "type": track_type,
+                    "track": track_idx,
+                }
+                clips.append((info, clip_item))
+    return clips
+
+
+# --- _impl Function ---
+
+
+def beat_marker_impl(
+    bpm: float,
+    clip_index: int,
+    note_value: str = "1/4",
+    color: str = "Blue",
+    name: str = "",
+    duration: int = 1,
+    dry_run: bool = False,
+) -> dict[str, Any]:
+    """BPM と音価を指定して、指定クリップの範囲にマーカーを配置する。"""
+    # 1. バリデーション
+    if note_value not in NOTE_VALUE_MAP:
+        valid = ", ".join(NOTE_VALUE_MAP)
+        raise ValidationError(
+            field="note_value",
+            reason=f"Invalid note_value: '{note_value}'. Must be one of: {valid}",
+        )
+    if not (20.0 <= bpm <= 300.0):
+        raise ValidationError(
+            field="bpm",
+            reason=f"BPM must be between 20.0 and 300.0, got {bpm}",
+        )
+
+    # 2. タイムライン情報取得
+    project = _get_current_project()
+    tl = project.GetCurrentTimeline()
+    if not tl:
+        raise ProjectNotOpenError()
+    fps = float(tl.GetSetting("timelineFrameRate") or "24")
+
+    # 3. クリップ取得
+    clips = _collect_clips(tl)
+    if clip_index < 0 or clip_index >= len(clips):
+        raise ValidationError(
+            field="clip_index",
+            reason=f"Clip index {clip_index} out of range (0..{len(clips) - 1})",
+        )
+    clip_info, _clip_item = clips[clip_index]
+    start_frame = clip_info["start"]
+    end_frame = clip_info["end"]
+    clip_name = clip_info["name"]
+
+    # 4. フレーム計算（クリップの start〜end 範囲）
+    frames = _calculate_beat_frames(bpm, note_value, fps, start_frame, end_frame)
+
+    # 5. dry-run
+    if dry_run:
+        return {
+            "dry_run": True,
+            "action": "marker_beats",
+            "bpm": bpm,
+            "note_value": note_value,
+            "color": color,
+            "clip_name": clip_name,
+            "count": len(frames),
+            "frames": frames,
+        }
+
+    # 6. マーカー追加（マーカーAPIは相対フレームを要求、空nameは拒否される）
+    from davinci_cli.commands.timeline import _get_start_frame_offset
+
+    offset = _get_start_frame_offset(tl)
+    marker_name = name or " "
+    added_count = 0
+    failed_frames = []
+    for frame_abs in frames:
+        rel_frame = frame_abs - offset
+        if tl.AddMarker(rel_frame, color, marker_name, "", duration):
+            added_count += 1
+        else:
+            failed_frames.append(frame_abs)
+
+    result = {
+        "added_count": added_count,
+        "requested_count": len(frames),
+        "bpm": bpm,
+        "note_value": note_value,
+        "color": color,
+        "clip_name": clip_name,
+        "frames": frames,
+    }
+    if failed_frames:
+        result["failed_frames"] = failed_frames
+    return result
+
+
+# --- CLI Command ---
+
+
+@click.command(name="beats")
+@json_input_option
+@dry_run_option
+@click.pass_context
+def beat_marker_cmd(
+    ctx: click.Context,
+    json_input: dict[str, Any] | None,
+    dry_run: bool,
+) -> None:
+    """BPMベースのマーカー自動配置。"""
+    if not json_input:
+        raise click.UsageError("--json is required")
+    data = BeatMarkerInput.model_validate(json_input)
+    result = beat_marker_impl(
+        bpm=data.bpm,
+        clip_index=data.clip_index,
+        note_value=data.note_value,
+        color=data.color,
+        name=data.name,
+        duration=data.duration,
+        dry_run=dry_run,
+    )
+    output(result, pretty=ctx.obj.get("pretty"))
+
+
+# --- Schema Registration ---
+
+register_schema(
+    "timeline.marker.beats",
+    output_model=BeatMarkerOutput,
+    input_model=BeatMarkerInput,
+)