v6.7: Native speed control and zip word-level timestamps
This commit is contained in:
parent
2ade7e1ca6
commit
3c389b0292
@ -37,7 +37,7 @@ RUN pip install --no-cache-dir torch torchvision torchaudio \
|
||||
|
||||
# Install faster-qwen3-tts and server dependencies
|
||||
RUN pip install --no-cache-dir -e ".[demo]"
|
||||
RUN pip install --no-cache-dir pydub soundfile uvicorn fastapi
|
||||
RUN pip install --no-cache-dir pydub soundfile uvicorn fastapi qwen-asr
|
||||
|
||||
EXPOSE 8000
|
||||
|
||||
|
||||
@ -210,7 +210,8 @@ The streaming service on port `8023` uses the same generated `config/voices.json
|
||||
| `model` | string | `tts-1` | Kept for OpenAI compatibility |
|
||||
| `input` | string | required | Text to synthesize |
|
||||
| `voice` | string | first configured voice | Voice ID from the selected service |
|
||||
| `response_format` | string | `wav` | `wav`, `pcm`, or `mp3` |
|
||||
| `response_format` | string | `wav` | `wav`, `pcm`, `mp3`, or `zip` (for timestamps) |
|
||||
| `speed` | float | 1.0 | Scales audio tempo via ffmpeg |
|
||||
| `language` | string | voice config | Per-request override for VoiceDesign/CustomVoice |
|
||||
| `instruct` | string | voice config | Per-request style override for VoiceDesign/CustomVoice |
|
||||
| `max_new_tokens` | int | server default | Per-request generation length override |
|
||||
@ -343,6 +344,12 @@ The first request after container startup can be slower because CUDA graph captu
|
||||
|
||||
## Changelog
|
||||
|
||||
### v6.7 — 2026-06-26
|
||||
**Feature: Native Speed Control and Word-Level Timestamps**
|
||||
- **Speed Parameter:** The `speed` parameter in the OpenAI `SpeechRequest` schema is now fully supported. Audio tempo is natively adjusted using `ffmpeg` without affecting pitch, and works for both streaming and non-streaming responses.
|
||||
- **Word-Level Timestamps:** Added support for a new `response_format: "zip"`. When requested, the server automatically lazy-loads the `Qwen3-ForcedAligner-0.6B` model to generate word-level timestamps (`timer.json`) and returns it alongside the audio in a compressed zip file.
|
||||
- **Input Sanitization:** Automatically strips leading and trailing whitespace from input text to fix a bug where excessive blank space caused the tokenizer to stutter and repeat words.
|
||||
|
||||
### v6.6 — 2026-06-21
|
||||
**Feature: Eager Background Precomputation of Speaker Embeddings**
|
||||
- The server now automatically precomputes all missing `.pt` files in the background immediately after startup.
|
||||
|
||||
@ -37,7 +37,24 @@ SAMPLE_RATE = 24000
|
||||
DEFAULT_MAX_NEW_TOKENS = 2048
|
||||
_model_lock = threading.Lock()
|
||||
_load_model_kwargs = None
|
||||
aligner_model = None
|
||||
|
||||
def _get_aligner():
|
||||
global aligner_model
|
||||
if aligner_model is None:
|
||||
try:
|
||||
from qwen_asr import Qwen3ForcedAligner
|
||||
import torch
|
||||
except ImportError:
|
||||
raise HTTPException(status_code=500, detail="qwen-asr is not installed. Run: pip install qwen-asr")
|
||||
logger.info("Loading Qwen3-ForcedAligner-0.6B...")
|
||||
aligner_model = Qwen3ForcedAligner.from_pretrained(
|
||||
"Qwen/Qwen3-ForcedAligner-0.6B",
|
||||
dtype=torch.bfloat16,
|
||||
device_map="cuda"
|
||||
)
|
||||
logger.info("Aligner loaded.")
|
||||
return aligner_model
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
@ -87,7 +104,7 @@ class SpeechRequest(BaseModel):
|
||||
model: str = "tts-1"
|
||||
input: str
|
||||
voice: str = "Ryan"
|
||||
response_format: str = "wav"
|
||||
response_format: str = "wav" # wav | pcm | mp3 | zip
|
||||
speed: float = 1.0
|
||||
language: Optional[str] = None
|
||||
instruct: Optional[str] = None
|
||||
@ -141,20 +158,58 @@ def _request_generation_params(req: SpeechRequest, voice_cfg: dict) -> dict:
|
||||
}
|
||||
|
||||
|
||||
async def _stream_chunks(params: dict):
|
||||
async def _stream_chunks(params: dict, speed: float):
|
||||
q: queue.Queue = queue.Queue()
|
||||
done = object()
|
||||
|
||||
def producer():
|
||||
process = None
|
||||
if speed != 1.0:
|
||||
import subprocess
|
||||
cmd = [
|
||||
"ffmpeg", "-y", "-loglevel", "error",
|
||||
"-f", "s16le", "-ar", str(SAMPLE_RATE), "-ac", "1", "-i", "pipe:0",
|
||||
"-filter:a", f"atempo={speed}",
|
||||
"-f", "s16le", "-ar", str(SAMPLE_RATE), "-ac", "1", "pipe:1"
|
||||
]
|
||||
process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
|
||||
def ffmpeg_reader():
|
||||
try:
|
||||
while True:
|
||||
out = process.stdout.read(4096)
|
||||
if not out:
|
||||
break
|
||||
q.put(out)
|
||||
except Exception as e:
|
||||
q.put(e)
|
||||
finally:
|
||||
q.put(done)
|
||||
|
||||
import threading
|
||||
threading.Thread(target=ffmpeg_reader, daemon=True).start()
|
||||
|
||||
try:
|
||||
with _model_lock:
|
||||
for chunk, _sr, _timing in tts_model.generate_custom_voice_streaming(**params):
|
||||
q.put(chunk)
|
||||
raw = _to_pcm16(chunk)
|
||||
if process:
|
||||
process.stdin.write(raw)
|
||||
process.stdin.flush()
|
||||
else:
|
||||
q.put(raw)
|
||||
except Exception as exc:
|
||||
q.put(exc)
|
||||
finally:
|
||||
q.put(done)
|
||||
if process:
|
||||
try:
|
||||
process.stdin.close()
|
||||
except Exception:
|
||||
pass
|
||||
else:
|
||||
q.put(done)
|
||||
|
||||
import threading
|
||||
threading.Thread(target=producer, daemon=True).start()
|
||||
loop = asyncio.get_event_loop()
|
||||
while True:
|
||||
@ -163,7 +218,7 @@ async def _stream_chunks(params: dict):
|
||||
break
|
||||
if isinstance(item, Exception):
|
||||
raise item
|
||||
yield _to_pcm16(item)
|
||||
yield item
|
||||
|
||||
|
||||
@app.get("/health")
|
||||
@ -175,18 +230,19 @@ async def health():
|
||||
async def create_speech(req: SpeechRequest):
|
||||
if tts_model is None:
|
||||
raise HTTPException(status_code=503, detail="Model not loaded")
|
||||
if not req.input.strip():
|
||||
req.input = req.input.strip()
|
||||
if not req.input:
|
||||
raise HTTPException(status_code=400, detail="'input' text is empty")
|
||||
|
||||
voice_cfg = resolve_voice(req.voice)
|
||||
params = _request_generation_params(req, voice_cfg)
|
||||
fmt = req.response_format.lower()
|
||||
|
||||
content_types = {"wav": "audio/wav", "pcm": "audio/pcm", "mp3": "audio/mpeg"}
|
||||
content_types = {"wav": "audio/wav", "pcm": "audio/pcm", "mp3": "audio/mpeg", "zip": "application/zip"}
|
||||
if fmt not in content_types:
|
||||
raise HTTPException(status_code=400, detail=f"Unsupported format: {fmt!r}")
|
||||
|
||||
if fmt == "mp3":
|
||||
if fmt in ("mp3", "zip"):
|
||||
loop = asyncio.get_event_loop()
|
||||
|
||||
def generate():
|
||||
@ -195,12 +251,46 @@ async def create_speech(req: SpeechRequest):
|
||||
|
||||
audio_arrays, sr = await loop.run_in_executor(None, generate)
|
||||
audio = audio_arrays[0] if audio_arrays else np.zeros(1, dtype=np.float32)
|
||||
|
||||
if req.speed != 1.0:
|
||||
import subprocess
|
||||
cmd = [
|
||||
"ffmpeg", "-y", "-loglevel", "error",
|
||||
"-f", "f32le", "-ar", str(sr), "-ac", "1", "-i", "pipe:0",
|
||||
"-filter:a", f"atempo={req.speed}",
|
||||
"-f", "f32le", "-ar", str(sr), "-ac", "1", "pipe:1"
|
||||
]
|
||||
process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
process.stdin.write(audio.tobytes())
|
||||
process.stdin.close()
|
||||
out = process.stdout.read()
|
||||
audio = np.frombuffer(out, dtype=np.float32)
|
||||
|
||||
if fmt == "zip":
|
||||
def _align():
|
||||
aligner = _get_aligner()
|
||||
res = aligner.align(audio=(audio, sr), text=req.input, language=voice_cfg.get("language", "Auto"))
|
||||
import dataclasses
|
||||
return [dataclasses.asdict(x) for x in res]
|
||||
|
||||
align_data = await loop.run_in_executor(None, _align)
|
||||
|
||||
import zipfile
|
||||
import io
|
||||
mp3_bytes = _to_mp3_bytes(audio, sr)
|
||||
zip_buf = io.BytesIO()
|
||||
with zipfile.ZipFile(zip_buf, "w", zipfile.ZIP_DEFLATED) as zf:
|
||||
zf.writestr("audio.mp3", mp3_bytes)
|
||||
zf.writestr("timer.json", json.dumps(align_data, ensure_ascii=False))
|
||||
|
||||
return Response(content=zip_buf.getvalue(), media_type=content_types[fmt])
|
||||
|
||||
return Response(content=_to_mp3_bytes(audio, sr), media_type="audio/mpeg")
|
||||
|
||||
async def audio_stream():
|
||||
if fmt == "wav":
|
||||
yield _wav_header(SAMPLE_RATE)
|
||||
async for raw in _stream_chunks(params):
|
||||
async for raw in _stream_chunks(params, req.speed):
|
||||
yield raw
|
||||
|
||||
return StreamingResponse(audio_stream(), media_type=content_types[fmt])
|
||||
|
||||
@ -36,7 +36,24 @@ SAMPLE_RATE = 24000
|
||||
DEFAULT_MAX_NEW_TOKENS = 2048
|
||||
_model_lock = threading.Lock()
|
||||
_load_model_kwargs = None
|
||||
aligner_model = None
|
||||
|
||||
def _get_aligner():
|
||||
global aligner_model
|
||||
if aligner_model is None:
|
||||
try:
|
||||
from qwen_asr import Qwen3ForcedAligner
|
||||
import torch
|
||||
except ImportError:
|
||||
raise HTTPException(status_code=500, detail="qwen-asr is not installed. Run: pip install qwen-asr")
|
||||
logger.info("Loading Qwen3-ForcedAligner-0.6B...")
|
||||
aligner_model = Qwen3ForcedAligner.from_pretrained(
|
||||
"Qwen/Qwen3-ForcedAligner-0.6B",
|
||||
dtype=torch.bfloat16,
|
||||
device_map="cuda"
|
||||
)
|
||||
logger.info("Aligner loaded.")
|
||||
return aligner_model
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
@ -90,7 +107,7 @@ class SpeechRequest(BaseModel):
|
||||
model: str = "tts-1"
|
||||
input: str
|
||||
voice: str = "vd_british_male"
|
||||
response_format: str = "wav"
|
||||
response_format: str = "wav" # wav | pcm | mp3 | zip
|
||||
speed: float = 1.0
|
||||
language: Optional[str] = None
|
||||
instruct: Optional[str] = None
|
||||
@ -151,20 +168,58 @@ def _request_generation_params(req: SpeechRequest, voice_cfg: dict) -> dict:
|
||||
}
|
||||
|
||||
|
||||
async def _stream_chunks(params: dict):
|
||||
async def _stream_chunks(params: dict, speed: float):
|
||||
q: queue.Queue = queue.Queue()
|
||||
_DONE = object()
|
||||
|
||||
def producer():
|
||||
process = None
|
||||
if speed != 1.0:
|
||||
import subprocess
|
||||
cmd = [
|
||||
"ffmpeg", "-y", "-loglevel", "error",
|
||||
"-f", "s16le", "-ar", str(SAMPLE_RATE), "-ac", "1", "-i", "pipe:0",
|
||||
"-filter:a", f"atempo={speed}",
|
||||
"-f", "s16le", "-ar", str(SAMPLE_RATE), "-ac", "1", "pipe:1"
|
||||
]
|
||||
process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
|
||||
def ffmpeg_reader():
|
||||
try:
|
||||
while True:
|
||||
out = process.stdout.read(4096)
|
||||
if not out:
|
||||
break
|
||||
q.put(out)
|
||||
except Exception as e:
|
||||
q.put(e)
|
||||
finally:
|
||||
q.put(_DONE)
|
||||
|
||||
import threading
|
||||
threading.Thread(target=ffmpeg_reader, daemon=True).start()
|
||||
|
||||
try:
|
||||
with _model_lock:
|
||||
for chunk, _sr, _timing in tts_model.generate_voice_design_streaming(**params):
|
||||
q.put(chunk)
|
||||
raw = _to_pcm16(chunk)
|
||||
if process:
|
||||
process.stdin.write(raw)
|
||||
process.stdin.flush()
|
||||
else:
|
||||
q.put(raw)
|
||||
except Exception as exc:
|
||||
q.put(exc)
|
||||
finally:
|
||||
q.put(_DONE)
|
||||
if process:
|
||||
try:
|
||||
process.stdin.close()
|
||||
except Exception:
|
||||
pass
|
||||
else:
|
||||
q.put(_DONE)
|
||||
|
||||
import threading
|
||||
threading.Thread(target=producer, daemon=True).start()
|
||||
loop = asyncio.get_event_loop()
|
||||
while True:
|
||||
@ -173,7 +228,7 @@ async def _stream_chunks(params: dict):
|
||||
break
|
||||
if isinstance(item, Exception):
|
||||
raise item
|
||||
yield _to_pcm16(item)
|
||||
yield item
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@ -189,30 +244,65 @@ async def health():
|
||||
async def create_speech(req: SpeechRequest):
|
||||
if tts_model is None:
|
||||
raise HTTPException(status_code=503, detail="Model not loaded")
|
||||
if not req.input.strip():
|
||||
req.input = req.input.strip()
|
||||
if not req.input:
|
||||
raise HTTPException(status_code=400, detail="'input' text is empty")
|
||||
|
||||
voice_cfg = resolve_voice(req.voice)
|
||||
params = _request_generation_params(req, voice_cfg)
|
||||
fmt = req.response_format.lower()
|
||||
|
||||
_CONTENT_TYPES = {"wav": "audio/wav", "pcm": "audio/pcm", "mp3": "audio/mpeg"}
|
||||
_CONTENT_TYPES = {"wav": "audio/wav", "pcm": "audio/pcm", "mp3": "audio/mpeg", "zip": "application/zip"}
|
||||
if fmt not in _CONTENT_TYPES:
|
||||
raise HTTPException(status_code=400, detail=f"Unsupported format: {fmt!r}")
|
||||
|
||||
if fmt == "mp3":
|
||||
if fmt in ("mp3", "zip"):
|
||||
loop = asyncio.get_event_loop()
|
||||
def _gen():
|
||||
with _model_lock:
|
||||
return tts_model.generate_voice_design(**params)
|
||||
audio_arrays, sr = await loop.run_in_executor(None, _gen)
|
||||
audio = audio_arrays[0] if audio_arrays else np.zeros(1, dtype=np.float32)
|
||||
|
||||
if req.speed != 1.0:
|
||||
import subprocess
|
||||
cmd = [
|
||||
"ffmpeg", "-y", "-loglevel", "error",
|
||||
"-f", "f32le", "-ar", str(sr), "-ac", "1", "-i", "pipe:0",
|
||||
"-filter:a", f"atempo={req.speed}",
|
||||
"-f", "f32le", "-ar", str(sr), "-ac", "1", "pipe:1"
|
||||
]
|
||||
process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
process.stdin.write(audio.tobytes())
|
||||
process.stdin.close()
|
||||
out = process.stdout.read()
|
||||
audio = np.frombuffer(out, dtype=np.float32)
|
||||
|
||||
if fmt == "zip":
|
||||
def _align():
|
||||
aligner = _get_aligner()
|
||||
res = aligner.align(audio=(audio, sr), text=req.input, language=voice_cfg.get("language", "Auto"))
|
||||
import dataclasses
|
||||
return [dataclasses.asdict(x) for x in res]
|
||||
|
||||
align_data = await loop.run_in_executor(None, _align)
|
||||
|
||||
import zipfile
|
||||
import io
|
||||
mp3_bytes = _to_mp3_bytes(audio, sr)
|
||||
zip_buf = io.BytesIO()
|
||||
with zipfile.ZipFile(zip_buf, "w", zipfile.ZIP_DEFLATED) as zf:
|
||||
zf.writestr("audio.mp3", mp3_bytes)
|
||||
zf.writestr("timer.json", json.dumps(align_data, ensure_ascii=False))
|
||||
|
||||
return Response(content=zip_buf.getvalue(), media_type=_CONTENT_TYPES[fmt])
|
||||
|
||||
return Response(content=_to_mp3_bytes(audio, sr), media_type="audio/mpeg")
|
||||
|
||||
async def audio_stream():
|
||||
if fmt == "wav":
|
||||
yield _wav_header(SAMPLE_RATE)
|
||||
async for raw in _stream_chunks(params):
|
||||
async for raw in _stream_chunks(params, req.speed):
|
||||
yield raw
|
||||
|
||||
return StreamingResponse(audio_stream(), media_type=_CONTENT_TYPES[fmt])
|
||||
|
||||
@ -1,192 +1,192 @@
|
||||
--- /tmp/upstream_openai_server.py 2026-06-21 14:29:34.858114787 +0200
|
||||
+++ build/examples/openai_server.py 2026-06-21 14:26:33.557536313 +0200
|
||||
@@ -36,6 +36,7 @@
|
||||
"""
|
||||
import argparse
|
||||
import asyncio
|
||||
+import hashlib
|
||||
import io
|
||||
import json
|
||||
import logging
|
||||
@@ -66,10 +67,29 @@
|
||||
|
||||
tts_model = None
|
||||
voices: dict = {}
|
||||
+voices_file_path: Optional[str] = None
|
||||
+last_voices_mtime: float = 0.0
|
||||
--- examples/openai_server.py 2026-06-26 11:11:13.425594803 +0200
|
||||
+++ /tmp/my_openai_server.py 2026-06-26 11:11:13.417691441 +0200
|
||||
@@ -72,6 +72,24 @@
|
||||
default_voice: Optional[str] = None
|
||||
SAMPLE_RATE = 24000 # updated once the model loads
|
||||
_model_lock = threading.Lock() # prevent concurrent GPU inference
|
||||
|
||||
+aligner_model = None
|
||||
+
|
||||
+def _voice_seed(voice_name: str) -> int:
|
||||
+ """Return a stable per-voice seed derived from the voice name.
|
||||
+
|
||||
+ Used as the default when no explicit 'seed' is set in voices.json.
|
||||
+ MD5 is used only for its stable byte output — not for security.
|
||||
+ """
|
||||
+ return int(hashlib.md5(voice_name.encode()).hexdigest(), 16) % (2 ** 31)
|
||||
+
|
||||
+
|
||||
+def _seed_rng(seed: int) -> None:
|
||||
+ """Seed PyTorch CPU and CUDA RNGs for reproducible sampling."""
|
||||
+ torch.manual_seed(seed)
|
||||
+ if torch.cuda.is_available():
|
||||
+ torch.cuda.manual_seed_all(seed)
|
||||
+
|
||||
+
|
||||
# ---------------------------------------------------------------------------
|
||||
# Request / response models
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -145,6 +165,21 @@
|
||||
|
||||
def resolve_voice(voice_name: str) -> dict:
|
||||
"""Return voice config dict or fall back to default, else raise 400."""
|
||||
+ global voices, last_voices_mtime
|
||||
+ voice_name = voice_name.strip()
|
||||
+
|
||||
+ # Hot-reload voices.json if it was modified
|
||||
+ if voices_file_path and os.path.exists(voices_file_path):
|
||||
+def _get_aligner():
|
||||
+ global aligner_model
|
||||
+ if aligner_model is None:
|
||||
+ try:
|
||||
+ current_mtime = os.path.getmtime(voices_file_path)
|
||||
+ if current_mtime > last_voices_mtime:
|
||||
+ with open(voices_file_path, "r", encoding="utf-8") as f:
|
||||
+ voices = json.load(f)
|
||||
+ last_voices_mtime = current_mtime
|
||||
+ logger.info("Hot-reloaded %d voices from %s", len(voices), voices_file_path)
|
||||
+ except Exception as e:
|
||||
+ logger.warning("Failed to hot-reload voices.json: %s", e)
|
||||
+
|
||||
if voice_name in voices:
|
||||
return voices[voice_name]
|
||||
if default_voice and default_voice in voices:
|
||||
@@ -168,7 +203,47 @@
|
||||
+ from qwen_asr import Qwen3ForcedAligner
|
||||
+ import torch
|
||||
+ except ImportError:
|
||||
+ raise HTTPException(status_code=500, detail="qwen-asr is not installed. Run: pip install qwen-asr")
|
||||
+ logger.info("Loading Qwen3-ForcedAligner-0.6B...")
|
||||
+ aligner_model = Qwen3ForcedAligner.from_pretrained(
|
||||
+ "Qwen/Qwen3-ForcedAligner-0.6B",
|
||||
+ dtype=torch.bfloat16,
|
||||
+ device_map="cuda"
|
||||
+ )
|
||||
+ logger.info("Aligner loaded.")
|
||||
+ return aligner_model
|
||||
|
||||
|
||||
def _voice_seed(voice_name: str) -> int:
|
||||
@@ -99,8 +117,8 @@
|
||||
model: str = "tts-1"
|
||||
input: str
|
||||
voice: str = "alloy"
|
||||
- response_format: str = "wav" # wav | pcm | mp3
|
||||
- speed: float = 1.0 # accepted but not yet applied
|
||||
+ response_format: str = "wav" # wav | pcm | mp3 | zip
|
||||
+ speed: float = 1.0 # scales audio tempo
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -243,7 +261,7 @@
|
||||
return None
|
||||
|
||||
|
||||
-async def _stream_chunks(voice_cfg: dict, text: str) -> AsyncGenerator[bytes, None]:
|
||||
+def _load_voice_clone_prompt(voice_cfg: dict, voice_name: str, tts_model):
|
||||
+ spk_emb_path = voice_cfg.get("speaker_embeddings") or voice_cfg.get("speaker embeddings")
|
||||
+ if spk_emb_path and os.path.isfile(spk_emb_path):
|
||||
+ try:
|
||||
+ return torch.load(spk_emb_path, map_location="cpu", weights_only=False)
|
||||
+ except Exception as e:
|
||||
+ logger.error("Failed to load speaker embeddings from %s: %s", spk_emb_path, e)
|
||||
+
|
||||
+ # Auto-generate if missing
|
||||
+ ref_audio = voice_cfg.get("ref_audio")
|
||||
+ if not ref_audio or not os.path.isfile(ref_audio):
|
||||
+ return None
|
||||
+
|
||||
+ logger.info("Precomputing and saving speaker embedding for voice %r...", voice_name)
|
||||
+ try:
|
||||
+ ref_text = voice_cfg.get("ref_text", "")
|
||||
+ # generate prompt using the model's built-in helper
|
||||
+ prompt_items = tts_model.model.create_voice_clone_prompt(ref_audio, [ref_text])
|
||||
+ vcp = tts_model.model._prompt_items_to_voice_clone_prompt(prompt_items)
|
||||
+
|
||||
+ # save it to the speakers directory
|
||||
+ # If the file path is already in voice_cfg but doesn't exist, use that, otherwise generate a path
|
||||
+ if spk_emb_path and not os.path.exists(spk_emb_path) and spk_emb_path.endswith('.pt'):
|
||||
+ pt_path = spk_emb_path
|
||||
+ else:
|
||||
+ pt_path = f"/config/speakers/{voice_name}.pt"
|
||||
+
|
||||
+ os.makedirs(os.path.dirname(pt_path), exist_ok=True)
|
||||
+ torch.save(vcp, pt_path)
|
||||
+ logger.info("Saved speaker embedding to %s", pt_path)
|
||||
+
|
||||
+ # update in memory so future requests skip generating
|
||||
+ voice_cfg["speaker_embeddings"] = pt_path
|
||||
+
|
||||
+ return vcp
|
||||
+ except Exception as e:
|
||||
+ logger.error("Failed to precompute speaker embedding: %s", e)
|
||||
+ return None
|
||||
+
|
||||
+
|
||||
+async def _stream_chunks(voice_cfg: dict, text: str, voice_name: str) -> AsyncGenerator[bytes, None]:
|
||||
-async def _stream_chunks(voice_cfg: dict, text: str, voice_name: str) -> AsyncGenerator[bytes, None]:
|
||||
+async def _stream_chunks(voice_cfg: dict, text: str, voice_name: str, speed: float) -> AsyncGenerator[bytes, None]:
|
||||
"""
|
||||
Run generate_voice_clone_streaming in a background thread and yield
|
||||
raw PCM bytes for each chunk as they arrive.
|
||||
@@ -179,13 +254,19 @@
|
||||
@@ -252,6 +270,31 @@
|
||||
_DONE = object()
|
||||
|
||||
def producer():
|
||||
+ process = None
|
||||
+ if speed != 1.0:
|
||||
+ import subprocess
|
||||
+ cmd = [
|
||||
+ "ffmpeg", "-y", "-loglevel", "error",
|
||||
+ "-f", "s16le", "-ar", str(SAMPLE_RATE), "-ac", "1", "-i", "pipe:0",
|
||||
+ "-filter:a", f"atempo={speed}",
|
||||
+ "-f", "s16le", "-ar", str(SAMPLE_RATE), "-ac", "1", "pipe:1"
|
||||
+ ]
|
||||
+ process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
+
|
||||
+ def ffmpeg_reader():
|
||||
+ try:
|
||||
+ while True:
|
||||
+ out = process.stdout.read(4096)
|
||||
+ if not out:
|
||||
+ break
|
||||
+ q.put(out)
|
||||
+ except Exception as e:
|
||||
+ q.put(e)
|
||||
+ finally:
|
||||
+ q.put(_DONE)
|
||||
+
|
||||
+ threading.Thread(target=ffmpeg_reader, daemon=True).start()
|
||||
+
|
||||
try:
|
||||
with _model_lock:
|
||||
+ _seed_rng(voice_cfg.get("seed", _voice_seed(voice_name)))
|
||||
for chunk, _sr, _timing in tts_model.generate_voice_clone_streaming(
|
||||
text=text,
|
||||
language=voice_cfg.get("language", "Auto"),
|
||||
- ref_audio=voice_cfg["ref_audio"],
|
||||
+ ref_audio=voice_cfg.get("ref_audio"),
|
||||
ref_text=voice_cfg.get("ref_text", ""),
|
||||
chunk_size=voice_cfg.get("chunk_size", 12),
|
||||
- non_streaming_mode=False,
|
||||
+ instruct=voice_cfg.get("instruct"),
|
||||
+ voice_clone_prompt=_load_voice_clone_prompt(voice_cfg, voice_name, tts_model),
|
||||
+ non_streaming_mode=True,
|
||||
+ temperature=voice_cfg.get("temperature", 0.8),
|
||||
+ top_k=voice_cfg.get("top_k", 50),
|
||||
+ top_p=voice_cfg.get("top_p", 0.9),
|
||||
_seed_rng(voice_cfg.get("seed", _voice_seed(voice_name)))
|
||||
@@ -268,11 +311,22 @@
|
||||
top_k=voice_cfg.get("top_k", 50),
|
||||
top_p=voice_cfg.get("top_p", 0.9),
|
||||
):
|
||||
q.put(chunk)
|
||||
- q.put(chunk)
|
||||
+ raw = _to_pcm16(chunk)
|
||||
+ if process:
|
||||
+ process.stdin.write(raw)
|
||||
+ process.stdin.flush()
|
||||
+ else:
|
||||
+ q.put(raw)
|
||||
except Exception as exc:
|
||||
@@ -244,11 +325,18 @@
|
||||
q.put(exc)
|
||||
finally:
|
||||
- q.put(_DONE)
|
||||
+ if process:
|
||||
+ try:
|
||||
+ process.stdin.close()
|
||||
+ except Exception:
|
||||
+ pass
|
||||
+ else:
|
||||
+ q.put(_DONE)
|
||||
|
||||
thread = threading.Thread(target=producer, daemon=True)
|
||||
thread.start()
|
||||
@@ -284,7 +338,7 @@
|
||||
break
|
||||
if isinstance(item, Exception):
|
||||
raise item
|
||||
- yield _to_pcm16(item)
|
||||
+ yield item
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -301,7 +355,8 @@
|
||||
async def create_speech(req: SpeechRequest):
|
||||
if tts_model is None:
|
||||
raise HTTPException(status_code=503, detail="Model not loaded")
|
||||
- if not req.input.strip():
|
||||
+ req.input = req.input.strip()
|
||||
+ if not req.input:
|
||||
raise HTTPException(status_code=400, detail="'input' text is empty")
|
||||
|
||||
voice_cfg = resolve_voice(req.voice)
|
||||
@@ -311,16 +366,17 @@
|
||||
"wav": "audio/wav",
|
||||
"pcm": "audio/pcm",
|
||||
"mp3": "audio/mpeg",
|
||||
+ "zip": "application/zip",
|
||||
}
|
||||
if fmt not in _CONTENT_TYPES:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
- detail=f"response_format {fmt!r} not supported. Use: wav, pcm, mp3",
|
||||
+ detail=f"response_format {fmt!r} not supported. Use: wav, pcm, mp3, zip",
|
||||
)
|
||||
content_type = _CONTENT_TYPES[fmt]
|
||||
|
||||
- # --- MP3: generate all audio, then encode (non-streaming) ---
|
||||
- if fmt == "mp3":
|
||||
+ # --- MP3 / ZIP: generate all audio, then encode (non-streaming) ---
|
||||
+ if fmt in ("mp3", "zip"):
|
||||
loop = asyncio.get_event_loop()
|
||||
|
||||
def _generate():
|
||||
with _model_lock:
|
||||
+ _seed_rng(voice_cfg.get("seed", _voice_seed(req.voice)))
|
||||
return tts_model.generate_voice_clone(
|
||||
text=req.input,
|
||||
language=voice_cfg.get("language", "Auto"),
|
||||
- ref_audio=voice_cfg["ref_audio"],
|
||||
+ ref_audio=voice_cfg.get("ref_audio"),
|
||||
ref_text=voice_cfg.get("ref_text", ""),
|
||||
+ instruct=voice_cfg.get("instruct"),
|
||||
+ voice_clone_prompt=_load_voice_clone_prompt(voice_cfg, req.voice, tts_model),
|
||||
+ non_streaming_mode=True,
|
||||
+ temperature=voice_cfg.get("temperature", 0.8),
|
||||
+ top_k=voice_cfg.get("top_k", 50),
|
||||
+ top_p=voice_cfg.get("top_p", 0.9),
|
||||
)
|
||||
@@ -341,13 +397,46 @@
|
||||
|
||||
audio_arrays, sr = await loop.run_in_executor(None, _generate)
|
||||
@@ -259,7 +347,7 @@
|
||||
audio = audio_arrays[0] if audio_arrays else np.zeros(1, dtype=np.float32)
|
||||
+
|
||||
+ if req.speed != 1.0:
|
||||
+ import subprocess
|
||||
+ cmd = [
|
||||
+ "ffmpeg", "-y", "-loglevel", "error",
|
||||
+ "-f", "f32le", "-ar", str(sr), "-ac", "1", "-i", "pipe:0",
|
||||
+ "-filter:a", f"atempo={req.speed}",
|
||||
+ "-f", "f32le", "-ar", str(sr), "-ac", "1", "pipe:1"
|
||||
+ ]
|
||||
+ process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
+ process.stdin.write(audio.tobytes())
|
||||
+ process.stdin.close()
|
||||
+ out = process.stdout.read()
|
||||
+ audio = np.frombuffer(out, dtype=np.float32)
|
||||
+
|
||||
+ if fmt == "zip":
|
||||
+ def _align():
|
||||
+ aligner = _get_aligner()
|
||||
+ res = aligner.align(audio=(audio, sr), text=req.input, language=voice_cfg.get("language", "Auto"))
|
||||
+ import dataclasses
|
||||
+ return [dataclasses.asdict(x) for x in res]
|
||||
+
|
||||
+ align_data = await loop.run_in_executor(None, _align)
|
||||
+
|
||||
+ import zipfile
|
||||
+ mp3_bytes = _to_mp3_bytes(audio, sr)
|
||||
+ zip_buf = io.BytesIO()
|
||||
+ with zipfile.ZipFile(zip_buf, "w", zipfile.ZIP_DEFLATED) as zf:
|
||||
+ zf.writestr("audio.mp3", mp3_bytes)
|
||||
+ zf.writestr("timer.json", json.dumps(align_data, ensure_ascii=False))
|
||||
+
|
||||
+ return Response(content=zip_buf.getvalue(), media_type=content_type)
|
||||
+
|
||||
return Response(content=_to_mp3_bytes(audio, sr), media_type=content_type)
|
||||
|
||||
# --- WAV / PCM: stream chunks as they are generated ---
|
||||
async def audio_stream():
|
||||
if fmt == "wav":
|
||||
yield _wav_header(SAMPLE_RATE) # stream with unknown data length
|
||||
- async for raw_chunk in _stream_chunks(voice_cfg, req.input):
|
||||
+ async for raw_chunk in _stream_chunks(voice_cfg, req.input, req.voice):
|
||||
- async for raw_chunk in _stream_chunks(voice_cfg, req.input, req.voice):
|
||||
+ async for raw_chunk in _stream_chunks(voice_cfg, req.input, req.voice, req.speed):
|
||||
yield raw_chunk
|
||||
|
||||
return StreamingResponse(audio_stream(), media_type=content_type)
|
||||
@@ -306,16 +394,20 @@
|
||||
p.add_argument("--host", default="0.0.0.0", help="Bind host (default: 0.0.0.0)")
|
||||
p.add_argument("--port", type=int, default=8000, help="Bind port (default: 8000)")
|
||||
p.add_argument("--device", default="cuda", help="Torch device (default: cuda)")
|
||||
+ p.add_argument("--max-seq-len", type=int, default=4096, help="Max sequence length for CUDA graph static cache (default: 4096)")
|
||||
return p.parse_args()
|
||||
|
||||
|
||||
def main():
|
||||
- global tts_model, voices, default_voice, SAMPLE_RATE
|
||||
+ global tts_model, voices, voices_file_path, last_voices_mtime, default_voice, SAMPLE_RATE
|
||||
|
||||
args = _parse_args()
|
||||
|
||||
# Build voice registry
|
||||
if args.voices:
|
||||
+ voices_file_path = args.voices
|
||||
+ if os.path.exists(args.voices):
|
||||
+ last_voices_mtime = os.path.getmtime(args.voices)
|
||||
with open(args.voices) as f:
|
||||
voices = json.load(f)
|
||||
default_voice = next(iter(voices))
|
||||
@@ -344,6 +436,7 @@
|
||||
args.model,
|
||||
device=args.device,
|
||||
dtype=torch.bfloat16,
|
||||
+ max_seq_len=args.max_seq_len,
|
||||
)
|
||||
SAMPLE_RATE = tts_model.sample_rate
|
||||
logger.info("Model ready. Sample rate: %d Hz", SAMPLE_RATE)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user