Fix mypy typing issues across library

Author: Bre77

tesla_fleet_api/tesla/bluetooth.py

@@ -22,7 +22,7 @@ class TeslaBluetooth(Tesla):
 
     def __init__(
         self,
-    ):
+    ) -> None:
         """Initialize the Tesla Fleet API."""
 
         self.vehicles = self.Vehicles(self)

tesla_fleet_api/tesla/fleet.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Awaitable, Callable
 from json import dumps
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
 
 import aiohttp
 
@@ -22,7 +22,6 @@
     from tesla_fleet_api.tesla.energysite import EnergySites
     from tesla_fleet_api.tesla.partner import Partner
     from tesla_fleet_api.tesla.user import User
-    from tesla_fleet_api.tesla.vehicle.vehicles import Vehicles
 
 
 def _normalize_query_value(value: Any) -> Any:
@@ -44,7 +43,7 @@ class TeslaFleetApi(Tesla):
     energySites: "EnergySites"
     user: "User"
     partner: "Partner"
-    vehicles: "Vehicles[TeslaFleetApi]"
+    vehicles: Any
 
     def __init__(
         self,
@@ -91,10 +90,16 @@ async def find_server(self) -> str:
             try:
                 region_response = await self.user.region()
                 response = region_response.get("response")
-                if response:
-                    self.server = response["fleet_api_base_url"]
+                if isinstance(response, dict):
+                    fleet_api_base_url = response.get("fleet_api_base_url")
+                    region = response.get("region")
+                    if not isinstance(fleet_api_base_url, str) or not isinstance(
+                        region, str
+                    ):
+                        continue
+                    self.server = fleet_api_base_url
                     LOGGER.debug("Using server %s", self.server)
-                    return response["region"]
+                    return region
             except InvalidRegion:
                 continue
         raise LibraryError("Could not find a valid Tesla API server.")
@@ -168,8 +173,10 @@ async def _request(
                 raise ResponseError(status=resp.status, data=await resp.text())
 
             data = await resp.json()
+            if not isinstance(data, dict):
+                raise ResponseError(status=resp.status, data=str(data))
             LOGGER.debug("Response JSON: %s", data)
-            return data
+            return cast(dict[str, Any], data)
 
     async def status(self) -> str:
         """This endpoint returns the string "ok" if the API is operating normally. No HTTP headers are required."""
@@ -221,9 +228,14 @@ async def partner_login(
         ) as resp:
             if resp.ok:
                 token_data = await resp.json()
+                if not isinstance(token_data, dict):
+                    raise ResponseError(status=resp.status, data=str(token_data))
+                access_token = token_data.get("access_token")
+                if not isinstance(access_token, str):
+                    raise ValueError("Partner login response did not include access_token")
                 # Set the access token for subsequent API calls
-                self._access_token = token_data["access_token"]
-                return token_data
+                self._access_token = access_token
+                return cast(dict[str, Any], token_data)
             else:
                 error_data = await resp.json()
                 raise ValueError(f"Partner login failed: {error_data}")

tesla_fleet_api/tesla/tesla.py

@@ -1,6 +1,7 @@
 """Tesla Fleet API for Python."""
 
 from os.path import exists
+from typing import Any
 import aiofiles
 
 from tesla_fleet_api.tesla.charging import Charging
@@ -21,7 +22,7 @@ class Tesla:
     EnergySites = EnergySites
     Partner = Partner
     User = User
-    Vehicles = Vehicles
+    Vehicles: type[Any] = Vehicles
 
     private_key: ec.EllipticCurvePrivateKey | None = None
 

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -114,7 +114,7 @@ def __init__(self, callback: Callable[[RoutableMessage], None]):
         self.packet_starts: list[int] = []
         self.callback = callback
 
-    def receive_data(self, data: bytearray):
+    def receive_data(self, data: bytearray) -> None:
         """
         Receives a chunk of bytearray data and attempts to assemble a complete message.
 
@@ -159,7 +159,7 @@ def receive_data(self, data: bytearray):
             else:
                 return
 
-    def discard_packet(self):
+    def discard_packet(self) -> None:
         """Drop the current packet and resynchronize on the next candidate start byte."""
         self.packet_starts.pop(0)
         if len(self.packet_starts) > 0:
@@ -188,7 +188,7 @@ def __init__(
         vin: str,
         key: ec.EllipticCurvePrivateKey | None = None,
         device: BLEDevice | None = None,
-    ):
+    ) -> None:
         super().__init__(parent, vin, key)
         self.ble_name = "S" + hashlib.sha1(vin.encode("utf-8")).hexdigest()[:16] + "C"
         self._queues = {
@@ -450,6 +450,7 @@ async def query_display_name(self, max_attempts: int = 5) -> str | None:
                 )
             except Exception as e:
                 LOGGER.error(f"Failed to read device name: {e}")
+        return None
 
     async def query_appearance(self) -> bytearray | None:
         """Read the device appearance via GATT characteristic if available"""
@@ -488,7 +489,7 @@ async def pair(
         role: Role = Role.ROLE_OWNER,
         form: KeyFormFactor = KeyFormFactor.KEY_FORM_FACTOR_CLOUD_KEY,
         timeout: int = 60,
-    ):
+    ) -> None:
         """Pair the key."""
 
         request = UnsignedMessage(
@@ -523,7 +524,7 @@ async def pair(
                 )
         return
 
-    async def wake_up(self):
+    async def wake_up(self) -> dict[str, Any]:
         """Wake up the vehicle."""
         return await self._sendVehicleSecurity(
             UnsignedMessage(RKEAction=RKEAction_E.RKE_ACTION_WAKE_VEHICLE)