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

tesla_fleet_api/tesla/vehicle/commands.py

@@ -13,16 +13,19 @@ from cryptography.hazmat.primitives.hashes import Hash, SHA256
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 from asyncio import Lock, sleep
 
-from ...exceptions import (
+from tesla_fleet_api.exceptions import (
+    MESSAGE_FAULTS,
     SIGNED_MESSAGE_INFORMATION_FAULTS,
+    NotOnWhitelistFault,
+    #TeslaFleetMessageFaultInvalidSignature,
     TeslaFleetMessageFaultIncorrectEpoch,
     TeslaFleetMessageFaultInvalidTokenOrCounter,
 )
 
-from .vehicle import Vehicle
+from tesla_fleet_api.tesla.vehicle.vehicle import Vehicle
 
 
-from ...const import (
+from tesla_fleet_api.const import (
     LOGGER,
     Trunk,
     ClimateKeeperMode,
@@ -32,40 +35,32 @@ from ...const import (
 )
 
 # Protocol
-from .proto.errors_pb2 import GenericError_E
-from .proto.car_server_pb2 import (
+from tesla_fleet_api.tesla.vehicle.proto.errors_pb2 import GenericError_E
+from tesla_fleet_api.tesla.vehicle.proto.car_server_pb2 import (
     Response,
 )
-from .proto.signatures_pb2 import (
-    SIGNATURE_TYPE_AES_GCM_PERSONALIZED,
-    SIGNATURE_TYPE_HMAC_PERSONALIZED,
-    TAG_COUNTER,
-    TAG_DOMAIN,
-    TAG_END,
-    TAG_EPOCH,
-    TAG_EXPIRES_AT,
-    TAG_PERSONALIZATION,
-    TAG_SIGNATURE_TYPE,
+from tesla_fleet_api.tesla.vehicle.proto.signatures_pb2 import (
+    Session_Info_Status,
+    SignatureType,
+    Tag,
     AES_GCM_Personalized_Signature_Data,
     KeyIdentity,
     SessionInfo,
     SignatureData,
 )
-from .proto.universal_message_pb2 import (
-    DOMAIN_INFOTAINMENT,
-    DOMAIN_VEHICLE_SECURITY,
-    OPERATIONSTATUS_ERROR,
-    OPERATIONSTATUS_WAIT,
+from tesla_fleet_api.tesla.vehicle.proto.universal_message_pb2 import (
+    OperationStatus_E,
     Destination,
     Domain,
     RoutableMessage,
     SessionInfoRequest,
+    Flags,
 )
-from .proto.vcsec_pb2 import (
-    OPERATIONSTATUS_OK,
+from tesla_fleet_api.tesla.vehicle.proto.vcsec_pb2 import (
     FromVCSECMessage,
+    VehicleStatus,
 )
-from .proto.car_server_pb2 import (
+from tesla_fleet_api.tesla.vehicle.proto.car_server_pb2 import (
     Action,
     MediaPlayAction,
     VehicleAction,
@@ -83,8 +78,6 @@ from .proto.car_server_pb2 import (
     HvacSteeringWheelHeaterAction,
     HvacTemperatureAdjustmentAction,
     GetNearbyChargingSites,
-    # NearbyChargingSites,
-    # Superchargers,
     VehicleControlCancelSoftwareUpdateAction,
     VehicleControlHonkHornAction,
     VehicleControlResetValetPinAction,
@@ -112,24 +105,24 @@ from .proto.car_server_pb2 import (
     MediaPreviousTrack,
     MediaPreviousFavorite,
 )
-from .proto.vehicle_pb2 import VehicleState, ClimateState
-from .proto.vcsec_pb2 import (
+from tesla_fleet_api.tesla.vehicle.proto.vehicle_pb2 import VehicleData, VehicleState, ClimateState
+from tesla_fleet_api.tesla.vehicle.proto.vcsec_pb2 import (
     UnsignedMessage,
     RKEAction_E,
     ClosureMoveRequest,
     ClosureMoveType_E,
 )
-from .proto.signatures_pb2 import (
+from tesla_fleet_api.tesla.vehicle.proto.signatures_pb2 import (
     HMAC_Personalized_Signature_Data,
 )
-from .proto.common_pb2 import (
+from tesla_fleet_api.tesla.vehicle.proto.common_pb2 import (
     Void,
     PreconditioningTimes,
     OffPeakChargingTimes,
 )
 
 if TYPE_CHECKING:
-    from ..tesla import Tesla
+    from tesla_fleet_api.tesla.tesla import Tesla
 
 # ENUMs to convert ints to proto typed ints
 AutoSeatClimatePositions = (
@@ -175,6 +168,7 @@ class Session:
     hmac: bytes
     publicKey: bytes
     lock: Lock
+    ready: bool
 
     def __init__(self, parent: Commands, domain: Domain):
         self.parent = parent
@@ -260,10 +254,21 @@ class Commands(Vehicle):
 
 
     @abstractmethod
-    async def _send(self, msg: RoutableMessage) -> RoutableMessage:
+    async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
         """Transmit the message to the vehicle."""
         raise NotImplementedError
 
+    def validate_msg(self, msg: RoutableMessage) -> None:
+        """Validate the message."""
+        if(msg.session_info):
+            info = SessionInfo.FromString(msg.session_info)
+            if(info.status == Session_Info_Status.SESSION_INFO_STATUS_KEY_NOT_ON_WHITELIST):
+                raise NotOnWhitelistFault
+            self._sessions[msg.from_destination.domain].update(info)
+
+        if msg.signedMessageStatus.signed_message_fault > 0:
+            raise MESSAGE_FAULTS[msg.signedMessageStatus.signed_message_fault]
+
     @abstractmethod
     async def _command(self, domain: Domain, command: bytes, attempt: int = 0) -> dict[str, Any]:
         """Serialize a message and send to the signed command endpoint."""
@@ -279,8 +284,9 @@ class Commands(Vehicle):
             raise ValueError(f"Unknown auth method: {self._auth_method}")
 
         try:
-            resp = await self._send(msg)
+            resp = await self._send(msg, "protobuf_message_as_bytes")
         except (
+            #TeslaFleetMessageFaultInvalidSignature,
             TeslaFleetMessageFaultIncorrectEpoch,
             TeslaFleetMessageFaultInvalidTokenOrCounter,
         ) as e:
@@ -290,7 +296,7 @@ class Commands(Vehicle):
                 raise e
             return await self._command(domain, command, attempt)
 
-        if resp.signedMessageStatus.operation_status == OPERATIONSTATUS_WAIT:
+        if resp.signedMessageStatus.operation_status == OperationStatus_E.OPERATIONSTATUS_WAIT:
             attempt += 1
             if attempt > 3:
                 # We tried 3 times, give up, raise the error
@@ -300,8 +306,53 @@ class Commands(Vehicle):
             return await self._command(domain, command, attempt)
 
         if resp.HasField("protobuf_message_as_bytes"):
-            if(resp.from_destination.domain == DOMAIN_VEHICLE_SECURITY):
-                vcsec = FromVCSECMessage.FromString(resp.protobuf_message_as_bytes)
+            #decrypt
+            if(resp.signature_data.HasField("AES_GCM_Response_data")):
+                if(msg.signature_data.HasField("AES_GCM_Personalized_data")):
+                    request_hash = bytes([SignatureType.SIGNATURE_TYPE_AES_GCM_PERSONALIZED]) + msg.signature_data.AES_GCM_Personalized_data.tag
+                elif(msg.signature_data.HasField("HMAC_Personalized_data")):
+                    request_hash = bytes([SignatureType.SIGNATURE_TYPE_HMAC_PERSONALIZED]) + msg.signature_data.HMAC_Personalized_data.tag
+                    if(session.domain == Domain.DOMAIN_VEHICLE_SECURITY):
+                        request_hash = request_hash[:17]
+                else:
+                    raise ValueError("Invalid request signature data")
+
+                metadata = bytes([
+                    Tag.TAG_SIGNATURE_TYPE,
+                    1,
+                    SignatureType.SIGNATURE_TYPE_AES_GCM_RESPONSE,
+                    Tag.TAG_DOMAIN,
+                    1,
+                    resp.from_destination.domain,
+                    Tag.TAG_PERSONALIZATION,
+                    17,
+                    *self.vin.encode(),
+                    Tag.TAG_COUNTER,
+                    4,
+                    *struct.pack(">I", resp.signature_data.AES_GCM_Response_data.counter),
+                    Tag.TAG_FLAGS,
+                    4,
+                    *struct.pack(">I", resp.flags),
+                    Tag.TAG_REQUEST_HASH,
+                    17,
+                    *request_hash,
+                    Tag.TAG_FAULT,
+                    4,
+                    *struct.pack(">I", resp.signedMessageStatus.signed_message_fault),
+                    Tag.TAG_END,
+                ])
+
+                aad = Hash(SHA256())
+                aad.update(metadata)
+                aesgcm = AESGCM(session.sharedKey)
+                resp.protobuf_message_as_bytes = aesgcm.decrypt(resp.signature_data.AES_GCM_Response_data.nonce, resp.protobuf_message_as_bytes + resp.signature_data.AES_GCM_Response_data.tag, aad.finalize())
+
+            if(resp.from_destination.domain == Domain.DOMAIN_VEHICLE_SECURITY):
+                try:
+                    vcsec = FromVCSECMessage.FromString(resp.protobuf_message_as_bytes)
+                except Exception as e:
+                    LOGGER.error("Failed to parse VCSEC message: %s %s", e, resp)
+                    raise e
                 LOGGER.debug("VCSEC Response: %s", vcsec)
                 if vcsec.HasField("nominalError"):
                     LOGGER.error("Command failed with reason: %s", vcsec.nominalError.genericError)
@@ -311,9 +362,13 @@ class Commands(Vehicle):
                             "reason": GenericError_E.Name(vcsec.nominalError.genericError)
                         }
                     }
-                elif vcsec.commandStatus.operationStatus == OPERATIONSTATUS_OK:
+                elif vcsec.HasField("vehicleStatus"):
+                    return {
+                        "response": vcsec.vehicleStatus
+                    }
+                elif vcsec.commandStatus.operationStatus == OperationStatus_E.OPERATIONSTATUS_OK:
                     return {"response": {"result": True, "reason": ""}}
-                elif vcsec.commandStatus.operationStatus == OPERATIONSTATUS_WAIT:
+                elif vcsec.commandStatus.operationStatus == OperationStatus_E.OPERATIONSTATUS_WAIT:
                     attempt += 1
                     if attempt > 3:
                         # We tried 3 times, give up, raise the error
@@ -321,29 +376,37 @@ class Commands(Vehicle):
                     async with session.lock:
                         await sleep(2)
                     return await self._command(domain, command, attempt)
-                elif vcsec.commandStatus.operationStatus == OPERATIONSTATUS_ERROR:
+                elif vcsec.commandStatus.operationStatus == OperationStatus_E.OPERATIONSTATUS_ERROR:
                     if(resp.HasField("signedMessageStatus")):
                         raise SIGNED_MESSAGE_INFORMATION_FAULTS[vcsec.commandStatus.signedMessageStatus.signedMessageInformation]
 
-            elif(resp.from_destination.domain == DOMAIN_INFOTAINMENT):
-                response = Response.FromString(resp.protobuf_message_as_bytes)
+            elif(resp.from_destination.domain == Domain.DOMAIN_INFOTAINMENT):
+                try:
+                    response = Response.FromString(resp.protobuf_message_as_bytes)
+                except Exception as e:
+                    LOGGER.error("Failed to parse Infotainment Response: %s %s", e, resp)
+                    raise e
                 LOGGER.debug("Infotainment Response: %s", response)
                 if (response.HasField("ping")):
-                    print(response.ping)
                     return {
                         "response": {
                             "result": True,
                             "reason": response.ping.local_timestamp
                         }
                     }
+                if response.HasField("vehicleData"):
+                    return {
+                        "response": response.vehicleData
+                    }
                 if response.HasField("actionStatus"):
                     return {
                         "response": {
-                            "result": response.actionStatus.result == OPERATIONSTATUS_OK,
+                            "result": response.actionStatus.result == OperationStatus_E.OPERATIONSTATUS_OK,
                             "reason": response.actionStatus.result_reason.plain_text or ""
                             }
                         }
 
+
         return {"response": {"result": True, "reason": ""}}
 
     async def _commandHmac(self, session: Session, command: bytes, attempt: int = 1) -> RoutableMessage:
@@ -353,25 +416,25 @@ class Commands(Vehicle):
         hmac_personalized = session.hmac_personalized()
 
         metadata = bytes([
-            TAG_SIGNATURE_TYPE,
+            Tag.TAG_SIGNATURE_TYPE,
             1,
-            SIGNATURE_TYPE_HMAC_PERSONALIZED,
-            TAG_DOMAIN,
+            SignatureType.SIGNATURE_TYPE_HMAC_PERSONALIZED,
+            Tag.TAG_DOMAIN,
             1,
             session.domain,
-            TAG_PERSONALIZATION,
+            Tag.TAG_PERSONALIZATION,
             17,
             *self.vin.encode(),
-            TAG_EPOCH,
+            Tag.TAG_EPOCH,
             len(hmac_personalized.epoch),
             *hmac_personalized.epoch,
-            TAG_EXPIRES_AT,
+            Tag.TAG_EXPIRES_AT,
             4,
             *struct.pack(">I", hmac_personalized.expires_at),
-            TAG_COUNTER,
+            Tag.TAG_COUNTER,
             4,
             *struct.pack(">I", hmac_personalized.counter),
-            TAG_END,
+            Tag.TAG_END,
         ])
 
         hmac_personalized.tag = hmac.new(
@@ -400,27 +463,31 @@ class Commands(Vehicle):
         LOGGER.debug(f"Sending AES to domain {Domain.Name(session.domain)}")
 
         aes_personalized = session.aes_gcm_personalized()
+        flags = 1 << Flags.FLAG_ENCRYPT_RESPONSE
 
         metadata = bytes([
-            TAG_SIGNATURE_TYPE,
+            Tag.TAG_SIGNATURE_TYPE,
             1,
-            SIGNATURE_TYPE_AES_GCM_PERSONALIZED,
-            TAG_DOMAIN,
+            SignatureType.SIGNATURE_TYPE_AES_GCM_PERSONALIZED,
+            Tag.TAG_DOMAIN,
             1,
             session.domain,
-            TAG_PERSONALIZATION,
+            Tag.TAG_PERSONALIZATION,
             17,
             *self.vin.encode(),
-            TAG_EPOCH,
+            Tag.TAG_EPOCH,
             len(aes_personalized.epoch),
             *aes_personalized.epoch,
-            TAG_EXPIRES_AT,
+            Tag.TAG_EXPIRES_AT,
             4,
             *struct.pack(">I", aes_personalized.expires_at),
-            TAG_COUNTER,
+            Tag.TAG_COUNTER,
             4,
             *struct.pack(">I", aes_personalized.counter),
-            TAG_END,
+            Tag.TAG_FLAGS,
+            4,
+            *struct.pack(">I", flags),
+            Tag.TAG_END,
         ])
 
         aad = Hash(SHA256())
@@ -431,7 +498,6 @@ class Commands(Vehicle):
 
         aes_personalized.tag = ct[-16:]
 
-        # I think this whole section could be improved
         return RoutableMessage(
             to_destination=Destination(
                 domain=session.domain,
@@ -446,7 +512,8 @@ class Commands(Vehicle):
                     public_key=self._public_key
                 ),
                 AES_GCM_Personalized_data=aes_personalized,
-            )
+            ),
+            flags=flags,
         )
 
 
@@ -454,10 +521,20 @@ class Commands(Vehicle):
         """Sign and send a message to Infotainment computer."""
         return await self._command(Domain.DOMAIN_VEHICLE_SECURITY, command.SerializeToString())
 
+    async def _getVehicleSecurity(self, command: UnsignedMessage) -> VehicleStatus:
+        """Sign and send a message to Infotainment computer."""
+        reply = await self._command(Domain.DOMAIN_VEHICLE_SECURITY, command.SerializeToString())
+        return reply["response"]
+
     async def _sendInfotainment(self, command: Action) -> dict[str, Any]:
         """Sign and send a message to Infotainment computer."""
         return await self._command(Domain.DOMAIN_INFOTAINMENT, command.SerializeToString())
 
+    async def _getInfotainment(self, command: Action) -> VehicleData:
+        """Sign and send a message to Infotainment computer."""
+        reply = await self._command(Domain.DOMAIN_INFOTAINMENT, command.SerializeToString())
+        return reply["response"]
+
     async def handshakeVehicleSecurity(self) -> None:
         """Perform a handshake with the vehicle security domain."""
         await self._handshake(Domain.DOMAIN_VEHICLE_SECURITY)
@@ -466,7 +543,7 @@ class Commands(Vehicle):
         """Perform a handshake with the infotainment domain."""
         await self._handshake(Domain.DOMAIN_INFOTAINMENT)
 
-    async def _handshake(self, domain: Domain) -> None:
+    async def _handshake(self, domain: Domain) -> bool:
         """Perform a handshake with the vehicle."""
 
         LOGGER.debug(f"Handshake with domain {Domain.Name(domain)}")
@@ -483,7 +560,8 @@ class Commands(Vehicle):
             uuid=randbytes(16)
         )
 
-        await self._send(msg)
+        await self._send(msg, "session_info")
+        return self._sessions[domain].ready
 
     async def ping(self) -> dict[str, Any]:
         """Ping the vehicle."""

tesla_fleet_api/tesla/vehicle/fleet.py

@@ -4,7 +4,7 @@ from locale import getlocale
 from time import time
 from typing import TYPE_CHECKING, Any, List
 
-from ...const import (
+from tesla_fleet_api.const import (
     CabinOverheatProtectionTemp,
     ClimateKeeperMode,
     Level,
@@ -15,12 +15,12 @@ from ...const import (
     VehicleDataEndpoint,
     WindowCommand,
 )
-from .vehicle import Vehicle
+from tesla_fleet_api.tesla.vehicle.vehicle import Vehicle
 
 DEFAULT_LOCALE = (getlocale()[0] or "en-US").replace("_","-")
 
 if TYPE_CHECKING:
-    from ..fleet import TeslaFleetApi
+    from tesla_fleet_api.tesla.fleet import TeslaFleetApi
 
 class VehicleFleet(Vehicle):
     """Class describing the Tesla Fleet API vehicle endpoints and commands."""

tesla_fleet_api/tesla/vehicle/signed.py

@@ -3,21 +3,22 @@ from __future__ import annotations
 import base64
 from typing import TYPE_CHECKING
 
-from .fleet import VehicleFleet
-from .commands import Commands
-
-from ...exceptions import (
+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 .proto.signatures_pb2 import (
+from tesla_fleet_api.tesla.vehicle.proto.signatures_pb2 import (
+    Session_Info_Status,
     SessionInfo,
 )
-from .proto.universal_message_pb2 import (
+from tesla_fleet_api.tesla.vehicle.proto.universal_message_pb2 import (
     RoutableMessage,
 )
 
 if TYPE_CHECKING:
-    from ..fleet import TeslaFleetApi
+    from tesla_fleet_api.tesla.fleet import TeslaFleetApi
 
 
 class VehicleSigned(VehicleFleet, Commands):
@@ -32,25 +33,17 @@ class VehicleSigned(VehicleFleet, Commands):
         super(Commands, self).__init__(parent, vin)
 
 
-    async def _send(self, msg: RoutableMessage) -> RoutableMessage:
+    async def _send(self, msg: RoutableMessage, requires: str) -> RoutableMessage:
         """Serialize a message and send to the signed command endpoint."""
+        # requires isnt used because Fleet API messages are singular
 
         async with self._sessions[msg.to_destination.domain].lock:
-            resp = await self.signed_command(
+            json = await self.signed_command(
                 base64.b64encode(msg.SerializeToString()).decode()
             )
 
-            resp_msg = RoutableMessage.FromString(base64.b64decode(resp["response"]))
-
-            # Check UUID?
-            # Check RoutingAdress?
-
-            if resp_msg.session_info:
-                self._sessions[resp_msg.from_destination.domain].update(
-                    SessionInfo.FromString(resp_msg.session_info), self.private_key
-                )
+            resp = RoutableMessage.FromString(base64.b64decode(json["response"]))
 
-            if resp_msg.signedMessageStatus.signed_message_fault:
-                raise MESSAGE_FAULTS[resp_msg.signedMessageStatus.signed_message_fault]
+            self.validate_msg(resp)
 
-            return resp_msg
+            return resp

tesla_fleet_api/tesla/vehicle/vehicle.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 
 
 if TYPE_CHECKING:
-    from ..tesla import Tesla
+    from tesla_fleet_api.tesla.tesla import Tesla
 
 
 class Vehicle:

tesla_fleet_api/tesla/vehicle/vehicles.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from .signed import VehicleSigned
-from .bluetooth import VehicleBluetooth
-from .fleet import VehicleFleet
-from .vehicle import Vehicle
+from tesla_fleet_api.tesla.vehicle.signed import VehicleSigned
+from tesla_fleet_api.tesla.vehicle.bluetooth import VehicleBluetooth
+from tesla_fleet_api.tesla.vehicle.fleet import VehicleFleet
+from tesla_fleet_api.tesla.vehicle.vehicle import Vehicle
 
 if TYPE_CHECKING:
-    from ..fleet import TeslaFleetApi
+    from tesla_fleet_api.tesla.fleet import TeslaFleetApi
 
 
 
@@ -31,7 +31,7 @@ class Vehicles(dict[str, Vehicle]):
         self[vin] = vehicle
         return vehicle
 
-    def createBluetooth(self, vin: str) -> VehicleBluetooth:
+    def createBluetooth(self, vin: str):
         """Creates a bluetooth vehicle that uses command protocol."""
         vehicle = VehicleBluetooth(self._parent, vin)
         self[vin] = vehicle

tesla_fleet_api/teslemetry/__init__.py

@@ -1,4 +1,4 @@
-from .teslemetry import Teslemetry
+from tesla_fleet_api.teslemetry.teslemetry import Teslemetry
 
 __all__ = [
     "Teslemetry",

tesla_fleet_api/teslemetry/teslemetry.py

@@ -2,12 +2,12 @@ from typing import Any
 
 import aiohttp
 
-from ..tesla.charging import Charging
-from ..tesla.energysite import EnergySites
-from ..tesla.user import User
-from .vehicle import TeslemetryVehicles
-from ..const import LOGGER, Method
-from ..tesla import TeslaFleetApi
+from tesla_fleet_api.tesla.charging import Charging
+from tesla_fleet_api.tesla.energysite import EnergySites
+from tesla_fleet_api.tesla.user import User
+from tesla_fleet_api.teslemetry.vehicle import TeslemetryVehicles
+from tesla_fleet_api.const import LOGGER, Method
+from tesla_fleet_api.tesla import TeslaFleetApi
 
 class Teslemetry(TeslaFleetApi):
 

tesla_fleet_api/teslemetry/vehicle.py

@@ -1,15 +1,13 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
-from ..const import Method
-from ..tesla.vehicle.proto.universal_message_pb2 import Domain
-from ..tesla.vehicle.vehicle import Vehicle
-from ..tesla.vehicle.vehicles import Vehicles
-from ..tesla.vehicle.bluetooth import VehicleBluetooth
-from ..tesla.vehicle.fleet import VehicleFleet
+from tesla_fleet_api.const import Method
+from tesla_fleet_api.tesla.vehicle.vehicle import Vehicle
+from tesla_fleet_api.tesla.vehicle.vehicles import Vehicles
+from tesla_fleet_api.tesla.vehicle.fleet import VehicleFleet
 
 if TYPE_CHECKING:
-    from .teslemetry import Teslemetry
+    pass
 
 class TeslemetryVehicle(Vehicle):
     """Teslemetry specific base vehicle."""

tesla_fleet_api/tessie/__init__.py

@@ -1,4 +1,4 @@
-from .tessie import Tessie
+from tesla_fleet_api.tessie.tessie import Tessie
 
 __all__ = [
     "Tessie",

tesla_fleet_api/tessie/tessie.py

@@ -1,12 +1,12 @@
 import aiohttp
 from typing import Any
 
-from ..tesla.charging import Charging
-from ..tesla.energysite import EnergySites
-from ..tesla.user import User
-from ..tesla import TeslaFleetApi
-from ..const import Method
-from .vehicle import TessieVehicles
+from tesla_fleet_api.tesla.charging import Charging
+from tesla_fleet_api.tesla.energysite import EnergySites
+from tesla_fleet_api.tesla.user import User
+from tesla_fleet_api.tesla import TeslaFleetApi
+from tesla_fleet_api.const import Method
+from tesla_fleet_api.tessie.vehicle import TessieVehicles
 
 class Tessie(TeslaFleetApi):
 

tesla_fleet_api/tessie/vehicle.py

@@ -1,15 +1,9 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING, Any
 
-from ..const import Method
-from ..tesla.vehicle.proto.universal_message_pb2 import Domain
-from ..tesla.vehicle.vehicle import Vehicle
-from ..tesla.vehicle.vehicles import Vehicles
-from ..tesla.vehicle.bluetooth import VehicleBluetooth
-from ..tesla.vehicle.fleet import VehicleFleet
+from tesla_fleet_api.tesla.vehicle.vehicle import Vehicle
+from tesla_fleet_api.tesla.vehicle.vehicles import Vehicles
+from tesla_fleet_api.tesla.vehicle.fleet import VehicleFleet
 
-if TYPE_CHECKING:
-    from .tessie import Tessie
 
 class TessieVehicle(Vehicle):
     """Tessie specific base vehicle."""

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

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