tesla-fleet-api 1.0.8__py3-none-any.whl → 1.0.10__py3-none-any.whl

tesla_fleet_api/const.py

@@ -3,7 +3,7 @@
 from enum import Enum
 import logging
 
-VERSION = "1.0.8"
+VERSION = "1.0.10"
 LOGGER = logging.getLogger(__package__)
 SERVERS = {
     "na": "https://fleet-api.prd.na.vn.cloud.tesla.com",

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -65,6 +65,8 @@ SERVICE_UUID = "00000211-b2d1-43f0-9b88-960cebf8b91e"
 WRITE_UUID = "00000212-b2d1-43f0-9b88-960cebf8b91e"
 READ_UUID = "00000213-b2d1-43f0-9b88-960cebf8b91e"
 VERSION_UUID = "00000214-b2d1-43f0-9b88-960cebf8b91e"
+NAME_UUID = "00002a00-0000-1000-8000-00805f9b34fb"
+APPEARANCE_UUID = "00002a01-0000-1000-8000-00805f9b34fb"
 
 if TYPE_CHECKING:
     from tesla_fleet_api.tesla.tesla import Tesla
@@ -97,9 +99,12 @@ class VehicleBluetooth(Commands):
         if device is not None:
             self.device = device
 
-    async def find_vehicle(self, name: str | None = None, address: str | None = None, scanner: BleakScanner = BleakScanner()) -> BLEDevice:
+    async def find_vehicle(self, name: str | None = None, address: str | None = None, scanner: BleakScanner | None = None) -> BLEDevice:
         """Find the Tesla BLE device."""
 
+        if scanner is None:
+            scanner = BleakScanner(service_uuids=[SERVICE_UUID])
+
         if address is not None:
             device = await scanner.find_device_by_address(address)
         elif name is not None:
@@ -126,7 +131,8 @@ class VehicleBluetooth(Commands):
             self.device,
             self.vin,
             max_attempts=max_attempts,
-            ble_device_callback=self.get_device
+            #ble_device_callback=self.get_device,
+            services=[SERVICE_UUID]
         )
         await self.client.start_notify(READ_UUID, self._on_notify)
 
@@ -212,6 +218,40 @@ class VehicleBluetooth(Commands):
                     if resp.HasField(requires):
                         return resp
 
+    async def query_display_name(self, max_attempts=5) -> str | None:
+        """Read the device name via GATT characteristic if available"""
+        for i in range(max_attempts):
+            try:
+                # Standard GATT Device Name characteristic (0x2A00)
+                device_name = (await self.client.read_gatt_char(NAME_UUID)).decode('utf-8')
+                if device_name.startswith("🔑 "):
+                    return device_name.replace("🔑 ","")
+                await asyncio.sleep(1)
+                LOGGER.debug(f"Attempt {i+1} to query display name failed, {device_name}")
+            except Exception as e:
+                LOGGER.error(f"Failed to read device name: {e}")
+
+    async def query_appearance(self) -> bytearray | None:
+        """Read the device appearance via GATT characteristic if available"""
+        try:
+            # Standard GATT Appearance characteristic (0x2A01)
+            return await self.client.read_gatt_char(APPEARANCE_UUID)
+        except Exception as e:
+            LOGGER.error(f"Failed to read device appearance: {e}")
+            return None
+
+    async def query_version(self) -> int | None:
+        """Read the device version via GATT characteristic if available"""
+        try:
+            # Custom GATT Version characteristic (0x2A02)
+            device_version = await self.client.read_gatt_char(VERSION_UUID)
+            # Convert the bytes to an integer
+            if device_version and len(device_version) > 0:
+                return int.from_bytes(device_version, byteorder='big')
+        except Exception as e:
+            LOGGER.error(f"Failed to read device version: {e}")
+        return None
+
     async def pair(self, role: Role = Role.ROLE_OWNER, form: KeyFormFactor = KeyFormFactor.KEY_FORM_FACTOR_CLOUD_KEY, timeout: int = 60):
         """Pair the key."""
 

tesla_fleet_api/tesla/vehicle/commands.py

@@ -183,7 +183,7 @@ class Session:
         self.counter = sessionInfo.counter
         self.epoch = sessionInfo.epoch
         self.delta = int(time.time()) - sessionInfo.clock_time
