tesla-fleet-api 0.9.9__py3-none-any.whl → 1.0.0__py3-none-any.whl

tesla_fleet_api/__init__.py

@@ -1,30 +1,15 @@
-from .teslafleetapi import TeslaFleetApi
-from .teslafleetoauth import TeslaFleetOAuth
-from .teslafleetopensource import TeslaFleetOpenSource
-from .teslemetry import Teslemetry
-from .tessie import Tessie
-from .charging import Charging
-from .energy import Energy
-from .energyspecific import EnergySpecific
-from .partner import Partner
-from .user import User
-from .vehicle import Vehicle
-from .vehiclespecific import VehicleSpecific
-from .vehiclesigned import VehicleSigned
-
+from .tesla.fleet import TeslaFleetApi
+from .tesla.bluetooth import TeslaBluetooth
+from .tesla.oauth import TeslaFleetOAuth
+from .tesla.opensource import TeslaFleetOpenSource
+from .teslemetry.teslemetry import Teslemetry
+from .tessie.tessie import Tessie
 
 __all__ = [
     "TeslaFleetApi",
+    "TeslaBluetooth",
     "TeslaFleetOAuth",
     "TeslaFleetOpenSource",
     "Teslemetry",
     "Tessie",
-    "Charging",
-    "Energy",
-    "EnergySpecific",
-    "Partner",
-    "User",
-    "Vehicle",
-    "VehicleSpecific",
-    "VehicleSigned",
 ]

tesla_fleet_api/const.py

@@ -3,7 +3,7 @@
 from enum import Enum
 import logging
 
