tesla-fleet-api 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

tesla_fleet_api/const.py

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

tesla_fleet_api/exceptions.py

@@ -21,7 +21,6 @@ class ResponseError(TeslaFleetError):
     """The response from the server was not JSON."""
 
     message = "The response from the server was not JSON."
-    data: str | None = None
 
 
 class InvalidCommand(TeslaFleetError):

tesla_fleet_api/tesla/bluetooth.py

@@ -2,6 +2,7 @@
 
 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
 
@@ -43,3 +44,11 @@ class Vehicles(dict[str, VehicleBluetooth]):
         vehicle = VehicleBluetooth(self._parent, vin, key, device)
         self[vin] = vehicle
         return vehicle
+
+def toJson(message) -> str:
+    """Convert a protobuf message to JSON."""
+    return MessageToJson(message, preserving_proto_field_name=True)
+
+def toDict(message) -> dict:
+    """Convert a protobuf message to a dictionary."""
+    return MessageToDict(message, preserving_proto_field_name=True)

tesla_fleet_api/tesla/energysite.py

@@ -159,11 +159,12 @@ class EnergySites(dict[int, EnergySite]):
     """Class describing the Tesla Fleet API partner endpoints"""
 
     _parent: TeslaFleetApi
+    Site = EnergySite
 
     def __init__(self, parent: TeslaFleetApi):
         self._parent = parent
 
     def create(self, energy_site_id: int) -> EnergySite:
         """Create a specific energy site."""
-        self[energy_site_id] = EnergySite(self._parent, energy_site_id)
+        self[energy_site_id] = self.Site(self._parent, energy_site_id)
         return self[energy_site_id]

tesla_fleet_api/tesla/vehicle/bluetooth.py

@@ -4,7 +4,7 @@ import hashlib
 import asyncio
 from typing import TYPE_CHECKING
 from google.protobuf.message import DecodeError
-
+from bleak_retry_connector import establish_connection, MAX_CONNECT_ATTEMPTS
 from bleak import BleakClient, BleakScanner
 from bleak.backends.characteristic import BleakGATTCharacteristic
 from bleak.backends.device import BLEDevice
