Remove unnecessary subclass constructors, deprecate subclasses only setting the model (#1146)

* Remove unnecessary subclass constructors, deprecate subclasses only setting the model

* Remove constructors that just called the super class constructor with the model information
* Deprecate subclasses that were previously there to allow miiocli usage when no model parameter passing was possible

* Move airdog deprecations to ctors to make tests pass

* remove g1vacuum ctor

Author: rytilahti

miio/airdehumidifier.py

@@ -158,19 +158,6 @@ def alarm(self) -> str:
 class AirDehumidifier(Device):
     """Implementation of Xiaomi Mi Air Dehumidifier."""
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_DEHUMIDIFIER_V1,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
-        self.device_info: DeviceInfo
-
     @command(
         default_output=format_output(
             "",
@@ -193,15 +180,14 @@ def __init__(
     def status(self) -> AirDehumidifierStatus:
         """Retrieve properties."""
 
-        if self.device_info is None:
-            self.device_info = self.info()
-
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_DEHUMIDIFIER_V1]
+        )
 
         values = self.get_properties(properties, max_properties=1)
 
         return AirDehumidifierStatus(
-            defaultdict(lambda: None, zip(properties, values)), self.device_info
+            defaultdict(lambda: None, zip(properties, values)), self.info()
         )
 
     @command(default_output=format_output("Powering on"))

miio/airfresh.py

@@ -8,6 +8,7 @@
 from .click_common import EnumType, command, format_output
 from .device import Device, DeviceStatus
 from .exceptions import DeviceException
+from .utils import deprecated
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -218,17 +219,6 @@ def extra_features(self) -> Optional[int]:
 class AirFresh(Device):
     """Main class representing the air fresh."""
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_AIRFRESH_VA2,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
     @command(
         default_output=format_output(
             "",
@@ -254,7 +244,9 @@ def __init__(
     def status(self) -> AirFreshStatus:
         """Retrieve properties."""
 
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_AIRFRESH_VA2]
+        )
         values = self.get_properties(properties, max_properties=15)
 
         return AirFreshStatus(
@@ -356,6 +348,9 @@ def set_ptc(self, ptc: bool):
             return self.send("set_ptc_state", ["off"])
 
 
+@deprecated(
+    "This will be removed in the future, use AirFresh(..., model='zhimi.airfresh.va4'"
+)
 class AirFreshVA4(AirFresh):
     """Main class representing the air fresh va4."""
 

miio/airfresh_t2017.py

@@ -224,17 +224,6 @@ def display_orientation(self) -> Optional[DisplayOrientation]:
 class AirFreshA1(Device):
     """Main class representing the air fresh a1."""
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_AIRFRESH_A1,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
     @command(
         default_output=format_output(
             "",
@@ -257,7 +246,9 @@ def __init__(
     def status(self) -> AirFreshStatus:
         """Retrieve properties."""
 
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_AIRFRESH_A1]
+        )
         values = self.get_properties(properties, max_properties=15)
 
         return AirFreshStatus(defaultdict(lambda: None, zip(properties, values)))
@@ -366,17 +357,6 @@ def get_timer(self):
 class AirFreshT2017(AirFreshA1):
     """Main class representing the air fresh t2017."""
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_AIRFRESH_T2017,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
     @command(
         default_output=format_output(
             "",
@@ -400,11 +380,6 @@ def __init__(
             "Display orientation: {result.display_orientation}\n",
         )
     )
-    def status(self) -> AirFreshStatus:
-        """Retrieve properties."""
-
-        return super().status()
-
     @command(
         click.argument("speed", type=int),
         default_output=format_output("Setting favorite speed to {speed}"),

miio/airhumidifier.py

@@ -8,6 +8,7 @@
 from .click_common import EnumType, command, format_output
 from .device import Device, DeviceInfo, DeviceStatus
 from .exceptions import DeviceError, DeviceException
+from .utils import deprecated
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -246,20 +247,6 @@ def button_pressed(self) -> Optional[str]:
 class AirHumidifier(Device):
     """Implementation of Xiaomi Mi Air Humidifier."""
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_HUMIDIFIER_V1,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
-        # TODO: convert to use generic device info in the future
-        self.device_info: Optional[DeviceInfo] = None
-
     @command(
         default_output=format_output(
             "",
@@ -284,10 +271,10 @@ def __init__(
     )
     def status(self) -> AirHumidifierStatus:
         """Retrieve properties."""
-        if self.device_info is None:
-            self.device_info = self.info()
 
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_HUMIDIFIER_V1]
+        )
 
         # A single request is limited to 16 properties. Therefore the
         # properties are divided into multiple requests
@@ -304,7 +291,7 @@ def status(self) -> AirHumidifierStatus:
         values = self.get_properties(properties, max_properties=_props_per_request)
 
         return AirHumidifierStatus(
-            defaultdict(lambda: None, zip(properties, values)), self.device_info
+            defaultdict(lambda: None, zip(properties, values)), self.info()
         )
 
     @command(default_output=format_output("Powering on"))
@@ -407,6 +394,7 @@ def set_dry(self, dry: bool):
             return self.send("set_dry", ["off"])
 
 
+@deprecated("Use AirHumidifer(model='zhimi.humidifier.ca1")
 class AirHumidifierCA1(AirHumidifier):
     def __init__(
         self,
@@ -421,6 +409,7 @@ def __init__(
         )
 
 
+@deprecated("Use AirHumidifer(model='zhimi.humidifier.cb1")
 class AirHumidifierCB1(AirHumidifier):
     def __init__(
         self,
@@ -435,6 +424,7 @@ def __init__(
         )
 
 
+@deprecated("Use AirHumidifier(model='zhimi.humidifier.cb2')")
 class AirHumidifierCB2(AirHumidifier):
     def __init__(
         self,

miio/airhumidifier_mjjsq.py

@@ -122,16 +122,7 @@ def wet_protection(self) -> Optional[bool]:
 
 
 class AirHumidifierMjjsq(Device):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_HUMIDIFIER_MJJSQ,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
+    """Support for deerma.humidifier.(mj)jsq."""
 
     @command(
         default_output=format_output(
@@ -151,7 +142,9 @@ def __init__(
     def status(self) -> AirHumidifierStatus:
         """Retrieve properties."""
 
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_HUMIDIFIER_MJJSQ]
+        )
         values = self.get_properties(properties, max_properties=1)
 
         return AirHumidifierStatus(defaultdict(lambda: None, zip(properties, values)))

miio/airpurifier_airdog.py

@@ -8,6 +8,7 @@
 from .click_common import EnumType, command, format_output
 from .device import Device, DeviceStatus
 from .exceptions import DeviceException
+from .utils import deprecated
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -100,17 +101,6 @@ def hcho(self) -> Optional[int]:
 
 
 class AirDogX3(Device):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_AIRDOG_X3,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
     @command(
         default_output=format_output(
             "",
@@ -126,7 +116,9 @@ def __init__(
     def status(self) -> AirDogStatus:
         """Retrieve properties."""
 
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_AIRDOG_X3]
+        )
         values = self.get_properties(properties, max_properties=10)
 
         return AirDogStatus(defaultdict(lambda: None, zip(properties, values)))
@@ -186,6 +178,7 @@ def set_filters_cleaned(self):
 
 
 class AirDogX5(AirDogX3):
+    @deprecated("Use AirDogX3(model='airdog.airpurifier.x5')")
     def __init__(
         self,
         ip: str = None,
@@ -199,6 +192,7 @@ def __init__(
 
 
 class AirDogX7SM(AirDogX3):
+    @deprecated("Use AirDogX3(model='airdog.airpurifier.x7sm')")
     def __init__(
         self,
         ip: str = None,

miio/airqualitymonitor.py

@@ -151,22 +151,6 @@ def tvoc(self) -> Optional[int]:
 class AirQualityMonitor(Device):
     """Xiaomi PM2.5 Air Quality Monitor."""
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_AIRQUALITYMONITOR_V1,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
-        if model not in AVAILABLE_PROPERTIES:
-            _LOGGER.error(
-                "Device model %s unsupported. Falling back to %s.", model, self.model
-            )
-
     @command(
         default_output=format_output(
             "",
@@ -185,7 +169,9 @@ def __init__(
     )
     def status(self) -> AirQualityMonitorStatus:
         """Return device status."""
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_AIRQUALITYMONITOR_V1]
+        )
 
         if self.model == MODEL_AIRQUALITYMONITOR_B1:
             values = self.send("get_air_data")

miio/fan_leshow.py

@@ -93,17 +93,6 @@ def error_detected(self) -> bool:
 class FanLeshow(Device):
     """Main class representing the Xiaomi Rosou SS4 Ventilator."""
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_FAN_LESHOW_SS4,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
     @command(
         default_output=format_output(
             "",
@@ -118,7 +107,9 @@ def __init__(
     )
     def status(self) -> FanLeshowStatus:
         """Retrieve properties."""
-        properties = AVAILABLE_PROPERTIES[self.model]
+        properties = AVAILABLE_PROPERTIES.get(
+            self.model, AVAILABLE_PROPERTIES[MODEL_FAN_LESHOW_SS4]
+        )
         values = self.get_properties(properties, max_properties=15)
 
         return FanLeshowStatus(dict(zip(properties, values)))

miio/g1vacuum.py

@@ -275,18 +275,6 @@ class G1Vacuum(MiotDevice):
 
     mapping = MIOT_MAPPING[MIJIA_VACUUM_V2]
 
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MIJIA_VACUUM_V2,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover)
-        self._model = model
-
     @command(
         default_output=format_output(
             "",