Simplify tado service actions (home-assistant#146614)

Author: epenet

homeassistant/components/tado/__init__.py

@@ -35,7 +35,7 @@
 )
 from .coordinator import TadoDataUpdateCoordinator, TadoMobileDeviceUpdateCoordinator
 from .models import TadoData
-from .services import setup_services
+from .services import async_setup_services
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -58,7 +58,7 @@
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Tado."""
 
-    setup_services(hass)
+    async_setup_services(hass)
     return True
 
 

homeassistant/components/tado/services.py

@@ -29,26 +29,27 @@
 )
 
 
-@callback
-def setup_services(hass: HomeAssistant) -> None:
-    """Set up the services for the Tado integration."""
+async def _add_meter_reading(call: ServiceCall) -> None:
+    """Send meter reading to Tado."""
+    entry_id: str = call.data[CONF_CONFIG_ENTRY]
+    reading: int = call.data[CONF_READING]
+    _LOGGER.debug("Add meter reading %s", reading)
+
+    entry = call.hass.config_entries.async_get_entry(entry_id)
+    if entry is None:
+        raise ServiceValidationError("Config entry not found")
 
-    async def add_meter_reading(call: ServiceCall) -> None:
-        """Send meter reading to Tado."""
-        entry_id: str = call.data[CONF_CONFIG_ENTRY]
-        reading: int = call.data[CONF_READING]
-        _LOGGER.debug("Add meter reading %s", reading)
+    coordinator = entry.runtime_data.coordinator
+    response: dict = await coordinator.set_meter_reading(call.data[CONF_READING])
 
-        entry = hass.config_entries.async_get_entry(entry_id)
-        if entry is None:
-            raise ServiceValidationError("Config entry not found")
+    if ATTR_MESSAGE in response:
+        raise HomeAssistantError(response[ATTR_MESSAGE])
 
-        coordinator = entry.runtime_data.coordinator
-        response: dict = await coordinator.set_meter_reading(call.data[CONF_READING])
 
-        if ATTR_MESSAGE in response:
-            raise HomeAssistantError(response[ATTR_MESSAGE])
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Set up the services for the Tado integration."""
 
     hass.services.async_register(
-        DOMAIN, SERVICE_ADD_METER_READING, add_meter_reading, SCHEMA_ADD_METER_READING
+        DOMAIN, SERVICE_ADD_METER_READING, _add_meter_reading, SCHEMA_ADD_METER_READING
     )