xiaozhi-sdk 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

xiaozhi_sdk/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.3"
+__version__ = "0.0.5"
 
 import asyncio
 import json
@@ -147,6 +147,7 @@ class XiaoZhiWebsocket(McpTool):
                 await self.message_handler_callback(
                     {"type": "websocket", "state": "close", "source": "sdk.message_handler"}
                 )
+                logger.info("[websocket] close")
 
     async def set_mcp_tool_callback(self, tool_func: Dict[str, Callable[..., Any]]) -> None:
         """设置MCP工具回调函数"""
@@ -165,11 +166,15 @@ class XiaoZhiWebsocket(McpTool):
 
         self.ota = OtaDevice(self.mac_addr, self.client_id, self.ota_url, serial_number)
         ota_info = await self.ota.activate_device()
-        ws_url = ota_info["websocket"]["url"]
+        ws_url = ota_info.get("websocket", {}).get("url")
         self.url = self.url or ws_url
 
+        if not self.url:
+            logger.warning("[websocket] 未找到websocket链接地址")
+            return
+
         if "tenclass.net" not in self.url and "xiaozhi.me" not in self.url:
-            logger.warning("[websocket] 检测到非官方服务器，请谨慎使用！当前链接地址: %s", self.url)
+            logger.warning("[websocket] 检测到非官方服务器，当前链接地址: %s", self.url)
 
         headers = {
             "Authorization": "Bearer {}".format(ota_info["websocket"]["token"]),
@@ -202,6 +207,8 @@ class XiaoZhiWebsocket(McpTool):
             if self.message_handler_callback:
                 await self.message_handler_callback({"type": "websocket", "state": "close", "source": "sdk.send_audio"})
                 self.websocket = None
+                logger.info("[websocket] close")
+
             await asyncio.sleep(0.5)
         else:
             await asyncio.sleep(0.1)

xiaozhi_sdk/__main__.py

@@ -20,11 +20,15 @@ logger = logging.getLogger("xiaozhi_sdk")
 # 全局状态
 input_audio_buffer: deque[bytes] = deque()
 is_playing_audio = False
+is_end = False
 
 
 async def handle_message(message):
     """处理接收到的消息"""
+    global is_end
     logger.info("message received: %s", message)
+    if message["type"] == "websocket" and message["state"] == "close":
+        is_end = True
 
 
 async def play_assistant_audio(audio_queue: deque[bytes]):
@@ -36,6 +40,9 @@ async def play_assistant_audio(audio_queue: deque[bytes]):
     last_audio_time = None
 
     while True:
+        if is_end:
+            return
+
         if not audio_queue:
             await asyncio.sleep(0.01)
             if last_audio_time and time.time() - last_audio_time > 1:
@@ -77,6 +84,10 @@ class XiaoZhiClient:
     async def process_audio_input(self):
         """处理音频输入"""
         while True:
+
+            if is_end:
+                return
+
             if not input_audio_buffer:
                 await asyncio.sleep(0.02)
                 continue

xiaozhi_sdk/config.py

@@ -1,3 +1,3 @@
 INPUT_SERVER_AUDIO_SAMPLE_RATE = 16000
 
-OTA_URL = "https://api.tenclass.net/xiaozhi/ota/"
+OTA_URL = "https://api.tenclass.net/xiaozhi/ota"

xiaozhi_sdk/iot.py

@@ -29,6 +29,8 @@ class OtaDevice:
 
     def __init__(self, mac_addr: str, client_id: str, ota_url: Optional[str] = None, serial_number: str = "") -> None:
         self.ota_url = ota_url or OTA_URL
+        self.ota_url = self.ota_url.rstrip("/")
+
         self.mac_addr = mac_addr
         self.client_id = client_id
         self.serial_number = serial_number
@@ -54,12 +56,13 @@ class OtaDevice:
         }
 
         async with aiohttp.ClientSession() as session:
-            async with session.post(self.ota_url, headers=headers, data=json.dumps(payload)) as response:
+            async with session.post(self.ota_url + "/", headers=headers, data=json.dumps(payload)) as response:
                 response.raise_for_status()
                 return await response.json()
 
     async def check_activate(self, challenge: str, license_key: str = "") -> bool:
         url = f"{self.ota_url}/activate"
+
         headers = self._get_base_headers()
 
         hmac_instance = hmac.new(license_key.encode(), challenge.encode(), hashlib.sha256)

{xiaozhi_sdk-0.0.3.dist-info → xiaozhi_sdk-0.0.5.dist-info}/METADATA

@@ -1,34 +1,25 @@
 Metadata-Version: 2.4
 Name: xiaozhi-sdk
