update:优化docker-compose

core/connection.py

@@ -68,19 +68,25 @@ class ConnectionHandler:
         self.tts_start_speak_time = None
         self.tts_duration = 0
 
+        self.cmd_exit = self.config["CMD_exit"]
+        self.max_cmd_length = 0
+        for cmd in self.cmd_exit:
+            if len(cmd) > self.max_cmd_length:
+                self.max_cmd_length = len(cmd)
+
     async def handle_connection(self, ws):
         try:
             # 获取并验证headers
             self.headers = dict(ws.request.headers)
             self.logger.info(f"New connection request - Headers: {self.headers}")
-            
+
             # 进行认证
             await self.auth.authenticate(self.headers)
-            
+
             # 认证通过,继续处理
             self.websocket = ws
             self.session_id = str(uuid.uuid4())
-            
+
             self.welcome_msg = self.config["xiaozhi"]
             self.welcome_msg["session_id"] = self.session_id
             await self.websocket.send(json.dumps(self.welcome_msg))
@@ -96,7 +102,7 @@ class ConnectionHandler:
             except websockets.exceptions.ConnectionClosed:
                 self.logger.info("客户端断开连接")
                 await self.close()
-                
+
         except AuthenticationError as e:
             self.logger.error(f"Authentication failed: {str(e)}")
             await ws.close()
@@ -255,4 +261,4 @@ class ConnectionHandler:
         while self.scheduled_tasks:
             task = self.scheduled_tasks.popleft()
             task.cancel()
-        self.scheduled_tasks.clear()
+        self.scheduled_tasks.clear()

core/handle/audioHandle.py

@@ -27,7 +27,10 @@ async def handleAudioMessage(conn, audio):
         conn.asr_server_receive = False
         text, file_path = conn.asr.speech_to_text(conn.asr_audio, conn.session_id)
         logger.info(f"识别文本: {text}")
-        text_len = remove_punctuation_and_length(text)
+
+        text_len, text_without_punctuation = remove_punctuation_and_length(text)
+        if text_len <= conn.max_cmd_length and await handleCMDMessage(conn, text_without_punctuation):
+            return
         if text_len > 0:
             await startToChat(conn, text)
         else:
@@ -36,6 +39,32 @@ async def handleAudioMessage(conn, audio):
         conn.reset_vad_states()
 
 
+async def handleCMDMessage(conn, text):
+    cmd_exit = conn.cmd_exit
+    for cmd in cmd_exit:
+        if text == cmd:
+            logger.info("识别到明确的退出命令".format(text))
+            await finishToChat(conn)
+            return True
+    return False
+
+
+async def finishToChat(conn):
+    await conn.close()
+
+
+async def isLLMWantToFinish(conn):
+    first_text = conn.tts_first_text
+    last_text = conn.tts_last_text
+    _, last_text_without_punctuation = remove_punctuation_and_length(last_text)
+    if "再见" in last_text_without_punctuation or "拜拜" in last_text_without_punctuation:
+        return True
+    _, first_text_without_punctuation = remove_punctuation_and_length(first_text)
+    if "再见" in first_text_without_punctuation or "拜拜" in first_text_without_punctuation:
+        return True
+    return False
+
+
 async def startToChat(conn, text):
     # 异步发送 stt 信息
     stt_task = asyncio.create_task(
@@ -71,6 +100,11 @@ async def sendAudioMessage(conn, audios, duration, text):
             schedule_with_interrupt(stop_duration, send_tts_message(conn, 'stop'))
         )
         conn.scheduled_tasks.append(stop_task)
+        if await isLLMWantToFinish(conn):
+            finish_task = asyncio.create_task(
+                schedule_with_interrupt(stop_duration, finishToChat(conn))
+            )
+            conn.scheduled_tasks.append(finish_task)
 
 
 async def send_tts_message(conn, state, text=None):
@@ -112,4 +146,4 @@ async def schedule_with_interrupt(delay, coro):
         await asyncio.sleep(delay)
         await coro
     except asyncio.CancelledError:
-        pass
+        pass

core/utils/util.py

@@ -5,9 +5,8 @@ import socket
 
 
 def get_project_dir():
-    projectName = 'xiaozhi-esp32-server'
-    filePath = os.path.abspath(__file__)
-    return filePath[:filePath.rfind('/' + projectName + '/') + len(projectName) + 2]
+    """获取项目根目录"""
+    return os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + '/'
 
 
 def get_local_ip():
@@ -91,4 +90,4 @@ def remove_punctuation_and_length(text):
 
     if result == "Yeah":
         return 0
-    return len(result)
+    return len(result), result