Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
11c3621093 | ||
|
|
7ad5d99380 | ||
|
|
39a0944105 | ||
|
|
b9f637faa4 |
@@ -66,9 +66,18 @@ services:
|
||||
WHISPER_MODEL: ${WHISPER_MODEL:-medium}
|
||||
WHISPER_DEVICE: ${WHISPER_DEVICE:-cuda}
|
||||
WHISPER_COMPUTE_TYPE: ${WHISPER_COMPUTE_TYPE:-float16}
|
||||
# TTS engine. Rendered into /app/config/jarvis.json via envsubst (the
|
||||
# bridge reads that JSON BEFORE the env, so it must carry the real engine,
|
||||
# not the template's old hardcoded "piper" — otherwise Korean text is read
|
||||
# by the English Piper voice). Default melo; .env can override.
|
||||
TTS_ENGINE: ${TTS_ENGINE:-melo}
|
||||
# MeloTTS on the GPU (cu128 torch baked by docker/setup-melo.sh). CPU synth
|
||||
# serialised under load and pushed TTS to 7-8s; GPU does ~0.3s/sentence.
|
||||
MELO_DEVICE: ${MELO_DEVICE:-cuda}
|
||||
# Speaking rate for MeloTTS. Set here (with a default) so supervisord's
|
||||
# %(ENV_MELO_SPEED)s passthrough always resolves and an .env override
|
||||
# actually reaches the melo-worker. Lower it (e.g. 1.1) for a calmer pace.
|
||||
MELO_SPEED: ${MELO_SPEED:-1.5}
|
||||
# Optional single-language lock for replies (empty = user's own language).
|
||||
OUTPUT_LANGUAGE: ${OUTPUT_LANGUAGE:-ko}
|
||||
# Drop the pre-loop planner LLM call to cut voice-reply latency on small
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
"ollama_chat_model": "${OLLAMA_CHAT_MODEL}",
|
||||
"intent_judge_model": "${OLLAMA_INTENT_MODEL}",
|
||||
"tts_enabled": true,
|
||||
"tts_engine": "piper",
|
||||
"tts_engine": "${TTS_ENGINE}",
|
||||
"tts_piper_model_path": "${TTS_PIPER_MODEL_PATH}",
|
||||
"whisper_model": "${WHISPER_MODEL}",
|
||||
"whisper_backend": "faster-whisper",
|
||||
|
||||
@@ -61,10 +61,13 @@ directory=/app
|
||||
; HF_HUB_OFFLINE/TRANSFORMERS_OFFLINE force pure-cache reads: the pinned old
|
||||
; transformers/huggingface_hub otherwise retry the network on every load and
|
||||
; error out instead of falling back to the (complete) baked cache.
|
||||
; MELO_DEVICE inherits from the container env (compose sets it; default cuda)
|
||||
; so the worker runs MeloTTS on the GPU. supervisord interpolates %(ENV_x)s
|
||||
; from its own environment, which is the container's.
|
||||
environment=MELO_LANGUAGE="KR",MELO_SPEED="1.5",MELO_DEVICE="%(ENV_MELO_DEVICE)s",MELO_WORKER_HOST="127.0.0.1",MELO_WORKER_PORT="8770",HF_HOME="/opt/melo-cache",HF_HUB_OFFLINE="1",TRANSFORMERS_OFFLINE="1"
|
||||
; MELO_DEVICE and MELO_SPEED inherit from the container env (compose sets both
|
||||
; with defaults: cuda / 1.5) so the worker runs MeloTTS on the GPU at the
|
||||
; configured rate. supervisord interpolates %(ENV_x)s from its own environment,
|
||||
; which is the container's — so MELO_SPEED must always be set in the env
|
||||
; (compose guarantees it) or this expansion fails at startup. Hardcoding 1.5
|
||||
; here previously shadowed the .env value, so lowering MELO_SPEED had no effect.
|
||||
environment=MELO_LANGUAGE="KR",MELO_SPEED="%(ENV_MELO_SPEED)s",MELO_DEVICE="%(ENV_MELO_DEVICE)s",MELO_WORKER_HOST="127.0.0.1",MELO_WORKER_PORT="8770",HF_HOME="/opt/melo-cache",HF_HUB_OFFLINE="1",TRANSFORMERS_OFFLINE="1"
|
||||
priority=280
|
||||
autorestart=true
|
||||
stdout_logfile=/dev/stdout
|
||||
|
||||
35
tests/test_tts_engine_config.py
Normal file
35
tests/test_tts_engine_config.py
Normal file
@@ -0,0 +1,35 @@
|
||||
"""The container's TTS engine must be env-driven, not hardcoded.
|
||||
|
||||
Regression for a bug where docker/jarvis-config.template.json hardcoded
|
||||
`"tts_engine": "piper"`. The bridge reads the rendered /app/config/jarvis.json
|
||||
*before* the environment, so a hardcoded "piper" overrode `TTS_ENGINE=melo` in
|
||||
.env and the bot read Korean text with the English Piper voice ("foreign
|
||||
accent"). The template must carry `${TTS_ENGINE}` so envsubst (entrypoint.sh)
|
||||
renders whatever engine the deployment configured.
|
||||
"""
|
||||
|
||||
import json
|
||||
import string
|
||||
from pathlib import Path
|
||||
|
||||
TEMPLATE = Path(__file__).resolve().parent.parent / "docker" / "jarvis-config.template.json"
|
||||
|
||||
|
||||
def _render(**env) -> dict:
|
||||
"""Mimic entrypoint.sh `envsubst < template`: substitute env vars, leaving
|
||||
any unset ones as literal text (valid JSON string values)."""
|
||||
raw = TEMPLATE.read_text(encoding="utf-8")
|
||||
return json.loads(string.Template(raw).safe_substitute(**env))
|
||||
|
||||
|
||||
def test_template_does_not_hardcode_an_engine():
|
||||
raw = TEMPLATE.read_text(encoding="utf-8")
|
||||
assert '"tts_engine": "${TTS_ENGINE}"' in raw
|
||||
assert '"tts_engine": "piper"' not in raw
|
||||
assert '"tts_engine": "melo"' not in raw
|
||||
|
||||
|
||||
def test_rendered_engine_follows_env():
|
||||
assert _render(TTS_ENGINE="melo")["tts_engine"] == "melo"
|
||||
assert _render(TTS_ENGINE="piper")["tts_engine"] == "piper"
|
||||
assert _render(TTS_ENGINE="xtts")["tts_engine"] == "xtts"
|
||||
Reference in New Issue
Block a user