Revise error handling to be more consistent for library users

miio/ceil_cli.py

@@ -10,6 +10,8 @@
     sys.exit(1)
 
 import miio  # noqa: E402
+from miio.click_common import (ExceptionHandlerGroup, validate_ip,
+                               validate_token)
 
 _LOGGER = logging.getLogger(__name__)
 pass_dev = click.make_pass_decorator(miio.Ceil)
@@ -36,22 +38,7 @@ def validate_scene(ctx, param, value):
     return value
 
 
-def validate_ip(ctx, param, value):
-    try:
-        ipaddress.ip_address(value)
-        return value
-    except ValueError as ex:
-        raise click.BadParameter("Invalid IP: %s" % ex)
-
-
-def validate_token(ctx, param, value):
-    token_len = len(value)
-    if token_len != 32:
-        raise click.BadParameter("Token length != 32 chars: %s" % token_len)
-    return value
-
-
-@click.group(invoke_without_command=True)
+@click.group(invoke_without_command=True, cls=ExceptionHandlerGroup)
 @click.option('--ip', envvar="DEVICE_IP", callback=validate_ip)
 @click.option('--token', envvar="DEVICE_TOKEN", callback=validate_token)
 @click.option('-d', '--debug', default=False, count=True)

miio/click_common.py

@@ -0,0 +1,35 @@
+"""Click commons.
+
+This file contains common functions for cli tools.
+"""
+import click
+import ipaddress
+import miio
+import logging
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def validate_ip(ctx, param, value):
+    try:
+        ipaddress.ip_address(value)
+        return value
+    except ValueError as ex:
+        raise click.BadParameter("Invalid IP: %s" % ex)
+
+
+def validate_token(ctx, param, value):
+    token_len = len(value)
+    if token_len != 32:
+        raise click.BadParameter("Token length != 32 chars: %s" % token_len)
+    return value
+
+
+class ExceptionHandlerGroup(click.Group):
+    def __call__(self, *args, **kwargs):
+        try:
+            return self.main(*args, **kwargs)
+        except miio.DeviceException as ex:
+            _LOGGER.debug("Exception: %s", ex, exc_info=True)
+            click.echo(click.style("Error: %s" % ex, fg='red', bold=True))

miio/device.py

@@ -2,6 +2,7 @@
 import datetime
 import socket
 import logging
+import construct
 from typing import Any, List, Optional  # noqa: F401
 
 from .protocol import Message
@@ -14,6 +15,11 @@ class DeviceException(Exception):
     pass
 
 
+class DeviceError(DeviceException):
+    """Exception communicating an error delivered by the target device."""
+    pass
+
+
 class DeviceInfo:
     """Container of miIO device information.
     Hardware properties such as device model, MAC address, memory information,
@@ -242,18 +248,25 @@ def send(self, command: str, parameters: Any=None, retry_count=3) -> Any:
                           m.header.value.ts,
                           m.data.value["id"],
                           m.data.value)
+            if "error" in m.data.value:
+                raise DeviceError(m.data.value["error"])
+
             try:
                 return m.data.value["result"]
             except KeyError:
                 return m.data.value
+        except construct.core.ChecksumError as ex:
+            raise DeviceException("Got checksum error which indicates use "
+                                  "of an invalid token. "
+                                  "Please check your token!") from ex
         except OSError as ex:
             _LOGGER.error("Got error when receiving: %s", ex)
             if retry_count > 0:
                 _LOGGER.warning("Retrying with incremented id, "
                                 "retries left: %s", retry_count)
                 self.__id += 100
                 return self.send(command, parameters, retry_count - 1)
-            raise DeviceException from ex
+            raise DeviceException("No response from the device") from ex
 
     def raw_command(self, cmd, params):
         """Send a raw command to the device.

miio/philips_eyecare_cli.py

@@ -10,6 +10,8 @@
     sys.exit(1)
 
 import miio  # noqa: E402
+from miio.click_common import (ExceptionHandlerGroup, validate_ip,
+                               validate_token)
 
 _LOGGER = logging.getLogger(__name__)
 pass_dev = click.make_pass_decorator(miio.PhilipsEyecare)
@@ -36,22 +38,7 @@ def validate_scene(ctx, param, value):
     return value
 
 
-def validate_ip(ctx, param, value):
-    try:
-        ipaddress.ip_address(value)
-        return value
-    except ValueError as ex:
-        raise click.BadParameter("Invalid IP: %s" % ex)
-
-
-def validate_token(ctx, param, value):
-    token_len = len(value)
-    if token_len != 32:
-        raise click.BadParameter("Token length != 32 chars: %s" % token_len)
-    return value
-
-
-@click.group(invoke_without_command=True)
+@click.group(invoke_without_command=True, cls=ExceptionHandlerGroup)
 @click.option('--ip', envvar="DEVICE_IP", callback=validate_ip)
 @click.option('--token', envvar="DEVICE_TOKEN", callback=validate_token)
 @click.option('-d', '--debug', default=False, count=True)

miio/plug_cli.py

@@ -3,7 +3,6 @@
 import click
 import ast
 import sys
-import ipaddress
 from typing import Any  # noqa: F401
 
 if sys.version_info < (3, 4):
@@ -12,27 +11,14 @@
     sys.exit(1)
 
 import miio  # noqa: E402
+from miio.click_common import (ExceptionHandlerGroup, validate_ip,
+                               validate_token)
 
 _LOGGER = logging.getLogger(__name__)
 pass_dev = click.make_pass_decorator(miio.Plug)
 
 
-def validate_ip(ctx, param, value):
-    try:
-        ipaddress.ip_address(value)
-        return value
-    except ValueError as ex:
-        raise click.BadParameter("Invalid IP: %s" % ex)
-
-
-def validate_token(ctx, param, value):
-    token_len = len(value)
-    if token_len != 32:
-        raise click.BadParameter("Token length != 32 chars: %s" % token_len)
-    return value
-
-
-@click.group(invoke_without_command=True)
+@click.group(invoke_without_command=True, cls=ExceptionHandlerGroup)
 @click.option('--ip', envvar="DEVICE_IP", callback=validate_ip)
 @click.option('--token', envvar="DEVICE_TOKEN", callback=validate_token)
 @click.option('-d', '--debug', default=False, count=True)

miio/vacuum_cli.py

@@ -5,7 +5,6 @@
 import ast
 import sys
 import json
-import ipaddress
 import time
 import pathlib
 from appdirs import user_cache_dir
@@ -19,31 +18,14 @@
     sys.exit(1)
 
 import miio  # noqa: E402
+from miio.click_common import (ExceptionHandlerGroup, validate_ip,
+                               validate_token)
 
 _LOGGER = logging.getLogger(__name__)
 pass_dev = click.make_pass_decorator(miio.Device, ensure=True)
 
 
-def validate_ip(ctx, param, value):
-    if value is None:
-        return value
-    try:
-        ipaddress.ip_address(value)
-        return value
-    except ValueError as ex:
-        raise click.BadParameter("Invalid IP: %s" % ex)
-
-
-def validate_token(ctx, param, value):
-    if value is None:
-        return value
-    token_len = len(value)
-    if token_len != 32:
-        raise click.BadParameter("Token length != 32 chars: %s" % token_len)
-    return value
-
-
-@click.group(invoke_without_command=True)
+@click.group(invoke_without_command=True, cls=ExceptionHandlerGroup)
 @click.option('--ip', envvar="MIROBO_IP", callback=validate_ip)
 @click.option('--token', envvar="MIROBO_TOKEN", callback=validate_token)
 @click.option('-d', '--debug', default=False, count=True)