Remove brackets from decorator in Husqvarna Automower (home-assistant#154042)

Author: Thomas55555

homeassistant/components/husqvarna_automower/button.py

@@ -112,7 +112,7 @@ def available(self) -> bool:
             self.mower_attributes
         )
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_press(self) -> None:
         """Send a command to the mower."""
         await self.entity_description.press_fn(self.coordinator.api, self.mower_id)

homeassistant/components/husqvarna_automower/entity.py

@@ -6,7 +6,7 @@
 from collections.abc import Callable, Coroutine
 import functools
 import logging
-from typing import TYPE_CHECKING, Any, Concatenate
+from typing import TYPE_CHECKING, Any, Concatenate, ParamSpec, TypeVar, overload
 
 from aioautomower.exceptions import ApiError
 from aioautomower.model import MowerActivities, MowerAttributes, MowerStates, WorkArea
@@ -37,23 +37,42 @@
 ]
 
 
-@callback
-def _work_area_translation_key(work_area_id: int, key: str) -> str:
-    """Return the translation key."""
-    if work_area_id == 0:
-        return f"my_lawn_{key}"
-    return f"work_area_{key}"
+_Entity = TypeVar("_Entity", bound="AutomowerBaseEntity")
+_P = ParamSpec("_P")
+
 
+@overload
+def handle_sending_exception(
+    _func: Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, Any]],
+) -> Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, None]]: ...
 
-type _FuncType[_T, **_P, _R] = Callable[Concatenate[_T, _P], Coroutine[Any, Any, _R]]
+
+@overload
+def handle_sending_exception(
+    *,
+    poll_after_sending: bool = False,
+) -> Callable[
+    [Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, Any]]],
+    Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, None]],
+]: ...
 
 
-def handle_sending_exception[_Entity: AutomowerBaseEntity, **_P](
+def handle_sending_exception(
+    _func: Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, Any]] | None = None,
+    *,
     poll_after_sending: bool = False,
-) -> Callable[[_FuncType[_Entity, _P, Any]], _FuncType[_Entity, _P, None]]:
+) -> (
+    Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, None]]
+    | Callable[
+        [Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, Any]]],
+        Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, None]],
+    ]
+):
     """Handle exceptions while sending a command and optionally refresh coordinator."""
 
-    def decorator(func: _FuncType[_Entity, _P, Any]) -> _FuncType[_Entity, _P, None]:
+    def decorator(
+        func: Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, Any]],
+    ) -> Callable[Concatenate[_Entity, _P], Coroutine[Any, Any, None]]:
         @functools.wraps(func)
         async def wrapper(self: _Entity, *args: _P.args, **kwargs: _P.kwargs) -> None:
             try:
@@ -73,7 +92,20 @@ async def wrapper(self: _Entity, *args: _P.args, **kwargs: _P.kwargs) -> None:
 
         return wrapper
 
-    return decorator
+    if _func is None:
+        # call with brackets: @handle_sending_exception(...)
+        return decorator
+
+    # call without brackets: @handle_sending_exception
+    return decorator(_func)
+
+
+@callback
+def _work_area_translation_key(work_area_id: int, key: str) -> str:
+    """Return the translation key."""
+    if work_area_id == 0:
+        return f"my_lawn_{key}"
+    return f"work_area_{key}"
 
 
 class AutomowerBaseEntity(CoordinatorEntity[AutomowerDataUpdateCoordinator]):

homeassistant/components/husqvarna_automower/lawn_mower.py

@@ -135,22 +135,22 @@ def work_areas(self) -> dict[int, WorkArea] | None:
         """Return the work areas of the mower."""
         return self.mower_attributes.work_areas
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_start_mowing(self) -> None:
         """Resume schedule."""
         await self.coordinator.api.commands.resume_schedule(self.mower_id)
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_pause(self) -> None:
         """Pauses the mower."""
         await self.coordinator.api.commands.pause_mowing(self.mower_id)
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_dock(self) -> None:
         """Parks the mower until next schedule."""
         await self.coordinator.api.commands.park_until_next_schedule(self.mower_id)
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_override_schedule(
         self, override_mode: str, duration: timedelta
     ) -> None:
@@ -160,7 +160,7 @@ async def async_override_schedule(
         if override_mode == PARK:
             await self.coordinator.api.commands.park_for(self.mower_id, duration)
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_override_schedule_work_area(
         self, work_area_id: int, duration: timedelta
     ) -> None:

homeassistant/components/husqvarna_automower/select.py

@@ -67,7 +67,7 @@ def current_option(self) -> str:
         """Return the current option for the entity."""
         return cast(HeadlightModes, self.mower_attributes.settings.headlight.mode)
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_select_option(self, option: str) -> None:
         """Change the selected option."""
         await self.coordinator.api.commands.set_headlight_mode(

homeassistant/components/husqvarna_automower/switch.py

@@ -108,12 +108,12 @@ def is_on(self) -> bool:
         """Return the state of the switch."""
         return self.mower_attributes.mower.mode != MowerModes.HOME
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
         await self.coordinator.api.commands.park_until_further_notice(self.mower_id)
 
-    @handle_sending_exception()
+    @handle_sending_exception
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the entity on."""
         await self.coordinator.api.commands.resume_schedule(self.mower_id)