From 4044e2b3e6fa336064e5b410bff7cb3d634fe3a7 Mon Sep 17 00:00:00 2001 From: IrvingGao <1729854488@qq.com> Date: Tue, 18 Jun 2024 22:25:52 +0800 Subject: [PATCH] [event] fix bugs --- takway/clients/web_socket_client_utils.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/takway/clients/web_socket_client_utils.py b/takway/clients/web_socket_client_utils.py index 54a330a..478fbd3 100644 --- a/takway/clients/web_socket_client_utils.py +++ b/takway/clients/web_socket_client_utils.py @@ -386,8 +386,8 @@ class WebSocketClinet: if not self.wakeup_event.is_set(): continue - if self.listening_event.is_set(): - print(f"{datetime.now()}: listening, skip setup web socket connection.") + if self.listening_event.is_set() or self.speaking_event.is_set(): + print(f"{datetime.now()}: listening or speaking, skip setup web socket connection.") continue # 接收数据 @@ -399,11 +399,6 @@ class WebSocketClinet: client.close_client() break - # if self.interrupt_event.is_set(): - # self.listening_event.set() - # self.speaking_event.clear() - # break - response, data_type = client.receive_per_data() if data_type == dict: print(f"{datetime.now()}: receive json data: {response}") # 打印接收到的消息 @@ -430,11 +425,7 @@ class WebSocketClinet: self.listening_event.clear() self.speaking_event.set() self.audio_play_queue.put(('text_audio_data', response)) - - elif data_type == bytes: - # 开始播放 - print(f"{datetime.now()}: receive audio bytes") - self.audio_play_queue.put(('audio_bytes', response)) + elif data_type == None: print(f"{datetime.now()}: receive None data, break loop.") # 切换录音模式 @@ -540,7 +531,7 @@ class WebSocketClinet: - + """ def excute_process(self): ''' Args: @@ -562,4 +553,5 @@ class WebSocketClinet: self.audio_play_queue.put((instruct, content)) self.speaker_active_set.clear() + """ \ No newline at end of file