-Version: 0.0.3
+Version: 0.0.5
 Summary: 一个用于连接和控制小智智能设备的Python SDK，支持实时音频通信、MCP工具集成和设备管理功能。
-Home-page: https://github.com/dairoot/xiaozhi-sdk
-Author: dairoot
-Author-email: 623815825@qq.com
+Author-email: dairoot <623815825@qq.com>
+License: MIT
+Project-URL: Homepage, https://github.com/dairoot/xiaozhi-sdk
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.8.1
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
-Requires-Dist: websockets
+Requires-Dist: websockets>=15.0.1
 Requires-Dist: aiohttp
 Requires-Dist: av
 Requires-Dist: opuslib
 Requires-Dist: requests
 Requires-Dist: sounddevice
 Requires-Dist: python-socks
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # 小智SDK (XiaoZhi SDK)
 

{xiaozhi_sdk-0.0.3.dist-info → xiaozhi_sdk-0.0.5.dist-info}/RECORD

@@ -7,16 +7,16 @@ 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-x86_64-opus.dll,sha256=kLfhioMvbJhOgNMAldpWk3DCZqC5Xd70LRbHnACvAnw,463360
-xiaozhi_sdk/__init__.py,sha256=BYamw1o8-Q8SjZ_UT9rrE5Ut080A13NA6Jom4Fp0gF0,7935
-xiaozhi_sdk/__main__.py,sha256=sRwuPQIv2hd6NC6j7LQtAgv4mrh-fTCaApH6y-4FUgw,3594
-xiaozhi_sdk/config.py,sha256=mpjWWklTI2bw4zY3ZWCYvqvpfZSoF5iM7ubAP9y_8cM,90
+xiaozhi_sdk/__init__.py,sha256=psrVT0BBTsCj1wqJ7ZmKRhGfRj2y7NPGRwn_aiKLw-E,8146
+xiaozhi_sdk/__main__.py,sha256=_Xh6v2oMYXYHsrAkw4PYMJpvi-0r3ujLNRLMxPNarTQ,3807
+xiaozhi_sdk/config.py,sha256=h4mpMeBf2vT9qYAqCCbGVGmMemkgk98pcXP2Rh4TEFc,89
 xiaozhi_sdk/data.py,sha256=8z8erOjBZFvPSBJlPoyTzRYZ3BuMvnPpAFQCbSxs-48,2522
-xiaozhi_sdk/iot.py,sha256=hVrxBUZ_oegkTXKu345SQkniKaEm-PBeL9iCBZ4z90s,2336
+xiaozhi_sdk/iot.py,sha256=w_DvEDcQmaP1JJAYElRDCJP5h0GhaoZ2lg5JBnmZBnU,2392
 xiaozhi_sdk/mcp.py,sha256=JA-z6EjGqitEfwMlvxk6XUSjbmfAdyWJVZPjtjqo6Oo,3823
 xiaozhi_sdk/opus.py,sha256=4O-kz-PcUVmpa27Vju6jv-sbwywuAXFvVL23R1-vv5o,2104
 xiaozhi_sdk/utils.py,sha256=5qHAiI5Nrzeka3TofMPhAVmMovEJJa6QSrKcDM0OF4g,1703
-xiaozhi_sdk-0.0.3.dist-info/licenses/LICENSE,sha256=Vwgps1iODKl43cAtME_0dawTjAzNW-O2BWiN5BHggww,1085
-xiaozhi_sdk-0.0.3.dist-info/METADATA,sha256=gDnKThKZGvkxJLXQbHhArOwGoZjLFiGptMsBbub__Z0,2520
-xiaozhi_sdk-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xiaozhi_sdk-0.0.3.dist-info/top_level.txt,sha256=nBpue4hU5Ykm5CtYPsAdxSa_yqbtZsIT_gF_EkBaJPM,12
-xiaozhi_sdk-0.0.3.dist-info/RECORD,,
+xiaozhi_sdk-0.0.5.dist-info/licenses/LICENSE,sha256=Vwgps1iODKl43cAtME_0dawTjAzNW-O2BWiN5BHggww,1085
+xiaozhi_sdk-0.0.5.dist-info/METADATA,sha256=M0BcMb2zM9SjHdJHfivECeUtOFKNuPDiBoe3BM8dkW0,2352
+xiaozhi_sdk-0.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xiaozhi_sdk-0.0.5.dist-info/top_level.txt,sha256=nBpue4hU5Ykm5CtYPsAdxSa_yqbtZsIT_gF_EkBaJPM,12
+xiaozhi_sdk-0.0.5.dist-info/RECORD,,