mirror of
https://github.com/xinnan-tech/xiaozhi-esp32-server.git
synced 2026-07-28 01:53:53 +08:00
update:优化stt发送顺序
This commit is contained in:
+23
-22
@@ -36,19 +36,10 @@ async def handleAudioMessage(conn, audio):
|
|||||||
conn.reset_vad_states()
|
conn.reset_vad_states()
|
||||||
|
|
||||||
async def startToChat(conn, text):
|
async def startToChat(conn, text):
|
||||||
stt_text = get_string_no_punctuation_or_emoji(text)
|
# 异步发送 stt 信息
|
||||||
await conn.websocket.send(json.dumps({
|
asyncio.create_task(
|
||||||
"type": "stt",
|
schedule_with_interrupt(0, send_stt_message(conn, text))
|
||||||
"text": stt_text,
|
)
|
||||||
"session_id": conn.session_id}
|
|
||||||
))
|
|
||||||
await conn.websocket.send(
|
|
||||||
json.dumps({
|
|
||||||
"type": "llm",
|
|
||||||
"text": "😊",
|
|
||||||
"emotion": "happy",
|
|
||||||
"session_id": conn.session_id}
|
|
||||||
))
|
|
||||||
conn.executor.submit(conn.chat, text)
|
conn.executor.submit(conn.chat, text)
|
||||||
|
|
||||||
|
|
||||||
@@ -59,10 +50,6 @@ async def sendAudioMessage(conn, audios, duration, text):
|
|||||||
if text == conn.tts_first_text:
|
if text == conn.tts_first_text:
|
||||||
logger.info(f"发送第一段语音: {text}")
|
logger.info(f"发送第一段语音: {text}")
|
||||||
conn.tts_start_speak_time = time.time()
|
conn.tts_start_speak_time = time.time()
|
||||||
await send_tts_message(conn, "start", text)
|
|
||||||
|
|
||||||
# 先等待0.5秒,确保客户端处于 speaking 状态
|
|
||||||
await asyncio.sleep(0.5)
|
|
||||||
|
|
||||||
# 发送 sentence_start(每个音频文件之前发送一次)
|
# 发送 sentence_start(每个音频文件之前发送一次)
|
||||||
await send_tts_message(conn, "sentence_start", text)
|
await send_tts_message(conn, "sentence_start", text)
|
||||||
@@ -78,15 +65,12 @@ async def sendAudioMessage(conn, audios, duration, text):
|
|||||||
await send_tts_message(conn, "sentence_end", text)
|
await send_tts_message(conn, "sentence_end", text)
|
||||||
|
|
||||||
if conn.llm_finish_task and text == conn.tts_last_text:
|
if conn.llm_finish_task and text == conn.tts_last_text:
|
||||||
stop_duration = conn.tts_duration - \
|
stop_duration = conn.tts_duration - (time.time() - conn.tts_start_speak_time)
|
||||||
(time.time() - conn.tts_start_speak_time)
|
|
||||||
stop_task = asyncio.create_task(
|
stop_task = asyncio.create_task(
|
||||||
schedule_with_interrupt(
|
schedule_with_interrupt(stop_duration, send_tts_message(conn, 'stop'))
|
||||||
stop_duration, send_tts_message(conn, 'stop'))
|
|
||||||
)
|
)
|
||||||
conn.scheduled_tasks.append(stop_task)
|
conn.scheduled_tasks.append(stop_task)
|
||||||
|
|
||||||
|
|
||||||
async def send_tts_message(conn, state, text=None):
|
async def send_tts_message(conn, state, text=None):
|
||||||
"""发送 TTS 状态消息"""
|
"""发送 TTS 状态消息"""
|
||||||
message = {
|
message = {
|
||||||
@@ -101,6 +85,23 @@ async def send_tts_message(conn, state, text=None):
|
|||||||
if state == "stop":
|
if state == "stop":
|
||||||
conn.clearSpeakStatus()
|
conn.clearSpeakStatus()
|
||||||
|
|
||||||
|
async def send_stt_message(conn, text):
|
||||||
|
"""发送 STT 状态消息"""
|
||||||
|
stt_text = get_string_no_punctuation_or_emoji(text)
|
||||||
|
await conn.websocket.send(json.dumps({
|
||||||
|
"type": "stt",
|
||||||
|
"text": stt_text,
|
||||||
|
"session_id": conn.session_id}
|
||||||
|
))
|
||||||
|
await conn.websocket.send(
|
||||||
|
json.dumps({
|
||||||
|
"type": "llm",
|
||||||
|
"text": "😊",
|
||||||
|
"emotion": "happy",
|
||||||
|
"session_id": conn.session_id}
|
||||||
|
))
|
||||||
|
await send_tts_message(conn, "start")
|
||||||
|
|
||||||
|
|
||||||
async def schedule_with_interrupt(delay, coro):
|
async def schedule_with_interrupt(delay, coro):
|
||||||
"""可中断的延迟调度"""
|
"""可中断的延迟调度"""
|
||||||
|
|||||||
Reference in New Issue
Block a user