xiaozhi-sdk 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

xiaozhi_sdk/__init__.py

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

xiaozhi_sdk/core.py

@@ -139,8 +139,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 +152,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.info("[websocket] close")
 
     async def set_mcp_tool(self, mcp_tool_list) -> None:
         """设置MCP工具"""

xiaozhi_sdk/mcp.py

@@ -8,7 +8,7 @@ from typing import Any, Dict
 import numpy as np
 import requests
 
-from xiaozhi_sdk.utils.mcp_tool import _get_random_music_info
+from xiaozhi_sdk.utils.tool_func import _get_random_music_info
 
 logger = logging.getLogger("xiaozhi_sdk")
 

xiaozhi_sdk/utils/mcp_tool.py

@@ -1,96 +1,4 @@
-import io
-import random
-
-import aiohttp
-import numpy as np
-
-
-async def async_search_custom_music(data) -> tuple[dict, bool]:
-    search_url = f"https://music-api.gdstudio.xyz/api.php?types=search&name={data['music_name']}&count=100&pages=1"
-
-    # 为搜索请求设置 10 秒超时
-    timeout = aiohttp.ClientTimeout(total=10)
-    async with aiohttp.ClientSession(timeout=timeout) as session:
-        async with session.get(search_url) as response:
-            response_json = await response.json()
-
-    music_list = []
-    first_music_list = []
-    other_music_list1 = []
-    other_music_list2 = []
-    for line in response_json:
-        if data.get("author_name") and data["author_name"] in line["artist"][0]:
-            first_music_list.append(line)
-        elif data.get("author_name") and (data["author_name"] in line["artist"] or data["author_name"] in line["name"]):
-            other_music_list1.append(line)
-        else:
-            other_music_list2.append(line)
-
-    if len(first_music_list) <= 10:
-        music_list = first_music_list
-        random.shuffle(other_music_list2)
-        music_list = music_list + other_music_list1[: 20 - len(music_list)]
-        music_list = music_list + other_music_list2[: 20 - len(music_list)]
-
-    # print(data)
-    # print("找到音乐，数量：", len(first_music_list), len(music_list))
-
-    if not music_list:
-        return {}, False
-    return {"message": "已找到歌曲", "music_list": music_list}, False
-
-
-async def _get_random_music_info(id_list: list) -> dict:
-    timeout = aiohttp.ClientTimeout(total=10)
-    async with aiohttp.ClientSession(timeout=timeout) as session:
-        random.shuffle(id_list)
-
-        for music_id in id_list:
-            url = f"https://music-api.gdstudio.xyz/api.php?types=url&id={music_id}&br=128"
-            async with session.get(url) as response:
-                res_json = await response.json()
-            if res_json.get("url"):
-                break
-
-    return res_json
-
-
-async def async_mcp_play_music(data) -> tuple[list, bool]:
-    try:
-        from pydub import AudioSegment
-    except ImportError:
-        return [], True
-
-    id_list = data["id_list"]
-    res_json = await _get_random_music_info(id_list)
-
-    if not res_json:
-        return [], False
-
-    pcm_list = []
-    buffer = io.BytesIO()
-    # 为下载音乐文件设置 60 秒超时（音乐文件可能比较大）
-    download_timeout = aiohttp.ClientTimeout(total=60)
-    async with aiohttp.ClientSession(timeout=download_timeout) as session:
-        async with session.get(res_json["url"]) as resp:
-            async for chunk in resp.content.iter_chunked(1024):
-                buffer.write(chunk)
-
-    buffer.seek(0)
-    audio = AudioSegment.from_mp3(buffer)
-    audio = audio.set_frame_rate(16000).set_channels(1).set_sample_width(2)  # 2 bytes = 16 bits
-    pcm_data = audio.raw_data
-
-    chunk_size = 960 * 2
-    for i in range(0, len(pcm_data), chunk_size):
-        chunk = pcm_data[i : i + chunk_size]
-
-        if chunk:  # 确保不添加空块
-            chunk = np.frombuffer(chunk, dtype=np.int16)
-            pcm_list.extend(chunk)
-
-    return pcm_list, False
-
+from xiaozhi_sdk.utils.tool_func import async_mcp_play_music, async_search_custom_music
 
 search_custom_music = {
     "name": "search_custom_music",
@@ -164,7 +72,7 @@ set_theme = {
 
 take_photo = {
     "name": "take_photo",
-    "description": "Use this tool when the user asks you to look at something, take a picture, or solve a problem based on what is captured.\nArgs:\n`question`: A clear question or task you want to ask about the captured photo (e.g., identify objects, read text, explain content, or solve a math/logic problem).\nReturn:\n  A JSON object that provides the photo information, including answers, explanations, or problem-solving results if applicable.",
+    "description": "Have visual ability, Use this tool when the user asks you to look at something, take a picture, or solve a problem based on what is captured.\nArgs:\n`question`: A clear question or task you want to ask about the captured photo (e.g., identify objects, read text, explain content, or solve a math/logic problem).\nReturn:\n  A JSON object that provides the photo information, including answers, explanations, or problem-solving results if applicable.",
     "inputSchema": {
         "type": "object",
         "properties": {"question": {"type": "string"}},

xiaozhi_sdk/utils/tool_func.py

@@ -0,0 +1,92 @@
+import io
+import random
+
+import aiohttp
+import numpy as np
+
+
+async def async_search_custom_music(data) -> tuple[dict, bool]:
+    search_url = f"https://music-api.gdstudio.xyz/api.php?types=search&name={data['music_name']}&count=100&pages=1"
+
+    # 为搜索请求设置 10 秒超时
+    timeout = aiohttp.ClientTimeout(total=10)
+    async with aiohttp.ClientSession(timeout=timeout) as session:
+        async with session.get(search_url) as response:
+            response_json = await response.json()
+
+    music_list = []
+    first_music_list = []
+    other_music_list1 = []
+    other_music_list2 = []
+    for line in response_json:
+        if data.get("author_name") and data["author_name"] in line["artist"][0]:
+            first_music_list.append(line)
+        elif data.get("author_name") and (data["author_name"] in line["artist"] or data["author_name"] in line["name"]):
+            other_music_list1.append(line)
+        else:
+            other_music_list2.append(line)
+
+    if len(first_music_list) <= 10:
+        music_list = first_music_list
+        random.shuffle(other_music_list2)
+        music_list = music_list + other_music_list1[: 20 - len(music_list)]
+        music_list = music_list + other_music_list2[: 20 - len(music_list)]
+
+    # print(data)
+    # print("找到音乐，数量：", len(first_music_list), len(music_list))
+
+    if not music_list:
+        return {}, False
+    return {"message": "已找到歌曲", "music_list": music_list}, False
+
+
+async def _get_random_music_info(id_list: list) -> dict:
+    timeout = aiohttp.ClientTimeout(total=10)
+    async with aiohttp.ClientSession(timeout=timeout) as session:
+        random.shuffle(id_list)
+
+        for music_id in id_list:
+            url = f"https://music-api.gdstudio.xyz/api.php?types=url&id={music_id}&br=128"
+            async with session.get(url) as response:
+                res_json = await response.json()
+            if res_json.get("url"):
+                break
+
+    return res_json
+
+
+async def async_mcp_play_music(data) -> tuple[list, bool]:
+    try:
+        from pydub import AudioSegment
+    except ImportError:
+        return [], True
+
+    id_list = data["id_list"]
+    res_json = await _get_random_music_info(id_list)
+
+    if not res_json:
+        return [], False
+
+    pcm_list = []
+    buffer = io.BytesIO()
+    # 为下载音乐文件设置 60 秒超时（音乐文件可能比较大）
+    download_timeout = aiohttp.ClientTimeout(total=60)
+    async with aiohttp.ClientSession(timeout=download_timeout) as session:
+        async with session.get(res_json["url"]) as resp:
+            async for chunk in resp.content.iter_chunked(1024):
+                buffer.write(chunk)
+
+    buffer.seek(0)
+    audio = AudioSegment.from_mp3(buffer)
+    audio = audio.set_frame_rate(16000).set_channels(1).set_sample_width(2)  # 2 bytes = 16 bits
+    pcm_data = audio.raw_data
+
+    chunk_size = 960 * 2
+    for i in range(0, len(pcm_data), chunk_size):
+        chunk = pcm_data[i : i + chunk_size]
+
+        if chunk:  # 确保不添加空块
+            chunk = np.frombuffer(chunk, dtype=np.int16)
+            pcm_list.extend(chunk)
+
+    return pcm_list, False

{xiaozhi_sdk-0.2.0.dist-info → xiaozhi_sdk-0.2.2.dist-info}/METADATA

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

{xiaozhi_sdk-0.2.0.dist-info → xiaozhi_sdk-0.2.2.dist-info}/RECORD

@@ -8,18 +8,19 @@ file/opus/linux-x64-libopus.so,sha256=FmXJqkxLpDzNFOHYkmOzmsp1hP0eIS5b6x_XfOs-IQ
 file/opus/macos-arm64-libopus.dylib,sha256=H7wXwkrGwb-hesMMZGFxWb0Ri1Y4m5GWiKsd8CfOhE8,357584
 file/opus/macos-x64-libopus.dylib,sha256=MqyL_OjwSACF4Xs_-KrGbcScy4IEprr5Rlkk3ddZye8,550856
 file/opus/windows-opus.dll,sha256=kLfhioMvbJhOgNMAldpWk3DCZqC5Xd70LRbHnACvAnw,463360
-xiaozhi_sdk/__init__.py,sha256=EnDhE3nCihG1u1vq2yjaZLzlHRKoNmEC-eJSlD7BXxo,77
+xiaozhi_sdk/__init__.py,sha256=vnorG8iuWFOKelF22ZlRtQ154kXla-XOnvzebaHa5j8,77
 xiaozhi_sdk/__main__.py,sha256=i0ZJdHUqAKg9vwZrK_w0TJkzdotTYTK8aUeSPcJc1ks,210
 xiaozhi_sdk/cli.py,sha256=CEpjXW-vnT8DieaK1MV0AYCG4bmK2_vpIz-9zhWHVgE,7001
 xiaozhi_sdk/config.py,sha256=h4mpMeBf2vT9qYAqCCbGVGmMemkgk98pcXP2Rh4TEFc,89
-xiaozhi_sdk/core.py,sha256=kTcENYV7s91kpVyb5-E72l3GMweBpC8bKVZQ_SHR1GU,9807
+xiaozhi_sdk/core.py,sha256=_HT4zWdAkzvQKrgnlyL5b6fIg9PXULnkuE2LReoZOZM,10265
 xiaozhi_sdk/iot.py,sha256=VVAheynp1iV4GCaoPywQWpKtlyoACDLswH8yfV_JZgI,2699
-xiaozhi_sdk/mcp.py,sha256=YLZOj1F2ILwqhfevETVK2_K7pVweJGMnuMcdRmu6PJg,6558
+xiaozhi_sdk/mcp.py,sha256=TVSHrWIy7qDy8DQOjQ9EAzVZ1SFtXkSgTDYysL-dRhk,6559
 xiaozhi_sdk/opus.py,sha256=r3nnYg0ZKAJTreb_3nKgfHJh06MJiMvnNMPO1SWdoMM,2224
 xiaozhi_sdk/utils/__init__.py,sha256=XKSHWoFmuSkpwaIr308HybRzfFIXoT1Fd-eUKo_im6Y,1705
-xiaozhi_sdk/utils/mcp_tool.py,sha256=uxT8jUANGs1mDrTGVkIv1eO89k4qn8WAgXYzITBLObg,7251
-xiaozhi_sdk-0.2.0.dist-info/licenses/LICENSE,sha256=Vwgps1iODKl43cAtME_0dawTjAzNW-O2BWiN5BHggww,1085
-xiaozhi_sdk-0.2.0.dist-info/METADATA,sha256=PN5vqqocSqZEoQl30P_IO_QMfMY_cZo7YkboXP8SR3M,2121
-xiaozhi_sdk-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xiaozhi_sdk-0.2.0.dist-info/top_level.txt,sha256=nBpue4hU5Ykm5CtYPsAdxSa_yqbtZsIT_gF_EkBaJPM,12
-xiaozhi_sdk-0.2.0.dist-info/RECORD,,
+xiaozhi_sdk/utils/mcp_tool.py,sha256=T6OIrSqcyAHQ85sduz5Klx646SoEnGD5ROBTKoX6NhE,4207
+xiaozhi_sdk/utils/tool_func.py,sha256=imwehfUlENjelYmGbGYgb6C82-ijs53XCxrtCpqrJps,3152
+xiaozhi_sdk-0.2.2.dist-info/licenses/LICENSE,sha256=Vwgps1iODKl43cAtME_0dawTjAzNW-O2BWiN5BHggww,1085
+xiaozhi_sdk-0.2.2.dist-info/METADATA,sha256=azrkbi4i84qSDRxSBTDUC4CQg5mGbvbz_f_3__TRKHk,2121
+xiaozhi_sdk-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xiaozhi_sdk-0.2.2.dist-info/top_level.txt,sha256=nBpue4hU5Ykm5CtYPsAdxSa_yqbtZsIT_gF_EkBaJPM,12
+xiaozhi_sdk-0.2.2.dist-info/RECORD,,