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

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

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

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

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

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

@@ -120,18 +120,20 @@ class XiaoZhiWebsocket(McpTool):
             await self.websocket.send(opus_data)
         await self.send_silence_audio()
 
-    async def send_wake_word(self, wake_word: str) -> None:
+    async def send_wake_word(self, wake_word: str) -> bool:
         """发送唤醒词"""
         try:
             await self.websocket.send(
                 json.dumps({"session_id": self.session_id, "type": "listen", "state": "detect", "text": wake_word})
             )
+            return True
         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")
+            return False
 
     async def send_silence_audio(self, duration_seconds: float = 1.2) -> None:
         """发送静音音频"""
@@ -253,15 +255,16 @@ class XiaoZhiWebsocket(McpTool):
         if self.wake_word:
             await self.send_wake_word(self.wake_word)
 
-    async def send_audio(self, pcm: bytes) -> None:
+    async def send_audio(self, pcm: bytes) -> bool:
         """发送音频数据"""
         if not self.websocket:
-            return
+            return False
 
         state = self.websocket.state
         if state == websockets.protocol.State.OPEN:
             opus_data = await self.audio_opus.pcm_to_opus(pcm)
             await self.websocket.send(opus_data)
+            return True
         elif state in [websockets.protocol.State.CLOSED, websockets.protocol.State.CLOSING]:
             if self.wait_device_activated:
                 logger.debug("[websocket] Server actively disconnected, reconnecting...")
@@ -272,8 +275,10 @@ class XiaoZhiWebsocket(McpTool):
                 logger.debug("[websocket] Server actively disconnected")
 
             await asyncio.sleep(0.5)
+            return False
         else:
             await asyncio.sleep(0.1)
+            return False
 
     async def close(self) -> None:
         """关闭连接"""

{xiaozhi_sdk-0.2.3 → xiaozhi_sdk-0.2.5}/xiaozhi_sdk/mcp.py

@@ -12,24 +12,23 @@ from xiaozhi_sdk.utils.tool_func import _get_random_music_info
 
 logger = logging.getLogger("xiaozhi_sdk")
 
-mcp_initialize_payload: Dict[str, Any] = {
-    "jsonrpc": "2.0",
-    "id": 1,
-    "result": {
-        "protocolVersion": "2024-11-05",
-        "capabilities": {"tools": {}},
-        "serverInfo": {"name": "", "version": "0.0.1"},
-    },
-}
-
-mcp_tools_payload: Dict[str, Any] = {
-    "jsonrpc": "2.0",
-    "id": 2,
-    "result": {"tools": []},
-}
-
 
 class McpTool(object):
+    mcp_initialize_payload: Dict[str, Any] = {
+        "jsonrpc": "2.0",
+        "id": 1,
+        "result": {
+            "protocolVersion": "2024-11-05",
+            "capabilities": {"tools": {}},
+            "serverInfo": {"name": "", "version": "0.0.1"},
+        },
+    }
+
+    mcp_tools_payload: Dict[str, Any] = {
+        "id": 2,
+        "jsonrpc": "2.0",
+        "result": {"tools": []},
+    }
 
     def __init__(self):
         self.session_id = ""
@@ -131,8 +130,8 @@ class McpTool(object):
             # self.explain_url = "http://82.157.143.133:8000/vision/explain"
             self.explain_token = payload["params"]["capabilities"]["vision"]["token"]
 
-            mcp_initialize_payload["id"] = payload["id"]
-            await self.websocket.send(self.get_mcp_json(mcp_initialize_payload))
+            self.mcp_initialize_payload["id"] = payload["id"]
+            await self.websocket.send(self.get_mcp_json(self.mcp_initialize_payload))
 
         elif method == "notifications/initialized":
             # print("\nMCP 工具初始化")
@@ -142,9 +141,9 @@ class McpTool(object):
             logger.error("[MCP] 工具加载失败")
 
         elif method == "tools/list":
-            mcp_tools_payload["id"] = payload["id"]
             tool_name_list = []
             mcp_tool_dict = copy.deepcopy(self.mcp_tool_dict)
+            mcp_tool_list = []
             for _, mcp_tool in mcp_tool_dict.items():
                 tool_name_list.append(mcp_tool["name"])
                 tool_func = mcp_tool.pop("tool_func", None)
@@ -152,9 +151,11 @@ class McpTool(object):
                     logger.error("[MCP] Tool %s has no tool_func", mcp_tool["name"])
                     return
                 mcp_tool.pop("is_async", None)
-                mcp_tools_payload["result"]["tools"].append(mcp_tool)
+                mcp_tool_list.append(mcp_tool)
 
-            await self.websocket.send(self.get_mcp_json(mcp_tools_payload))
+            self.mcp_tools_payload["id"] = payload["id"]
+            self.mcp_tools_payload["result"]["tools"] = mcp_tool_list
+            await self.websocket.send(self.get_mcp_json(self.mcp_tools_payload))
             logger.debug("[MCP] 加载成功，当前可用工具列表为：%s", tool_name_list)
 
         elif method == "tools/call":

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

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