tesla-fleet-api 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

tesla_fleet_api/const.py

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

tesla_fleet_api/exceptions.py

@@ -875,9 +875,6 @@ SIGNED_MESSAGE_INFORMATION_FAULTS = [
 class WhitelistOperationStatus(TeslaFleetError):
     message = "Whitelist operation failed"
 
-    def __init__(self, message):
-        self.message = message
-
 class WhitelistOperationUndocumentedError(WhitelistOperationStatus):
     message = "Undocumented whitelist operation error"
     code = 1

tesla_fleet_api/tesla/bluetooth.py

@@ -3,21 +3,21 @@
 import hashlib
 import re
 from google.protobuf.json_format import MessageToJson, MessageToDict
-from bleak.backends.device import BLEDevice
-from cryptography.hazmat.primitives.asymmetric import ec
 
 from tesla_fleet_api.tesla.tesla import Tesla
-from tesla_fleet_api.tesla.vehicle.bluetooth import VehicleBluetooth
+from tesla_fleet_api.tesla.vehicle.vehicles import VehiclesBluetooth
 
 class TeslaBluetooth(Tesla):
     """Class describing a Tesla Bluetooth connection."""
 
+    Vehicles = VehiclesBluetooth
+
     def __init__(
         self,
     ):
         """Initialize the Tesla Fleet API."""
 
-        self.vehicles = Vehicles(self)
+        self.vehicles = self.Vehicles(self)
 
     def valid_name(self, name: str) -> bool:
         """Check if a BLE device name is a valid Tesla vehicle."""
@@ -27,23 +27,8 @@ class TeslaBluetooth(Tesla):
         """Get the name of a vehicle."""
         return "S" + hashlib.sha1(vin.encode('utf-8')).hexdigest()[:16] + "C"
 
-class Vehicles(dict[str, VehicleBluetooth]):
-    """Class containing and creating vehicles."""
-
-    _parent: TeslaBluetooth
-
-    def __init__(self, parent: TeslaBluetooth):
-        self._parent = parent
-
-    def create(self, vin: str) -> VehicleBluetooth:
-        """Creates a specific vehicle."""
-        return self.createBluetooth(vin)
 
-    def createBluetooth(self, vin: str, key: ec.EllipticCurvePrivateKey | None = None, device: None | str | BLEDevice = None) -> VehicleBluetooth:
-        """Creates a specific vehicle."""
-        vehicle = VehicleBluetooth(self._parent, vin, key, device)
-        self[vin] = vehicle
-        return vehicle
+# Helpers
 
 def toJson(message) -> str:
     """Convert a protobuf message to JSON."""

tesla_fleet_api/tesla/fleet.py

@@ -7,11 +7,6 @@ import aiohttp
 from tesla_fleet_api.tesla.tesla import Tesla
 from tesla_fleet_api.exceptions import raise_for_status, InvalidRegion, LibraryError, ResponseError
 from tesla_fleet_api.const import SERVERS, Method, LOGGER, VERSION
-from tesla_fleet_api.tesla.charging import Charging
-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
 
 
 # Based on https://developer.tesla.com/docs/fleet-api
@@ -54,15 +49,15 @@ class TeslaFleetApi(Tesla):
         LOGGER.debug("Using server %s", self.server)
 
         if charging_scope:
-            self.charging = Charging(self)
+            self.charging = self.Charging(self)
         if energy_scope:
-            self.energySites = EnergySites(self)
+            self.energySites = self.EnergySites(self)
         if user_scope:
-            self.user = User(self)
+            self.user = self.User(self)
         if partner_scope:
-            self.partner = Partner(self)
+            self.partner = self.Partner(self)
         if vehicle_scope:
-            self.vehicles = Vehicles(self)
+            self.vehicles = self.Vehicles(self)
 
     async def find_server(self) -> str:
         """Find the server URL for the Tesla Fleet API."""

tesla_fleet_api/tesla/tesla.py

@@ -3,6 +3,12 @@
 from os.path import exists
 import aiofiles
 
+from tesla_fleet_api.tesla.charging import Charging
+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
+
 # cryptography
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization
@@ -11,6 +17,12 @@ from cryptography.hazmat.backends import default_backend
 class Tesla:
     """Base class describing interactions with Tesla products."""
 
+    Charging = Charging
+    EnergySites = EnergySites
+    Partner = Partner
+    User = User
+    Vehicles = Vehicles
+
     private_key: ec.EllipticCurvePrivateKey | None = None
 
     async def get_private_key(

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -86,7 +86,7 @@ class VehicleBluetooth(Commands):
     _auth_method = "aes"
 
     def __init__(
-        self, parent: Tesla, vin: str, key: ec.EllipticCurvePrivateKey | None = None, device: None | str | BLEDevice = None
+        self, parent: Tesla, vin: str, key: ec.EllipticCurvePrivateKey | None = None, device: BLEDevice | None = None
     ):
         super().__init__(parent, vin, key)
         self.ble_name = "S" + hashlib.sha1(vin.encode('utf-8')).hexdigest()[:16] + "C"
@@ -95,14 +95,18 @@ class VehicleBluetooth(Commands):
             Domain.DOMAIN_INFOTAINMENT: asyncio.Queue(),
         }
         if device is not None:
-            self.client = BleakClient(device, services=[SERVICE_UUID])
+            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 name is not None:
-            device = await scanner.find_device_by_name(name)
-        elif address is not None:
+
+        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:
+            device = await scanner.find_device_by_name(name)
         else:
             device = await scanner.find_device_by_name(self.ble_name)
         if not device:
@@ -116,18 +120,17 @@ class VehicleBluetooth(Commands):
     def get_device(self) -> BLEDevice:
         return self.device
 
-    async def connect(self, device: BLEDevice | None = None, max_attempts: int = MAX_CONNECT_ATTEMPTS) -> None:
+    async def connect(self, max_attempts: int = MAX_CONNECT_ATTEMPTS) -> None:
         """Connect to the Tesla BLE device."""
-        if device:
-            self.device = device
-        if not self.device:
-            raise ValueError(f"Device {self.ble_name} not found")
+        if not hasattr(self, 'device'):
+            raise ValueError(f"BLEDevice {self.ble_name} has not been found or set")
         self.client = await establish_connection(
             BleakClient,
             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)
 
@@ -189,7 +192,7 @@ class VehicleBluetooth(Commands):
         LOGGER.debug(f"Received response: {msg}")
         await self._queues[msg.from_destination.domain].put(msg)
 
-    async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
+    async def _send(self, msg: RoutableMessage, requires: str, timeout: int = 2) -> RoutableMessage:
         """Serialize a message and send to the vehicle and wait for a response."""
         domain = msg.to_destination.domain
         async with self._sessions[domain].lock:
@@ -203,7 +206,7 @@ class VehicleBluetooth(Commands):
             await self.client.write_gatt_char(WRITE_UUID, payload, True)
 
             # Process the response
-            async with asyncio.timeout(2):
+            async with asyncio.timeout(timeout):
                 while True:
                     resp = await self._queues[domain].get()
                     LOGGER.debug(f"Received message {resp}")
@@ -213,7 +216,8 @@ class VehicleBluetooth(Commands):
                     if resp.HasField(requires):
                         return resp
 
-    async def pair(self, role: Role = Role.ROLE_OWNER, form: KeyFormFactor = KeyFormFactor.KEY_FORM_FACTOR_CLOUD_KEY):
+
+    async def pair(self, role: Role = Role.ROLE_OWNER, form: KeyFormFactor = KeyFormFactor.KEY_FORM_FACTOR_CLOUD_KEY, timeout: int = 60):
         """Pair the key."""
 
         request = UnsignedMessage(
@@ -236,7 +240,7 @@ class VehicleBluetooth(Commands):
             ),
             protobuf_message_as_bytes=request.SerializeToString(),
         )
