mijiaAPI 1.3.6__tar.gz → 1.3.7__tar.gz

{mijiaapi-1.3.6 → mijiaapi-1.3.7}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: mijiaAPI
-Version: 1.3.6
+Version: 1.3.7
 Summary: A Python API for Xiaomi Mijia
-Home-page: https://github.com/Do1e/mijia-api
 License: GPLv3
 Author: Do1e
 Author-email: dpj.email@qq.com
@@ -19,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: pillow (>=11.0.0,<12.0.0)
 Requires-Dist: qrcode (>=8.0,<9.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
+Project-URL: Homepage, https://github.com/Do1e/mijia-api
 Project-URL: Repository, https://github.com/Do1e/mijia-api
 Description-Content-Type: text/markdown
 

{mijiaapi-1.3.6 → mijiaapi-1.3.7}/mijiaAPI/devices.py

@@ -34,10 +34,24 @@ class DevAction(object):
         return f'  {self.name}: {self.desc}'
 
 class mijiaDevices(object):
-    def __init__(self, api: mijiaAPI, dev_info: dict,
+    def __init__(self, api: mijiaAPI,
+                 dev_info: Optional[dict] = None,
+                 dev_name: Optional[str] = None,
                  did: Optional[str] = None,
                  sleep_time: Optional[Union[int, float]] = 0.5):
         self.api = api
+        if dev_info is None:
+            if dev_name is None:
+                raise ValueError('Please specify the device name or device info')
+            devices_list = self.api.get_devices_list()
+            matches = [device for device in devices_list['list'] if device['name'] == dev_name]
+            if not matches:
+                raise ValueError(f"Device {dev_name} not found")
+            elif len(matches) > 1:
+                raise ValueError(f"Multiple devices named {dev_name} found")
+            else:
+                dev_info = get_device_info(matches[0]['model'])
+                did = matches[0]['did']
         self.name = dev_info['name']
         self.model = dev_info['model']
         self.prop_list = {prop['name']: DevProp(prop) for prop in dev_info['properties']}
@@ -133,7 +147,7 @@ class mijiaDevices(object):
         else:
             return super().__getattr__(name)
 
-    def run_action(self, name: str, did: Optional[str] = None, value: Optional[Union[list, tuple]] = None) -> bool:
+    def run_action(self, name: str, did: Optional[str] = None, value: Optional[Union[list, tuple]] = None, **kwargs) -> bool:
         if did is None:
             did = self.did
         if did is None:
@@ -145,6 +159,13 @@ class mijiaDevices(object):
         method['did'] = did
         if value is not None:
             method['value'] = value
+        if kwargs:
+            for k, v in kwargs.items():
+                if k.startswith("_"):
+                    k = k[1:]
+                if k in method:
+                    raise ValueError(f'Invalid argument: {k}. Do not use arguments in ({", ".join(method.keys())})')
+                method[k] = v
         ret = self.api.run_action(method)['code'] == 0
         sleep(self.sleep_time)
         return ret

{mijiaapi-1.3.6 → mijiaapi-1.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mijiaAPI"
-version = "1.3.5"
+version = "1.3.7"
 description = "A Python API for Xiaomi Mijia"
 readme = "README.md"
 requires-python = ">=3.9,<4.0"
@@ -12,7 +12,7 @@ dependencies = [
 
 [tool.poetry]
 name = "mijiaAPI"
-version = "1.3.6"
+version = "1.3.7"
 description = "A Python API for Xiaomi Mijia"
 authors = ["Do1e <dpj.email@qq.com>"]
 license = "GPLv3"