xiaozhi-sdk 0.2.1__tar.gz → 0.2.3__tar.gz

{xiaozhi_sdk-0.2.1/xiaozhi_sdk.egg-info → xiaozhi_sdk-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xiaozhi-sdk
-Version: 0.2.1
+Version: 0.2.3
 Summary: 一个用于连接和控制小智智能设备的Python SDK，支持实时音频通信、MCP工具集成和设备管理功能。
 Author-email: dairoot <623815825@qq.com>
 License-Expression: MIT

{xiaozhi_sdk-0.2.1 → xiaozhi_sdk-0.2.3}/tests/test_wake_word.py

@@ -25,7 +25,9 @@ async def test_main():
     xiaozhi = XiaoZhiWebsocket(message_handler_callback, url=URL, ota_url=ota_url)
     await xiaozhi.init_connection(MAC_ADDR)
 
-    await xiaozhi.send_wake_word("你是")
+    await xiaozhi.send_wake_word("退下，拜拜不聊了")
+    await asyncio.wait_for(is_end.wait(), timeout=20.0)
+    await xiaozhi.send_wake_word("你好")
 
     await asyncio.wait_for(is_end.wait(), timeout=20.0)
     await xiaozhi.close()

{xiaozhi_sdk-0.2.1 → xiaozhi_sdk-0.2.3}/xiaozhi_sdk/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.2.1"
+__version__ = "0.2.3"
 
 from xiaozhi_sdk.core import XiaoZhiWebsocket  # noqa

{xiaozhi_sdk-0.2.1 → xiaozhi_sdk-0.2.3}/xiaozhi_sdk/core.py

@@ -122,9 +122,16 @@ class XiaoZhiWebsocket(McpTool):
 
     async def send_wake_word(self, wake_word: str) -> None:
         """发送唤醒词"""
-        await self.websocket.send(
-            json.dumps({"session_id": self.session_id, "type": "listen", "state": "detect", "text": wake_word})
-        )
+        try:
+            await self.websocket.send(
+                json.dumps({"session_id": self.session_id, "type": "listen", "state": "detect", "text": wake_word})
+            )
+        except websockets.ConnectionClosed:
+            if self.message_handler_callback:
+                await self.message_handler_callback(
+                    {"type": "websocket", "state": "close", "source": "sdk.send_wake_word"}
+                )
+            logger.debug("[websocket] close")
 
     async def send_silence_audio(self, duration_seconds: float = 1.2) -> None:
         """发送静音音频"""
@@ -139,8 +146,11 @@ class XiaoZhiWebsocket(McpTool):
 
         # audio data
         if isinstance(message, bytes):
-            pcm_array = await self.audio_opus.opus_to_pcm(message)
-            self.output_audio_queue.extend(pcm_array)
+            try:
+                pcm_array = await self.audio_opus.opus_to_pcm(message)
+                self.output_audio_queue.extend(pcm_array)
+            except Exception as e:
+                logger.error("opus_to_pcm error: %s", e)
             return
 
         # json message
@@ -149,29 +159,41 @@ class XiaoZhiWebsocket(McpTool):
         if message_type == "hello":
             self.hello_received.set()
             self.session_id = data["session_id"]
+            return
         elif message_type == "mcp":
             await self.mcp(data)
-        elif self.message_handler_callback:
-            if data["type"] == "tts":
+            return
+
+        # 转发其他 message_type
+        if self.message_handler_callback:
+            try:
+                await self.message_handler_callback(data)
+            except Exception as e:
+                logger.error("message_handler_callback error: %s", e)
+
+            if message_type == "tts":
                 if data["state"] == "sentence_start":
                     self.is_playing = True
-                    # self.output_audio_queue.clear()
                 else:
                     self.is_playing = False
-
-            await self.message_handler_callback(data)
+        else:
+            logger.warning("未定义回调函数 %s", data)
 
     async def _message_handler(self) -> None:
         """消息处理器"""
         try:
             async for message in self.websocket:
-                await self._handle_websocket_message(message)
+                try:
+                    await self._handle_websocket_message(message)
+                except Exception as e:
+                    logger.error("message_handler error: %s", e)
+
         except websockets.ConnectionClosed:
             if self.message_handler_callback:
                 await self.message_handler_callback(
                     {"type": "websocket", "state": "close", "source": "sdk.message_handler"}
                 )
-                logger.debug("[websocket] close")
+            logger.debug("[websocket] close")
 
     async def set_mcp_tool(self, mcp_tool_list) -> None:
         """设置MCP工具"""

{xiaozhi_sdk-0.2.1 → xiaozhi_sdk-0.2.3/xiaozhi_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xiaozhi-sdk
-Version: 0.2.1
+Version: 0.2.3
 Summary: 一个用于连接和控制小智智能设备的Python SDK，支持实时音频通信、MCP工具集成和设备管理功能。
 Author-email: dairoot <623815825@qq.com>
 License-Expression: MIT