-        resp = await self._send(msg, "protobuf_message_as_bytes")
+        resp = await self._send(msg, "protobuf_message_as_bytes", timeout)
         respMsg = FromVCSECMessage.FromString(resp.protobuf_message_as_bytes)
         if(respMsg.commandStatus.whitelistOperationStatus.whitelistOperationInformation):
             if(respMsg.commandStatus.whitelistOperationStatus.whitelistOperationInformation < len(WHITELIST_OPERATION_STATUS)):

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/vehicles.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
+from bleak.backends.device import BLEDevice
+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
@@ -8,7 +10,7 @@ from tesla_fleet_api.tesla.vehicle.vehicle import Vehicle
 
 if TYPE_CHECKING:
     from tesla_fleet_api.tesla.fleet import TeslaFleetApi
-
+    from tesla_fleet_api.tesla.bluetooth import TeslaBluetooth
 
 
 class Vehicles(dict[str, Vehicle]):
@@ -47,3 +49,23 @@ class Vehicles(dict[str, Vehicle]):
     def specificSigned(self, vin: str) -> VehicleSigned:
         """Legacy method for creating a Fleet API vehicle that uses command protocol."""
         return self.createSigned(vin)
+
+
+class VehiclesBluetooth(dict[str, Vehicle]):
+    """Class containing and creating bluetooth vehicles."""
+
+    _parent: TeslaBluetooth
+    Bluetooth = VehicleBluetooth
+
+    def __init__(self, parent: TeslaBluetooth):
+        self._parent = parent
+
+    def create(self, vin: str, key: ec.EllipticCurvePrivateKey | None = None, device: BLEDevice | None = None) -> VehicleBluetooth:
+        """Creates a bluetooth vehicle that uses command protocol."""
+        return self.createBluetooth(vin, key, device)
+
+    def createBluetooth(self, vin: str, key: ec.EllipticCurvePrivateKey | None = None, device: BLEDevice | None = None) -> VehicleBluetooth:
+        """Creates a bluetooth vehicle that uses command protocol."""
+        vehicle = self.Bluetooth(self._parent, vin, key, device)
+        self[vin] = vehicle
+        return vehicle

