Check if firmware is supported by device model (#632)

* Check supported firmware by device model

* Add comment

* Cleaning

* Fix fixture.py file

* Cleaning

* Add is_firmware_supported function

* Add test

* Additional condition

* switch to dataclass

* model names

* compat

* cleanup

* preserve const

* preen

* preen

* preen

* add tests for constru

* Update tests/test_const.py

* fixes

---------

Co-authored-by: J. Nick Koston <nick@koston.org>

Author: bieniu

aioshelly/block_device/device.py

@@ -12,16 +12,17 @@
 from aiohttp import ClientResponse, ClientResponseError, ClientSession, ClientTimeout
 from yarl import URL
 
-from ..common import ConnectionOptions, IpOrOptionsType, get_info, process_ip_or_options
+from ..common import (
+    ConnectionOptions,
+    IpOrOptionsType,
+    get_info,
+    is_firmware_supported,
+    process_ip_or_options,
+)
 from ..const import (
     CONNECT_ERRORS,
     DEFAULT_HTTP_PORT,
     DEVICE_IO_TIMEOUT,
-    FIRMWARE_PATTERN,
-    GEN1_LIGHT_TRANSITION_MIN_FIRMWARE_DATE,
-    GEN1_MIN_FIRMWARE_DATE,
-    GEN1_MODELS_SUPPORTING_LIGHT_TRANSITION,
-    GEN1_MODELS_UNSUPPORTED,
     HTTP_CALL_TIMEOUT,
     MODEL_RGBW2,
 )
@@ -451,22 +452,7 @@ def last_error(self) -> ShellyError | None:
     @property
     def firmware_supported(self) -> bool:
         """Return True if device firmware version is supported."""
-        if self.model in GEN1_MODELS_UNSUPPORTED:
-            return False
-
-        if self.model in GEN1_MODELS_SUPPORTING_LIGHT_TRANSITION:
-            fw_ver = GEN1_LIGHT_TRANSITION_MIN_FIRMWARE_DATE
-        else:
-            fw_ver = GEN1_MIN_FIRMWARE_DATE
-
-        match = FIRMWARE_PATTERN.search(self.firmware_version)
-
-        if match is None:
-            return False
-
-        # We compare firmware release dates because Shelly version numbering is
-        # inconsistent, sometimes the word is used as the version number.
-        return int(match[0]) >= fw_ver
+        return is_firmware_supported(self.gen, self.model, self.firmware_version)
 
 
 class Block:

aioshelly/common.py

@@ -12,7 +12,14 @@
 from aiohttp import BasicAuth, ClientSession, ClientTimeout
 from yarl import URL
 
-from .const import CONNECT_ERRORS, DEFAULT_HTTP_PORT, DEVICE_IO_TIMEOUT
+from .const import (
+    CONNECT_ERRORS,
+    DEFAULT_HTTP_PORT,
+    DEVICE_IO_TIMEOUT,
+    DEVICES,
+    FIRMWARE_PATTERN,
+    MIN_FIRMWARE_DATES,
+)
 from .exceptions import (
     DeviceConnectionError,
     MacAddressMismatchError,
@@ -91,3 +98,23 @@ async def get_info(
         raise mac_err
 
     return result
+
+
+def is_firmware_supported(gen: int, model: str, firmware_version: str) -> bool:
+    """Return True if firmware is supported."""
+    fw_ver: int | None
+    if device := DEVICES.get(model):
+        # Specific model is known
+        if not device.supported:
+            return False
+        fw_ver = device.min_fw_date
+    elif not (fw_ver := MIN_FIRMWARE_DATES.get(gen)):
+        # Protection against future generations of devices.
+        return False
+
+    match = FIRMWARE_PATTERN.search(firmware_version)
+    if match is None:
+        return False
+    # We compare firmware release dates because Shelly version numbering is
+    # inconsistent, sometimes the word is used as the version number.
+    return int(match[0]) >= fw_ver