@@ -19,17 +19,14 @@ from tesla_fleet_api.const import (
     BluetoothVehicleData
 )
 from tesla_fleet_api.exceptions import (
-    MESSAGE_FAULTS,
     WHITELIST_OPERATION_STATUS,
     WhitelistOperationStatus,
-    NotOnWhitelistFault,
 )
 
 # Protocol
 from tesla_fleet_api.tesla.vehicle.proto.car_server_pb2 import (
     Action,
     VehicleAction,
-    Response,
     GetVehicleData,
     GetChargeState,
     GetClimateState,
@@ -44,10 +41,6 @@ from tesla_fleet_api.tesla.vehicle.proto.car_server_pb2 import (
     GetSoftwareUpdateState,
     GetParentalControlsState,
 )
-from tesla_fleet_api.tesla.vehicle.proto.signatures_pb2 import (
-    SessionInfo,
-    Session_Info_Status
-)
 from tesla_fleet_api.tesla.vehicle.proto.universal_message_pb2 import (
     Destination,
     Domain,
@@ -84,6 +77,7 @@ class VehicleBluetooth(Commands):
     """Class describing the Tesla Fleet API vehicle endpoints and commands for a specific vehicle with command signing."""
 
     ble_name: str
+    device: BLEDevice
     client: BleakClient
     _queues: dict[Domain, asyncio.Queue]
     _ekey: ec.EllipticCurvePublicKey
@@ -103,26 +97,38 @@ class VehicleBluetooth(Commands):
         if device is not None:
             self.client = BleakClient(device, services=[SERVICE_UUID])
 
-    async def find_client(self, scanner: BleakScanner = BleakScanner()) -> BleakClient:
+    async def find_vehicle(self, name: str | None = None, address: str | None = None, scanner: BleakScanner = BleakScanner()) -> BLEDevice:
         """Find the Tesla BLE device."""
-
-        device = await scanner.find_device_by_name(self.ble_name)
+        if name is not None:
+            device = await scanner.find_device_by_name(name)
+        elif address is not None:
+            device = await scanner.find_device_by_address(address)
+        else:
+            device = await scanner.find_device_by_name(self.ble_name)
         if not device:
             raise ValueError(f"Device {self.ble_name} not found")
-        self.client = BleakClient(device, services=[SERVICE_UUID])
-        LOGGER.debug(f"Discovered device {device.name} {device.address}")
-        return self.client
+        self.device = device
+        return self.device
+
+    def set_device(self, device: BLEDevice) -> None:
+        self.device = device
 
-    def create_client(self, device: str|BLEDevice) -> BleakClient:
-        """Create a client using a MAC address or Bleak Device."""
-        self.client = BleakClient(device, services=[SERVICE_UUID])
-        return self.client
+    def get_device(self) -> BLEDevice:
+        return self.device
 
-    async def connect(self, device: str|BLEDevice | None = None) -> None:
+    async def connect(self, device: BLEDevice | None = None, max_attempts: int = MAX_CONNECT_ATTEMPTS) -> None:
         """Connect to the Tesla BLE device."""
-        if device is not None:
-            self.create_client(device)
-        await self.client.connect()
+        if device:
+            self.device = device
+        if not self.device:
+            raise ValueError(f"Device {self.ble_name} not found")
+        self.client = await establish_connection(
+            BleakClient,
+            self.device,
+            self.vin,
+            max_attempts=max_attempts,
+            ble_device_callback=self.get_device
+        )
         await self.client.start_notify(READ_UUID, self._on_notify)
 
     async def disconnect(self) -> bool:
@@ -144,34 +150,43 @@ class VehicleBluetooth(Commands):
             self._recv += data
         else:
             self._recv_len = int.from_bytes(data[:2], 'big')
+            if self._recv_len > 1024:
+                LOGGER.error("Parsed very large message length")
+                self._recv = bytearray()
+                self._recv_len = 0
+                return
             self._recv = data[2:]
-        LOGGER.debug(f"Received {len(self._recv)} of {self._recv_len} bytes")
-        while len(self._recv) > self._recv_len:
-            LOGGER.warn(f"Received more data than expected: {len(self._recv)} > {self._recv_len}")
-            await self._on_message(bytes(self._recv[:self._recv_len]))
-            self._recv_len = int.from_bytes(self._recv[self._recv_len:self._recv_len+2], 'big')
-            self._recv = self._recv[self._recv_len+2:]
-            continue
-        if len(self._recv) == self._recv_len:
-            await self._on_message(bytes(self._recv))
-            self._recv = bytearray()
-            self._recv_len = 0
-
-    async def _on_message(self, data:bytes) -> None:
+        #while len(self._recv) > self._recv_len:
+        #
+        #    # Maybe this needs to trigger a reset
+        #    await self._on_message(bytes(self._recv[:self._recv_len]))
+        #    self._recv_len = int.from_bytes(self._recv[self._recv_len:self._recv_len+2], 'big')
+        #    self._recv = self._recv[self._recv_len+2:]
+        #    continue
+        if len(self._recv) >= self._recv_len:
+            if len(self._recv) > self._recv_len:
+                LOGGER.debug(f"Received more data than expected: {len(self._recv)} > {self._recv_len}")
+            try:
+                msg = RoutableMessage.FromString(bytes(self._recv[:self._recv_len]))
+                await self._on_message(msg)
+                self._recv = bytearray()
+                self._recv_len = 0
+            except DecodeError:
+                # Attempt parsing the whole payload
+                msg = RoutableMessage.FromString(bytes(self._recv))
+                LOGGER.warn(f"Parsed more data than length: {len(self._recv)} > {self._recv_len}")
+                await self._on_message(msg)
+                self._recv = bytearray()
+                self._recv_len = 0
+
+    async def _on_message(self, msg: RoutableMessage) -> None:
         """Receive messages from the Tesla BLE data."""
-        try:
-            msg = RoutableMessage.FromString(data)
-        except DecodeError as e:
-            LOGGER.error(f"Error parsing message: {e}")
-            self._recv = bytearray()
-            self._recv_len = 0
-            return
 
         if(msg.to_destination.routing_address != self._from_destination):
             # Ignore ephemeral key broadcasts
             return
 
-        LOGGER.info(f"Received response: {msg}")
+        LOGGER.debug(f"Received response: {msg}")
         await self._queues[msg.from_destination.domain].put(msg)
 
     async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
@@ -188,7 +203,7 @@ class VehicleBluetooth(Commands):
             await self.client.write_gatt_char(WRITE_UUID, payload, True)
 
             # Process the response
-            async with asyncio.timeout(10):
+            async with asyncio.timeout(2):
                 while True:
                     resp = await self._queues[domain].get()
                     LOGGER.debug(f"Received message {resp}")
@@ -221,7 +236,7 @@ class VehicleBluetooth(Commands):
             ),
             protobuf_message_as_bytes=request.SerializeToString(),
         )
-        resp = await self._send(msg)
+        resp = await self._send(msg, "protobuf_message_as_bytes")
         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/signed.py

@@ -5,14 +5,6 @@ from typing import TYPE_CHECKING
 
 from tesla_fleet_api.tesla.vehicle.fleet import VehicleFleet
 from tesla_fleet_api.tesla.vehicle.commands import Commands
