fixes

switchbot/adv_parsers/bulb.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 def process_color_bulb(data: bytes, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process WoBulb services data."""
+    assert mfr_data is not None
     return {
         "sequence_number": mfr_data[6],
         "isOn": bool(mfr_data[7] & 0b10000000),

switchbot/adv_parsers/meter.py

@@ -1,8 +1,10 @@
 """Meter parser."""
 from __future__ import annotations
 
+from typing import Any
 
-def process_wosensorth(data: bytes, mfr_data: bytes | None) -> dict[str, object]:
+
+def process_wosensorth(data: bytes, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data."""
 
     _temp_sign = 1 if data[4] & 0b10000000 else -1

switchbot/adv_parsers/plug.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 def process_woplugmini(data: bytes, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process plug mini."""
+    assert mfr_data is not None
     return {
         "switchMode": True,
         "isOn": mfr_data[7] == 0x80,

switchbot/devices/device.py

@@ -185,10 +185,12 @@ class SwitchbotDevice:
 
     async def _send_command_locked(self, key: str, command: bytes) -> bytes:
         """Send command to device and read response."""
-        client: BleakClientWithServiceCache | None = None
         await self._ensure_connected()
-        client = self._client
+        assert self._client is not None
+        assert self._read_char is not None
+        assert self._write_char is not None
         future: asyncio.Future[bytearray] = asyncio.Future()
+        client = self._client
 
         def _notification_handler(_sender: int, data: bytearray) -> None:
             """Handle notification responses."""
@@ -239,7 +241,7 @@ class SwitchbotDevice:
 
     async def get_device_data(
         self, retry: int = DEFAULT_RETRY_COUNT, interface: int | None = None
-    ) -> dict | None:
+    ) -> SwitchBotAdvertisement | None:
         """Find switchbot devices and their advertisement data."""
         if interface:
             _interface: int = interface
@@ -255,7 +257,7 @@ class SwitchbotDevice:
 
         return self._sb_adv_data
 
-    async def _get_basic_info(self) -> dict | None:
+    async def _get_basic_info(self) -> bytes | None:
         """Return basic info of device."""
         _data = await self._sendcommand(
             key=DEVICE_GET_BASIC_SETTINGS_KEY, retry=self._retry_count

switchbot/discovery.py

@@ -109,8 +109,8 @@ class GetSwitchbotDevices:
             await self.discover()
 
         return {
-            device: data
-            for device, data in self._adv_data.items()
+            device: adv
+            for device, adv in self._adv_data.items()
             # MacOS uses UUIDs instead of MAC addresses
-            if data.get("address") == address
+            if adv.data.get("address") == address
         }