From: snickersun Date: Fri, 5 Jun 2026 06:53:18 +0000 (+0800) Subject: 1、关闭长对话 拼接能力 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3b43a52ecf27704d92db9365a41c5eb7da79d7e9;p=mirrors%2FASR1603_G5.git 1、关闭长对话 拼接能力 2、修复tts播报消息结束,pcm缓存未消耗掉,过早关闭播报的bug。 --- diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py index 95d7012b..52557e27 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py @@ -211,6 +211,9 @@ VAD_ENERGY_THRESHOLD = 10000 # NO_SPEECH_MS 解决"场景①开麦后一直没说话"——停录回 idle 省电,不提交。两者动作不同。 LONG_DIALOGUE_MAX_TURN_MS = 25000 LONG_DIALOGUE_ASR_CONTINUE_MS = 1000 +# 句末续说拼接开关:1=开(句末等 CONTINUE_MS 看是否续说,支持连续读,时延高) +# 0=关(本地 VAD 判句末立即停麦提交,时延低)。与“连续读”互斥,按场景择一。 +LONG_DIALOGUE_ASR_MERGE_EN = 0 # 场景①:开麦后本轮始终无本地 VAD 说话起点且无服务端 asr.result,超此(ms)停录回 idle;0=不限制 LONG_DIALOGUE_NO_SPEECH_MS = 12000 # llm 已起后连续 canceled 达此次数则冻结续说、停麦等回复(避免一直录无 TTS) diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py index 95d7012b..035d90fa 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py @@ -189,6 +189,9 @@ VC_WELCOME_SERVER_ENABLED = 0 # 协议 failed / websocket_error 是否 synthesis 播报错误原文(联调=1,量产=0) VC_ERROR_TTS_ENABLED = 1 +# 服务端 tts.done 后立刻 clean-close WS 时,Close 前等待本地 PCM 放完尾音的最大时长(ms), +# 防"对话播报一半就停";仅对正常收尾且仍在播放时生效 +VC_CLEAN_CLOSE_DRAIN_MS = 3000 # 长对话 L1:轮次间隙无 TTS 下行累计达此秒 Close(听/想/播/录、保活帧不计;最小 5) VC_IDLE_AUTO_CLOSE_SEC = 20 @@ -211,6 +214,9 @@ VAD_ENERGY_THRESHOLD = 10000 # NO_SPEECH_MS 解决"场景①开麦后一直没说话"——停录回 idle 省电,不提交。两者动作不同。 LONG_DIALOGUE_MAX_TURN_MS = 25000 LONG_DIALOGUE_ASR_CONTINUE_MS = 1000 +# 句末续说拼接开关:1=开(句末等 CONTINUE_MS 看是否续说,支持连续读,时延高) +# 0=关(本地 VAD 判句末立即停麦提交,时延低)。与“连续读”互斥,按场景择一。 +LONG_DIALOGUE_ASR_MERGE_EN = 0 # 场景①:开麦后本轮始终无本地 VAD 说话起点且无服务端 asr.result,超此(ms)停录回 idle;0=不限制 LONG_DIALOGUE_NO_SPEECH_MS = 12000 # llm 已起后连续 canceled 达此次数则冻结续说、停麦等回复(避免一直录无 TTS) diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini index c7dbb1ea..f935a1d4 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8v3.ini @@ -1,3 +1,3 @@ DEV_TYPE=k8v3 SRV_TYPE=beike_dev_v3 -VERSION=V1.5 \ No newline at end of file +VERSION=V1.6 \ No newline at end of file diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py index 763d611e..bd48f6f5 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py @@ -147,10 +147,13 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): pass def _vc_long_dialogue_defer_vad_stop(self): + # LONG_DIALOGUE_ASR_MERGE_EN=0:关闭句末续说拼接窗口,本地 VAD 判句末即停麦提交, + # 降低等待时延(与“连续读/续说”互斥,按场景择一);默认 1 保持原拼接行为。 try: return ( self._vc_is_long_dialogue_mode() and getattr(self, "record_data_save_flag", 0) == 0 + and cfg_bool("LONG_DIALOGUE_ASR_MERGE_EN", True) ) except Exception: return False diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py index b27ca991..2877828e 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py @@ -38,6 +38,19 @@ class VCSessionIoMixin: "invalid json", "internal server", "concurrency_limit", + # 传输/连接/识别类技术错误:多为端侧断开或会话空闲超时所致, + # 属“非远端业务原因”,不朗读原文(避免把英文报错读给用户) + "idle timeout", + "transcribe_error", + "转写错误", + "读取消息失败", + "websocket: close", + "invalid payload", + "connection reset", + "econnreset", + "broken pipe", + "connection refused", + "timeout", ): if pat in low: return None @@ -287,12 +300,42 @@ class VCSessionIoMixin: except Exception: return False + def _vc_wait_play_drain_before_close(self): + """服务端 tts.done 后立刻 clean-close WS 时:TTS 音频已全部收到但本地 PCM 环形 + 缓冲可能仍有数 100ms~数 s 未放完。此时若直接 Close()→play_pcm.close() 会丢弃尾音, + 表现为"对话播报一半就停了"。这里在 Close 前先等已缓冲音频放完(有界),仅对 + 服务端正常收尾(clean)且仍在播放时生效,不影响真异常的快速恢复。""" + try: + if not self._vc_ws_close_is_clean(): + return + pcm = getattr(self, "play_pcm", None) + if pcm is None or getattr(self, "VC_Play_flag", 0) != 1: + return + max_ms = cfg_int("VC_CLEAN_CLOSE_DRAIN_MS", 3000) + waited = 0 + step = 50 + while waited < max_ms: + try: + if pcm is not getattr(self, "play_pcm", None): + break + if pcm.stream_is_empty() == 1: + break + except Exception: + break + utime.sleep_ms(step) + waited += step + print("[VC] ws clean close: drain {}ms before Close".format(waited)) + except Exception: + pass + def websocket_error(self, TTS_str=None, play_weak_signal_tone=False): """play_weak_signal_tone=True 时播 xinhaoruo1(弱网/无卡类);连接/协议失败请传 False,避免误报「信号弱」。""" if getattr(self, "VC_mode", 0) != 1: print("[VC][long_idle] websocket_error enter VC_mode={} TTS_str={} weak_hint={} -> Close then uplink_stop(async)".format( getattr(self, "VC_mode", -1), TTS_str, play_weak_signal_tone)) print("websocket_error1!!!!") + # 服务端 tts.done 后立刻 clean-close:先等已缓冲 TTS 尾音放完再 Close,避免播报被掐断 + self._vc_wait_play_drain_before_close() utime.sleep_ms(800) self.Close() print("websocket_error1.1!!!!")