mijiaAPI 3.0.4__tar.gz → 3.1.0__tar.gz

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/CHANGELOG.md

@@ -2,9 +2,20 @@
 
 本文档记录了项目的v1.3.7以来的重要变更。
 
+## [3.1.0](https://github.com/Do1e/mijia-api/compare/v3.0.5...v3.1.0) - 2026-05-27
+### new feature
+* 删除设备属性的单位`unit`属性，因为 home.miot-spec.com 上已废弃
+### bugfix
+* 适配 home.miot-spec.com 新的规格页格式
+* 修复 execute-text-directive 中 quiet 参数的类型转换
+
+## [3.0.5](https://github.com/Do1e/mijia-api/compare/v3.0.4...v3.0.5) - 2026-01-24
+### bugfix
+* 蓝牙设备控制返回 code 为 1 时表示网关已经接收指令，视为成功。
+
 ## [3.0.4](https://github.com/Do1e/mijia-api/compare/v3.0.3...v3.0.4) - 2026-01-12
 ### bugfix
-* api不可用时不对`available`进行缓存，以修复刷新token成果后依然提示不可用的问题
+* api不可用时不对`available`进行缓存，以修复刷新token成功后依然提示不可用的问题
 
 ## [3.0.3](https://github.com/Do1e/mijia-api/compare/v3.0.2...v3.0.3) - 2026-01-02
 ### new feature

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/FAQ.md

@@ -6,7 +6,8 @@
 
 ## 扫码登录后的有效期多长？
 
-`serviceToken` 有效期较短，但是已实现自动刷新。用于刷新的 `passToken` 有效期也许是一个月，即扫码登录后理论上可以保活一个月。
+用于访问API的 `serviceToken` 有效期较短，但是已实现自动刷新。  
+用于刷新的 `passToken` 有效期也许是一个月，即扫码登录后理论上可以保活一个月。但实际上截至当前 commit，我一个半月前的 `passToken` 依然有效。
 
 ## XXX设备的XXX如何获取/设置？
 

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mijiaAPI
-Version: 3.0.4
+Version: 3.1.0
 Summary: A Python API for Xiaomi Mijia
 Author-email: Do1e <i@do1e.cn>
 License-Expression: GPL-3.0-or-later
