mijiaAPI 1.4.2__tar.gz → 1.4.4__tar.gz

{mijiaapi-1.4.2 → mijiaapi-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mijiaAPI
-Version: 1.4.2
+Version: 1.4.4
 Summary: A Python API for Xiaomi Mijia
 License: GPLv3
 Author: Do1e

{mijiaapi-1.4.2 → mijiaapi-1.4.4}/mijiaAPI/__main__.py

@@ -271,6 +271,19 @@ def set(args):
 
 def main(args):
     args = parse_args(args)
+
+    if args.get_device_info:
+        device_info = get_device_info(args.get_device_info)
+        print(json.dumps(device_info, indent=2, ensure_ascii=False))
+    if not (args.list_devices or
+            args.list_homes or
+            args.list_scenes or
+            args.list_consumable_items or
+            args.run_scene or
+            args.run or
+            hasattr(args, 'func') and args.func is not None):
+        return
+
     api = init_api(args.auth_path)
     device_mapping = None
     home_mapping = None
@@ -287,9 +300,6 @@ def main(args):
     if args.run_scene:
         for scene_id in args.run_scene:
             run_scene(api, scene_id, scene_mapping=scenes_mapping)
-    if args.get_device_info:
-        device_info = get_device_info(args.get_device_info)
-        print(json.dumps(device_info, indent=2, ensure_ascii=False))
     if args.run:
         if device_mapping is None:
             device_mapping = get_devices_list(api, verbose=False)

{mijiaapi-1.4.2 → mijiaapi-1.4.4}/mijiaAPI/devices.py

@@ -7,7 +7,9 @@ from time import sleep
 from .apis import mijiaAPI
 from .code import ERROR_CODE
 from .urls import deviceURL
-from .logger import logger
+from .logger import get_logger
+
+logger = get_logger(__name__)
 
 class DevProp(object):
     def __init__(self, prop_dict: dict):
@@ -170,7 +172,7 @@ class mijiaDevices(object):
             raise ValueError(f'Unsupported property: {name}, available properties: {list(self.prop_list.keys())}')
         prop = self.prop_list[name]
         if 'w' not in prop.rw:
-            raise ValueError(f'Property {name} is read-only')
+            raise ValueError(f'Property {name} can not be written')
         if prop.value_list:
             if value not in [item['value'] for item in prop.value_list]:
                 raise ValueError(f'Invalid value: {value}, should be in {prop.value_list}')
@@ -227,6 +229,7 @@ class mijiaDevices(object):
                 f"message: {ERROR_CODE.get(str(result['code']), 'Unknown error')}"
             )
         sleep(self.sleep_time)
+        logger.debug(f"Set property: {self.name} -> {name}, value: {value}, result: {result}")
         return result['code'] == 0
 
     def set_v2(self, name: str, value: Union[bool, int, float, str], did: Optional[str] = None) -> bool:
@@ -274,7 +277,7 @@ class mijiaDevices(object):
             raise ValueError(f'Unsupported property: {name}, available properties: {list(self.prop_list.keys())}')
         prop = self.prop_list[name]
         if 'r' not in prop.rw:
-            raise ValueError(f'Property {name} is write-only')
+            raise ValueError(f'Property {name} can not be read')
         method = prop.method.copy()
         method['did'] = did
         result = self.api.get_devices_prop([method])[0]
@@ -285,6 +288,7 @@ class mijiaDevices(object):
                 f"message: {ERROR_CODE.get(str(result['code']), 'Unknown error')}"
             )
         sleep(self.sleep_time)
+        logger.debug(f"Get property: {self.name} -> {name}, result: {result}")
         return result['value']
 
     def __setattr__(self, name: str, value: Union[bool, int, float, str]) -> None:
@@ -368,6 +372,7 @@ class mijiaDevices(object):
                 f"message: {ERROR_CODE.get(str(result['code']), 'Unknown error')}"
             )
         sleep(self.sleep_time)
+        logger.debug(f"Run action: {self.name} -> {name}, result: {result}")
         return result['code'] == 0
 
 