{tesla_fleet_api-1.0.7.dist-info → tesla_fleet_api-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tesla_fleet_api
-Version: 1.0.7
+Version: 1.0.9
 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.7.dist-info → tesla_fleet_api-1.0.9.dist-info}/RECORD

@@ -1,23 +1,23 @@
 tesla_fleet_api/__init__.py,sha256=3DZMoZ-5srW-7SooAjqcRubQDuZPY8rMKH7eqIp4qtg,392
-tesla_fleet_api/const.py,sha256=SBoj3pXbqLxQ0upG6_D3oV-um6M6OGSLXoN6eLQqajs,3748
-tesla_fleet_api/exceptions.py,sha256=iZJv_6YJO6wK_lYvR18SugpNk-ZTzElmcsOqNqd05M0,35495
+tesla_fleet_api/const.py,sha256=6avk1nS7GL_OVZaiC1Cmy0a-QoZ3LNoXTUjxFNKiPWA,3748
+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
-tesla_fleet_api/tesla/bluetooth.py,sha256=WhDo66OEwCGhvsGskvWcGUiNv6eyFsdEiQdIm571jQM,1835
+tesla_fleet_api/tesla/bluetooth.py,sha256=vxDPTM-Uq9IAVJjK54-p_llj26hssEEXAQI5-lVGx8Q,1137
 tesla_fleet_api/tesla/charging.py,sha256=D7I7cAf-3-95sIjyP6wpVqCq9Cppj6U-VPFQGpQQ8bs,1704
 tesla_fleet_api/tesla/energysite.py,sha256=vStffklBQfQNAO_1wrHLFu7BlBCTVVbLh7_IrAUL3wg,6131
-tesla_fleet_api/tesla/fleet.py,sha256=X74tzwGO9w65j9YUGuW04CwG7Bx6biEHwxIjWGCzB4c,5670
+tesla_fleet_api/tesla/fleet.py,sha256=zfmagXF4TbbVOPWcngCSKebaGB1daXbw8mTJ9o8einY,5432
 tesla_fleet_api/tesla/oauth.py,sha256=aWBsWmnM-QxzaU8W9TXVNxGsYn_LraXnpexwdE8wOqo,4104
 tesla_fleet_api/tesla/partner.py,sha256=e-l6sEP6-IupjFEQieSUjhhvRXF3aL4ebPNahcGFRCE,1238
-tesla_fleet_api/tesla/tesla.py,sha256=Jlz90-fM0nJbhnQN0k3ukNv59-9KqZZbyQ91IiLIbfo,2010
+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=25UlaAatKxu_NzbG5te5sKHeM9jAufj42LjGJaIKNHg,16476
-tesla_fleet_api/tesla/vehicle/commands.py,sha256=zgfc2yo1UxEh8ePqSb-4h0UTK0RmpCG_9LZX44CES2c,51268
+tesla_fleet_api/tesla/vehicle/bluetooth.py,sha256=SAzJL0GW8Gp5cCs_Gyc2qBJP9WVVwV_qwUFkQF8waTI,16561
+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=axiH33YRnkYcbQmolbL85PF69SRI_5FA5T10v-cMmBc,1644
+tesla_fleet_api/tesla/vehicle/vehicles.py,sha256=c1KFTAYDvuTVNjM5O23KvT54UbNwo3ofFVpfkY-Mq5Y,2640
 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.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tesla_fleet_api-1.0.7.dist-info/METADATA,sha256=8V2QJ6JsJYg745xq--pFzS1n8tm30avdLd-bEfmatkk,4382
-tesla_fleet_api-1.0.7.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-tesla_fleet_api-1.0.7.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
-tesla_fleet_api-1.0.7.dist-info/RECORD,,
+tesla_fleet_api-1.0.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+tesla_fleet_api-1.0.9.dist-info/METADATA,sha256=bDVsevE52Rb5wKU46C2oUVlDHMmMp9zClJl2KQlRpjk,4382
+tesla_fleet_api-1.0.9.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+tesla_fleet_api-1.0.9.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
+tesla_fleet_api-1.0.9.dist-info/RECORD,,