xiaozhi-sdk 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

xiaozhi_sdk/__init__.py

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

xiaozhi_sdk/cli.py

@@ -46,12 +46,14 @@ async def handle_message(message):
         is_end = True
 
 
-async def play_assistant_audio(audio_queue: deque[bytes]):
+async def play_assistant_audio(audio_queue: deque[bytes], enable_audio):
     """播放音频流"""
     global is_playing_audio
 
-    stream = sd.OutputStream(samplerate=INPUT_SERVER_AUDIO_SAMPLE_RATE, channels=1, dtype=np.int16)
-    stream.start()
+    stream = None
+    if enable_audio:
+        stream = sd.OutputStream(samplerate=INPUT_SERVER_AUDIO_SAMPLE_RATE, channels=1, dtype=np.int16)
+        stream.start()
     last_audio_time = None
 
     while True:
@@ -66,7 +68,8 @@ async def play_assistant_audio(audio_queue: deque[bytes]):
 
         is_playing_audio = True
         pcm_data = audio_queue.popleft()
-        stream.write(pcm_data)
+        if stream:
+            stream.write(pcm_data)
         last_audio_time = time.time()
 
 
@@ -83,7 +86,7 @@ class XiaoZhiClient:
         self.ota_url = ota_url
         self.mac_address = ""
 
-    async def start(self, mac_address: str, serial_number: str = "", license_key: str = ""):
+    async def start(self, mac_address: str, serial_number: str, license_key: str, enable_audio):
         """启动客户端连接"""
         self.mac_address = mac_address
         self.xiaozhi = XiaoZhiWebsocket(handle_message, url=self.url, ota_url=self.ota_url, send_wake=True)
@@ -92,7 +95,7 @@ class XiaoZhiClient:
             self.mac_address, aec=False, serial_number=serial_number, license_key=license_key
         )
 
-        asyncio.create_task(play_assistant_audio(self.xiaozhi.output_audio_queue))
+        asyncio.create_task(play_assistant_audio(self.xiaozhi.output_audio_queue, enable_audio))
 
     def audio_callback(self, indata, frames, time, status):
         """音频输入回调函数"""
@@ -115,11 +118,11 @@ class XiaoZhiClient:
                 await self.xiaozhi.send_audio(pcm_data)
 
 
-async def run_client(mac_address: str, url: str, ota_url: str, serial_number: str, license_key: str):
+async def run_client(mac_address: str, url: str, ota_url: str, serial_number: str, license_key: str, enable_audio: bool):
     """运行客户端的异步函数"""
     logger.debug("Recording... Press Ctrl+C to stop.")
     client = XiaoZhiClient(url, ota_url)
-    await client.start(mac_address, serial_number, license_key)
+    await client.start(mac_address, serial_number, license_key, enable_audio)
 
     with sd.InputStream(callback=client.audio_callback, channels=1, samplerate=16000, blocksize=960):
         await client.process_audio_input()