-from tesla_fleet_api.exceptions import (
-    MESSAGE_FAULTS,
-    NotOnWhitelistFault,
-)
-from tesla_fleet_api.tesla.vehicle.proto.signatures_pb2 import (
-    Session_Info_Status,
-    SessionInfo,
-)
 from tesla_fleet_api.tesla.vehicle.proto.universal_message_pb2 import (
     RoutableMessage,
 )
@@ -41,9 +33,6 @@ class VehicleSigned(VehicleFleet, Commands):
             json = await self.signed_command(
                 base64.b64encode(msg.SerializeToString()).decode()
             )
-
             resp = RoutableMessage.FromString(base64.b64decode(json["response"]))
-
             self.validate_msg(resp)
-
             return resp

tesla_fleet_api/tesla/vehicle/vehicle.py

@@ -1,10 +1,18 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-
 if TYPE_CHECKING:
     from tesla_fleet_api.tesla.tesla import Tesla
 
+MODELS = {
+    "S": "Model S",
+    "X": "Model X",
+    "3": "Model 3",
+    "Y": "Model Y",
+    "C": "Cybertruck",
+    "R": "Roadster",
+    "T": "Semi",
+}
 
 class Vehicle:
     """Base class describing a Tesla vehicle."""
@@ -14,6 +22,12 @@ class Vehicle:
     def __init__(self, parent: Tesla, vin: str):
         self.vin = vin
 
-    def pre2021(self, vin: str) -> bool:
+
+    def pre2021(self) -> bool:
         """Checks if a vehicle is a pre-2021 model S or X."""
-        return vin[3] in ["S", "X"] and (vin[9] <= "L" or (vin[9] == "M" and vin[7] in ['1', '2', '3', '4']))
+        return self.vin[3] in ["S", "X"] and (self.vin[9] <= "L" or (self.vin[9] == "M" and self.vin[7] in ['1', '2', '3', '4']))
+
+    @property
+    def model(self) -> str:
+        """Returns the model of the vehicle."""
+        return MODELS.get(self.vin[3], "Unknown")

tesla_fleet_api/tesla/vehicle/vehicles.py

@@ -15,25 +15,28 @@ class Vehicles(dict[str, Vehicle]):
     """Class containing and creating vehicles."""
 
     _parent: TeslaFleetApi
+    Fleet = VehicleFleet
+    Signed = VehicleSigned
+    Bluetooth = VehicleBluetooth
 
     def __init__(self, parent: TeslaFleetApi):
         self._parent = parent
 
     def createFleet(self, vin: str) -> VehicleFleet:
         """Creates a Fleet API vehicle."""
-        vehicle = VehicleFleet(self._parent, vin)
+        vehicle = self.Fleet(self._parent, vin)
         self[vin] = vehicle
         return vehicle
 
     def createSigned(self, vin: str) -> VehicleSigned:
         """Creates a Fleet API vehicle that uses command protocol."""
-        vehicle = VehicleSigned(self._parent, vin)
+        vehicle = self.Signed(self._parent, vin)
         self[vin] = vehicle
         return vehicle
 
     def createBluetooth(self, vin: str):
         """Creates a bluetooth vehicle that uses command protocol."""
-        vehicle = VehicleBluetooth(self._parent, vin)
+        vehicle = self.Bluetooth(self._parent, vin)
         self[vin] = vehicle
         return vehicle
 