@@ -26,12 +26,6 @@ Dynamic: license-file
 [![PyPI](https://img.shields.io/badge/PyPI-mijiaAPI-blue)](https://pypi.org/project/mijiaAPI/)
 [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-green.svg)](https://opensource.org/licenses/GPL-3.0)
 
-## ⚠️ 重要提醒
-
-**v1.5.0 和 v3.0.0包含多项破坏性变更！**
-
-如果您正在从旧版本升级，请务必查看 [CHANGELOG.md](CHANGELOG.md) 以了解详细的变更内容和迁移指南。
-
 常见问题见 [FAQ.md](FAQ.md)。
 
 ## 安装
@@ -40,6 +34,7 @@ Dynamic: license-file
 
 ```bash
 pip install mijiaAPI
+# Or `uv add mijiaAPI` for uv users
 ```
 
 ### 从源码安装
@@ -49,7 +44,8 @@ git clone https://github.com/Do1e/mijia-api.git
 cd mijia-api
 pip install .
 # Or `pip install -e .` for editable mode
-# Or `uv sync` for uv users
+# Or `pip install git+https://github.com/Do1e/mijia-api.git` for direct install
+# Or `uv add git+https://github.com/Do1e/mijia-api.git` for uv users
 ```
 
 ### aur

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/README.md

@@ -6,12 +6,6 @@
 [![PyPI](https://img.shields.io/badge/PyPI-mijiaAPI-blue)](https://pypi.org/project/mijiaAPI/)
 [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-green.svg)](https://opensource.org/licenses/GPL-3.0)
 
-## ⚠️ 重要提醒
-
-**v1.5.0 和 v3.0.0包含多项破坏性变更！**
-
-如果您正在从旧版本升级，请务必查看 [CHANGELOG.md](CHANGELOG.md) 以了解详细的变更内容和迁移指南。
-
 常见问题见 [FAQ.md](FAQ.md)。
 
 ## 安装
@@ -20,6 +14,7 @@
 
 ```bash
 pip install mijiaAPI
+# Or `uv add mijiaAPI` for uv users
 ```
 
 ### 从源码安装
@@ -29,7 +24,8 @@ git clone https://github.com/Do1e/mijia-api.git
 cd mijia-api
 pip install .
 # Or `pip install -e .` for editable mode
-# Or `uv sync` for uv users
+# Or `pip install git+https://github.com/Do1e/mijia-api.git` for direct install
+# Or `uv add git+https://github.com/Do1e/mijia-api.git` for uv users
 ```
 
 ### aur

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/mijiaAPI/__main__.py

@@ -265,8 +265,7 @@ def get(args):
     api = init_api(args.auth_path)
     device = mijiaDevice(api, did=args.did, dev_name=args.dev_name)
     value = device.get(args.prop_name)
-    unit = device.prop_list[args.prop_name].unit
-    print(f"{device.name} ({device.did}) 的 {args.prop_name} 值为 {value} {unit if unit else ''}")
+    print(f"{device.name} ({device.did}) 的 {args.prop_name} 值为 {value}")
 
 def set(args):
     api = init_api(args.auth_path)
@@ -276,8 +275,7 @@ def set(args):
     except Exception as e:
         print(f"设置 {args.dev_name} 的 {args.prop_name} 值为 {args.value} 失败: {e}")
         return
-    unit = device.prop_list[args.prop_name].unit
-    print(f"{device.name} ({device.did}) 的 {args.prop_name} 值已设置为 {args.value} {unit if unit else ''}")
+    print(f"{device.name} ({device.did}) 的 {args.prop_name} 值已设置为 {args.value}")
 
 def main(args):
     args = parse_args(args)
@@ -323,7 +321,7 @@ def main(args):
                 raise ValueError("未找到小爱音箱设备")
         else:
             wifispeaker = mijiaDevice(api, dev_name=args.wifispeaker_name)
-        wifispeaker.run_action('execute-text-directive', _in=[args.run, args.quiet])
+        wifispeaker.run_action('execute-text-directive', _in=[args.run, 1 if args.quiet else 0])
     if hasattr(args, 'func') and args.func is not None:
         if args.func == 'get':
             get(args)

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/mijiaAPI/apis.py

@@ -665,7 +665,7 @@ class mijiaAPI():
         uri = "/miotspec/prop/set"
         ret_data = self._request(uri, {"params": params})
         for ret in ret_data:
-            if ret.get("code", 0) != 0:
+            if ret.get("code", 0) not in (0, 1):
                 ret.update({"message": ERROR_CODE.get(str(ret["code"]), "未知错误")})
             else:
                 ret.update({"message": "成功"})
@@ -741,7 +741,7 @@ class mijiaAPI():
             ret = self._request(uri, {"params": param})
             ret_data.append(ret)
         for ret in ret_data:
-            if ret.get("code", 0) != 0:
+            if ret.get("code", 0) not in (0, 1):
                 ret.update({"message": ERROR_CODE.get(str(ret["code"]), "未知错误")})
             else:
                 ret.update({"message": "成功"})

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/mijiaAPI/devices.py

@@ -30,7 +30,6 @@ class DevProp():
         if self.type not in ["bool", "int", "uint", "float", "string"]:
             raise ValueError(f"不支持的类型: {self.type}, 可选类型: bool, int, uint, float, string")
         self.rw = prop_dict["rw"]
-        self.unit = prop_dict["unit"]
         self.range = prop_dict["range"]
         self.value_list = prop_dict.get("value-list", None)
         self.method = prop_dict["method"]
@@ -38,7 +37,7 @@ class DevProp():
     def __str__(self):
         lines = [
             f"  {self.name}: {self.desc}",
-            f"    valuetype: {self.type}, rw: {self.rw}, unit: {self.unit}, range: {self.range}"
+            f"    valuetype: {self.type}, rw: {self.rw}, range: {self.range}"
         ]
 
         if self.value_list:
@@ -190,7 +189,9 @@ class mijiaDevice():
         method["did"] = self.did
         method["value"] = value
         result = self.api.set_devices_prop(method)
-        if result["code"] != 0:
+        if result["code"] == 1:
+            logger.warning(f"网关已经接收指令，无法判断是否设置成功: {self.name} -> {name}, 值: {value}")
+        elif result["code"] != 0:
             raise DeviceSetError(self.name, name, result["code"])
         time.sleep(self.sleep_time)
         logger.debug(f"设置属性: {self.name} -> {name}, 值: {value}, 结果: {result}")
@@ -228,7 +229,9 @@ class mijiaDevice():
                     raise ValueError(f"无效的参数: {k}. 请勿使用以下参数 ({', '.join(method.keys())})")
                 method[k] = v
         result = self.api.run_action(method)
-        if result["code"] != 0:
+        if result["code"] == 1:
+            logger.warning(f"网关已经接收指令，无法判断是否执行成功: {self.name} -> {name}")
+        elif result["code"] != 0:
             raise DeviceActionError(self.name, name, result["code"])
         time.sleep(self.sleep_time)
         logger.debug(f"执行动作: {self.name} -> {name}, 结果: {result}")
@@ -256,7 +259,6 @@ def get_device_info(device_model: str, cache_path: Optional[Union[str, Path]] =
                 - description (str): 属性描述
                 - type (str): 属性数据类型（int、uint、float、bool、string）
                 - rw (str): 读写权限（'r' 可读，'w' 可写，'rw' 可读写）
-                - unit (str): 属性单位
                 - range (list): 属性值范围 [min, max, step]
                 - value-list (list): 枚举值列表
                 - method (dict): API 调用方法参数
@@ -284,72 +286,84 @@ def get_device_info(device_model: str, cache_path: Optional[Union[str, Path]] =
     })
     if response.status_code != 200:
         raise GetDeviceInfoError(device_model)
-    content = re.search(r"data-page=\"(.*?)\">", response.text)
+    content = re.search(r"<script data-page=\"app\" type=\"application/json\">(.*?)</script>", response.text)
     if content is None:
         raise GetDeviceInfoError(device_model)
     content = content.group(1)
-    content = json.loads(content.replace("&quot;", "\""))
-
-    if content["props"]["product"]:
-        name = content["props"]["product"]["name"]
-        model = content["props"]["product"]["model"]
-    else:
-        name = content["props"]["spec"]["name"]
-        model = device_model
+    content = json.loads(content)
+
+    product = content["props"]["product"]
+    name = product["name"]
+    model = product["model"]
+    i18n_zh = content["props"]["i18n"]["zh_cn"]
     result = {
         "name": name,
         "model": model,
         "properties": [],
         "actions": []
     }
-    services = content["props"]["spec"]["services"]
+    services = content["props"]["tree"]["services"]
 
     properties_name = []
     actions_name = []
-    for siid in services:
-        if "properties" in services[siid]:
-            for piid in services[siid]["properties"]:
-                prop = services[siid]["properties"][piid]
-                if prop["format"].startswith("int"):
-                    prop_type = "int"
-                elif prop["format"].startswith("uint"):
-                    prop_type = "uint"
-                else:
-                    prop_type = prop["format"]
-                item = {
-                    "name": prop["name"],
-                    "description": f"{prop.get('description', '')} / {prop.get('desc_zh_cn', '')}",
-                    "type": prop_type,
-                    "rw": "".join([
-                        "r" if "read" in prop["access"] else "",
-                        "w" if "write" in prop["access"] else ""
-                    ]),
-                    "unit": prop.get("unit", None),
-                    "range": prop.get("value-range", None),
-                    "value-list": prop.get("value-list", None),
-                    "method": {
-                        "siid": int(siid),
-                        "piid": int(piid)
-                    }
+    for svc in services:
+        siid = svc["iid"]
+        svc_type = svc["type"]
+        for prop in svc.get("properties", []):
+            piid = prop["iid"]
+            if prop["format"].startswith("int"):
+                prop_type = "int"
+            elif prop["format"].startswith("uint"):
+                prop_type = "uint"
+            else:
+                prop_type = prop["format"]
+            access_str = "".join([
+                "r" if "read" in prop["access"] else "",
+                "w" if "write" in prop["access"] else ""
+            ])
+            zh_cn = i18n_zh.get(f"service:{siid:03d}:property:{piid:03d}", "")
+            item = {
+                "name": prop["type"],
+                "description": f"{prop['description']} / {zh_cn}".rstrip(" / "),
+                "type": prop_type,
+                "rw": access_str,
+                "range": prop.get("valueRange", None),
+                "value-list": None,
+                "method": {
+                    "siid": siid,
+                    "piid": piid
                 }
-                if item["name"] in properties_name:
-                    item["name"] = f"{services[siid]['name']}-{item['name']}"
-                properties_name.append(item["name"])
-                result["properties"].append({k: None if v == "none" else v for k, v in item.items()})
-        if "actions" in services[siid]:
-            for aiid in services[siid]["actions"]:
-                act = services[siid]["actions"][aiid]
-                if act["name"] in actions_name:
-                    act["name"] = f"{services[siid]['name']}-{act['name']}"
-                actions_name.append(act["name"])
-                result["actions"].append({
-                    "name": act["name"],
-                    "description": f"{act.get('description', '')} / {act.get('desc_zh_cn', '')}",
-                    "method": {
-                        "siid": int(siid),
-                        "aiid": int(aiid)
+            }
+            if prop.get("valueList"):
+                item["value-list"] = []
+                for vl_item in prop["valueList"]:
+                    vl_zh = i18n_zh.get(vl_item.get("i18nKey", ""), "")
+                    vl_entry = {
+                        "value": vl_item["value"],
+                        "description": vl_item["description"]
                     }
-                })
+                    if vl_zh:
+                        vl_entry["desc_zh_cn"] = vl_zh
+                    item["value-list"].append(vl_entry)
+            if item["name"] in properties_name:
+                item["name"] = f"{svc_type}-{item['name']}"
+            properties_name.append(item["name"])
+            result["properties"].append(item)
+        for act in svc.get("actions", []):
+            aiid = act["iid"]
+            zh_cn = i18n_zh.get(f"service:{siid:03d}:action:{aiid:03d}", "")
+            act_item = {
+                "name": act["type"],
+                "description": f"{act['description']} / {zh_cn}".rstrip(" / "),
+                "method": {
+                    "siid": siid,
+                    "aiid": aiid
+                }
+            }
+            if act_item["name"] in actions_name:
+                act_item["name"] = f"{svc_type}-{act_item['name']}"
+            actions_name.append(act_item["name"])
+            result["actions"].append(act_item)
 
     if cache_path is not None:
         cache_path = Path(cache_path)

mijiaapi-3.1.0/mijiaAPI/version.py

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

{mijiaapi-3.0.4 → mijiaapi-3.1.0}/mijiaAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mijiaAPI
-Version: 3.0.4
+Version: 3.1.0
 Summary: A Python API for Xiaomi Mijia
 Author-email: Do1e <i@do1e.cn>
 License-Expression: GPL-3.0-or-later
@@ -26,12 +26,6 @@ Dynamic: license-file
 [![PyPI](https://img.shields.io/badge/PyPI-mijiaAPI-blue)](https://pypi.org/project/mijiaAPI/)
 [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-green.svg)](https://opensource.org/licenses/GPL-3.0)
 
-## ⚠️ 重要提醒
-
-**v1.5.0 和 v3.0.0包含多项破坏性变更！**
-
-如果您正在从旧版本升级，请务必查看 [CHANGELOG.md](CHANGELOG.md) 以了解详细的变更内容和迁移指南。
-
 常见问题见 [FAQ.md](FAQ.md)。
 
 ## 安装
@@ -40,6 +34,7 @@ Dynamic: license-file
 
 ```bash
 pip install mijiaAPI
+# Or `uv add mijiaAPI` for uv users
 ```
 
 ### 从源码安装
@@ -49,7 +44,8 @@ git clone https://github.com/Do1e/mijia-api.git
 cd mijia-api
 pip install .
 # Or `pip install -e .` for editable mode
-# Or `uv sync` for uv users
+# Or `pip install git+https://github.com/Do1e/mijia-api.git` for direct install
+# Or `uv add git+https://github.com/Do1e/mijia-api.git` for uv users
 ```
 
 ### aur

mijiaapi-3.0.4/mijiaAPI/version.py

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