diff --git a/.strict-typing b/.strict-typing index 062aafc709c..50cb735060a 100644 --- a/.strict-typing +++ b/.strict-typing @@ -120,7 +120,6 @@ homeassistant.components.blueprint.* homeassistant.components.bluesound.* homeassistant.components.bluetooth.* homeassistant.components.bluetooth_adapters.* -homeassistant.components.bluetooth_tracker.* homeassistant.components.bmw_connected_drive.* homeassistant.components.bond.* homeassistant.components.bosch_alarm.* diff --git a/homeassistant/components/bluetooth_tracker/__init__.py b/homeassistant/components/bluetooth_tracker/__init__.py deleted file mode 100644 index e58d5abab4a..00000000000 --- a/homeassistant/components/bluetooth_tracker/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""The bluetooth_tracker component.""" diff --git a/homeassistant/components/bluetooth_tracker/const.py b/homeassistant/components/bluetooth_tracker/const.py deleted file mode 100644 index 6be453be9ff..00000000000 --- a/homeassistant/components/bluetooth_tracker/const.py +++ /dev/null @@ -1,10 +0,0 @@ -"""Constants for the Bluetooth Tracker component.""" - -from typing import Final - -DOMAIN: Final = "bluetooth_tracker" -SERVICE_UPDATE: Final = "update" - -BT_PREFIX: Final = "BT_" -CONF_REQUEST_RSSI: Final = "request_rssi" -DEFAULT_DEVICE_ID: Final = -1 diff --git a/homeassistant/components/bluetooth_tracker/device_tracker.py b/homeassistant/components/bluetooth_tracker/device_tracker.py deleted file mode 100644 index 17d166f2b32..00000000000 --- a/homeassistant/components/bluetooth_tracker/device_tracker.py +++ /dev/null @@ -1,213 +0,0 @@ -"""Tracking for bluetooth devices.""" - -from __future__ import annotations - -import asyncio -from datetime import datetime, timedelta -import logging -from typing import Final - -import bluetooth -from bt_proximity import BluetoothRSSI -import voluptuous as vol - -from homeassistant.components.device_tracker import ( - CONF_SCAN_INTERVAL, - CONF_TRACK_NEW, - DEFAULT_TRACK_NEW, - PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, - SCAN_INTERVAL, - SourceType, -) -from homeassistant.components.device_tracker.legacy import ( - YAML_DEVICES, - AsyncSeeCallback, - Device, - async_load_config, -) -from homeassistant.const import CONF_DEVICE_ID -from homeassistant.core import HomeAssistant, ServiceCall -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers.event import async_track_time_interval -from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType - -from .const import ( - BT_PREFIX, - CONF_REQUEST_RSSI, - DEFAULT_DEVICE_ID, - DOMAIN, - SERVICE_UPDATE, -) - -_LOGGER: Final = logging.getLogger(__name__) - -PLATFORM_SCHEMA: Final = DEVICE_TRACKER_PLATFORM_SCHEMA.extend( - { - vol.Optional(CONF_TRACK_NEW): cv.boolean, - vol.Optional(CONF_REQUEST_RSSI): cv.boolean, - vol.Optional(CONF_DEVICE_ID, default=DEFAULT_DEVICE_ID): vol.All( - vol.Coerce(int), vol.Range(min=-1) - ), - } -) - - -def is_bluetooth_device(device: Device) -> bool: - """Check whether a device is a bluetooth device by its mac.""" - return device.mac is not None and device.mac[:3].upper() == BT_PREFIX - - -def discover_devices(device_id: int) -> list[tuple[str, str]]: - """Discover Bluetooth devices.""" - try: - result = bluetooth.discover_devices( - duration=8, - lookup_names=True, - flush_cache=True, - lookup_class=False, - device_id=device_id, - ) - except OSError as ex: - # OSError is generally thrown if a bluetooth device isn't found - _LOGGER.error("Couldn't discover bluetooth devices: %s", ex) - return [] - _LOGGER.debug("Bluetooth devices discovered = %d", len(result)) - return result # type: ignore[no-any-return] - - -async def see_device( - hass: HomeAssistant, - async_see: AsyncSeeCallback, - mac: str, - device_name: str, - rssi: tuple[int] | None = None, -) -> None: - """Mark a device as seen.""" - attributes = {} - if rssi is not None: - attributes["rssi"] = rssi - - await async_see( - mac=f"{BT_PREFIX}{mac}", - host_name=device_name, - attributes=attributes, - source_type=SourceType.BLUETOOTH, - ) - - -async def get_tracking_devices(hass: HomeAssistant) -> tuple[set[str], set[str]]: - """Load all known devices. - - We just need the devices so set consider_home and home range to 0 - """ - yaml_path: str = hass.config.path(YAML_DEVICES) - - devices = await async_load_config(yaml_path, hass, timedelta(0)) - bluetooth_devices = [device for device in devices if is_bluetooth_device(device)] - - devices_to_track: set[str] = { - device.mac[3:] - for device in bluetooth_devices - if device.track and device.mac is not None - } - devices_to_not_track: set[str] = { - device.mac[3:] - for device in bluetooth_devices - if not device.track and device.mac is not None - } - - return devices_to_track, devices_to_not_track - - -def lookup_name(mac: str) -> str | None: - """Lookup a Bluetooth device name.""" - _LOGGER.debug("Scanning %s", mac) - return bluetooth.lookup_name(mac, timeout=5) # type: ignore[no-any-return] - - -async def async_setup_scanner( - hass: HomeAssistant, - config: ConfigType, - async_see: AsyncSeeCallback, - discovery_info: DiscoveryInfoType | None = None, -) -> bool: - """Set up the Bluetooth Scanner.""" - device_id: int = config[CONF_DEVICE_ID] - interval: timedelta = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL) - request_rssi: bool = config.get(CONF_REQUEST_RSSI, False) - update_bluetooth_lock = asyncio.Lock() - - # If track new devices is true discover new devices on startup. - track_new: bool = config.get(CONF_TRACK_NEW, DEFAULT_TRACK_NEW) - _LOGGER.debug("Tracking new devices is set to %s", track_new) - - devices_to_track, devices_to_not_track = await get_tracking_devices(hass) - - if not devices_to_track and not track_new: - _LOGGER.debug("No Bluetooth devices to track and not tracking new devices") - - if request_rssi: - _LOGGER.debug("Detecting RSSI for devices") - - async def perform_bluetooth_update() -> None: - """Discover Bluetooth devices and update status.""" - _LOGGER.debug("Performing Bluetooth devices discovery and update") - tasks: list[asyncio.Task[None]] = [] - - try: - if track_new: - devices = await hass.async_add_executor_job(discover_devices, device_id) - for mac, _device_name in devices: - if mac not in devices_to_track and mac not in devices_to_not_track: - devices_to_track.add(mac) - - for mac in devices_to_track: - friendly_name = await hass.async_add_executor_job(lookup_name, mac) - if friendly_name is None: - # Could not lookup device name - continue - - rssi = None - if request_rssi: - client = BluetoothRSSI(mac) - rssi = await hass.async_add_executor_job(client.request_rssi) - client.close() - - tasks.append( - asyncio.create_task( - see_device(hass, async_see, mac, friendly_name, rssi) - ) - ) - - if tasks: - await asyncio.wait(tasks) - - except bluetooth.BluetoothError: - _LOGGER.exception("Error looking up Bluetooth device") - - async def update_bluetooth(now: datetime | None = None) -> None: - """Lookup Bluetooth devices and update status.""" - # If an update is in progress, we don't do anything - if update_bluetooth_lock.locked(): - _LOGGER.debug( - ( - "Previous execution of update_bluetooth is taking longer than the" - " scheduled update of interval %s" - ), - interval, - ) - return - - async with update_bluetooth_lock: - await perform_bluetooth_update() - - async def handle_manual_update_bluetooth(call: ServiceCall) -> None: - """Update bluetooth devices on demand.""" - await update_bluetooth() - - hass.async_create_task(update_bluetooth()) - async_track_time_interval(hass, update_bluetooth, interval) - - hass.services.async_register(DOMAIN, SERVICE_UPDATE, handle_manual_update_bluetooth) - - return True diff --git a/homeassistant/components/bluetooth_tracker/icons.json b/homeassistant/components/bluetooth_tracker/icons.json deleted file mode 100644 index 217f1240893..00000000000 --- a/homeassistant/components/bluetooth_tracker/icons.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "services": { - "update": { - "service": "mdi:update" - } - } -} diff --git a/homeassistant/components/bluetooth_tracker/manifest.json b/homeassistant/components/bluetooth_tracker/manifest.json deleted file mode 100644 index 8fb35b311c9..00000000000 --- a/homeassistant/components/bluetooth_tracker/manifest.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "domain": "bluetooth_tracker", - "name": "Bluetooth Tracker", - "codeowners": [], - "documentation": "https://www.home-assistant.io/integrations/bluetooth_tracker", - "iot_class": "local_polling", - "loggers": ["bluetooth", "bt_proximity"], - "quality_scale": "legacy", - "requirements": ["bt-proximity==0.2.1", "PyBluez==0.22"] -} diff --git a/homeassistant/components/bluetooth_tracker/services.yaml b/homeassistant/components/bluetooth_tracker/services.yaml deleted file mode 100644 index 91b8669505b..00000000000 --- a/homeassistant/components/bluetooth_tracker/services.yaml +++ /dev/null @@ -1 +0,0 @@ -update: diff --git a/homeassistant/components/bluetooth_tracker/strings.json b/homeassistant/components/bluetooth_tracker/strings.json deleted file mode 100644 index 70584cbcb2d..00000000000 --- a/homeassistant/components/bluetooth_tracker/strings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "services": { - "update": { - "description": "Triggers manual tracker update.", - "name": "Update" - } - } -} diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json index 5fdcb471f7e..c04db4bed0b 100644 --- a/homeassistant/generated/integrations.json +++ b/homeassistant/generated/integrations.json @@ -788,12 +788,6 @@ "config_flow": false, "iot_class": "local_push" }, - "bluetooth_tracker": { - "name": "Bluetooth Tracker", - "integration_type": "hub", - "config_flow": false, - "iot_class": "local_polling" - }, "bmw_connected_drive": { "name": "BMW Connected Drive", "integration_type": "hub", diff --git a/mypy.ini b/mypy.ini index 2fdd78cffa5..fad89abb1e6 100644 --- a/mypy.ini +++ b/mypy.ini @@ -955,16 +955,6 @@ disallow_untyped_defs = true warn_return_any = true warn_unreachable = true -[mypy-homeassistant.components.bluetooth_tracker.*] -check_untyped_defs = true -disallow_incomplete_defs = true -disallow_subclassing_any = true -disallow_untyped_calls = true -disallow_untyped_decorators = true -disallow_untyped_defs = true -warn_return_any = true -warn_unreachable = true - [mypy-homeassistant.components.bmw_connected_drive.*] check_untyped_defs = true disallow_incomplete_defs = true diff --git a/requirements_all.txt b/requirements_all.txt index 074f0b339fa..17dee29906e 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -43,9 +43,6 @@ PlexAPI==4.15.16 # homeassistant.components.progettihwsw ProgettiHWSW==0.1.3 -# homeassistant.components.bluetooth_tracker -# PyBluez==0.22 - # homeassistant.components.cast PyChromecast==14.0.9 @@ -702,9 +699,6 @@ brottsplatskartan==1.0.5 # homeassistant.components.brunt brunt==1.2.0 -# homeassistant.components.bluetooth_tracker -bt-proximity==0.2.1 - # homeassistant.components.bthome bthome-ble==3.15.0 diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 23b8a77bcea..cc89285302a 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -25,7 +25,6 @@ EXCLUDED_REQUIREMENTS_ALL = { "beewi-smartclim", # depends on bluepy "bluepy", "evdev", - "pybluez", } # Requirements excluded by EXCLUDED_REQUIREMENTS_ALL which should be included when diff --git a/script/hassfest/quality_scale.py b/script/hassfest/quality_scale.py index 502dc2a9ca7..b91a8264bd7 100644 --- a/script/hassfest/quality_scale.py +++ b/script/hassfest/quality_scale.py @@ -214,7 +214,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [ "bluetooth", "bluetooth_adapters", "bluetooth_le_tracker", - "bluetooth_tracker", "bond", "bosch_shc", "braviatv", @@ -1218,7 +1217,6 @@ INTEGRATIONS_WITHOUT_SCALE = [ "bluetooth", "bluetooth_adapters", "bluetooth_le_tracker", - "bluetooth_tracker", "bmw_connected_drive", "bond", "bosch_shc",