Remove sensor entities, trim changes

homeassistant/components/snooz/__init__.py

@@ -1,18 +1,9 @@
 """The Snooz component."""
 from __future__ import annotations
 
-import logging
-
-from pysnooz.advertisement import SnoozAdvertisementData
 from pysnooz.device import SnoozDevice
 
-from homeassistant.components.bluetooth import (
-    BluetoothScanningMode,
-    async_ble_device_from_address,
-)
-from homeassistant.components.bluetooth.passive_update_processor import (
-    PassiveBluetoothProcessorCoordinator,
-)
+from homeassistant.components.bluetooth import async_ble_device_from_address
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ADDRESS, CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
@@ -21,41 +12,26 @@
 from .const import DOMAIN
 from .models import SnoozConfigurationData
 
-PLATFORMS: list[Platform] = [Platform.FAN, Platform.SENSOR]
-
-_LOGGER = logging.getLogger(__name__)
+PLATFORMS: list[Platform] = [Platform.FAN]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Snooz device from a config entry."""
-    address = entry.data.get(CONF_ADDRESS)
-    assert address
-
-    token = entry.data.get(CONF_TOKEN)
-    assert token
+    address: str = entry.data[CONF_ADDRESS]
+    token: str = entry.data[CONF_TOKEN]
 
-    if not (ble_device := async_ble_device_from_address(hass, address.upper())):
+    if not (ble_device := async_ble_device_from_address(hass, address)):
         raise ConfigEntryNotReady(
             f"Could not find Snooz with address {address}. Try power cycling the device"
         )
 
-    data = SnoozAdvertisementData()
-    coordinator = PassiveBluetoothProcessorCoordinator(
-        hass,
-        _LOGGER,
-        address=address,
-        mode=BluetoothScanningMode.ACTIVE,
-        update_method=data.update,
-    )
-
     device = SnoozDevice(ble_device, token, hass.loop)
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = SnoozConfigurationData(
-        ble_device, device, coordinator
+        ble_device, device
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    entry.async_on_unload(coordinator.async_start())
 
     return True
 

homeassistant/components/snooz/config_flow.py

@@ -4,7 +4,7 @@
 import asyncio
 from typing import Any
 
-from pysnooz.advertisement import SnoozAdvertisementData, get_snooz_display_name
+from pysnooz.advertisement import SnoozAdvertisementData
 import voluptuous as vol
 
 from homeassistant.components.bluetooth import (
@@ -23,7 +23,7 @@
 WAIT_FOR_PAIRING_TIMEOUT = 30
 
 
-class DeviceDiscovery:
+class DiscoveredSnooz:
     """Represents a discovered Snooz device."""
 
     info: BluetoothServiceInfo
@@ -44,8 +44,8 @@ class SnoozConfigFlow(ConfigFlow, domain=DOMAIN):
 
     def __init__(self) -> None:
         """Initialize the config flow."""
-        self._discovery: DeviceDiscovery | None = None
-        self._discovered_devices: dict[str, DeviceDiscovery] = {}
+        self._discovery: DiscoveredSnooz | None = None
+        self._discovered_devices: dict[str, DiscoveredSnooz] = {}
         self._pairing_task: asyncio.Task | None = None
 
     async def async_step_bluetooth(
@@ -57,7 +57,7 @@ async def async_step_bluetooth(
         device = SnoozAdvertisementData()
         if not device.supported(discovery_info):
             return self.async_abort(reason="not_supported")
-        self._discovery = DeviceDiscovery(discovery_info, device)
+        self._discovery = DiscoveredSnooz(discovery_info, device)
         return await self.async_step_bluetooth_confirm()
 
     async def async_step_bluetooth_confirm(
@@ -73,11 +73,8 @@ async def async_step_bluetooth_confirm(
             return self._create_snooz_entry(self._discovery)
 
         self._set_confirm_only()
-        placeholders = {
-            "name": get_snooz_display_name(
-                self._discovery.device.title or "Snooz", self._discovery.info.address
-            )
-        }
+        assert self._discovery.device.display_name
+        placeholders = {"name": self._discovery.device.display_name}
         self.context["title_placeholders"] = placeholders
         return self.async_show_form(
             step_id="bluetooth_confirm", description_placeholders=placeholders
@@ -112,9 +109,10 @@ async def async_step_user(
                 continue
             device = SnoozAdvertisementData()
             if device.supported(info):
-                self._discovered_devices[
-                    get_snooz_display_name(device.title or "Snooz", info.address)
-                ] = DeviceDiscovery(info, device)
+                assert device.display_name
+                self._discovered_devices[device.display_name] = DiscoveredSnooz(
+                    info, device
+                )
 
         if not self._discovered_devices:
             return self.async_abort(reason="no_devices_found")
@@ -125,9 +123,7 @@ async def async_step_user(
                 {
                     vol.Required(CONF_NAME): vol.In(
                         [
-                            get_snooz_display_name(
-                                d.device.title or "Snooz", d.info.address
-                            )
+                            d.device.display_name
                             for d in self._discovered_devices.values()
                         ]
                     )
@@ -181,11 +177,10 @@ async def async_step_pairing_timeout(
         self._set_confirm_only()
         return self.async_show_form(step_id="pairing_timeout")
 
-    def _create_snooz_entry(self, discovery: DeviceDiscovery) -> FlowResult:
+    def _create_snooz_entry(self, discovery: DiscoveredSnooz) -> FlowResult:
+        assert discovery.device.display_name
         return self.async_create_entry(
-            title=get_snooz_display_name(
-                discovery.device.title or "Snooz", discovery.info.address
-            ),
+            title=discovery.device.display_name,
             data={
                 CONF_ADDRESS: discovery.info.address,
                 CONF_TOKEN: discovery.device.pairing_token,

homeassistant/components/snooz/models.py

@@ -3,21 +3,11 @@
 from bleak.backends.device import BLEDevice
 from pysnooz.device import SnoozDevice
 
-from homeassistant.components.bluetooth.passive_update_processor import (
-    PassiveBluetoothProcessorCoordinator,
-)
-
 
 class SnoozConfigurationData:
     """Configuration data for Snooz."""
 
-    def __init__(
-        self,
-        ble_device: BLEDevice,
-        device: SnoozDevice,
-        coordinator: PassiveBluetoothProcessorCoordinator,
-    ) -> None:
+    def __init__(self, ble_device: BLEDevice, device: SnoozDevice) -> None:
         """Initialize configuration data."""
         self.ble_device = ble_device
         self.device = device
-        self.coordinator = coordinator

homeassistant/components/snooz/translations/en.json

@@ -3,9 +3,13 @@
         "abort": {
             "already_configured": "Device is already configured",
             "already_in_progress": "Configuration flow is already in progress",
-            "no_devices_found": "No SNOOZ devices discovered."
+            "no_devices_found": "No devices found on the network"
         },
+        "error": {},
         "flow_title": "{name}",
+        "progress": {
+            "wait_for_pairing_mode": "To complete setup, put this device in pairing mode.\n\n### How to enter pairing mode\n1. Force quit SNOOZ mobile apps.\n2. Press and hold the power button on the device. Release when the lights start blinking (approximately 5 seconds)."
+        },
         "step": {
             "bluetooth_confirm": {
                 "description": "Do you want to setup {name}?"
@@ -19,9 +23,6 @@
                 },
                 "description": "Choose a device to setup"
             }
-        },
-        "progress": {
-            "wait_for_pairing_mode": "To complete setup, put this device in pairing mode.\n\n### How to enter pairing mode\n1. Force quit SNOOZ mobile apps.\n2. Press and hold the power button on the device.\n3. Release when the lights start blinking (approximately 5 seconds)."
         }
     }
 }