-        if (not self.ready or self.publicKey != sessionInfo.publicKey):
+        if (not self.ready or getattr(self, "publicKey", "None") != sessionInfo.publicKey):
             self.publicKey = sessionInfo.publicKey
             self.sharedKey = self.parent.shared_key(sessionInfo.publicKey)
             self.hmac = hmac.new(self.sharedKey, "authenticated command".encode(), hashlib.sha256).digest()

tesla_fleet_api/tesla/vehicle/vehicle.py

@@ -18,9 +18,11 @@ class Vehicle:
     """Base class describing a Tesla vehicle."""
 
     vin: str
+    parent: Tesla
 
     def __init__(self, parent: Tesla, vin: str):
         self.vin = vin
+        self.parent = parent
 
     @property
     def pre2021(self) -> bool:

tesla_fleet_api/tesla/vehicle/vehicles.py

@@ -1,12 +1,16 @@
 from __future__ import annotations
+import asyncio
 from typing import TYPE_CHECKING
+from bleak import BleakClient
 from bleak.backends.device import BLEDevice
+from bleak_retry_connector import establish_connection
 from cryptography.hazmat.primitives.asymmetric import ec
 
 from tesla_fleet_api.tesla.vehicle.signed import VehicleSigned
-from tesla_fleet_api.tesla.vehicle.bluetooth import VehicleBluetooth
+from tesla_fleet_api.tesla.vehicle.bluetooth import NAME_UUID, VehicleBluetooth
 from tesla_fleet_api.tesla.vehicle.fleet import VehicleFleet
 from tesla_fleet_api.tesla.vehicle.vehicle import Vehicle
+from tesla_fleet_api.const import LOGGER
 
 if TYPE_CHECKING:
     from tesla_fleet_api.tesla.fleet import TeslaFleetApi
@@ -69,3 +73,27 @@ class VehiclesBluetooth(dict[str, Vehicle]):
         vehicle = self.Bluetooth(self._parent, vin, key, device)
         self[vin] = vehicle
         return vehicle
+
+    async def query_display_name(self, device: BLEDevice, max_attempts=5) -> str | None:
+        """Queries the name of a bluetooth vehicle."""
+        client = await establish_connection(
+            BleakClient,
+            device,
+            device.name or "Unknown",
+            max_attempts=max_attempts
+        )
+        name: str | None = None
+        for i in range(max_attempts):
+            try:
+                # Standard GATT Device Name characteristic (0x2A00)
+                device_name = (await client.read_gatt_char(NAME_UUID)).decode('utf-8')
+                if device_name.startswith("🔑 "):
+                    name = device_name.replace("🔑 ","")
+                    break
+                await asyncio.sleep(1)
+                LOGGER.debug(f"Attempt {i+1} to query display name failed, {device_name}")
+            except Exception as e:
+                LOGGER.error(f"Failed to read device name: {e}")
+
+        await client.disconnect()
+        return name