@@ -131,9 +134,10 @@ async def run_client(mac_address: str, url: str, ota_url: str, serial_number: st
 @click.option("--ota_url", help="OTA地址")
 @click.option("--serial_number", default="", help="设备的序列号")
 @click.option("--license_key", default="", help="设备的授权密钥")
-def main(mac_address: str, url: str, ota_url: str, serial_number: str, license_key: str):
+@click.option("--enable_audio", default=True, help="是否开启音频播放")
+def main(mac_address: str, url: str, ota_url: str, serial_number: str, license_key: str, enable_audio: bool):
     """小智SDK客户端
 
     MAC_ADDRESS: 设备的MAC地址 (格式: XX:XX:XX:XX:XX:XX)
     """
-    asyncio.run(run_client(mac_address, url, ota_url, serial_number, license_key))
+    asyncio.run(run_client(mac_address, url, ota_url, serial_number, license_key, enable_audio))

xiaozhi_sdk/mcp.py

@@ -43,7 +43,7 @@ class McpTool(object):
         try:
             response = requests.post(self.explain_url, files=files, data=payload, headers=headers, timeout=5)
             res_json = response.json()
-        except Exception as e:
+        except Exception:
             return "网络异常", True
         if res_json.get("error"):
             return res_json, True
@@ -72,10 +72,11 @@ class McpTool(object):
                 else:
                     tool_res, is_error = {"message": "正在为你播放: {}".format(arguments["music_name"])}, False
                     data = {
-                        "type": "music", "state": "start",
+                        "type": "music",
+                        "state": "start",
                         "url": music_info["url"],
                         "text": arguments["music_name"],
-                        "source": "sdk.mcp_music_tool"
+                        "source": "sdk.mcp_music_tool",
                     }
                     await self.message_handler_callback(data)
 

xiaozhi_sdk/utils/mcp_data.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List
+from typing import Any, Dict
 
 mcp_initialize_payload: Dict[str, Any] = {
     "jsonrpc": "2.0",
@@ -23,7 +23,10 @@ mcp_tool_conf: Dict[str, Dict[str, Any]] = {
         "description": "Play music using music IDs. IMPORTANT: You must call `search_custom_music` first to get the music IDs before using this tool. Use this tool after getting music IDs from search results. Args:\n  `id_list`: The id list of the music to play (obtained from search_custom_music results). The list must contain more than 2 music IDs, and the system will randomly select one to play.\n  `music_name`: The name of the music (obtained from search_custom_music results)",
         "inputSchema": {
             "type": "object",
-            "properties": {"music_name": {"type": "string"}, "id_list": {"type": "array", "items": {"type": "string"}, "minItems": 3}},
+            "properties": {
+                "music_name": {"type": "string"},
+                "id_list": {"type": "array", "items": {"type": "string"}, "minItems": 3},
+            },
             "required": ["music_name", "id_list"],
         },
     },

xiaozhi_sdk/utils/mcp_tool.py

@@ -3,7 +3,6 @@ import random
 
 import aiohttp
 import numpy as np
-from pydub import AudioSegment
 
 
 async def async_search_custom_music(data) -> tuple[dict, bool]:
@@ -57,6 +56,11 @@ async def _get_random_music_info(id_list: list) -> dict:
 
 
 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)
 
@@ -79,7 +83,7 @@ async def async_mcp_play_music(data) -> tuple[list, bool]:
 
     chunk_size = 960 * 2
     for i in range(0, len(pcm_data), chunk_size):
-        chunk = pcm_data[i: i + chunk_size]
+        chunk = pcm_data[i : i + chunk_size]
 
         if chunk:  # 确保不添加空块
             chunk = np.frombuffer(chunk, dtype=np.int16)

{xiaozhi_sdk-0.0.7.dist-info → xiaozhi_sdk-0.0.9.dist-info}/METADATA

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

{xiaozhi_sdk-0.0.7.dist-info → xiaozhi_sdk-0.0.9.dist-info}/RECORD

@@ -8,19 +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=42z4NTA7JPjhEk64Z2CmOkQ71dd3aPyLX02T6gQfe_4,77
+xiaozhi_sdk/__init__.py,sha256=-gx5Vs8YIZLaWKtMWumKSkCiYu2Nu8Z7rFjFnYbkDhQ,77
 xiaozhi_sdk/__main__.py,sha256=i0ZJdHUqAKg9vwZrK_w0TJkzdotTYTK8aUeSPcJc1ks,210
-xiaozhi_sdk/cli.py,sha256=KCSTyH6ocMSNs3WYRSqQsvGlzJNRqBR88otz-w-yb9E,4241
+xiaozhi_sdk/cli.py,sha256=LFZE4f4A44EIPXLsowxQ4z_EskTh62MLusPwwFVtXr8,4490
 xiaozhi_sdk/config.py,sha256=h4mpMeBf2vT9qYAqCCbGVGmMemkgk98pcXP2Rh4TEFc,89
 xiaozhi_sdk/core.py,sha256=564SefCBus6qNRApWqwI113aIN1p4eYpci1mLeMExIs,10007
 xiaozhi_sdk/iot.py,sha256=IO3SfiuQxucYl_917BCNCwIAv1dajCJI-IFTWwHnSDE,2580
-xiaozhi_sdk/mcp.py,sha256=kFkyZjLrjJNwZuZtFueMdeFAjzm0DJa7GsXcIg5YYi4,5524
+xiaozhi_sdk/mcp.py,sha256=Pbr3JEDqEnWsPwLHKzRdrDYZMg6krYZoz74lXUSh9iI,5544
 xiaozhi_sdk/opus.py,sha256=r3nnYg0ZKAJTreb_3nKgfHJh06MJiMvnNMPO1SWdoMM,2224
 xiaozhi_sdk/utils/__init__.py,sha256=XKSHWoFmuSkpwaIr308HybRzfFIXoT1Fd-eUKo_im6Y,1705
-xiaozhi_sdk/utils/mcp_data.py,sha256=xeZhqucYCeKPJiRbrTptkNeCd0ampQXgb5lA5UsJW3U,3851
-xiaozhi_sdk/utils/mcp_tool.py,sha256=OU1mr3qr4XB0nvE8sX6-eCZyT2l-RdFe0caaTbOf4L8,3085
-xiaozhi_sdk-0.0.7.dist-info/licenses/LICENSE,sha256=Vwgps1iODKl43cAtME_0dawTjAzNW-O2BWiN5BHggww,1085
-xiaozhi_sdk-0.0.7.dist-info/METADATA,sha256=K4p1y2BqooqQ5gWqm4gf3iVQ5AbATsX-WgbBIM0jtHU,2091
-xiaozhi_sdk-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xiaozhi_sdk-0.0.7.dist-info/top_level.txt,sha256=nBpue4hU5Ykm5CtYPsAdxSa_yqbtZsIT_gF_EkBaJPM,12
-xiaozhi_sdk-0.0.7.dist-info/RECORD,,
+xiaozhi_sdk/utils/mcp_data.py,sha256=r_GLjFpvUKeV8IhlkT7Pfb4c9bDO9q4k3f4iPZBBcKI,3892
+xiaozhi_sdk/utils/mcp_tool.py,sha256=imwehfUlENjelYmGbGYgb6C82-ijs53XCxrtCpqrJps,3152
+xiaozhi_sdk-0.0.9.dist-info/licenses/LICENSE,sha256=Vwgps1iODKl43cAtME_0dawTjAzNW-O2BWiN5BHggww,1085
+xiaozhi_sdk-0.0.9.dist-info/METADATA,sha256=kqk96A4tgE9-b4rn-eyFKLLoXYqky1v3tlnVscck14k,2091
+xiaozhi_sdk-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xiaozhi_sdk-0.0.9.dist-info/top_level.txt,sha256=nBpue4hU5Ykm5CtYPsAdxSa_yqbtZsIT_gF_EkBaJPM,12
+xiaozhi_sdk-0.0.9.dist-info/RECORD,,