0.25.0b1 (#734)

* Use new `async_set_state` scheme of `asusrouter` (#733)

* Bump asusrouter to `1.3.0`

* Bump version to `0.25.0b1`

Author: Vaskivskyi

custom_components/asusrouter/button.py

@@ -78,23 +78,27 @@ async def async_press(
     ) -> None:
         """Press button."""
 
+        kwargs = self._state_args if self._state_args is not None else {}
+
         await self._set_state(
             state=self._state,
-            arguments=self._state_args,
             expect_modify=self._state_expect_modify,
+            **kwargs,
         )
 
     async def _set_state(
         self,
         state: AsusState,
-        arguments: Optional[dict[str, Any]] = None,
         expect_modify: bool = False,
+        **kwargs: Any,
     ) -> None:
         """Set switch state."""
 
         try:
             _LOGGER.debug("Pressing %s", state)
-            result = await self.api.async_set_state(state, arguments, expect_modify)
+            result = await self.api.async_set_state(
+                state=state, expect_modify=expect_modify, **kwargs
+            )
             if not result:
                 _LOGGER.debug("Didn't manage to press %s", state)
         except Exception as ex:  # pylint: disable=broad-except

custom_components/asusrouter/dataclass.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 from typing import Any, Optional
 
-from asusrouter.modules.state import AsusState
+from asusrouter.modules.state import AsusState, AsusStateNone
 from homeassistant.components.binary_sensor import BinarySensorEntityDescription
 from homeassistant.components.button import ButtonEntityDescription
 from homeassistant.components.light import LightEntityDescription
@@ -59,9 +59,9 @@ class ARSwitchDescription(AREntityDescription, SwitchEntityDescription):
     icon_on: Optional[str] = None
     icon_off: Optional[str] = None
 
-    state_on: Optional[AsusState] = None
+    state_on: AsusState = AsusStateNone.NONE
     state_on_args: Optional[dict[str, Any]] = None
-    state_off: Optional[AsusState] = None
+    state_off: AsusState = AsusStateNone.NONE
     state_off_args: Optional[dict[str, Any]] = None
 
     state_expect_modify: bool = False
@@ -71,7 +71,7 @@ class ARSwitchDescription(AREntityDescription, SwitchEntityDescription):
 class ARButtonDescription(AREntityDescription, ButtonEntityDescription):
     """Describe AsusRouter button."""
 
-    state: Optional[str] = None
+    state: AsusState = AsusStateNone.NONE
     state_args: Optional[dict[str, Any]] = None
     state_expect_modify: bool = False
 

custom_components/asusrouter/entity.py

@@ -153,14 +153,15 @@ def icon(self) -> Optional[str]:
     async def _set_state(
         self,
         state: AsusState,
-        arguments: Optional[dict[str, Any]] = None,
         expect_modify: bool = False,
+        **kwargs: Any,
     ) -> None:
         """Set switch state."""
-
         try:
             _LOGGER.debug("Setting state to %s", state)
-            result = await self.api.async_set_state(state, arguments, expect_modify)
+            result = await self.api.async_set_state(
+                state=state, expect_modify=expect_modify, **kwargs
+            )
             await self.coordinator.async_request_refresh()
             if not result:
                 _LOGGER.debug("State was not set!")

custom_components/asusrouter/manifest.json

@@ -8,11 +8,11 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/Vaskivskyi/ha-asusrouter/issues",
   "loggers": ["asusrouter"],
-  "requirements": ["asusrouter==1.2.0"],
+  "requirements": ["asusrouter==1.3.0"],
   "ssdp": [
     {
       "manufacturer": "ASUSTeK Computer Inc."
     }
   ],
-  "version": "0.25.0b0"
+  "version": "0.25.0b1"
 }

custom_components/asusrouter/switch.py

@@ -2,10 +2,8 @@
 
 from __future__ import annotations
 
-import logging
-from typing import Any, Optional
+from typing import Any
 
-from asusrouter.modules.state import AsusState
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -17,8 +15,6 @@
 from .entity import ARBinaryEntity, async_setup_ar_entry
 from .router import ARDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -67,10 +63,12 @@ async def async_turn_on(
     ) -> None:
         """Turn on switch."""
 
+        kwargs = self._state_on_args if self._state_on_args is not None else {}
+
         await self._set_state(
             state=self._state_on,
-            arguments=self._state_on_args,
             expect_modify=self._state_expect_modify,
+            **kwargs,
         )
 
     async def async_turn_off(
@@ -79,8 +77,10 @@ async def async_turn_off(
     ) -> None:
         """Turn off switch."""
 
+        kwargs = self._state_off_args if self._state_off_args is not None else {}
+
         await self._set_state(
             state=self._state_off,
-            arguments=self._state_off_args,
             expect_modify=self._state_expect_modify,
+            **kwargs,
         )