{tesla_fleet_api-1.0.8.dist-info → tesla_fleet_api-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tesla_fleet_api
-Version: 1.0.8
+Version: 1.0.10
 Summary: Tesla Fleet API library for Python
 Home-page: https://github.com/Teslemetry/python-tesla-fleet-api
 Author: Brett Adams

{tesla_fleet_api-1.0.8.dist-info → tesla_fleet_api-1.0.10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tesla_fleet_api/__init__.py,sha256=3DZMoZ-5srW-7SooAjqcRubQDuZPY8rMKH7eqIp4qtg,392
-tesla_fleet_api/const.py,sha256=677X3D-SV_9h-QyD0UM9cz8XHt5PY5TnHmkQzT1458Q,3748
+tesla_fleet_api/const.py,sha256=iX1zonX_WX3NYpR_I9RAoVx3eM2iLHQjSD8C3QcBdTk,3749
 tesla_fleet_api/exceptions.py,sha256=GvjJBR77xGt2g3vhiAxcNtysj-e1Me7F-9PwO9dyzOo,35430
 tesla_fleet_api/ratecalculator.py,sha256=4lz8yruUeouHXh_3ezsXX-CTpIegp1T1J4VuRV_qdHA,1791
 tesla_fleet_api/tesla/__init__.py,sha256=Cvpqu8OaOFmbuwu9KjgYrje8eVluDp2IU_zwdtXbmO0,282
@@ -12,12 +12,12 @@ tesla_fleet_api/tesla/partner.py,sha256=e-l6sEP6-IupjFEQieSUjhhvRXF3aL4ebPNahcGF
 tesla_fleet_api/tesla/tesla.py,sha256=Gs8-L3OsEMhs1N_vdDx-E46bOHKGowXTBxmRiP8NKh4,2391
 tesla_fleet_api/tesla/user.py,sha256=w8rwiAOIFjuDus8M0RpZ0wucJtw8kYFKtJfYVk7Ekr0,1194
 tesla_fleet_api/tesla/vehicle/__init__.py,sha256=3A5_wTQHofRShof4pUNOtF78-7lUh62uz2jq2ecnmRY,381
-tesla_fleet_api/tesla/vehicle/bluetooth.py,sha256=N4OHy1z_oAk8gOcub6AZ53Cpdi4PDur-5RAkWqi2hh0,16431
-tesla_fleet_api/tesla/vehicle/commands.py,sha256=zgfc2yo1UxEh8ePqSb-4h0UTK0RmpCG_9LZX44CES2c,51268
+tesla_fleet_api/tesla/vehicle/bluetooth.py,sha256=CJgyE99Q4ezWjDjEaRD5hA6_-bHPpztXXdQcKQh9GZ0,18334
+tesla_fleet_api/tesla/vehicle/commands.py,sha256=_LXAtuAIkeojJuw8k1QjEabAQQH2MLD5YZyUH58QoSg,51288
 tesla_fleet_api/tesla/vehicle/fleet.py,sha256=K9BVZj6CChJSDSMFroa7Cz0KrsYWj32ILtQumarkLaU,32080
 tesla_fleet_api/tesla/vehicle/signed.py,sha256=RUzVnZIfykz3YZW2gaxd1iaN1i8LkLaEoiXrbqZn9kg,1339
-tesla_fleet_api/tesla/vehicle/vehicle.py,sha256=BlmHjV5Hly8v0vWNVBUhdNvwsSSuCuF946D7zROUB3s,823
-tesla_fleet_api/tesla/vehicle/vehicles.py,sha256=c1KFTAYDvuTVNjM5O23KvT54UbNwo3ofFVpfkY-Mq5Y,2640
+tesla_fleet_api/tesla/vehicle/vehicle.py,sha256=IBvRO6qGkUf4bi-pFongA9fIe9iScvz_wGXtzEJXilY,870
+tesla_fleet_api/tesla/vehicle/vehicles.py,sha256=jLE_T_fWEwFjuYU5_AlJ0KhEvWAPx2wybENESksJ2R8,3777
 tesla_fleet_api/tesla/vehicle/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tesla_fleet_api/tesla/vehicle/proto/__init__.pyi,sha256=qFXWNIgl71wB260u-XPzaAwWAHL6krw21q-aXnBtop0,252
 tesla_fleet_api/tesla/vehicle/proto/car_server_pb2.py,sha256=v_eb4NDIkx_ZYPYW29_EFRky5vQ4b2q14gwuQSbouYw,29202
@@ -44,8 +44,8 @@ tesla_fleet_api/teslemetry/vehicles.py,sha256=9nybVg7VHKLa2woMG6fzMmQP6xJIE_jdAd
 tesla_fleet_api/tessie/__init__.py,sha256=9lhQJaB6X4PObUL9QdaaZYqs2BxiTidu3zmHcBESLVw,78
 tesla_fleet_api/tessie/tessie.py,sha256=uhg0oOIxpwDvlvdBhKHeF3AGR2PzmdBgzh2-_EkmSq0,2617
 tesla_fleet_api/tessie/vehicles.py,sha256=gfEatilI_ct-R4CM5xYhrlduqCR9IHlyc56WmJf7v7k,1149
-tesla_fleet_api-1.0.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tesla_fleet_api-1.0.8.dist-info/METADATA,sha256=_Lo_vqVRgsfYm5-2kKVO0lT4BOplNA7fam0SQ6cjxwk,4382
-tesla_fleet_api-1.0.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-tesla_fleet_api-1.0.8.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
-tesla_fleet_api-1.0.8.dist-info/RECORD,,
+tesla_fleet_api-1.0.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+tesla_fleet_api-1.0.10.dist-info/METADATA,sha256=Dr_QRBUiyoZ4PUgBBipQkoTBbqxW7qtE-vJ9GxzY8io,4383
+tesla_fleet_api-1.0.10.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+tesla_fleet_api-1.0.10.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
+tesla_fleet_api-1.0.10.dist-info/RECORD,,