Improve miotdevice mappings handling

miio/fan_miot.py

@@ -6,6 +6,7 @@
 from .click_common import EnumType, command, format_output
 from .fan_common import FanException, MoveDirection, OperationMode
 from .miot_device import DeviceStatus, MiotDevice
+from .utils import deprecated
 
 MODEL_FAN_P9 = "dmaker.fan.p9"
 MODEL_FAN_P10 = "dmaker.fan.p10"
@@ -252,21 +253,7 @@ def child_lock(self) -> bool:
 
 
 class FanMiot(MiotDevice):
-    mapping = MIOT_MAPPING[MODEL_FAN_P10]
-
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_FAN_P10,
-    ) -> None:
-        if model not in MIOT_MAPPING:
-            raise FanException("Invalid FanMiot model: %s" % model)
-
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
+    _mappings = MIOT_MAPPING
 
     @command(
         default_output=format_output(
@@ -406,14 +393,17 @@ def set_rotate(self, direction: MoveDirection):
         return self.set_property("set_move", value)
 
 
+@deprecated("Use FanMiot")
 class FanP9(FanMiot):
     mapping = MIOT_MAPPING[MODEL_FAN_P9]
 
 
+@deprecated("Use FanMiot")
 class FanP10(FanMiot):
     mapping = MIOT_MAPPING[MODEL_FAN_P10]
 
 
+@deprecated("Use FanMiot")
 class FanP11(FanMiot):
     mapping = MIOT_MAPPING[MODEL_FAN_P11]
 

miio/miot_device.py

@@ -28,9 +28,16 @@ def _str2bool(x):
 
 
 class MiotDevice(Device):
-    """Main class representing a MIoT device."""
+    """Main class representing a MIoT device.
+
+    The inheriting class should use the `_mappings` to set the `MiotMapping` keyed by
+    the model names to inform which mapping is to be used for methods contained in this
+    class. Defining the mappiong using `mapping` class variable is deprecated but
+    remains in-place for backwards compatibility.
+    """
 
     mapping: MiotMapping
+    _mappings: Dict[str, MiotMapping] = {}
 
     def __init__(
         self,
@@ -49,7 +56,7 @@ def __init__(
             ip, token, start_id, debug, lazy_discover, timeout, model=model
         )
 
-        if mapping is None and not hasattr(self, "mapping"):
+        if mapping is None and not hasattr(self, "mapping") and not self._mappings:
             _LOGGER.warning("Neither the class nor the parameter defines the mapping")
 
         if mapping is not None:
@@ -59,9 +66,8 @@ def get_properties_for_mapping(self, *, max_properties=15) -> list:
         """Retrieve raw properties based on mapping."""
 
         # We send property key in "did" because it's sent back via response and we can identify the property.
-        properties = [
-            {"did": k, **v} for k, v in self.mapping.items() if "aiid" not in v
-        ]
+        mapping = self._get_mapping()
+        properties = [{"did": k, **v} for k, v in mapping.items() if "aiid" not in v]
 
         return self.get_properties(
             properties, property_getter="get_properties", max_properties=max_properties
@@ -141,7 +147,30 @@ def set_property_by(
 
     def set_property(self, property_key: str, value):
         """Sets property value using the existing mapping."""
+        mapping = self._get_mapping()
         return self.send(
             "set_properties",
-            [{"did": property_key, **self.mapping[property_key], "value": value}],
+            [{"did": property_key, **mapping[property_key], "value": value}],
         )
+
+    def _get_mapping(self) -> MiotMapping:
+        """Return the protocol mapping to use.
+
+        The logic is as follows:
+        1. Use device model as key to lookup _mappings for the mapping
+        2. If no match is found, but _mappings is defined, use the first item
+        3. Fallback to class-defined `mapping` for backwards compat
+        """
+        if not self._mappings:
+            return self.mapping
+
+        mapping = self._mappings.get(self.model)
+        if mapping is not None:
+            return mapping
+
+        first_model, first_mapping = list(self._mappings.items())[0]
+        _LOGGER.warning(
+            "Unable to find mapping for %s, falling back to %s", self.model, first_model
+        )
+
+        return first_mapping

miio/tests/test_miotdevice.py

@@ -90,3 +90,26 @@ def test_call_action_by(dev):
             "in": params,
         },
     )
+
+
+@pytest.mark.parametrize(
+    "model,expected_mapping,expected_log",
+    [
+        ("some_model", {"x": {"y": 1}}, ""),
+        ("unknown_model", {"x": {"y": 1}}, "Unable to find mapping"),
+    ],
+)
+def test_get_mapping(dev, caplog, model, expected_mapping, expected_log):
+    """Test _get_mapping logic for fallbacks."""
+    dev._mappings["some_model"] = {"x": {"y": 1}}
+    dev._model = model
+    assert dev._get_mapping() == expected_mapping
+
+    assert expected_log in caplog.text
+
+
+def test_get_mapping_backwards_compat(dev):
+    """Test that the backwards compat works."""
+    # as dev is mocked on module level, need to empty manually
+    dev._mappings = {}
+    assert dev._get_mapping() == {}