Update to support bleak 0.17 (#113)

Author: bdraco

setup.py

@@ -3,7 +3,7 @@
 setup(
     name="PySwitchbot",
     packages=["switchbot", "switchbot.devices", "switchbot.adv_parsers"],
-    install_requires=["async_timeout>=4.0.1", "bleak", "bleak-retry-connector>=1.14.0"],
+    install_requires=["async_timeout>=4.0.1", "bleak>=0.17.0", "bleak-retry-connector>=1.15.0"],
     version="0.19.6",
     description="A library to communicate with Switchbot",
     author="Daniel Hjelseth Hoyer",

switchbot/devices/device.py

@@ -107,7 +107,6 @@ def __init__(
                 binascii.crc32(password.encode("ascii")) & 0xFFFFFFFF
             )
         self._client: BleakClientWithServiceCache | None = None
-        self._cached_services: BleakGATTServiceCollection | None = None
         self._read_char: BleakGATTCharacteristic | None = None
         self._write_char: BleakGATTCharacteristic | None = None
         self._disconnect_timer: asyncio.TimerHandle | None = None
@@ -229,15 +228,14 @@ async def _ensure_connected(self):
                 self._device,
                 self.name,
                 self._disconnected,
-                cached_services=self._cached_services,
+                use_services_cache=True,
                 ble_device_callback=lambda: self._device,
             )
             _LOGGER.debug("%s: Connected; RSSI: %s", self.name, self.rssi)
             resolved = self._resolve_characteristics(client.services)
             if not resolved:
                 # Try to handle services failing to load
                 resolved = self._resolve_characteristics(await client.get_services())
-            self._cached_services = client.services if resolved else None
             self._client = client
             self._reset_disconnect_timer()
 
@@ -399,8 +397,6 @@ def update_from_advertisement(self, advertisement: SwitchBotAdvertisement) -> No
         """Update device data from advertisement."""
         # Only accept advertisements if the data is not missing
         # if we already have an advertisement with data
-        if self._device and ble_device_has_changed(self._device, advertisement.device):
-            self._cached_services = None
         self._device = advertisement.device
 
     async def get_device_data(