Refactoring to support Python 3.11 and Home Assistant 2023.6

Author: vmakeev

README.md

@@ -4,7 +4,7 @@ Home Assistant custom component for control Huawei mesh routers over LAN.
 
 [![hacs_badge](https://img.shields.io/badge/HACS-Default-orange.svg)](https://github.com/hacs/integration)
 [![License](https://img.shields.io/github/license/vmakeev/huawei_mesh_router)](https://github.com/vmakeev/huawei_mesh_router/blob/master/LICENSE.md)
-![Active installations](https://raw.githubusercontent.com/vmakeev/custom_badges_updater/main/huawei_mesh_router.svg)
+![Active installatons](https://img.shields.io/badge/dynamic/json?color=blue&label=active%20installations&query=$[%27huawei_mesh_router%27][%27total%27]&url=https%3A%2F%2Fanalytics.home-assistant.io%2Fcustom_integrations.json&cacheSeconds=600)
 
 [![Release](https://img.shields.io/github/v/release/vmakeev/huawei_mesh_router)](https://github.com/vmakeev/huawei_mesh_router/releases/latest)
 [![ReleaseDate](https://img.shields.io/github/release-date/vmakeev/huawei_mesh_router)](https://github.com/vmakeev/huawei_mesh_router/releases/latest)
@@ -66,10 +66,13 @@ By default, Huawei mesh routers use the username `admin`, although it is not dis
 
 ### Advanced options
 
-You can perform advanced component configuration by clicking the `CONFIGURE` button after adding it. 
+You can perform advanced configuration of the component after adding it. 
+To do this, click on the gear, and in the tab that opens, click `CONFIGURE`
 
 ![Integration](docs/images/integration.png)
 
+![Integration details](docs/images/integration_details.png)
+
 Advanced settings include:
 |                                                       Name                                                       |  Default   |
 |------------------------------------------------------------------------------------------------------------------|------------|

custom_components/huawei_mesh_router/button.py

@@ -11,8 +11,7 @@
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .classes import ConnectedDevice
-from .client.classes import MAC_ADDR
-from .client.huaweiapi import ACTION_REBOOT
+from .client.classes import MAC_ADDR, Action
 from .helpers import (
     generate_entity_id,
     generate_entity_name,
@@ -80,12 +79,12 @@ class HuaweiButton(CoordinatorEntity[HuaweiDataUpdateCoordinator], ButtonEntity,
     def __init__(
         self,
         coordinator: HuaweiDataUpdateCoordinator,
-        action_name: str,
+        action: Action,
         device_mac: MAC_ADDR | None,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
-        self._action_name: str = action_name
+        self._action: Action = action
         self._device_mac: MAC_ADDR = device_mac
         self._attr_device_info = coordinator.get_device_info(device_mac)
 
@@ -100,10 +99,10 @@ async def async_added_to_hass(self) -> None:
         self._handle_coordinator_update()
         if self._device_mac:
             _LOGGER.debug(
-                "Button %s (%s) added to hass", self._action_name, self._device_mac
+                "Button %s (%s) added to hass", self._action, self._device_mac
             )
         else:
-            _LOGGER.debug("Button %s added to hass", self._action_name)
+            _LOGGER.debug("Button %s added to hass", self._action)
 
     @callback
     def _handle_coordinator_update(self) -> None:
@@ -112,7 +111,7 @@ def _handle_coordinator_update(self) -> None:
 
     async def async_press(self) -> None:
         """Triggers the button press service."""
-        await self.coordinator.execute_action(self._action_name, self._device_mac)
+        await self.coordinator.execute_action(self._action, self._device_mac)
 
     def press(self) -> None:
         """Press the button."""
@@ -131,7 +130,7 @@ def __init__(
         device: ConnectedDevice | None,
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator, ACTION_REBOOT, device.mac if device else None)
+        super().__init__(coordinator, Action.REBOOT, device.mac if device else None)
 
         self._attr_device_class = ButtonDeviceClass.RESTART
 

custom_components/huawei_mesh_router/classes.py

@@ -1,10 +1,9 @@
 """Huawei Mesh Router component classes."""
 
 from dataclasses import dataclass
+from enum import StrEnum
 from typing import Any, Dict, Iterable, Tuple
 
-from homeassistant.backports.enum import StrEnum
-
 from .client.classes import MAC_ADDR, HuaweiFilterItem
 
 DEVICE_TAG = str
@@ -19,6 +18,22 @@ class ZoneInfo:
     entity_id: str
 
 
+# ---------------------------
+#   Select
+# ---------------------------
+class Select(StrEnum):
+    WLAN_FILTER_MODE = "wlan_filter_mode_select"
+    ROUTER_ZONE = "router_zone_select"
+
+
+# ---------------------------
+#   EmulatedSwitch
+# ---------------------------
+class EmulatedSwitch(StrEnum):
+    DEVICE_ACCESS = "wlan_device_access_switch"
+    URL_FILTER = "url_filter_switch"
+
+
 # ---------------------------
 #   HuaweiInterfaceType
 # ---------------------------

custom_components/huawei_mesh_router/client/classes.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from enum import Enum, IntEnum
+from enum import Enum, IntEnum, StrEnum
 from typing import Any, Dict, Final, Iterable, TypeAlias
 
 VENDOR_CLASS_ID_ROUTER: Final = "router"
@@ -14,6 +14,45 @@
 MAC_ADDR: TypeAlias = str
 
 
+# ---------------------------
+#   Feature
+# ---------------------------
+class Feature(StrEnum):
+    NFC: Final = "feature_nfc"
+    URL_FILTER = "feature_url_filter"
+    WIFI_80211R = "feature_wifi_80211r"
+    WIFI_TWT = "feature_wifi_twt"
+    WLAN_FILTER = "feature_wlan_filter"
+    DEVICE_TOPOLOGY = "feature_device_topology"
+    GUEST_NETWORK = "feature_guest_network"
+
+
+# ---------------------------
+#   Switch
+# ---------------------------
+class Switch(StrEnum):
+    NFC: Final = "nfc_switch"
+    WIFI_80211R = "wifi_80211r_switch"
+    WIFI_TWT = "wifi_twt_switch"
+    WLAN_FILTER = "wlan_filter_switch"
+    GUEST_NETWORK = "guest_network_switch"
+
+
+# ---------------------------
+#   Action
+# ---------------------------
+class Action(StrEnum):
+    REBOOT: Final = "reboot_action"
+
+
+# ---------------------------
+#   Frequency
+# ---------------------------
+class Frequency(StrEnum):
+    WIFI_2_4_GHZ = "2.4GHz"
+    WIFI_5_GHZ = "5GHz"
+
+
 # ---------------------------
 #   FilterAction
 # ---------------------------

custom_components/huawei_mesh_router/client/const.py

@@ -3,28 +3,8 @@
 WIFI_SECURITY_OPEN: Final = "none"
 WIFI_SECURITY_ENCRYPTED: Final = "tkip"
 
-SWITCH_NFC: Final = "nfc_switch"
-SWITCH_WIFI_80211R: Final = "wifi_80211r_switch"
-SWITCH_WIFI_TWT: Final = "wifi_twt_switch"
-SWITCH_WLAN_FILTER: Final = "wlan_filter_switch"
-SWITCH_URL_FILTER: Final = "url_filter_switch"
-SWITCH_GUEST_NETWORK: Final = "guest_network_switch"
-
-FREQUENCY_2_4_GHZ: Final = "2.4GHz"
-FREQUENCY_5_GHZ: Final = "5GHz"
-
-ACTION_REBOOT: Final = "reboot_action"
-
 CONNECTED_VIA_ID_PRIMARY: Final = "primary"
 
-FEATURE_NFC: Final = "feature_nfc"
-FEATURE_URL_FILTER: Final = "feature_url_filter"
-FEATURE_WIFI_80211R: Final = "feature_wifi_80211r"
-FEATURE_WIFI_TWT: Final = "feature_wifi_twt"
-FEATURE_WLAN_FILTER: Final = "feature_wlan_filter"
-FEATURE_DEVICE_TOPOLOGY: Final = "feature_device_topology"
-FEATURE_GUEST_NETWORK: Final = "feature_guest_network"
-
 URL_DEVICE_INFO: Final = "api/system/deviceinfo"
 URL_DEVICE_TOPOLOGY: Final = "api/device/topology"
 URL_HOST_INFO: Final = "api/system/HostInfo"