feat: graph-decoded streaming, prebuffer_ms and cancel-on-disconnect (v6.13)
- Fixed-window CUDA-graph codec decode for streaming (TTS_GRAPH_DECODE=0 disables) - Per-request chunk_size (2-24) on /v1/audio/speech - prebuffer_ms (0-10000) to hold back audio before sending - Stop generation on client disconnect - Recommend --max-seq-len 2048 for the streaming container Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
1b40b7f446
commit
ccccdf820a
@ -20,7 +20,7 @@ docker run -d \
|
|||||||
--name qwen3-tts-streaming \
|
--name qwen3-tts-streaming \
|
||||||
-p 8023:8000 \
|
-p 8023:8000 \
|
||||||
-e NVIDIA_VISIBLE_DEVICES=all \
|
-e NVIDIA_VISIBLE_DEVICES=all \
|
||||||
-v /path/to/Qwen3-TTS-12Hz-1.7B-Base:/models/Qwen3-TTS:ro \
|
-v /path/to/Qwen3-TTS-12Hz-0.6B-Base:/models/Qwen3-TTS:ro \
|
||||||
-v /path/to/faster-qwen3-tts/config:/config:rw \
|
-v /path/to/faster-qwen3-tts/config:/config:rw \
|
||||||
-v /path/to/active_voices:/voices:ro \
|
-v /path/to/active_voices:/voices:ro \
|
||||||
martinb78/faster-qwen3-tts-dgx-spark:streaming \
|
martinb78/faster-qwen3-tts-dgx-spark:streaming \
|
||||||
@ -30,10 +30,20 @@ docker run -d \
|
|||||||
--model /models/Qwen3-TTS
|
--model /models/Qwen3-TTS
|
||||||
--voices /config/voices.json
|
--voices /config/voices.json
|
||||||
--port 8000
|
--port 8000
|
||||||
--max-seq-len 4096
|
--max-seq-len 2048
|
||||||
"
|
"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Download the 0.6B Base weights before starting the container:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
hf download Qwen/Qwen3-TTS-12Hz-0.6B-Base --local-dir /path/to/Qwen3-TTS-12Hz-0.6B-Base
|
||||||
|
```
|
||||||
|
|
||||||
|
For an existing stack, change only the streaming service's model bind mount.
|
||||||
|
`--model /models/Qwen3-TTS` loads that directory; `QWEN_TTS_MODEL` does not
|
||||||
|
override this explicit argument. Use Base for reference-audio voice cloning.
|
||||||
|
|
||||||
Check it's running:
|
Check it's running:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@ -97,7 +107,7 @@ Works with **OpenWebUI**, **SillyTavern**, **llama-swap**, and any OpenAI-compat
|
|||||||
- NVIDIA DGX Spark GB10 or another ARM64 system with CUDA 13
|
- NVIDIA DGX Spark GB10 or another ARM64 system with CUDA 13
|
||||||
- CUDA driver 580+
|
- CUDA driver 580+
|
||||||
- Docker + NVIDIA Container Toolkit
|
- Docker + NVIDIA Container Toolkit
|
||||||
- [Qwen3-TTS-12Hz-1.7B-Base](https://huggingface.co/Qwen/Qwen3-TTS-12Hz-1.7B-Base) weights downloaded locally
|
- [Qwen3-TTS-12Hz-0.6B-Base](https://huggingface.co/Qwen/Qwen3-TTS-12Hz-0.6B-Base) weights downloaded locally
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
25
README.md
25
README.md
@ -19,8 +19,8 @@ One Docker image covers all four backends, with two semantic tag aliases:
|
|||||||
|
|
||||||
| Tag | Use for |
|
| Tag | Use for |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `:latest` / `:v6` / `:v6.12` | VoiceClone, VoiceDesign, CustomVoice |
|
| `:latest` / `:v6` / `:v6.13` | VoiceClone, VoiceDesign, CustomVoice |
|
||||||
| `:latest-streaming` / `:v6-streaming` / `:v6.12-streaming` | Streaming VoiceClone |
|
| `:latest-streaming` / `:v6-streaming` / `:v6.13-streaming` | Streaming VoiceClone |
|
||||||
|
|
||||||
Both tags point to the same image — the `-streaming` suffix is a semantic convention so compose files and version pins are unambiguous.
|
Both tags point to the same image — the `-streaming` suffix is a semantic convention so compose files and version pins are unambiguous.
|
||||||
|
|
||||||
@ -378,6 +378,27 @@ The first request after container startup can be slower because CUDA graph captu
|
|||||||
|
|
||||||
## Changelog
|
## Changelog
|
||||||
|
|
||||||
|
### v6.13 — 2026-10-04
|
||||||
|
**Feature: Per-Request `chunk_size` for Streaming**
|
||||||
|
- `/v1/audio/speech` accepts an optional integer `chunk_size` (codec frames per streamed chunk, 12 = 1 s), clamped to 2–24. It applies to the streaming wav/pcm path only; omitted keeps the voice's `voices.json` value (default unchanged).
|
||||||
|
- Use case: a voice bot can request a small chunk for the first sentence of a reply (faster first audio) and the efficient default for the rest. Measured on GB10 (2.6 s sentence, shared GPU): chunk 4 → first audio 0.60 s, RTF 1.61, underrun 1.28 s; chunk 12 → 1.24 s, RTF 1.25, underrun 0.16 s.
|
||||||
|
|
||||||
|
**Perf: Fixed-Window CUDA-Graph Codec Decode for Streaming**
|
||||||
|
- **Root Cause:** upstream re-decoded the whole reference prompt (~210 frames) plus all generated frames for the first chunks of every request (~215 ms per decode, 3× per request), and decoded eagerly afterwards. The streaming path now always decodes the last 25 + `chunk_size` frames (reference codes are the left context at the start) through one captured CUDA graph per window size (~18–25 ms per chunk). Token generation is unchanged; the 25-frame context is the same one upstream uses after its first chunks, no extra boundary clicks were measured.
|
||||||
|
- Measured on GB10 (voice `DE_Jarvis_2`, median of 3, no other GPU load): 8.4 s sentence chunk 12 → first audio 1.14 → 1.01 s, RTF 1.00 → 0.95, underrun 0.23 → 0.00 s; chunk 4 → first audio 0.58 → 0.44 s, RTF 1.15 → 0.99, underrun 1.02 → 0.00 s. With the LLM generating at the same time, chunk 4 underrun 5.86 → 3.90 s (the GPU is time-sliced, RTF stays 1.5–1.9).
|
||||||
|
- Small chunks are now cheap: `chunk_size: 4` gives ~0.4 s first audio without stutter when the GPU is not shared.
|
||||||
|
- Kill switch: env `TTS_GRAPH_DECODE=0` restores the upstream decode path.
|
||||||
|
|
||||||
|
**Feature: `prebuffer_ms` for Streaming**
|
||||||
|
- `/v1/audio/speech` accepts optional `prebuffer_ms` (0–10000): the server holds back that much audio before sending, so a client that plays on arrival rides out a slow start on a shared GPU. Default 0 (unchanged). Measured with LLM load, 2.6 s sentence, chunk 4: `prebuffer_ms: 1000` → underrun 1.08 → 0.00 s, first audio 1.45 → 2.44 s.
|
||||||
|
|
||||||
|
**Fix: Client Disconnect Stops Generation**
|
||||||
|
- When a streaming client hangs up (e.g. voice-bot barge-in), generation stops after the current chunk and frees the GPU lock. Previously the whole text was still generated and blocked the next request. Measured: next request's first audio 0.74 s after hanging up on a ~25 s text.
|
||||||
|
- `config/run_server.py` warm-up now also captures the chunk-12 decode graph.
|
||||||
|
|
||||||
|
**Recommended: `--max-seq-len 2048` for Streaming**
|
||||||
|
- Run the streaming container with `--max-seq-len 2048` (saves ~7 ms per decode step versus larger values). All compose files in `docker/` already use it.
|
||||||
|
|
||||||
### v6.12 — 2026-10-03
|
### v6.12 — 2026-10-03
|
||||||
**Fix: Streaming (8023) Slower Than Realtime**
|
**Fix: Streaming (8023) Slower Than Realtime**
|
||||||
- **Root Cause:** `generate_voices.py` wrote `chunk_size: 4` (~0.33 s audio) into every voice. Each streamed chunk runs a codec decode over 25 frames of left context plus a GPU sync, so a 4-frame chunk spent most of its time re-decoding context. Measured on GB10: RTF 1.13–1.49 with 1.0–1.9 s of playback underruns per 8.4 s sentence.
|
- **Root Cause:** `generate_voices.py` wrote `chunk_size: 4` (~0.33 s audio) into every voice. Each streamed chunk runs a codec decode over 25 frames of left context plus a GPU sync, so a 4-frame chunk spent most of its time re-decoding context. Measured on GB10: RTF 1.13–1.49 with 1.0–1.9 s of playback underruns per 8.4 s sentence.
|
||||||
|
|||||||
@ -50,14 +50,19 @@ def _do_warmup():
|
|||||||
|
|
||||||
logger.info("Warming up CUDA graphs (first request will be fast)...")
|
logger.info("Warming up CUDA graphs (first request will be fast)...")
|
||||||
try:
|
try:
|
||||||
for _ in model.generate_voice_clone_streaming(
|
kwargs = dict(
|
||||||
text="Warmup.",
|
text="Warmup.",
|
||||||
language=voice_cfg.get("language", "Auto"),
|
language=voice_cfg.get("language", "Auto"),
|
||||||
ref_audio=ref_audio,
|
ref_audio=ref_audio,
|
||||||
ref_text=voice_cfg.get("ref_text", ""),
|
ref_text=voice_cfg.get("ref_text", ""),
|
||||||
chunk_size=12,
|
|
||||||
non_streaming_mode=True,
|
non_streaming_mode=True,
|
||||||
):
|
)
|
||||||
|
# Patched server: also captures the codec decode graph for chunk 12.
|
||||||
|
if getattr(openai_server, "_GRAPH_DECODE", False):
|
||||||
|
stream = openai_server._voice_clone_stream(12, **kwargs)
|
||||||
|
else:
|
||||||
|
stream = model.generate_voice_clone_streaming(chunk_size=12, **kwargs)
|
||||||
|
for _ in stream:
|
||||||
pass
|
pass
|
||||||
logger.info("CUDA warmup complete — server ready.")
|
logger.info("CUDA warmup complete — server ready.")
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
|
|||||||
@ -129,7 +129,7 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "8023:8000"
|
- "8023:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/Qwen3-TTS-12Hz-1.7B-Base:/models/Qwen3-TTS:ro
|
- /path/to/Qwen3-TTS-12Hz-0.6B-Base:/models/Qwen3-TTS:ro
|
||||||
- /path/to/faster-qwen3-tts/config:/config:rw
|
- /path/to/faster-qwen3-tts/config:/config:rw
|
||||||
- /path/to/active_voices:/voices:ro
|
- /path/to/active_voices:/voices:ro
|
||||||
command: >
|
command: >
|
||||||
@ -139,7 +139,7 @@ services:
|
|||||||
--model /models/Qwen3-TTS
|
--model /models/Qwen3-TTS
|
||||||
--voices /config/voices.json
|
--voices /config/voices.json
|
||||||
--port 8000
|
--port 8000
|
||||||
--max-seq-len 4096
|
--max-seq-len 2048
|
||||||
"
|
"
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
diff --git a/examples/openai_server.py b/examples/openai_server.py
|
diff --git a/examples/openai_server.py b/examples/openai_server.py
|
||||||
index 2199e14..ca5eaf9 100644
|
index 2199e14..3f3a4e6 100644
|
||||||
--- a/examples/openai_server.py
|
--- a/examples/openai_server.py
|
||||||
+++ b/examples/openai_server.py
|
+++ b/examples/openai_server.py
|
||||||
@@ -36,11 +36,13 @@ API usage:
|
@@ -36,11 +36,13 @@ API usage:
|
||||||
@ -84,7 +84,7 @@ index 2199e14..ca5eaf9 100644
|
|||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Request / response models
|
# Request / response models
|
||||||
@@ -79,8 +139,60 @@ class SpeechRequest(BaseModel):
|
@@ -79,8 +139,68 @@ class SpeechRequest(BaseModel):
|
||||||
model: str = "tts-1"
|
model: str = "tts-1"
|
||||||
input: str
|
input: str
|
||||||
voice: str = "alloy"
|
voice: str = "alloy"
|
||||||
@ -93,6 +93,14 @@ index 2199e14..ca5eaf9 100644
|
|||||||
+ response_format: str = "wav" # wav | pcm | mp3 | zip
|
+ response_format: str = "wav" # wav | pcm | mp3 | zip
|
||||||
+ speed: float = 1.0 # scales audio tempo
|
+ speed: float = 1.0 # scales audio tempo
|
||||||
+ instruct: Optional[str] = None # per-line delivery direction, see _merge_instruct
|
+ instruct: Optional[str] = None # per-line delivery direction, see _merge_instruct
|
||||||
|
+ # Streaming only: codec frames per streamed chunk (12 = 1 s). Small values
|
||||||
|
+ # cut time-to-first-audio but cost throughput; clamped to 2..24.
|
||||||
|
+ # None keeps the voice's voices.json chunk_size.
|
||||||
|
+ chunk_size: Optional[int] = None
|
||||||
|
+ # Streaming only: hold back the first N ms of audio before sending, so a
|
||||||
|
+ # client that plays on arrival rides out a slower-than-realtime start
|
||||||
|
+ # (shared GPU) instead of stuttering. 0/None = send immediately. Max 10 s.
|
||||||
|
+ prebuffer_ms: Optional[int] = None
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+# ---------------------------------------------------------------------------
|
+# ---------------------------------------------------------------------------
|
||||||
@ -147,7 +155,7 @@ index 2199e14..ca5eaf9 100644
|
|||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -144,9 +256,39 @@ def _to_mp3_bytes(pcm: np.ndarray, sample_rate: int) -> bytes:
|
@@ -144,9 +264,39 @@ def _to_mp3_bytes(pcm: np.ndarray, sample_rate: int) -> bytes:
|
||||||
|
|
||||||
|
|
||||||
def resolve_voice(voice_name: str) -> dict:
|
def resolve_voice(voice_name: str) -> dict:
|
||||||
@ -188,7 +196,7 @@ index 2199e14..ca5eaf9 100644
|
|||||||
if default_voice and default_voice in voices:
|
if default_voice and default_voice in voices:
|
||||||
logger.warning(
|
logger.warning(
|
||||||
"Voice %r not configured; falling back to default voice %r",
|
"Voice %r not configured; falling back to default voice %r",
|
||||||
@@ -168,7 +310,47 @@ def resolve_voice(voice_name: str) -> dict:
|
@@ -168,42 +318,214 @@ def resolve_voice(voice_name: str) -> dict:
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
@ -233,12 +241,81 @@ index 2199e14..ca5eaf9 100644
|
|||||||
+ return None
|
+ return None
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+async def _stream_chunks(voice_cfg: dict, text: str, voice_name: str, speed: float, instruct: Optional[str] = None) -> AsyncGenerator[bytes, None]:
|
+def _clamp_chunk_size(n: int) -> int:
|
||||||
|
+ return max(2, min(24, n))
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+# Fixed-window codec decode. Upstream re-decodes the whole reference prompt plus
|
||||||
|
+# every generated frame for the first chunks (~250 frames on long references)
|
||||||
|
+# and decodes eagerly (hundreds of small kernel launches). The 12 Hz codec
|
||||||
|
+# decoder is causal, so decoding the last (context + chunk) frames and keeping
|
||||||
|
+# the tail is exact; with the reference codes as left context the window is
|
||||||
|
+# always full, so one CUDA graph per window size covers every chunk.
|
||||||
|
+_DECODE_CONTEXT = 25 # frames, same as upstream chunked_decode / streaming
|
||||||
|
+_GRAPH_DECODE = os.environ.get("TTS_GRAPH_DECODE", "1") != "0"
|
||||||
|
+_decoder_graphs: dict = {} # window frames -> (graph, static_in, static_out)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+def _decode_window(decoder, window: torch.Tensor) -> torch.Tensor:
|
||||||
|
+ """Decode [frames, Q] codes to a waveform tensor, graph-replayed when possible."""
|
||||||
|
+ codes = window.T.unsqueeze(0)
|
||||||
|
+ entry = _decoder_graphs.get(codes.shape[-1])
|
||||||
|
+ if entry is None:
|
||||||
|
+ static_in = codes.clone()
|
||||||
|
+ side = torch.cuda.Stream()
|
||||||
|
+ side.wait_stream(torch.cuda.current_stream())
|
||||||
|
+ with torch.cuda.stream(side):
|
||||||
|
+ for _ in range(2):
|
||||||
|
+ decoder(static_in)
|
||||||
|
+ torch.cuda.current_stream().wait_stream(side)
|
||||||
|
+ graph = torch.cuda.CUDAGraph()
|
||||||
|
+ with torch.cuda.graph(graph, capture_error_mode="thread_local"):
|
||||||
|
+ static_out = decoder(static_in)
|
||||||
|
+ entry = _decoder_graphs[codes.shape[-1]] = (graph, static_in, static_out)
|
||||||
|
+ graph, static_in, static_out = entry
|
||||||
|
+ static_in.copy_(codes)
|
||||||
|
+ graph.replay()
|
||||||
|
+ return static_out
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+@torch.inference_mode()
|
||||||
|
+def _voice_clone_stream(chunk_size: int, **kwargs):
|
||||||
|
+ """generate_voice_clone_streaming with fixed-window (graphed) codec decode.
|
||||||
|
+
|
||||||
|
+ Yields float32 numpy chunks. Token generation is upstream's
|
||||||
|
+ fast_generate_streaming unchanged.
|
||||||
|
+ """
|
||||||
|
+ from faster_qwen3_tts.streaming import fast_generate_streaming
|
||||||
|
+
|
||||||
|
+ gen_keys = ("temperature", "top_k", "top_p")
|
||||||
|
+ gen = {k: kwargs.pop(k) for k in gen_keys if k in kwargs}
|
||||||
|
+ m, talker, config, tie, tam, tth, tpe, ref_codes = tts_model._prepare_generation(**kwargs)
|
||||||
|
+ decoder = m.speech_tokenizer.model.decoder
|
||||||
|
+ upsample = decoder.total_upsample
|
||||||
|
+ window = _DECODE_CONTEXT + chunk_size
|
||||||
|
+ hist = ref_codes.to(tie.device)[-window:] if ref_codes is not None else None
|
||||||
|
+ for codes, _timing in fast_generate_streaming(
|
||||||
|
+ talker=talker, talker_input_embeds=tie, attention_mask=tam,
|
||||||
|
+ trailing_text_hiddens=tth, tts_pad_embed=tpe, config=config,
|
||||||
|
+ predictor_graph=tts_model.predictor_graph, talker_graph=tts_model.talker_graph,
|
||||||
|
+ chunk_size=chunk_size, **gen,
|
||||||
|
+ ):
|
||||||
|
+ hist = codes if hist is None else torch.cat([hist, codes])[-window:]
|
||||||
|
+ if hist.shape[0] == window:
|
||||||
|
+ wav = _decode_window(decoder, hist)
|
||||||
|
+ else: # x-vector voice, first chunks: short eager decode
|
||||||
|
+ wav = decoder(hist.T.unsqueeze(0))
|
||||||
|
+ yield wav[..., -codes.shape[0] * upsample:].flatten().float().cpu().numpy()
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+async def _stream_chunks(voice_cfg: dict, text: str, voice_name: str, speed: float, instruct: Optional[str] = None, chunk_size: Optional[int] = None, prebuffer_ms: Optional[int] = None) -> AsyncGenerator[bytes, None]:
|
||||||
"""
|
"""
|
||||||
Run generate_voice_clone_streaming in a background thread and yield
|
Run generate_voice_clone_streaming in a background thread and yield
|
||||||
raw PCM bytes for each chunk as they arrive.
|
raw PCM bytes for each chunk as they arrive.
|
||||||
@@ -177,21 +359,65 @@ async def _stream_chunks(voice_cfg: dict, text: str) -> AsyncGenerator[bytes, No
|
"""
|
||||||
|
q: queue.Queue = queue.Queue()
|
||||||
_DONE = object()
|
_DONE = object()
|
||||||
|
+ cancelled = threading.Event()
|
||||||
|
|
||||||
def producer():
|
def producer():
|
||||||
+ process = None
|
+ process = None
|
||||||
@ -280,19 +357,27 @@ index 2199e14..ca5eaf9 100644
|
|||||||
+ _seed_rng(voice_cfg.get("seed", _voice_seed(voice_name)))
|
+ _seed_rng(voice_cfg.get("seed", _voice_seed(voice_name)))
|
||||||
+ segments = _split_text_for_generation(text, _max_chars_per_segment())
|
+ segments = _split_text_for_generation(text, _max_chars_per_segment())
|
||||||
+ for seg in segments:
|
+ for seg in segments:
|
||||||
+ for chunk, _sr, _timing in tts_model.generate_voice_clone_streaming(
|
+ kwargs = dict(
|
||||||
+ text=seg,
|
+ text=seg,
|
||||||
+ language=voice_cfg.get("language", "Auto"),
|
+ language=voice_cfg.get("language", "Auto"),
|
||||||
+ ref_audio=voice_cfg.get("ref_audio"),
|
+ ref_audio=voice_cfg.get("ref_audio"),
|
||||||
+ ref_text=voice_cfg.get("ref_text", ""),
|
+ ref_text=voice_cfg.get("ref_text", ""),
|
||||||
+ chunk_size=voice_cfg.get("chunk_size", 12),
|
|
||||||
+ instruct=_merge_instruct(voice_cfg, instruct),
|
+ instruct=_merge_instruct(voice_cfg, instruct),
|
||||||
+ voice_clone_prompt=_load_voice_clone_prompt(voice_cfg, voice_name, tts_model),
|
+ voice_clone_prompt=_load_voice_clone_prompt(voice_cfg, voice_name, tts_model),
|
||||||
+ non_streaming_mode=True,
|
+ non_streaming_mode=True,
|
||||||
+ temperature=voice_cfg.get("temperature", 0.8),
|
+ temperature=voice_cfg.get("temperature", 0.8),
|
||||||
+ top_k=voice_cfg.get("top_k", 50),
|
+ top_k=voice_cfg.get("top_k", 50),
|
||||||
+ top_p=voice_cfg.get("top_p", 0.9),
|
+ top_p=voice_cfg.get("top_p", 0.9),
|
||||||
+ ):
|
+ )
|
||||||
|
+ cs = _clamp_chunk_size(chunk_size) if chunk_size is not None else voice_cfg.get("chunk_size", 12)
|
||||||
|
+ if _GRAPH_DECODE:
|
||||||
|
+ chunks = _voice_clone_stream(cs, **kwargs)
|
||||||
|
+ else:
|
||||||
|
+ chunks = (c for c, _sr, _t in tts_model.generate_voice_clone_streaming(chunk_size=cs, **kwargs))
|
||||||
|
+ for chunk in chunks:
|
||||||
|
+ if cancelled.is_set(): # client gone: free the GPU for the next request
|
||||||
|
+ chunks.close()
|
||||||
|
+ return
|
||||||
+ raw = _to_pcm16(chunk)
|
+ raw = _to_pcm16(chunk)
|
||||||
+ if process:
|
+ if process:
|
||||||
+ process.stdin.write(raw)
|
+ process.stdin.write(raw)
|
||||||
@ -313,16 +398,38 @@ index 2199e14..ca5eaf9 100644
|
|||||||
|
|
||||||
thread = threading.Thread(target=producer, daemon=True)
|
thread = threading.Thread(target=producer, daemon=True)
|
||||||
thread.start()
|
thread.start()
|
||||||
@@ -203,7 +429,7 @@ async def _stream_chunks(voice_cfg: dict, text: str) -> AsyncGenerator[bytes, No
|
|
||||||
break
|
loop = asyncio.get_event_loop()
|
||||||
if isinstance(item, Exception):
|
- while True:
|
||||||
raise item
|
- item = await loop.run_in_executor(None, q.get)
|
||||||
|
- if item is _DONE:
|
||||||
|
- break
|
||||||
|
- if isinstance(item, Exception):
|
||||||
|
- raise item
|
||||||
- yield _to_pcm16(item)
|
- yield _to_pcm16(item)
|
||||||
+ yield item
|
+ hold = max(0, min(10000, prebuffer_ms or 0)) * SAMPLE_RATE * 2 // 1000 # PCM16 bytes
|
||||||
|
+ pending = b""
|
||||||
|
+ try:
|
||||||
|
+ while True:
|
||||||
|
+ item = await loop.run_in_executor(None, q.get)
|
||||||
|
+ if item is _DONE:
|
||||||
|
+ break
|
||||||
|
+ if isinstance(item, Exception):
|
||||||
|
+ raise item
|
||||||
|
+ if hold:
|
||||||
|
+ pending += item
|
||||||
|
+ if len(pending) < hold:
|
||||||
|
+ continue
|
||||||
|
+ item, pending, hold = pending, b"", 0
|
||||||
|
+ yield item
|
||||||
|
+ if pending:
|
||||||
|
+ yield pending
|
||||||
|
+ finally:
|
||||||
|
+ cancelled.set()
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -220,7 +446,8 @@ async def health():
|
@@ -220,7 +542,8 @@ async def health():
|
||||||
async def create_speech(req: SpeechRequest):
|
async def create_speech(req: SpeechRequest):
|
||||||
if tts_model is None:
|
if tts_model is None:
|
||||||
raise HTTPException(status_code=503, detail="Model not loaded")
|
raise HTTPException(status_code=503, detail="Model not loaded")
|
||||||
@ -332,7 +439,7 @@ index 2199e14..ca5eaf9 100644
|
|||||||
raise HTTPException(status_code=400, detail="'input' text is empty")
|
raise HTTPException(status_code=400, detail="'input' text is empty")
|
||||||
|
|
||||||
voice_cfg = resolve_voice(req.voice)
|
voice_cfg = resolve_voice(req.voice)
|
||||||
@@ -230,36 +457,84 @@ async def create_speech(req: SpeechRequest):
|
@@ -230,36 +553,84 @@ async def create_speech(req: SpeechRequest):
|
||||||
"wav": "audio/wav",
|
"wav": "audio/wav",
|
||||||
"pcm": "audio/pcm",
|
"pcm": "audio/pcm",
|
||||||
"mp3": "audio/mpeg",
|
"mp3": "audio/mpeg",
|
||||||
@ -426,11 +533,11 @@ index 2199e14..ca5eaf9 100644
|
|||||||
if fmt == "wav":
|
if fmt == "wav":
|
||||||
yield _wav_header(SAMPLE_RATE) # stream with unknown data length
|
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):
|
||||||
+ async for raw_chunk in _stream_chunks(voice_cfg, req.input, req.voice, req.speed, req.instruct):
|
+ async for raw_chunk in _stream_chunks(voice_cfg, req.input, req.voice, req.speed, req.instruct, req.chunk_size, req.prebuffer_ms):
|
||||||
yield raw_chunk
|
yield raw_chunk
|
||||||
|
|
||||||
return StreamingResponse(audio_stream(), media_type=content_type)
|
return StreamingResponse(audio_stream(), media_type=content_type)
|
||||||
@@ -306,16 +581,21 @@ def _parse_args():
|
@@ -306,16 +677,21 @@ def _parse_args():
|
||||||
p.add_argument("--host", default="0.0.0.0", help="Bind host (default: 0.0.0.0)")
|
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("--port", type=int, default=8000, help="Bind port (default: 8000)")
|
||||||
p.add_argument("--device", default="cuda", help="Torch device (default: cuda)")
|
p.add_argument("--device", default="cuda", help="Torch device (default: cuda)")
|
||||||
@ -453,7 +560,7 @@ index 2199e14..ca5eaf9 100644
|
|||||||
with open(args.voices) as f:
|
with open(args.voices) as f:
|
||||||
voices = json.load(f)
|
voices = json.load(f)
|
||||||
default_voice = next(iter(voices))
|
default_voice = next(iter(voices))
|
||||||
@@ -344,6 +624,7 @@ def main():
|
@@ -344,6 +720,7 @@ def main():
|
||||||
args.model,
|
args.model,
|
||||||
device=args.device,
|
device=args.device,
|
||||||
dtype=torch.bfloat16,
|
dtype=torch.bfloat16,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user