Move improvements

Author: Bre77

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 @@ def get_name(self, vin: str) -> str:
         """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 @@
 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 @@ def __init__(
         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 @@
 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/vehicles.py

@@ -8,7 +8,7 @@
 
 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 +47,19 @@ def specific(self, vin: 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) -> VehicleBluetooth:
+        """Creates a bluetooth vehicle that uses command protocol."""
+        vehicle = self.Bluetooth(self._parent, vin)
+        self[vin] = vehicle
+        return vehicle