Simplify fully_kiosk service actions (home-assistant#146509)

Author: epenet

homeassistant/components/fully_kiosk/__init__.py

@@ -27,7 +27,7 @@
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Fully Kiosk Browser."""
 
-    await async_setup_services(hass)
+    async_setup_services(hass)
 
     return True
 

homeassistant/components/fully_kiosk/services.py

@@ -6,7 +6,7 @@
 
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import ATTR_DEVICE_ID
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, device_registry as dr
 
@@ -23,71 +23,73 @@
 from .coordinator import FullyKioskDataUpdateCoordinator
 
 
-async def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up the services for the Fully Kiosk Browser integration."""
+async def _collect_coordinators(
+    call: ServiceCall,
+) -> list[FullyKioskDataUpdateCoordinator]:
+    device_ids: list[str] = call.data[ATTR_DEVICE_ID]
+    config_entries = list[ConfigEntry]()
+    registry = dr.async_get(call.hass)
+    for target in device_ids:
+        device = registry.async_get(target)
+        if device:
+            device_entries = list[ConfigEntry]()
+            for entry_id in device.config_entries:
+                entry = call.hass.config_entries.async_get_entry(entry_id)
+                if entry and entry.domain == DOMAIN:
+                    device_entries.append(entry)
+            if not device_entries:
+                raise HomeAssistantError(f"Device '{target}' is not a {DOMAIN} device")
+            config_entries.extend(device_entries)
+        else:
+            raise HomeAssistantError(f"Device '{target}' not found in device registry")
+    coordinators = list[FullyKioskDataUpdateCoordinator]()
+    for config_entry in config_entries:
+        if config_entry.state != ConfigEntryState.LOADED:
+            raise HomeAssistantError(f"{config_entry.title} is not loaded")
+        coordinators.append(config_entry.runtime_data)
+    return coordinators
 
-    async def collect_coordinators(
-        device_ids: list[str],
-    ) -> list[FullyKioskDataUpdateCoordinator]:
-        config_entries = list[ConfigEntry]()
-        registry = dr.async_get(hass)
-        for target in device_ids:
-            device = registry.async_get(target)
-            if device:
-                device_entries = list[ConfigEntry]()
-                for entry_id in device.config_entries:
-                    entry = hass.config_entries.async_get_entry(entry_id)
-                    if entry and entry.domain == DOMAIN:
-                        device_entries.append(entry)
-                if not device_entries:
-                    raise HomeAssistantError(
-                        f"Device '{target}' is not a {DOMAIN} device"
-                    )
-                config_entries.extend(device_entries)
-            else:
-                raise HomeAssistantError(
-                    f"Device '{target}' not found in device registry"
-                )
-        coordinators = list[FullyKioskDataUpdateCoordinator]()
-        for config_entry in config_entries:
-            if config_entry.state != ConfigEntryState.LOADED:
-                raise HomeAssistantError(f"{config_entry.title} is not loaded")
-            coordinators.append(config_entry.runtime_data)
-        return coordinators
-
-    async def async_load_url(call: ServiceCall) -> None:
-        """Load a URL on the Fully Kiosk Browser."""
-        for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
-            await coordinator.fully.loadUrl(call.data[ATTR_URL])
-
-    async def async_start_app(call: ServiceCall) -> None:
-        """Start an app on the device."""
-        for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
-            await coordinator.fully.startApplication(call.data[ATTR_APPLICATION])
-
-    async def async_set_config(call: ServiceCall) -> None:
-        """Set a Fully Kiosk Browser config value on the device."""
-        for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
-            key = call.data[ATTR_KEY]
-            value = call.data[ATTR_VALUE]
-
-            # Fully API has different methods for setting string and bool values.
-            # check if call.data[ATTR_VALUE] is a bool
-            if isinstance(value, bool) or (
-                isinstance(value, str) and value.lower() in ("true", "false")
-            ):
-                await coordinator.fully.setConfigurationBool(key, value)
-            else:
-                # Convert any int values to string
-                if isinstance(value, int):
-                    value = str(value)
-
-                await coordinator.fully.setConfigurationString(key, value)
+
+async def _async_load_url(call: ServiceCall) -> None:
+    """Load a URL on the Fully Kiosk Browser."""
+    for coordinator in await _collect_coordinators(call):
+        await coordinator.fully.loadUrl(call.data[ATTR_URL])
+
+
+async def _async_start_app(call: ServiceCall) -> None:
+    """Start an app on the device."""
+    for coordinator in await _collect_coordinators(call):
+        await coordinator.fully.startApplication(call.data[ATTR_APPLICATION])
+
+
+async def _async_set_config(call: ServiceCall) -> None:
+    """Set a Fully Kiosk Browser config value on the device."""
+    for coordinator in await _collect_coordinators(call):
+        key = call.data[ATTR_KEY]
+        value = call.data[ATTR_VALUE]
+
+        # Fully API has different methods for setting string and bool values.
+        # check if call.data[ATTR_VALUE] is a bool
+        if isinstance(value, bool) or (
+            isinstance(value, str) and value.lower() in ("true", "false")
+        ):
+            await coordinator.fully.setConfigurationBool(key, value)
+        else:
+            # Convert any int values to string
+            if isinstance(value, int):
+                value = str(value)
+
+            await coordinator.fully.setConfigurationString(key, value)
+
+
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Set up the services for the Fully Kiosk Browser integration."""
 
     # Register all the above services
     service_mapping = [
-        (async_load_url, SERVICE_LOAD_URL, ATTR_URL),
-        (async_start_app, SERVICE_START_APPLICATION, ATTR_APPLICATION),
+        (_async_load_url, SERVICE_LOAD_URL, ATTR_URL),
+        (_async_start_app, SERVICE_START_APPLICATION, ATTR_APPLICATION),
     ]
     for service_handler, service_name, attrib in service_mapping:
         hass.services.async_register(
@@ -107,7 +109,7 @@ async def async_set_config(call: ServiceCall) -> None:
     hass.services.async_register(
         DOMAIN,
         SERVICE_SET_CONFIG,
-        async_set_config,
+        _async_set_config,
         schema=vol.Schema(
             vol.All(
                 {