xiaozhi-sdk 0.0.3__tar.gz → 0.0.5__tar.gz

{xiaozhi_sdk-0.0.3/xiaozhi_sdk.egg-info → xiaozhi_sdk-0.0.5}/PKG-INFO

@@ -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.5/pyproject.toml

@@ -0,0 +1,64 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "xiaozhi-sdk"
+dynamic = ["version"]
+description = "一个用于连接和控制小智智能设备的Python SDK，支持实时音频通信、MCP工具集成和设备管理功能。"
+readme = "README.md"
+authors = [{name = "dairoot", email = "623815825@qq.com"}]
+license = {text = "MIT"}
+requires-python = ">=3.8.1"
+dependencies = [
+    "numpy",
+    "websockets>=15.0.1",
+    "aiohttp",
+    "av",
+    "opuslib",
+    "requests",
+    "sounddevice",
+    "python-socks",
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+
+[project.urls]
+Homepage = "https://github.com/dairoot/xiaozhi-sdk"
+
+
+
+[tool.setuptools.dynamic]
+version = {attr = "xiaozhi_sdk.__version__"}
+
+[tool.setuptools.packages.find]
+include = ["xiaozhi_sdk*"]
+
+[tool.setuptools.package-data]
+xiaozhi_sdk = ["../file/**/*"]
+
+# 保留现有的工具配置
+[tool.coverage.run]
+omit = [
+    "xiaozhi_sdk/__main__.py",
+    "tests/*",
+]
+
+[dependency-groups]
+dev = [
+    "black>=24.8.0",
+    "flake8>=5.0.4",
+    "flake8-bugbear",
+    "flake8-comprehensions",
+    "isort>=5.13.2",
+    "mypy>=1.14.1",
+    "types-requests",
+    "pre-commit>=3.5.0",
+    "pytest>=8.3.5",
+    "pytest-asyncio",
+    "pytest-cov",
+    "build>=0.10",
+]

xiaozhi_sdk-0.0.5/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{xiaozhi_sdk-0.0.3 → xiaozhi_sdk-0.0.5}/tests/test_iot.py

@@ -13,8 +13,10 @@ from xiaozhi_sdk.iot import OtaDevice
 async def test_main():
     serial_number = ""
     license_key = ""
-    mac_address = "00:22:44:66:88:00"
-    ota = OtaDevice(mac_addr=mac_address, client_id=str(uuid.uuid4()), serial_number=serial_number)
+    mac_address = ""
+    ota_url = "http://localhost:3080/api/ota"
+    ota_url = None
+    ota = OtaDevice(mac_addr=mac_address, client_id=str(uuid.uuid4()), serial_number=serial_number, ota_url=ota_url)
     res = await ota.activate_device()
     if not res.get("activation"):
         return

{xiaozhi_sdk-0.0.3 → xiaozhi_sdk-0.0.5}/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-0.0.3 → xiaozhi_sdk-0.0.5}/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-0.0.5/xiaozhi_sdk/config.py

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

{xiaozhi_sdk-0.0.3 → xiaozhi_sdk-0.0.5}/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 → xiaozhi_sdk-0.0.5/xiaozhi_sdk.egg-info}/PKG-INFO

@@ -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 → xiaozhi_sdk-0.0.5}/xiaozhi_sdk.egg-info/SOURCES.txt

@@ -1,8 +1,7 @@
 LICENSE
 MANIFEST.in
 README.md
-setup.cfg
-setup.py
+pyproject.toml
 file/audio/greet.wav
 file/audio/say_hello.wav
 file/audio/take_photo.wav

{xiaozhi_sdk-0.0.3 → xiaozhi_sdk-0.0.5}/xiaozhi_sdk.egg-info/requires.txt

@@ -1,5 +1,5 @@
 numpy
-websockets
+websockets>=15.0.1
 aiohttp
 av
 opuslib

xiaozhi_sdk-0.0.3/setup.cfg

@@ -1,17 +0,0 @@
-[flake8]
-ignore = E203, E266, E501, W503, F403, F401, E731, E711, C901, F841, D103, B008, D400, E402, E712
-max-line-length = 120
-max-complexity = 20
-exclude = 
-	tests/*
-
-[coverage:run]
-omit = 
-	xiaozhi_sdk/__main__.py
-	tests/*
-	setup.py
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

xiaozhi_sdk-0.0.3/setup.py

@@ -1,60 +0,0 @@
-import os
-import re
-
-from setuptools import find_packages, setup
-
-
-# 读取版本号
-def get_version():
-    with open(os.path.join("xiaozhi_sdk", "__init__.py"), "r", encoding="utf-8") as f:
-        content = f.read()
-        match = re.search(r'^__version__ = [\'"]([^\'"]*)[\'"]', content, re.M)
-        if match:
-            return match.group(1)
-        raise RuntimeError("Unable to find version string.")
-
-
-# 收集指定目录下的所有文件
-def get_data_files(*directories):
-    data_files = []
-    for directory in directories:
-        if os.path.exists(directory):
-            for root, _, files in os.walk(directory):
-                for file in files:
-                    # 将相对于项目根目录的路径转换为相对于包的路径
-                    rel_path = os.path.relpath(os.path.join(root, file), ".")
-                    data_files.append(rel_path)
-    return data_files
-
-
-setup(
-    name="xiaozhi-sdk",  # 包名
-    version=get_version(),  # 版本号
-    packages=find_packages(),  # 自动发现包
-    package_data={
-        "xiaozhi_sdk": ["../" + f for f in get_data_files("file")],  # 包含file目录下的所有文件
-    },
-    include_package_data=True,  # 使用MANIFEST.in文件包含额外文件
-    install_requires=[  # 依赖
-        "numpy",
-        "websockets",
-        "aiohttp",
-        "av",
-        "opuslib",
-        "requests",
-        "sounddevice",
-        "python-socks",
-    ],
-    author="dairoot",
-    author_email="623815825@qq.com",  # 作者邮箱
-    description="一个用于连接和控制小智智能设备的Python SDK，支持实时音频通信、MCP工具集成和设备管理功能。",  # 简短描述
-    long_description=open("README.md").read(),  # 详细描述（通常从 README 读取）
-    long_description_content_type="text/markdown",  # README 文件格式
-    url="https://github.com/dairoot/xiaozhi-sdk",  # 项目主页
-    classifiers=[  # 分类元数据
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires=">=3.8",  # 支持的 Python 版本
-)

xiaozhi_sdk-0.0.3/xiaozhi_sdk/config.py

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