@@ -399,9 +404,15 @@ def get_device_info(device_model: str, cache_path: Optional[str] = os.path.join(
     content = content.group(1)
     content = json.loads(content.replace('"', '"'))
 
+    if content['props']['product']:
+        name = content['props']['product']['name']
+        model = content['props']['product']['model']
+    else:
+        name = content['props']['spec']['name']
+        model = device_model
     result = {
-        'name': content['props']['product']['name'],
-        'model': content['props']['product']['model'],
+        'name': name,
+        'model': model,
         'properties': [],
         'actions': []
     }
@@ -421,7 +432,7 @@ def get_device_info(device_model: str, cache_path: Optional[str] = os.path.join(
                     prop_type = prop['format']
                 item = {
                     'name': prop['name'],
-                    'description': prop['description'],
+                    'description': f"{prop.get('description', '')} / {prop.get('desc_zh_cn', '')}",
                     'type': prop_type,
                     'rw': ''.join([
                         'r' if 'read' in prop['access'] else '',
@@ -447,7 +458,7 @@ def get_device_info(device_model: str, cache_path: Optional[str] = os.path.join(
                 actions_name.append(act['name'])
                 result['actions'].append({
                     'name': act['name'],
-                    'description': act['description'],
+                    'description': f"{act.get('description', '')} / {act.get('desc_zh_cn', '')}",
                     'method': {
                         'siid': int(siid),
                         'aiid': int(aiid)

{mijiaapi-1.4.2 → mijiaapi-1.4.4}/mijiaAPI/logger.py

@@ -22,16 +22,24 @@ class ColorFormatter(logging.Formatter):
             return f"{color_code}{log_message}{self.COLORS['RESET']}"
         return log_message
 
-logger = logging.getLogger('mijiaAPI')
-logger.setLevel(logging.INFO)
+def get_logger(name: str) -> logging.Logger:
+    """
+    获取指定名称的日志记录器。
 
-console_handler = logging.StreamHandler()
-console_handler.setLevel(logging.INFO)
+    Args:
+        name (str): 日志记录器的名称。
 
-formatter = ColorFormatter(
-    '%(asctime)s - %(name)s - %(levelname)s: %(message)s',
-    datefmt='%Y-%m-%d %H:%M:%S',
-)
-console_handler.setFormatter(formatter)
+    Returns:
+        logging.Logger: 日志记录器对象。
+    """
+    logger = logging.getLogger(name)
 
-logger.addHandler(console_handler)
+    console_handler = logging.StreamHandler()
+
+    formatter = ColorFormatter(
+        '%(asctime)s - %(name)s - %(levelname)s: %(message)s',
+        datefmt='%Y-%m-%d %H:%M:%S',
+    )
+    console_handler.setFormatter(formatter)
+    logger.addHandler(console_handler)
+    return logger

{mijiaapi-1.4.2 → mijiaapi-1.4.4}/mijiaAPI/login.py

@@ -12,10 +12,11 @@ from urllib import parse
 import requests
 from qrcode import QRCode
 
-from .logger import logger
+from .logger import get_logger
 from .urls import msgURL, loginURL, qrURL, accountURL
 from .utils import defaultUA
 
+logger = get_logger(__name__)
 
 class LoginError(Exception):
     def __init__(self, code: int, message: str):
@@ -97,7 +98,7 @@ class mijiaLogin(object):
         return data
 
     @staticmethod
-    def extract_latest_gmt_datetime(data: dict) -> datetime:
+    def _extract_latest_gmt_datetime(data: dict) -> datetime:
         """
         提取过期时间并转换为中国时区。
 
@@ -157,8 +158,7 @@ class mijiaLogin(object):
         Raises:
             LoginError: 登录失败时抛出。
         """
-        logger.warning(
-            'There is a high probability of verification code with account and password. Please try other login methods')
+        logger.warning('There is a high probability of verification code with account and password. Please try `QRlogin` method.')
         data = self._get_index()
         post_data = {
             'qs': data['qs'],
@@ -178,7 +178,7 @@ class mijiaLogin(object):
         if 'location' not in ret_data:
             raise LoginError(-1, 'Failed to get location')
         if 'notificationUrl' in ret_data:
-            raise LoginError(-1, 'Verification code required, please try other login methods')
+            raise LoginError(-1, 'Verification code required, please try `QRlogin` method')
         ret = self.session.get(ret_data['location'])
         if ret.status_code != 200:
             raise LoginError(ret.status_code, f'Failed to get location, {ret.text}')
@@ -189,7 +189,7 @@ class mijiaLogin(object):
             'ssecurity': ret_data['ssecurity'],
             'deviceId': data['deviceId'],
             'serviceToken': cookies['serviceToken'],
-            'expireTime': self.extract_latest_gmt_datetime(cookies).strftime('%Y-%m-%d %H:%M:%S'),
+            'expireTime': self._extract_latest_gmt_datetime(cookies).strftime('%Y-%m-%d %H:%M:%S'),
             **self._get_account(ret_data['userId'])
         }
 
@@ -274,7 +274,7 @@ class mijiaLogin(object):
             'ssecurity': ret_data['ssecurity'],
             'deviceId': data['deviceId'],
             'serviceToken': cookies['serviceToken'],
-            'expireTime': self.extract_latest_gmt_datetime(cookies).strftime('%Y-%m-%d %H:%M:%S'),
+            'expireTime': self._extract_latest_gmt_datetime(cookies).strftime('%Y-%m-%d %H:%M:%S'),
             **self._get_account(ret_data['userId'])
         }
 

{mijiaapi-1.4.2 → mijiaapi-1.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mijiaAPI"
-version = "1.4.2"
+version = "1.4.4"
 description = "A Python API for Xiaomi Mijia"
 readme = "README.md"
 requires-python = ">=3.9,<4.0"
@@ -15,7 +15,7 @@ mijiaAPI = "mijiaAPI.__main__:cli"
 
 [tool.poetry]
 name = "mijiaAPI"
-version = "1.4.2"
+version = "1.4.4"
 description = "A Python API for Xiaomi Mijia"
 authors = ["Do1e <dpj.email@qq.com>"]
 license = "GPLv3"