e2764160b6
Sync с n7.1-vf-cuda-grid-phase7 filter rework (один cuda_grid + native
runtime layout switching). Изменения:
dispatch._set_layout:
target: layout_filter_target (default cuda_grid@cg, был streamselect@layout)
command: "set_layout <name>" (был "map <index>")
validation: PREDEFINED_LAYOUTS (был inst.layout_map)
dispatch.set_main_cam:
target: main_cam_filter_target (default cuda_grid@cg, был streamselect@main_cam)
command: "cell_map <cell> <pad>" × max_cells
cell 0 = main camera; cells 1..N-1 = identity rotation остальных pads
(исключая main чтобы не дублировать в preview cells)
dispatch.set_mpp_main:
alias к set_main_cam — main_plus_preview тоже использует cell 0 как main.
config.InstanceCfg:
layout_filter_target / main_cam_filter_target / mpp_main_filter_target
default = cuda_grid@cg (Phase 7 single filter)
new max_cells: int = 4 (соответствует filter max_cells option)
layout_map deprecated — оставлен для UI subset visibility (HTTP /layouts/{inst})
http_api.set_layout:
validation против PREDEFINED_LAYOUTS вместо layout_map
Frigate bridge не меняется — set_main_cam подпись та же (instance, cam_index).
Compile-test OK. Pipeline image: gx/cuda-grid-pipeline:phase7. Controller
image rebuild требуется для deploy.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
195 lines
7.5 KiB
Python
195 lines
7.5 KiB
Python
"""Конфигурация — pydantic models + YAML loader.
|
|
|
|
Структура YAML:
|
|
broker:
|
|
host: localhost
|
|
port: 1883
|
|
username_env: MQTT_USERNAME
|
|
password_env: MQTT_PASSWORD
|
|
|
|
instances:
|
|
- name: livingroom_tv
|
|
zmq_endpoint: tcp://127.0.0.1:5555
|
|
default_layout: quad
|
|
|
|
ha_discovery:
|
|
enabled: true
|
|
prefix: homeassistant
|
|
device_name: "CUDA Grid Composer"
|
|
|
|
http:
|
|
host: 0.0.0.0
|
|
port: 8080
|
|
|
|
log:
|
|
level: INFO
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
from pathlib import Path
|
|
from typing import Self
|
|
|
|
import yaml
|
|
from pydantic import BaseModel, Field, field_validator
|
|
|
|
|
|
class BrokerCfg(BaseModel):
|
|
host: str = "localhost"
|
|
port: int = 1883
|
|
client_id: str = "cuda-grid-controller"
|
|
username_env: str | None = None
|
|
password_env: str | None = None
|
|
keepalive_sec: int = 30
|
|
|
|
@property
|
|
def username(self) -> str | None:
|
|
return os.environ.get(self.username_env) if self.username_env else None
|
|
|
|
@property
|
|
def password(self) -> str | None:
|
|
return os.environ.get(self.password_env) if self.password_env else None
|
|
|
|
|
|
class InstanceCfg(BaseModel):
|
|
"""Один FFmpeg pipeline = одна cuda_grid filter instance."""
|
|
|
|
name: str = Field(description="уникальное имя — становится частью HA entity ID")
|
|
zmq_endpoint: str = Field(
|
|
description="ZMQ endpoint видео-pipeline (cuda_grid + overlay filters)"
|
|
)
|
|
audio_zmq_endpoint: str | None = Field(
|
|
default=None,
|
|
description="ZMQ endpoint отдельного audio sidecar (Phase 5d split-process). "
|
|
"None = audio_set/intercom вызывают video pipeline (Phase 5a single source)",
|
|
)
|
|
default_layout: str = "quad"
|
|
filter_target: str = Field(
|
|
default="Parsed_cuda_grid_0",
|
|
description="Default ZMQ target для process_command (используется reload_icon и др.)",
|
|
)
|
|
overlay_filter_targets: list[str] = Field(
|
|
default_factory=list,
|
|
description="Список cuda_grid instances в pipeline (e.g. quad/single/mpp). "
|
|
"Overlay add/remove/clear broadcast ко всем — иначе при layout switch "
|
|
"overlays исчезают (каждый cuda_grid имеет own overlay state). "
|
|
"Если empty — fallback к [filter_target].",
|
|
)
|
|
output_rtsp_url: str | None = Field(
|
|
default=None,
|
|
description="URL куда pipeline push'ит composed stream — controller read'ит для snapshot/preview endpoints",
|
|
)
|
|
audio_sources: list["AudioSourceCfg"] = Field(
|
|
default_factory=list,
|
|
description="Audio sources для astreamselect switching (Phase 5b)",
|
|
)
|
|
audio_filter_target: str = Field(
|
|
default="astreamselect@as",
|
|
description="Target filter для ZMQ команд переключения audio (должен соответствовать pipeline filter_complex)",
|
|
)
|
|
music_volume_target: str = Field(
|
|
default="volume@music",
|
|
description="Target filter для управления громкостью music chain (Phase 5c ducking)",
|
|
)
|
|
intercom_volume_target: str = Field(
|
|
default="volume@intercom",
|
|
description="Target filter для управления громкостью intercom (Phase 5c)",
|
|
)
|
|
music_ducked_volume: float = Field(
|
|
default=0.2, ge=0.0, le=1.0,
|
|
description="Громкость music когда intercom активен (0.2 = -14 dB)",
|
|
)
|
|
layout_filter_target: str = Field(
|
|
default="cuda_grid@cg",
|
|
description="ZMQ target cuda_grid filter (Phase 7) для runtime layout switching "
|
|
"(set_layout <name>) и cell remapping (cell_map <cell> <pad>).",
|
|
)
|
|
main_cam_filter_target: str = Field(
|
|
default="cuda_grid@cg",
|
|
description="ZMQ target для cell_map command — single layout main camera. "
|
|
"Phase 7: тот же cuda_grid@cg (был streamselect@main_cam).",
|
|
)
|
|
mpp_main_filter_target: str = Field(
|
|
default="cuda_grid@cg",
|
|
description="ZMQ target для cell_map command — main_plus_preview main camera. "
|
|
"Phase 7: тот же cuda_grid@cg (был streamselect@mpp_main).",
|
|
)
|
|
max_cells: int = Field(
|
|
default=4, ge=1, le=16,
|
|
description="Кол-во input pads cuda_grid filter (Phase 7 max_cells option). "
|
|
"Должно совпадать с max_cells в pipeline filter_complex.",
|
|
)
|
|
layout_map: dict[str, int] = Field(
|
|
default_factory=lambda: {"quad": 0, "single": 1, "main_plus_preview": 2},
|
|
description="Список доступных layouts (Phase 7: ключи используются для validation, "
|
|
"значения игнорируются — cuda_grid resolve'ит layout по имени).",
|
|
)
|
|
snapshot_history: "SnapshotHistoryCfg" = Field(
|
|
default_factory=lambda: SnapshotHistoryCfg(),
|
|
description="Periodic snapshot capture в shared volume",
|
|
)
|
|
|
|
|
|
class SnapshotHistoryCfg(BaseModel):
|
|
enabled: bool = False
|
|
interval_sec: int = Field(default=60, ge=5, le=3600)
|
|
keep_last: int = Field(default=120, ge=1, le=10000,
|
|
description="Сколько последних snapshots держать (FIFO eviction)")
|
|
dir: str = Field(default="/var/lib/cuda-grid/snapshots",
|
|
description="Базовая директория; instance-name становится поддиректорией")
|
|
|
|
|
|
class AudioSourceCfg(BaseModel):
|
|
"""Описание audio source в порядке как они добавлены в pipeline -i ..."""
|
|
name: str = Field(description="Уникальное имя для API (e.g. 'europa_plus')")
|
|
index: int = Field(ge=0, description="Index в astreamselect inputs (соответствует порядку -i в pipeline)")
|
|
label: str | None = Field(default=None, description="UI-friendly label (default = name)")
|
|
|
|
@field_validator("name")
|
|
@classmethod
|
|
def name_alnum(cls, v: str) -> str:
|
|
if not v.replace("_", "").isalnum():
|
|
raise ValueError(f"instance name '{v}' must be alphanumeric + underscore")
|
|
return v
|
|
|
|
|
|
class HaDiscoveryCfg(BaseModel):
|
|
enabled: bool = True
|
|
prefix: str = "homeassistant"
|
|
device_name: str = "CUDA Grid Composer"
|
|
device_identifier: str = "cuda_grid_controller"
|
|
|
|
|
|
class HttpCfg(BaseModel):
|
|
host: str = "0.0.0.0"
|
|
port: int = 8080
|
|
|
|
|
|
class LogCfg(BaseModel):
|
|
level: str = "INFO"
|
|
|
|
|
|
class Config(BaseModel):
|
|
broker: BrokerCfg = BrokerCfg()
|
|
instances: list[InstanceCfg] = []
|
|
ha_discovery: HaDiscoveryCfg = HaDiscoveryCfg()
|
|
http: HttpCfg = HttpCfg()
|
|
log: LogCfg = LogCfg()
|
|
# Frigate bridge — late import чтобы избежать circular dep
|
|
frigate: dict | None = None # parsed в FrigateBridgeCfg при runtime
|
|
# Dynamic overlays (charts/chats) — late import тоже
|
|
dynamic_overlays: dict | None = None # parsed в DynamicRenderer cfg
|
|
# Stream watchdog — Phase 1 resilience (issue #3)
|
|
watchdog: dict | None = None # parsed в WatchdogCfg при runtime
|
|
icon_dir: str = Field(
|
|
default="/var/lib/cuda-grid/icons",
|
|
description="Shared volume куда controller пишет dynamic PNG; filter (`icon_dir=` option) читает оттуда",
|
|
)
|
|
|
|
@classmethod
|
|
def from_yaml(cls, path: Path | str) -> Self:
|
|
with open(path) as f:
|
|
data = yaml.safe_load(f) or {}
|
|
return cls.model_validate(data)
|