{tesla_fleet_api-1.0.3.dist-info → tesla_fleet_api-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tesla_fleet_api
-Version: 1.0.3
+Version: 1.0.5
 Summary: Tesla Fleet API library for Python
 Home-page: https://github.com/Teslemetry/python-tesla-fleet-api
 Author: Brett Adams
@@ -18,6 +18,7 @@ Requires-Dist: aiolimiter
 Requires-Dist: cryptography
 Requires-Dist: protobuf
 Requires-Dist: bleak
+Requires-Dist: bleak-retry-connector
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -29,10 +30,11 @@ Dynamic: requires-python
 Dynamic: summary
 
 # Tesla Fleet Api
-Python library for Tesla Fleet API and Teslemetry.
+Python library for Tesla Fleet API and Tesla Command Protocol, including signed commands and encrypted local Bluetooth (BLE). Also provides interfaces for Teslemetry and Tessie.
 
-Based on [Tesla Developer documentation](https://developer.tesla.com/docs/fleet-api).
+Based on [Tesla Developer documentation](https://developer.tesla.com/docs/fleet-api) and [Tesla Command Protocol](https://github.com/teslamotors/vehicle-command/blob/main/pkg/protocol/protocol.md)
 
+**Documentation is currently outdated for V1.0.X**
 
 ## TeslaFleetApi
 This is the base class, however can also be used directly if you have a valid user access_token.

{tesla_fleet_api-1.0.3.dist-info → tesla_fleet_api-1.0.5.dist-info}/RECORD

@@ -1,23 +1,23 @@
 tesla_fleet_api/__init__.py,sha256=3DZMoZ-5srW-7SooAjqcRubQDuZPY8rMKH7eqIp4qtg,392
-tesla_fleet_api/const.py,sha256=RB2ZgI0_y0DkLUJtMSpklCRH9aNlrninO4zot5cA-H0,3748
-tesla_fleet_api/exceptions.py,sha256=1EkMnDxQYxZBn4ApjGodIBZyNPu9oa_Pgpdl6lQQ5gk,35523
+tesla_fleet_api/const.py,sha256=1GEFPEYxka-ADBs_MWNaxdr2FPH7ObxaKRX2NvFrGaY,3748
+tesla_fleet_api/exceptions.py,sha256=iZJv_6YJO6wK_lYvR18SugpNk-ZTzElmcsOqNqd05M0,35495
 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=UCKXF3u_TfuGlJ-LYEIxgmbbzlElZfuJOInsWJ_ltr0,1471
+tesla_fleet_api/tesla/bluetooth.py,sha256=WhDo66OEwCGhvsGskvWcGUiNv6eyFsdEiQdIm571jQM,1835
 tesla_fleet_api/tesla/charging.py,sha256=D7I7cAf-3-95sIjyP6wpVqCq9Cppj6U-VPFQGpQQ8bs,1704
-tesla_fleet_api/tesla/energysite.py,sha256=96Q5npsJ2YIa257o_NL5_3gJNUS-ioAL7sTeQeGPgAM,6110
+tesla_fleet_api/tesla/energysite.py,sha256=vStffklBQfQNAO_1wrHLFu7BlBCTVVbLh7_IrAUL3wg,6131
 tesla_fleet_api/tesla/fleet.py,sha256=X74tzwGO9w65j9YUGuW04CwG7Bx6biEHwxIjWGCzB4c,5670
 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/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=fhV24gni_tkhRJmK5I-xUX0dqxEw_lumRViEwmkXDSw,15665
+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/fleet.py,sha256=K9BVZj6CChJSDSMFroa7Cz0KrsYWj32ILtQumarkLaU,32080
-tesla_fleet_api/tesla/vehicle/signed.py,sha256=ggdtq8PydKoCk044L5b2262nfNzZqPBnsJ4SonTFbb4,1539
-tesla_fleet_api/tesla/vehicle/vehicle.py,sha256=TyW5-LRlgRulWsm2indE3utSTdrJJRfG7H45Cc-ZASk,505
-tesla_fleet_api/tesla/vehicle/vehicles.py,sha256=wyMLfHNK_QaNTDtU9mkGRl2fB3Gb6lvmSfcgXzKu7WY,1565
+tesla_fleet_api/tesla/vehicle/signed.py,sha256=RUzVnZIfykz3YZW2gaxd1iaN1i8LkLaEoiXrbqZn9kg,1339
+tesla_fleet_api/tesla/vehicle/vehicle.py,sha256=nIhfn2hGuHJoAj-LiipcZdS4abdrWI6yST2cuE-w23s,810
+tesla_fleet_api/tesla/vehicle/vehicles.py,sha256=axiH33YRnkYcbQmolbL85PF69SRI_5FA5T10v-cMmBc,1644
 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/vehicle.py,sha256=9_2N1iNNDouqfb6YBBWAFjnlzVRTf5frhXi
 tesla_fleet_api/tessie/__init__.py,sha256=9lhQJaB6X4PObUL9QdaaZYqs2BxiTidu3zmHcBESLVw,78
 tesla_fleet_api/tessie/tessie.py,sha256=qdMZ61TcQi5JRuv2qaxuLHtOuy8WZJ1WNqWg5WDAwwU,2615
 tesla_fleet_api/tessie/vehicle.py,sha256=9khv4oCkGGLxHzQ2FYhDPH7wczxEDiUppsDXalawarE,1125
-tesla_fleet_api-1.0.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tesla_fleet_api-1.0.3.dist-info/METADATA,sha256=ARBm4GR744Ru7F2JumVFrw4UgeSxnYeV1k25KlzgqhY,4056
-tesla_fleet_api-1.0.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tesla_fleet_api-1.0.3.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
-tesla_fleet_api-1.0.3.dist-info/RECORD,,
+tesla_fleet_api-1.0.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+tesla_fleet_api-1.0.5.dist-info/METADATA,sha256=nL7RUQYO8-i8R0-zkSQBNvJD7BtruTEkNxywMB5lsT4,4382
+tesla_fleet_api-1.0.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+tesla_fleet_api-1.0.5.dist-info/top_level.txt,sha256=jeNbog_1saXBFrGpom9WyPWmilxsyP3szL_G7JLWQfM,16
+tesla_fleet_api-1.0.5.dist-info/RECORD,,

{tesla_fleet_api-1.0.3.dist-info → tesla_fleet_api-1.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any