fix: serialize worker warmup handshake to stop concurrent stdout reads
The STT/TTS worker _ensure() treated a spawned-but-not-yet-handshaked subprocess as ready, so a voice turn arriving during warmup read the same stdout StreamReader concurrently with the warmup handshake and crashed with "readuntil() called while another coroutine is already waiting for incoming data". Add a _start_lock + _ready flag so (re)start and the ready handshake run atomically and callers wait for real readiness before reading stdout. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -7,6 +7,7 @@ behaves with no source wired yet.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
from typing import AsyncIterator
|
||||
|
||||
from wsai.backends.whisper import WhisperSTT
|
||||
@@ -58,3 +59,75 @@ def test_empty_transcript_is_skipped(monkeypatch):
|
||||
|
||||
utts = _collect(stt)
|
||||
assert [u.text for u in utts] == ["안녕"]
|
||||
|
||||
|
||||
def test_request_during_warmup_does_not_overlap_stdout(monkeypatch):
|
||||
"""Regression: a transcribe() arriving while warmup() is still awaiting the
|
||||
worker's ready line must NOT read the same stdout StreamReader concurrently.
|
||||
|
||||
Before the fix, _ensure()'s fast path returned as soon as the subprocess was
|
||||
spawned (proc set, returncode None) even though the ready handshake was still
|
||||
in flight, so the request's stdout.readline() overlapped warmup's and asyncio
|
||||
raised "readuntil() called while another coroutine is already waiting for
|
||||
incoming data" — the exact crash seen in the Discord voice server."""
|
||||
|
||||
async def run():
|
||||
stt = WhisperSTT()
|
||||
stdout = asyncio.StreamReader()
|
||||
stderr = asyncio.StreamReader()
|
||||
stderr.feed_eof() # nothing on stderr; let the drain task finish cleanly
|
||||
|
||||
class FakeStdin:
|
||||
def write(self, _b):
|
||||
pass
|
||||
|
||||
async def drain(self):
|
||||
pass
|
||||
|
||||
class FakeProc:
|
||||
returncode = None
|
||||
|
||||
def __init__(self):
|
||||
self.stdin = FakeStdin()
|
||||
self.stdout = stdout
|
||||
self.stderr = stderr
|
||||
|
||||
def terminate(self):
|
||||
self.returncode = 0
|
||||
|
||||
async def wait(self):
|
||||
return 0
|
||||
|
||||
spawns = []
|
||||
|
||||
async def fake_create(*_a, **_k):
|
||||
spawns.append(1)
|
||||
return FakeProc()
|
||||
|
||||
monkeypatch.setattr(asyncio, "create_subprocess_exec", fake_create)
|
||||
|
||||
# warmup enters _ensure and blocks awaiting the ready line on stdout.
|
||||
warm = asyncio.create_task(stt.warmup())
|
||||
await asyncio.sleep(0.05)
|
||||
|
||||
# A concurrent request lands mid-warmup. It must wait for readiness, not
|
||||
# crash and not read stdout yet.
|
||||
tr = asyncio.create_task(stt.transcribe("x.wav"))
|
||||
await asyncio.sleep(0.05)
|
||||
assert not tr.done() # blocked on the start lock, no overlapping read
|
||||
|
||||
# Complete the handshake -> warmup finishes and releases the request.
|
||||
stdout.feed_data(
|
||||
(json.dumps({"ready": True, "ms": 1, "device": "cpu"}) + "\n").encode()
|
||||
)
|
||||
await asyncio.wait_for(warm, timeout=1)
|
||||
await asyncio.sleep(0.02)
|
||||
stdout.feed_data(
|
||||
(json.dumps({"ok": True, "text": "안녕", "ms": 2}) + "\n").encode()
|
||||
)
|
||||
assert await asyncio.wait_for(tr, timeout=1) == "안녕"
|
||||
assert sum(spawns) == 1 # one worker, not one-per-concurrent-caller
|
||||
|
||||
await stt.aclose()
|
||||
|
||||
asyncio.run(asyncio.wait_for(run(), timeout=5))
|
||||
|
||||
Reference in New Issue
Block a user