mirror of
https://github.com/xinnan-tech/xiaozhi-esp32-server.git
synced 2026-07-22 23:23:55 +08:00
* Update util.py解决返回元组报错 (#103) 解决返回元组报错 * 增加播放本地音乐功能 (#105) * Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. On branch Music-playback Your branch is up to date with 'origin/Music-playback'. Changes to be committed: modified: core/handle/audioHandle.py new file: "music/\346\234\210\344\272\256\344\273\243\350\241\250\346\210\221\347\232\204\345\277\203_\351\202\223\344\270\275\345\220\233.mp3" new file: "music/\350\270\217\345\261\261\346\262\263.mp3" * Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. On branch Music-playback Your branch is up to date with 'origin/Music-playback'. Changes to be committed: modified: config.yaml modified: core/connection.py modified: core/handle/abortHandle.py modified: core/handle/audioHandle.py new file: core/handle/musicHandler.py modified: core/handle/textHandle.py modified: core/websocket_server.py new file: "music/\344\270\200\345\277\265\345\215\203\345\271\264_\345\233\275\351\243\216\347\211\210.mp3" new file: "music/\344\270\255\347\247\213\346\234\210.mp3" deleted: "music/\346\234\210\344\272\256\344\273\243\350\241\250\346\210\221\347\232\204\345\277\203_\351\202\223\344\270\275\345\220\233.mp3" deleted: "music/\350\270\217\345\261\261\346\262\263.mp3" * 增加播放本地音乐功能 * 增加播放本地音乐功能 * 让音乐配置变的优雅 On branch Music-playback Your branch is up to date with 'origin/Music-playback'. Changes to be committed: modified: config.yaml modified: core/handle/musicHandler.py renamed: "music/\344\270\200\345\277\265\345\215\203\345\271\264_\345\233\275\351\243\216\347\211\210.mp3" -> "music/mp3/\344\270\200\345\277\265\345\215\203\345\271\264_\345\233\275\351\243\216\347\211\210.mp3" renamed: "music/\344\270\255\347\247\213\346\234\210.mp3" -> "music/mp3/\344\270\255\347\247\213\346\234\210.mp3" renamed: "music/\345\273\211\346\263\242\350\200\201\347\237\243\357\274\214\345\260\232\350\203\275\351\245\255\345\220\246.mp3" -> "music/mp3/\345\273\211\346\263\242\350\200\201\347\237\243\357\274\214\345\260\232\350\203\275\351\245\255\345\220\246.mp3" new file: music/music_config.yaml --------- Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com> * update:优化代码 * update:流控调试 * update:优化音乐播放 * update:优化音乐配置初始化 --------- Co-authored-by: linqingping <linqingping@users.noreply.github.com> Co-authored-by: Chris <119588753+Chris-websketch@users.noreply.github.com> Co-authored-by: hrz <1710360675@qq.com>
82 lines
3.1 KiB
Python
82 lines
3.1 KiB
Python
from config.logger import setup_logging
|
|
import asyncio
|
|
import time
|
|
from core.utils.util import remove_punctuation_and_length
|
|
from core.handle.sendAudioHandle import schedule_with_interrupt, send_stt_message
|
|
|
|
TAG = __name__
|
|
logger = setup_logging()
|
|
|
|
|
|
async def handleAudioMessage(conn, audio):
|
|
if not conn.asr_server_receive:
|
|
logger.bind(tag=TAG).debug(f"前期数据处理中,暂停接收")
|
|
return
|
|
if conn.client_listen_mode == "auto":
|
|
have_voice = conn.vad.is_vad(conn, audio)
|
|
else:
|
|
have_voice = conn.client_have_voice
|
|
|
|
# 如果本次没有声音,本段也没声音,就把声音丢弃了
|
|
if have_voice == False and conn.client_have_voice == False:
|
|
await no_voice_close_connect(conn)
|
|
conn.asr_audio.clear()
|
|
return
|
|
conn.client_no_voice_last_time = 0.0
|
|
conn.asr_audio.append(audio)
|
|
# 如果本段有声音,且已经停止了
|
|
if conn.client_voice_stop:
|
|
conn.client_abort = False
|
|
conn.asr_server_receive = False
|
|
# 音频太短了,无法识别
|
|
if len(conn.asr_audio) < 3:
|
|
conn.asr_server_receive = True
|
|
else:
|
|
text, file_path = await conn.asr.speech_to_text(conn.asr_audio, conn.session_id)
|
|
logger.bind(tag=TAG).info(f"识别文本: {text}")
|
|
text_len, text_without_punctuation = remove_punctuation_and_length(text)
|
|
if await conn.music_handler.handle_music_command(conn, text_without_punctuation):
|
|
conn.asr_server_receive = True
|
|
conn.asr_audio.clear()
|
|
return
|
|
if text_len <= conn.max_cmd_length and await handleCMDMessage(conn, text_without_punctuation):
|
|
return
|
|
if text_len > 0:
|
|
await startToChat(conn, text)
|
|
else:
|
|
conn.asr_server_receive = True
|
|
conn.asr_audio.clear()
|
|
conn.reset_vad_states()
|
|
|
|
|
|
async def handleCMDMessage(conn, text):
|
|
cmd_exit = conn.cmd_exit
|
|
for cmd in cmd_exit:
|
|
if text == cmd:
|
|
logger.bind(tag=TAG).info("识别到明确的退出命令".format(text))
|
|
await conn.close()
|
|
return True
|
|
return False
|
|
|
|
|
|
async def startToChat(conn, text):
|
|
# 异步发送 stt 信息
|
|
stt_task = asyncio.create_task(
|
|
schedule_with_interrupt(0, send_stt_message(conn, text))
|
|
)
|
|
conn.scheduled_tasks.append(stt_task)
|
|
conn.executor.submit(conn.chat, text)
|
|
|
|
|
|
async def no_voice_close_connect(conn):
|
|
if conn.client_no_voice_last_time == 0.0:
|
|
conn.client_no_voice_last_time = time.time() * 1000
|
|
else:
|
|
no_voice_time = time.time() * 1000 - conn.client_no_voice_last_time
|
|
close_connection_no_voice_time = conn.config.get("close_connection_no_voice_time", 120)
|
|
if no_voice_time > 1000 * close_connection_no_voice_time:
|
|
conn.client_abort = False
|
|
conn.asr_server_receive = False
|
|
prompt = "时间过得真快,我都好久没说话了。请你用十个字左右话跟我告别,以“再见”或“拜拜”为结尾"
|
|
await startToChat(conn, prompt)
|