-VERSION = "0.9.9"
+VERSION = "1.0.0"
 LOGGER = logging.getLogger(__package__)
 SERVERS = {
     "na": "https://fleet-api.prd.na.vn.cloud.tesla.com",
@@ -151,230 +151,6 @@ class EnergyExportMode(StrEnum):
     NEVER = "never"
 
 
-class TelemetryField(StrEnum):
-    """Fields available in telemetry streams"""
-
-    AC_CHARGING_ENERGY_IN = "ACChargingEnergyIn"
-    AC_CHARGING_POWER = "ACChargingPower"
-    AUTO_SEAT_CLIMATE_LEFT = "AutoSeatClimateLeft"
-    AUTO_SEAT_CLIMATE_RIGHT = "AutoSeatClimateRight"
-    AUTOMATIC_BLIND_SPOT_CAMERA = "AutomaticBlindSpotCamera"
-    AUTOMATIC_EMERGENCY_BRAKING_OFF = "AutomaticEmergencyBrakingOff"
-    BATTERY_HEATER_ON = "BatteryHeaterOn"
-    BATTERY_LEVEL = "BatteryLevel"
-    BLIND_SPOT_COLLISION_WARNING_CHIME = "BlindSpotCollisionWarningChime"
-    BMS_FULL_CHARGE_COMPLETE = "BmsFullchargecomplete"
-    BMS_STATE = "BMSState"
-    BRAKE_PEDAL = "BrakePedal"
-    BRAKE_PEDAL_POS = "BrakePedalPos"
-    BRICK_VOLTAGE_MAX = "BrickVoltageMax"
-    BRICK_VOLTAGE_MIN = "BrickVoltageMin"
-    CABIN_OVERHEAT_PROTECTION_MODE = "CabinOverheatProtectionMode"
-    CABIN_OVERHEAT_PROTECTION_TEMPERATURE_LIMIT = "CabinOverheatProtectionTemperatureLimit"
-    CAR_TYPE = "CarType"
-    CENTER_DISPLAY = "CenterDisplay"
-    CHARGE_AMPS = "ChargeAmps"
-    CHARGE_CURRENT_REQUEST = "ChargeCurrentRequest"
-    CHARGE_CURRENT_REQUEST_MAX = "ChargeCurrentRequestMax"
-    CHARGE_ENABLE_REQUEST = "ChargeEnableRequest"
-    CHARGE_LIMIT_SOC = "ChargeLimitSoc"
-    CHARGE_PORT = "ChargePort"
-    CHARGE_PORT_COLD_WEATHER_MODE = "ChargePortColdWeatherMode"
-    CHARGE_PORT_DOOR_OPEN = "ChargePortDoorOpen"
-    CHARGE_PORT_LATCH = "ChargePortLatch"
-    CHARGE_STATE = "ChargeState"
-    CHARGER_PHASES = "ChargerPhases"
-    CHARGING_CABLE_TYPE = "ChargingCableType"
-    CLIMATE_KEEPER_MODE = "ClimateKeeperMode"
-    CRUISE_FOLLOW_DISTANCE = "CruiseFollowDistance"
-    CRUISE_SET_SPEED = "CruiseSetSpeed"
-    CRUISE_STATE = "CruiseState"
-    CURRENT_LIMIT_MPH = "CurrentLimitMph"
-    DC_CHARGING_ENERGY_IN = "DCChargingEnergyIn"
-    DC_CHARGING_POWER = "DCChargingPower"
-    DC_DC_ENABLE = "DCDCEnable"
-    DEFROST_FOR_PRECONDITIONING = "DefrostForPreconditioning"
-    DEFROST_MODE = "DefrostMode"
-    DESTINATION_NAME = "DestinationName"
-    DESTINATION_LOCATION = "DestinationLocation"
-    DETAILED_CHARGE_STATE = "DetailedChargeState"
-    DI_AXLE_SPEED_F = "DiAxleSpeedF"
-    DI_AXLE_SPEED_R = "DiAxleSpeedR"
-    DI_AXLE_SPEED_REL = "DiAxleSpeedREL"
-    DI_AXLE_SPEED_RER = "DiAxleSpeedRER"
-    DI_HEATSINK_TF = "DiHeatsinkTF"
-    DI_HEATSINK_TR = "DiHeatsinkTR"
-    DI_HEATSINK_TREL = "DiHeatsinkTREL"
-    DI_HEATSINK_TRER = "DiHeatsinkTRER"
-    DI_MOTOR_CURRENT_F = "DiMotorCurrentF"
-    DI_MOTOR_CURRENT_R = "DiMotorCurrentR"
-    DI_MOTOR_CURRENT_REL = "DiMotorCurrentREL"
-    DI_MOTOR_CURRENT_RER = "DiMotorCurrentRER"
-    DI_SLAVE_TORQUE_CMD = "DiSlaveTorqueCmd"
-    DI_STATE_F = "DiStateF"
-    DI_STATE_R = "DiStateR"
-    DI_STATE_REL = "DiStateREL"
-    DI_STATE_RER = "DiStateRER"
-    DI_STATOR_TEMP_F = "DiStatorTempF"
-    DI_STATOR_TEMP_R = "DiStatorTempR"
-    DI_STATOR_TEMP_REL = "DiStatorTempREL"
-    DI_STATOR_TEMP_RER = "DiStatorTempRER"
-    DI_TORQUE_ACTUAL_F = "DiTorqueActualF"
-    DI_TORQUE_ACTUAL_R = "DiTorqueActualR"
-    DI_TORQUE_ACTUAL_REL = "DiTorqueActualREL"
-    DI_TORQUE_ACTUAL_RER = "DiTorqueActualRER"
-    DI_TORQUEMOTOR = "DiTorquemotor"
-    DI_V_BAT_F = "DiVBatF"
-    DI_V_BAT_R = "DiVBatR"
-    DI_V_BAT_REL = "DiVBatREL"
-    DI_V_BAT_RER = "DiVBatRER"
-    DOOR_STATE = "DoorState"
-    DRIVE_RAIL = "DriveRail"
-    DRIVER_SEAT_BELT = "DriverSeatBelt"
-    DRIVER_SEAT_OCCUPIED = "DriverSeatOccupied"
-    EFFICIENCY_PACKAGE = "EfficiencyPackage"
-    EMERGENCY_LANE_DEPARTURE_AVOIDANCE = "EmergencyLaneDepartureAvoidance"
-    ENERGY_REMAINING = "EnergyRemaining"
-    EST_BATTERY_RANGE = "EstBatteryRange"
-    ESTIMATED_HOURS_TO_CHARGE_TERMINATION = "EstimatedHoursToChargeTermination"
-    EUROPE_VEHICLE = "EuropeVehicle"
-    EXPECTED_ENERGY_PERCENT_AT_TRIP_ARRIVAL = "ExpectedEnergyPercentAtTripArrival"
-    EXPERIMENTAL_1 = "Experimental_1"
-    EXPERIMENTAL_2 = "Experimental_2"
-    EXPERIMENTAL_3 = "Experimental_3"
-    EXPERIMENTAL_4 = "Experimental_4"
-    EXTERIOR_COLOR = "ExteriorColor"
-    FAST_CHARGER_PRESENT = "FastChargerPresent"
-    FAST_CHARGER_TYPE = "FastChargerType"
-    FD_WINDOW = "FdWindow"
-    FORWARD_COLLISION_WARNING = "ForwardCollisionWarning"
-    FP_WINDOW = "FpWindow"
-    GEAR = "Gear"
-    GPS_HEADING = "GpsHeading"
-    GPS_STATE = "GpsState"
-    GUEST_MODE_ENABLED = "GuestModeEnabled"
-    GUEST_MODE_MOBILE_ACCESS_STATE = "GuestModeMobileAccessState"
-    HOMELINK_DEVICE_COUNT = "HomelinkDeviceCount"
-    HOMELINK_NEARBY = "HomelinkNearby"
-    HVAC_AC_ENABLED = "HvacACEnabled"
-    HVAC_AUTO_MODE = "HvacAutoMode"
-    HVAC_FAN_SPEED = "HvacFanSpeed"
-    HVAC_FAN_STATUS = "HvacFanStatus"
-    HVAC_LEFT_TEMPERATURE_REQUEST = "HvacLeftTemperatureRequest"
-    HVAC_POWER = "HvacPower"
-    HVAC_RIGHT_TEMPERATURE_REQUEST = "HvacRightTemperatureRequest"
-    HVAC_STEERING_WHEEL_HEAT_AUTO = "HvacSteeringWheelHeatAuto"
-    HVAC_STEERING_WHEEL_HEAT_LEVEL = "HvacSteeringWheelHeatLevel"
-    HVIL = "Hvil"
-    IDEAL_BATTERY_RANGE = "IdealBatteryRange"
-    INSIDE_TEMP = "InsideTemp"
-    ISOLATION_RESISTANCE = "IsolationResistance"
-    LANE_DEPARTURE_AVOIDANCE = "LaneDepartureAvoidance"
-    LATERAL_ACCELERATION = "LateralAcceleration"
-    LIFETIME_ENERGY_GAINED_REGEN = "LifetimeEnergyGainedRegen"
-    LIFETIME_ENERGY_USED = "LifetimeEnergyUsed"
-    LIFETIME_ENERGY_USED_DRIVE = "LifetimeEnergyUsedDrive"
-    LOCATION = "Location"
-    LOCKED = "Locked"
-    LONGITUDINAL_ACCELERATION = "LongitudinalAcceleration"
-    MILES_TO_ARRIVAL = "MilesToArrival"
-    MINUTES_TO_ARRIVAL = "MinutesToArrival"
-    MODULE_TEMP_MAX = "ModuleTempMax"
-    MODULE_TEMP_MIN = "ModuleTempMin"
-    NOT_ENOUGH_POWER_TO_HEAT = "NotEnoughPowerToHeat"
-    NUM_BRICK_VOLTAGE_MAX = "NumBrickVoltageMax"
-    NUM_BRICK_VOLTAGE_MIN = "NumBrickVoltageMin"
-    NUM_MODULE_TEMP_MAX = "NumModuleTempMax"
-    NUM_MODULE_TEMP_MIN = "NumModuleTempMin"
-    ODOMETER = "Odometer"
-    OFFROAD_LIGHTBAR_PRESENT = "OffroadLightbarPresent"
-    ORIGIN_LOCATION = "OriginLocation"
-    OUTSIDE_TEMP = "OutsideTemp"
-    PACK_CURRENT = "PackCurrent"
-    PACK_VOLTAGE = "PackVoltage"
-    PAIRED_PHONE_KEY_AND_KEY_FOB_QTY = "PairedPhoneKeyAndKeyFobQty"
-    PASSENGER_SEAT_BELT = "PassengerSeatBelt"
-    PEDAL_POSITION = "PedalPosition"
-    PIN_TO_DRIVE_ENABLED = "PinToDriveEnabled"
-    POWERSHARE_HOURS_LEFT = "PowershareHoursLeft"
-    POWERSHARE_INSTANTANEOUS_POWER_KW = "PowershareInstantaneousPowerKW"
-    POWERSHARE_STATUS = "PowershareStatus"
-    POWERSHARE_STOP_REASON = "PowershareStopReason"
-    POWERSHARE_TYPE = "PowershareType"
-    PRECONDITIONING_ENABLED = "PreconditioningEnabled"
-    RATED_RANGE = "RatedRange"
-    RD_WINDOW = "RdWindow"
-    REAR_DISPLAY_HVAC_ENABLED = "RearDisplayHvacEnabled"
-    REAR_SEAT_HEATERS = "RearSeatHeaters"
-    REMOTE_START_ENABLED = "RemoteStartEnabled"
-    RIGHT_HAND_DRIVE = "RightHandDrive"
-    ROOF_COLOR = "RoofColor"
-    ROUTE_LAST_UPDATED = "RouteLastUpdated"
-    ROUTE_LINE = "RouteLine"
-    ROUTE_TRAFFIC_MINUTES_DELAY = "RouteTrafficMinutesDelay"
-    RP_WINDOW = "RpWindow"
-    SCHEDULED_CHARGING_MODE = "ScheduledChargingMode"
-    SCHEDULED_CHARGING_PENDING = "ScheduledChargingPending"
-    SCHEDULED_CHARGING_START_TIME = "ScheduledChargingStartTime"
-    SCHEDULED_DEPARTURE_TIME = "ScheduledDepartureTime"
-    SEAT_HEATER_LEFT = "SeatHeaterLeft"
-    SEAT_HEATER_REAR_CENTER = "SeatHeaterRearCenter"
-    SEAT_HEATER_REAR_LEFT = "SeatHeaterRearLeft"
-    SEAT_HEATER_REAR_RIGHT = "SeatHeaterRearRight"
-    SEAT_HEATER_RIGHT = "SeatHeaterRight"
-    SENTRY_MODE = "SentryMode"
-    SERVICE_MODE = "ServiceMode"
-    SOC = "Soc"
-    SOFTWARE_UPDATE_DOWNLOAD_PERCENT_COMPLETE = "SoftwareUpdateDownloadPercentComplete"
-    SOFTWARE_UPDATE_EXPECTED_DURATION_MINUTES = "SoftwareUpdateExpectedDurationMinutes"
-    SOFTWARE_UPDATE_INSTALLATION_PERCENT_COMPLETE = "SoftwareUpdateInstallationPercentComplete"
-    SOFTWARE_UPDATE_SCHEDULED_START_TIME = "SoftwareUpdateScheduledStartTime"
-    SOFTWARE_UPDATE_VERSION = "SoftwareUpdateVersion"
-    SPEED_LIMIT_MODE = "SpeedLimitMode"
-    SPEED_LIMIT_WARNING = "SpeedLimitWarning"
-    SUPERCHARGER_SESSION_TRIP_PLANNER = "SuperchargerSessionTripPlanner"
-    TIME_TO_FULL_CHARGE = "TimeToFullCharge"
-    TONNEAU_OPEN_PERCENT = "TonneauOpenPercent"
-    TONNEAU_POSITION = "TonneauPosition"
-    TONNEAU_TENT_MODE = "TonneauTentMode"
-    TPMS_HARD_WARNINGS = "TpmsHardWarnings"
-    TPMS_LAST_SEEN_PRESSURE_TIME_FL = "TpmsLastSeenPressureTimeFl"
-    TPMS_LAST_SEEN_PRESSURE_TIME_FR = "TpmsLastSeenPressureTimeFr"
-    TPMS_LAST_SEEN_PRESSURE_TIME_RL = "TpmsLastSeenPressureTimeRl"
-    TPMS_LAST_SEEN_PRESSURE_TIME_RR = "TpmsLastSeenPressureTimeRr"
-    TPMS_PRESSURE_FL = "TpmsPressureFl"
-    TPMS_PRESSURE_FR = "TpmsPressureFr"
-    TPMS_PRESSURE_RL = "TpmsPressureRl"
-    TPMS_PRESSURE_RR = "TpmsPressureRr"
-    TPMS_SOFT_WARNINGS = "TpmsSoftWarnings"
-    TRIM = "Trim"
-    VALET_MODE_ENABLED = "ValetModeEnabled"
-    VEHICLE_NAME = "VehicleName"
-    VEHICLE_SPEED = "VehicleSpeed"
-    VERSION = "Version"
-    WHEEL_TYPE = "WheelType"
-    WIPER_HEAT_ENABLED = "WiperHeatEnabled"
-    LOCATED_AT_HOME = "LocatedAtHome"
-    LOCATED_AT_WORK = "LocatedAtWork"
-    LOCATED_AT_FAVORITE = "LocatedAtFavorite"
-    SETTING_DISTANCE_UNIT = "SettingDistanceUnit"
-    SETTING_TEMPERATURE_UNIT = "SettingTemperatureUnit"
-    SETTING_24_HOUR_TIME = "Setting24HourTime"
-    SETTING_TIRE_PRESSURE_UNIT = "SettingTirePressureUnit"
-    SETTING_CHARGE_UNIT = "SettingChargeUnit"
-    CLIMATE_SEAT_COOLING_FRONT_LEFT = "ClimateSeatCoolingFrontLeft"
-    CLIMATE_SEAT_COOLING_FRONT_RIGHT = "ClimateSeatCoolingFrontRight"
-
-
-
-class TelemetryAlert(StrEnum):
-    """Alerts available in telemetry streams"""
-
-    CUSTOMER = "Customer"
-    SERVICE = "Service"
-    SERVICE_FIX = "ServiceFix"
-
-
 class TeslaEnergyPeriod(StrEnum):
     """Period for history for energy sites"""
 

tesla_fleet_api/exceptions.py

@@ -853,6 +853,123 @@ SIGNED_MESSAGE_INFORMATION_FAULTS = [
     SignedMessageInformationFaultCouldNotHashMetadata,
 ]
 
+class WhitelistOperationStatus(TeslaFleetError):
+    message = "Whitelist operation failed"
+
+class WhitelistOperationUndocumentedError(WhitelistOperationStatus):
+    message = "Undocumented whitelist operation error"
+    code = 1
+
+class WhitelistOperationNoPermissionToRemoveOneself(WhitelistOperationStatus):
+    message = "No permission to remove oneself from whitelist"
+    code = 2
+
+class WhitelistOperationKeyfobSlotsFull(WhitelistOperationStatus):
+    message = "Keyfob slots are full"
+    code = 3
+
+class WhitelistOperationWhitelistFull(WhitelistOperationStatus):
+    message = "Whitelist is full"
+    code = 4
+
+class WhitelistOperationNoPermissionToAdd(WhitelistOperationStatus):
+    message = "No permission to add to whitelist"
+    code = 5
+
+class WhitelistOperationInvalidPublicKey(WhitelistOperationStatus):
+    message = "Invalid public key"
+    code = 6
+
+class WhitelistOperationNoPermissionToRemove(WhitelistOperationStatus):
+    message = "No permission to remove from whitelist"
+    code = 7
+
+class WhitelistOperationNoPermissionToChangePermissions(WhitelistOperationStatus):
+    message = "No permission to change permissions"
+    code = 8
+
+class WhitelistOperationAttemptingToElevateOthersAboveOneself(WhitelistOperationStatus):
+    message = "Attempting to elevate others above oneself"
+    code = 9
+
+class WhitelistOperationAttemptingToDemoteSuperiorToOneself(WhitelistOperationStatus):
+    message = "Attempting to demote superior to oneself"
+    code = 10
+
+class WhitelistOperationAttemptingToRemoveOwnPermissions(WhitelistOperationStatus):
+    message = "Attempting to remove own permissions"
+    code = 11
+
+class WhitelistOperationPublicKeyNotOnWhitelist(WhitelistOperationStatus):
+    message = "Public key not on whitelist"
+    code = 12
+
+class WhitelistOperationAttemptingToAddExistingKey(WhitelistOperationStatus):
+    message = "Attempting to add key that is already on the whitelist"
+    code = 13
+
+class WhitelistOperationNotAllowedToAddUnlessOnReader(WhitelistOperationStatus):
+    message = "Not allowed to add unless on reader"
+    code = 14
+
+class WhitelistOperationFMModifyingOutsideOfFMode(WhitelistOperationStatus):
+    message = "FM modifying outside of F mode"
+    code = 15
+
+class WhitelistOperationFMAttemptingToAddPermanentKey(WhitelistOperationStatus):
+    message = "FM attempting to add permanent key"
+    code = 16
+
+class WhitelistOperationFMAttemptingToRemovePermanentKey(WhitelistOperationStatus):
+    message = "FM attempting to remove permanent key"
+    code = 17
+
+class WhitelistOperationKeychainWhileFSFull(WhitelistOperationStatus):
+    message = "Keychain while FS full"
+    code = 18
+
+class WhitelistOperationAttemptingToAddKeyWithoutRole(WhitelistOperationStatus):
+    message = "Attempting to add key without role"
+    code = 19
+
+class WhitelistOperationAttemptingToAddKeyWithServiceRole(WhitelistOperationStatus):
+    message = "Attempting to add key with service role"
+    code = 20
+
+class WhitelistOperationNonServiceKeyAttemptingToAddServiceTech(WhitelistOperationStatus):
+    message = "Non-service key attempting to add service tech"
+    code = 21
+
+class WhitelistOperationServiceKeyAttemptingToAddServiceTechOutsideServiceMode(WhitelistOperationStatus):
+    message = "Service key attempting to add service tech outside service mode"
+    code = 22
+
+WHITELIST_OPERATION_STATUS = [
+    None,
+    WhitelistOperationUndocumentedError,
+    WhitelistOperationNoPermissionToRemoveOneself,
+    WhitelistOperationKeyfobSlotsFull,
+    WhitelistOperationWhitelistFull,
+    WhitelistOperationNoPermissionToAdd,
+    WhitelistOperationInvalidPublicKey,
+    WhitelistOperationNoPermissionToRemove,
+    WhitelistOperationNoPermissionToChangePermissions,
+    WhitelistOperationAttemptingToElevateOthersAboveOneself,
+    WhitelistOperationAttemptingToDemoteSuperiorToOneself,
+    WhitelistOperationAttemptingToRemoveOwnPermissions,
+    WhitelistOperationPublicKeyNotOnWhitelist,
+    WhitelistOperationAttemptingToAddExistingKey,
+    WhitelistOperationNotAllowedToAddUnlessOnReader,
+    WhitelistOperationFMModifyingOutsideOfFMode,
+    WhitelistOperationFMAttemptingToAddPermanentKey,
+    WhitelistOperationFMAttemptingToRemovePermanentKey,
+    WhitelistOperationKeychainWhileFSFull,
+    WhitelistOperationAttemptingToAddKeyWithoutRole,
+    WhitelistOperationAttemptingToAddKeyWithServiceRole,
+    WhitelistOperationNonServiceKeyAttemptingToAddServiceTech,
+    WhitelistOperationServiceKeyAttemptingToAddServiceTechOutsideServiceMode
+]
+
 
 async def raise_for_status(resp: aiohttp.ClientResponse) -> None:
     """Raise an exception if the response status code is >=400."""

tesla_fleet_api/tesla/__init__.py

@@ -0,0 +1,11 @@
+"""Tesla Fleet API classes."""
+
+from .fleet import TeslaFleetApi
+from .bluetooth import TeslaBluetooth
+from .oauth import TeslaFleetOAuth
+
+__all__ = [
+    "TeslaFleetApi",
+    "TeslaBluetooth",
+    "TeslaFleetOAuth",
+]

tesla_fleet_api/tesla/bluetooth.py

@@ -0,0 +1,33 @@
+"""Bluetooth only interface."""
+
+import re
+from .tesla import Tesla
+from .vehicle.bluetooth import VehicleBluetooth
+
+class TeslaBluetooth(Tesla):
+    """Class describing a Tesla Bluetooth connection."""
+
+    def __init__(
+        self,
+    ):
+        """Initialize the Tesla Fleet API."""
+
+        self.vehicles = Vehicles(self)
+
+    def valid_name(self, name: str) -> bool:
+        """Check if a BLE device name is a valid Tesla vehicle."""
+        return bool(re.match("^S[a-f0-9]{16}[A-F]$", name))
+
+class Vehicles(dict[str, VehicleBluetooth]):
+    """Class containing and creating vehicles."""
+
+    _parent: TeslaBluetooth
+
+    def __init__(self, parent: TeslaBluetooth):
+        self._parent = parent
+
+    def createBluetooth(self, vin: str) -> VehicleBluetooth:
+        """Creates a specific vehicle."""
+        vehicle = VehicleBluetooth(self._parent, vin)
+        self[vin] = vehicle
+        return vehicle

tesla_fleet_api/{charging.py → tesla/charging.py}

@@ -1,5 +1,5 @@
 from typing import Any
-from .const import Method
+from ..const import Method
 
 
 class Charging:

tesla_fleet_api/{energy.py → tesla/energysite.py}

@@ -1,37 +1,35 @@
 from __future__ import annotations
 from typing import Any, TYPE_CHECKING
-from .const import Method, EnergyOperationMode, EnergyExportMode, TeslaEnergyPeriod
-from .energyspecific import EnergySpecific
+from ..const import Method, EnergyOperationMode, EnergyExportMode, TeslaEnergyPeriod
 
 if TYPE_CHECKING:
-    from .teslafleetapi import TeslaFleetApi
+    from . import TeslaFleetApi
 
-
-class Energy:
+class EnergySite:
     """Class describing the Tesla Fleet API partner endpoints"""
 
-    parent: TeslaFleetApi
+    energy_site_id: int
 
-    def __init__(self, parent):
+    def __init__(
+        self,
+        parent: TeslaFleetApi,
+        energy_site_id: int
+    ):
         self._request = parent._request
-
-    def specific(self, energy_site_id: int) -> EnergySpecific:
-        """Create a specific energy site."""
-        return EnergySpecific(self, energy_site_id)
+        self.energy_site_id = energy_site_id
 
     async def backup(
-        self, energy_site_id: int, backup_reserve_percent: int
+        self, backup_reserve_percent: int
     ) -> dict[str, Any]:
         """Adjust the site's backup reserve."""
         return await self._request(
             Method.POST,
-            f"api/1/energy_sites/{energy_site_id}/backup",
+            f"api/1/energy_sites/{self.energy_site_id}/backup",
             json={"backup_reserve_percent": backup_reserve_percent},
         )
 
     async def backup_history(
         self,
-        energy_site_id: int,
         period: TeslaEnergyPeriod | str | None,
         start_date: str | None = None,
         end_date: str | None = None,
@@ -40,7 +38,7 @@ class Energy:
         """Returns the backup (off-grid) event history of the site in duration of seconds."""
         return await self._request(
             Method.GET,
-            f"api/1/energy_sites/{energy_site_id}/calendar_history",
+            f"api/1/energy_sites/{self.energy_site_id}/calendar_history",
             params={
                 "kind": "backup",
                 "start_date": start_date,
@@ -52,7 +50,6 @@ class Energy:
 
     async def charge_history(
         self,
-        energy_site_id: int,
         start_date: str,
         end_date: str,
         time_zone: str | None = None,
@@ -60,7 +57,7 @@ class Energy:
         """Returns the charging history of a wall connector."""
         return await self._request(
             Method.GET,
-            f"api/1/energy_sites/{energy_site_id}/telemetry_history",
+            f"api/1/energy_sites/{self.energy_site_id}/telemetry_history",
             params={
                 "kind": "charge",
                 "start_date": start_date,
@@ -71,7 +68,6 @@ class Energy:
 
     async def energy_history(
         self,
-        energy_site_id: int,
         period: TeslaEnergyPeriod | str | None,
         start_date: str | None = None,
         end_date: str | None = None,
@@ -80,7 +76,7 @@ class Energy:
         """Returns the energy measurements of the site, aggregated to the requested period."""
         return await self._request(
             Method.GET,
-            f"api/1/energy_sites/{energy_site_id}/calendar_history",
+            f"api/1/energy_sites/{self.energy_site_id}/calendar_history",
             params={
                 "kind": "energy",
                 "start_date": start_date,
@@ -92,70 +88,82 @@ class Energy:
 
     async def grid_import_export(
         self,
-        energy_site_id: int,
         disallow_charge_from_grid_with_solar_installed: bool | None = None,
         customer_preferred_export_rule: EnergyExportMode | str | None = None,
     ) -> dict[str, Any]:
         """Allow/disallow charging from the grid and exporting energy to the grid."""
         return await self._request(
             Method.POST,
-            f"api/1/energy_sites/{energy_site_id}/grid_import_export",
+            f"api/1/energy_sites/{self.energy_site_id}/grid_import_export",
             json={
                 "disallow_charge_from_grid_with_solar_installed": disallow_charge_from_grid_with_solar_installed,
                 "customer_preferred_export_rule": customer_preferred_export_rule,
             },
         )
 
-    async def live_status(self, energy_site_id: int) -> dict[str, Any]:
+    async def live_status(self) -> dict[str, Any]:
         """Returns the live status of the site (power, state of energy, grid status, storm mode)."""
         return await self._request(
             Method.GET,
-            f"api/1/energy_sites/{energy_site_id}/live_status",
+            f"api/1/energy_sites/{self.energy_site_id}/live_status",
         )
 
     async def off_grid_vehicle_charging_reserve(
-        self, energy_site_id: int, off_grid_vehicle_charging_reserve_percent: int
+        self, off_grid_vehicle_charging_reserve_percent: int
     ) -> dict[str, Any]:
         """Adjust the site's off-grid vehicle charging backup reserve."""
         return await self._request(
             Method.POST,
-            f"api/1/energy_sites/{energy_site_id}/off_grid_vehicle_charging_reserve",
+            f"api/1/energy_sites/{self.energy_site_id}/off_grid_vehicle_charging_reserve",
             json={
                 "off_grid_vehicle_charging_reserve_percent": off_grid_vehicle_charging_reserve_percent
             },
         )
 
     async def operation(
-        self, energy_site_id: int, default_real_mode: EnergyOperationMode | str
+        self, default_real_mode: EnergyOperationMode | str
     ) -> dict[str, Any]:
         """Set the site's mode."""
         return await self._request(
             Method.POST,
-            f"api/1/energy_sites/{energy_site_id}/operation",
+            f"api/1/energy_sites/{self.energy_site_id}/operation",
             json={"default_real_mode": default_real_mode},
         )
 
-    async def site_info(self, energy_site_id: int) -> dict[str, Any]:
+    async def site_info(self) -> dict[str, Any]:
         """Returns information about the site. Things like assets (has solar, etc), settings (backup reserve, etc), and features (storm_mode_capable, etc)."""
         return await self._request(
             Method.GET,
-            f"api/1/energy_sites/{energy_site_id}/site_info",
+            f"api/1/energy_sites/{self.energy_site_id}/site_info",
         )
 
-    async def storm_mode(self, energy_site_id: int, enabled: bool) -> dict[str, Any]:
+    async def storm_mode(self, enabled: bool) -> dict[str, Any]:
         """Update storm watch participation."""
         return await self._request(
             Method.POST,
-            f"api/1/energy_sites/{energy_site_id}/storm_mode",
+            f"api/1/energy_sites/{self.energy_site_id}/storm_mode",
             json={"enabled": enabled},
         )
 
     async def time_of_use_settings(
-        self, energy_site_id: int, settings: dict[str, Any]
+        self, settings: dict[str, Any]
     ) -> dict[str, Any]:
         """Update the time of use settings for the energy site."""
         return await self._request(
             Method.POST,
-            f"api/1/energy_sites/{energy_site_id}/time_of_use_settings",
+            f"api/1/energy_sites/{self.energy_site_id}/time_of_use_settings",
             json={"tou_settings": {"tariff_content_v2": settings}},
         )
+
+class EnergySites(dict[int, EnergySite]):
+    """Class describing the Tesla Fleet API partner endpoints"""
+
+    _parent: TeslaFleetApi
+
+    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)
+        return self[energy_site_id]