mijiaAPI 4.2.1__tar.gz → 4.3.0__tar.gz

{mijiaapi-4.2.1 → mijiaapi-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mijiaAPI
-Version: 4.2.1
+Version: 4.3.0
 Summary: A Python API for Xiaomi Mijia
 Author-email: Do1e <i@do1e.cn>
 License-Expression: GPL-3.0-or-later

{mijiaapi-4.2.1 → mijiaapi-4.3.0}/mijiaAPI/__main__.py

@@ -112,8 +112,33 @@ def parse_args(args):
     )
     run.add_argument(
         '--quiet',
-        action='store_true',
-        help="小爱音箱静默执行",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="小爱音箱静默执行（默认开启；使用 --no-quiet 播报回复）",
+    )
+
+    play = subparsers.add_parser(
+        'play',
+        help="通过小爱音箱播放指定文本",
+    )
+    play.set_defaults(func='play')
+    play.add_argument(
+        '-p', '--auth_path',
+        type=Path,
+        default=Path.home() / ".config" / "mijia-api" / "auth.json",
+        help="认证文件保存路径，默认保存在 ~/.config/mijia-api/auth.json",
+    )
+    play.add_argument(
+        'text',
+        type=str,
+        help="要通过小爱音箱播放的文本",
+        metavar='TEXT',
+    )
+    play.add_argument(
+        '--wifispeaker_name',
+        type=str,
+        help="指定小爱音箱名称，默认是获取到的第一个小爱音箱",
+        default=None,
     )
 
     mcp_cmd = subparsers.add_parser(
@@ -507,7 +532,7 @@ def main(args):
             run_action(api, args)
         if args.func == 'statistics':
             get_statistics(api, args)
-        if args.func == 'run':
+        if args.func in ('run', 'play'):
             if device_mapping is None:
                 device_mapping = get_devices_list(api, verbose=False)
             if args.wifispeaker_name is None:
@@ -520,7 +545,10 @@ def main(args):
                     raise ValueError("未找到小爱音箱设备")
             else:
                 wifispeaker = mijiaDevice(api, dev_name=args.wifispeaker_name)
-            wifispeaker.run_action('execute-text-directive', _in=[args.prompt, 1 if args.quiet else 0])
+            if args.func == 'run':
+                wifispeaker.run_action('execute-text-directive', _in=[args.prompt, 1 if args.quiet else 0])
+            else:
+                wifispeaker.run_action('play-text', _in=[args.text])
 
 def cli():
     main(sys.argv[1:])

{mijiaapi-4.2.1 → mijiaapi-4.3.0}/mijiaAPI/errors.py

@@ -1,4 +1,4 @@
-# https://github.com/kekeandzeyu/ha_xiaomi_home/blob/main/custom_components/xiaomi_home/miot/i18n/zh-Hans.json
+# https://github.com/XiaoMi/ha_xiaomi_home/blob/main/custom_components/xiaomi_home/miot/i18n/zh-Hans.json
 ERROR_CODE = {
     "-10000": "未知错误",
     "-10001": "服务不可用",

{mijiaapi-4.2.1 → mijiaapi-4.3.0}/mijiaAPI/mcp_server.py

@@ -305,42 +305,54 @@ def get_statistics(
     return json.dumps(ret, ensure_ascii=False)
 
 
+def _find_speaker(api: mijiaAPI, speaker_name: Optional[str]) -> Optional[dict]:
+    devices = api.get_devices_list()
+    if speaker_name is not None:
+        return next((d for d in devices if d["name"] == speaker_name), None)
+    return next((d for d in devices if "xiaomi.wifispeaker" in d["model"]), None)
+
+
 @mcp.tool
 def run_speaker_command(
     prompt: str,
     speaker_name: Optional[str] = None,
-    quiet: bool = False,
+    quiet: bool = True,
 ) -> str:
     """通过小爱音箱执行自然语言指令。
 
     参数:
         prompt: 自然语言指令，如 "打开卧室台灯"、"把亮度调到50%"。
         speaker_name: 可选，指定小爱音箱名称，默认使用获取到的第一个小爱音箱。
-        quiet: 是否静默执行（不语音播报），默认 False。
+        quiet: 是否静默执行（不语音播报），默认 True。
 
     返回执行结果。
     """
     api = _get_api()
     _refresh_if_needed(api)
-    devices = api.get_devices_list()
-    if speaker_name is None:
-        match = None
-        for device in devices:
-            if "xiaomi.wifispeaker" in device["model"]:
-                match = device
-                break
-        if match is None:
-            return "未找到小爱音箱设备"
-    else:
-        matches = [d for d in devices if d["name"] == speaker_name]
-        if not matches:
-            return f"未找到名为 {speaker_name} 的小爱音箱"
-        match = matches[0]
+    match = _find_speaker(api, speaker_name)
+    if match is None:
+        return "未找到小爱音箱设备" if speaker_name is None else f"未找到名为 {speaker_name} 的小爱音箱"
     speaker = mijiaDevice(api, did=match["did"])
     speaker.run_action("execute-text-directive", _in=[prompt, 1 if quiet else 0])
     return f"已通过 {match['name']} 执行: {prompt}"
 
 
+@mcp.tool
+def speaker_play(
+    text: str,
+    speaker_name: Optional[str] = None,
+) -> str:
+    """通过小爱音箱朗读指定文本（play-text），不是执行设备控制指令。"""
+    api = _get_api()
+    _refresh_if_needed(api)
+    match = _find_speaker(api, speaker_name)
+    if match is None:
+        return "未找到小爱音箱设备" if speaker_name is None else f"未找到名为 {speaker_name} 的小爱音箱"
+    speaker = mijiaDevice(api, did=match["did"])
+    speaker.run_action("play-text", _in=[text])
+    return f"已通过 {match['name']} 播放: {text}"
+
+
 def _login_worker(api: mijiaAPI, login_data: dict) -> None:
     try:
         api._complete_qr_login(login_data)

mijiaapi-4.3.0/mijiaAPI/version.py

@@ -0,0 +1 @@
+version = "4.3.0"

mijiaapi-4.2.1/mijiaAPI/version.py

@@ -1 +0,0 @@
-version = "4.2.1"