Use decorator for AsusWrt api calls

homeassistant/components/asuswrt/bridge.py

@@ -3,6 +3,8 @@
 
 from abc import ABC, abstractmethod
 from collections import namedtuple
+from collections.abc import Callable
+import functools
 import logging
 from typing import Any, cast
 
@@ -52,6 +54,28 @@ def _get_dict(keys: list, values: list) -> dict[str, Any]:
     return dict(zip(keys, values))
 
 
+def handle_errors_and_zip(exceptions: Any, keys: list | None) -> Callable:
+    """Run library methods and zip results or manage exceptions."""
+
+    def _handle_errors_and_zip(func: Callable) -> Callable:
+        """Run library methods and zip results or manage exceptions."""
+
+        @functools.wraps(func)
+        async def _wrapper(self: Any, *args: Any, **kwargs: Any) -> dict[str, Any]:
+            try:
+                data = await func(self, *args, **kwargs)
+            except exceptions as exc:
+                raise UpdateFailed(exc) from exc
+
+            if keys is None:
+                return cast(dict[str, Any], data)
+            return _get_dict(keys, data)
+
+        return _wrapper
+
+    return _handle_errors_and_zip
+
+
 class AsusWrtBridge(ABC):
     """The Base Bridge abstract class."""
 
@@ -236,38 +260,22 @@ async def _get_available_temperature_sensors(self) -> list[str]:
         availability = await self._api.async_find_temperature_commands()
         return [SENSORS_TEMPERATURES[i] for i in range(3) if availability[i]]
 
-    async def _get_bytes(self) -> dict[str, Any]:
+    @handle_errors_and_zip((IndexError, OSError, ValueError), SENSORS_BYTES)
+    async def _get_bytes(self) -> Any:
         """Fetch byte information from the router."""
-        try:
-            datas = await self._api.async_get_bytes_total()
-        except (IndexError, OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
-
-        return _get_dict(SENSORS_BYTES, datas)
+        return await self._api.async_get_bytes_total()
 
-    async def _get_rates(self) -> dict[str, Any]:
+    @handle_errors_and_zip((IndexError, OSError, ValueError), SENSORS_RATES)
+    async def _get_rates(self) -> Any:
         """Fetch rates information from the router."""
-        try:
-            rates = await self._api.async_get_current_transfer_rates()
-        except (IndexError, OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
-
-        return _get_dict(SENSORS_RATES, rates)
+        return await self._api.async_get_current_transfer_rates()
 
-    async def _get_load_avg(self) -> dict[str, Any]:
+    @handle_errors_and_zip((IndexError, OSError, ValueError), SENSORS_LOAD_AVG)
+    async def _get_load_avg(self) -> Any:
         """Fetch load average information from the router."""
-        try:
-            avg = await self._api.async_get_loadavg()
-        except (IndexError, OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
+        return await self._api.async_get_loadavg()
 
-        return _get_dict(SENSORS_LOAD_AVG, avg)
-
-    async def _get_temperatures(self) -> dict[str, Any]:
+    @handle_errors_and_zip((OSError, ValueError), None)
+    async def _get_temperatures(self) -> Any:
         """Fetch temperatures information from the router."""
-        try:
-            temperatures: dict[str, Any] = await self._api.async_get_temperature()
-        except (OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
-
-        return temperatures
+        return await self._api.async_get_temperature()