rivian-python-client 1.0.4__tar.gz → 1.1.1__tar.gz

{rivian_python_client-1.0.4 → rivian_python_client-1.1.1}/PKG-INFO

@@ -1,19 +1,23 @@
 Metadata-Version: 2.1
 Name: rivian-python-client
-Version: 1.0.4
+Version: 1.1.1
 Summary: Rivian API Client (Unofficial)
 License: MIT
 Author: Brian Retterer
 Author-email: bretterer@gmail.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.9,<3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Provides-Extra: ble
 Requires-Dist: aiohttp (>=3.0.0)
 Requires-Dist: backports-strenum (>=1.2.4,<2.0.0) ; python_version < "3.11"
+Requires-Dist: bleak (>=0.21,<0.22) ; extra == "ble"
 Requires-Dist: cryptography (>=41.0.1,<42.0.0)
+Requires-Dist: dbus-fast (>=2.11.0,<3.0.0) ; (sys_platform == "linux") and (extra == "ble")
 Description-Content-Type: text/markdown
 
 # Python: Rivian API Client

{rivian_python_client-1.0.4 → rivian_python_client-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rivian-python-client"
-version = "1.0.4"
+version = "1.1.1"
 description = "Rivian API Client (Unofficial)"
 readme = "README.md"
 authors = ["Brian Retterer <bretterer@gmail.com>"]
@@ -10,19 +10,25 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = ">=3.9, <3.13"
 aiohttp = ">=3.0.0"
 cryptography = "^41.0.1"
 backports-strenum = { version = "^1.2.4", python = "<3.11" }
+bleak = { version = "^0.21", optional = true }
+dbus-fast = {version = "^2.11.0", optional = true, platform = "linux"}
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.1.2"
-pytest-asyncio = "^0.18.3"
+pytest-asyncio = ">=0.18.3,<0.22.0"
 python-dotenv = "^0.20.0"
 aresponses = "^2.1.5"
+mypy = "^1.7.0"
+
+[tool.poetry.extras]
+ble = ["bleak", "dbus-fast"]
 
 [tool.poetry-dynamic-versioning]
-enable = true
+enable = false
 vcs = "git"
 style = "semver"
 pattern = "default-unprefixed"

rivian_python_client-1.1.1/src/rivian/ble.py

@@ -0,0 +1,166 @@
+"""Rivian BLE handler."""
+from __future__ import annotations
+
+import asyncio
+import logging
+import platform
+import secrets
+
+from .utils import generate_ble_command_hmac
+
+_LOGGER = logging.getLogger(__name__)
+
+try:
+    from bleak import BleakClient, BleakScanner, BLEDevice  # type: ignore
+except ImportError:
+    _LOGGER.error("Please install 'rivian-python-client[ble]' to use BLE features.")
+    raise
+
+
+DEVICE_LOCAL_NAME = "Rivian Phone Key"
+
+ACTIVE_ENTRY_CHARACTERISTIC_UUID = "5249565F-4D4F-424B-4559-5F5752495445"
+PHONE_ID_VEHICLE_ID_UUID = "AA49565A-4D4F-424B-4559-5F5752495445"
+PHONE_NONCE_VEHICLE_NONCE_UUID = "E020A15D-E730-4B2C-908B-51DAF9D41E19"
+
+CONNECT_TIMEOUT = 10.0
+NOTIFICATION_TIMEOUT = 3.0
+
+
+class BleNotificationResponse:
+    """BLE notification response helper."""
+
+    def __init__(self) -> None:
+        """Initialize the BLE notification response helper."""
+        self.data: bytes | None = None
+        self.event = asyncio.Event()
+
+    def notification_handler(self, _, notification_data: bytearray) -> None:
+        """Notification handler."""
+        self.data = notification_data
+        self.event.set()
+
+    async def wait(self, timeout: float | None = NOTIFICATION_TIMEOUT) -> bool:
+        """Wait for the notification response."""
+        return await asyncio.wait_for(self.event.wait(), timeout)
+
+
+async def create_notification_handler(
+    client: BleakClient, char_specifier: str
+) -> BleNotificationResponse:
+    """Create a notification handler."""
+    response = BleNotificationResponse()
+    await client.start_notify(char_specifier, response.notification_handler)
+    return response
+
+
+async def pair_phone(
+    device: BLEDevice,
+    phone_id: str,
+    vas_vehicle_id: str,
+    vehicle_key: str,
+    private_key: str,
+) -> bool:
+    """Pair a phone locally via BLE.
+
+    The phone must first be enrolled via `rivian.enroll_phone`.
+    This finishes the process to enable cloud and local vehicle control.
+    """
+    _LOGGER.debug("Connecting to %s", device)
+    try:
+        async with BleakClient(device, timeout=CONNECT_TIMEOUT) as client:
+            _LOGGER.debug("Connected to %s", device)
+            vehicle_id_handler = await create_notification_handler(
+                client, PHONE_ID_VEHICLE_ID_UUID
+            )
+            nonce_handler = await create_notification_handler(
+                client, PHONE_NONCE_VEHICLE_NONCE_UUID
+            )
+
+            _LOGGER.debug("Validating id")
+            await client.write_gatt_char(
+                PHONE_ID_VEHICLE_ID_UUID, bytes.fromhex(phone_id.replace("-", ""))
+            )
+            await vehicle_id_handler.wait()
+
+            assert vehicle_id_handler.data
+            vehicle_id_response = vehicle_id_handler.data.hex()
+            if vehicle_id_response != vas_vehicle_id.replace("-", ""):
+                _LOGGER.debug(
+                    "Incorrect vehicle id: received %s, expected %s",
+                    vehicle_id_response,
+                    vas_vehicle_id,
+                )
+                return False
+
+            _LOGGER.debug("Exchanging nonce")
+            phone_nonce = secrets.token_bytes(16)
+            hmac = generate_ble_command_hmac(phone_nonce, vehicle_key, private_key)
+            await client.write_gatt_char(
+                PHONE_NONCE_VEHICLE_NONCE_UUID, phone_nonce + hmac
+            )
+            await nonce_handler.wait()
+
+            # Vehicle is authenticated, trigger bonding
+            _LOGGER.debug("Attempting to pair")
+            if platform.system() == "Darwin":
+                # Mac BLE API doesn't have an explicit way to trigger bonding
+                # Instead, enable notification on protected characteristic to trigger bonding manually
+                await client.start_notify(
+                    ACTIVE_ENTRY_CHARACTERISTIC_UUID, lambda _, __: None
+                )
+            else:
+                await client.pair()
+
+            _LOGGER.debug("Successfully paired with %s", device)
+            return True
+    except Exception as ex:  # pylint: disable=broad-except
+        _LOGGER.debug(
+            "Couldn't connect to %s. "
+            'Make sure you are in the correct vehicle and have selected "Set Up" for the appropriate key and try again'
+            "%s",
+            device,
+            ("" if isinstance(ex, asyncio.TimeoutError) else f": {ex}"),
+        )
+    return False
+
+
+async def find_phone_key() -> BLEDevice | None:
+    """Find phone key."""
+    async with BleakScanner() as scanner:
+        return await scanner.find_device_by_name(DEVICE_LOCAL_NAME)
+
+
+async def set_bluez_pairable(device: BLEDevice) -> bool:
+    """Set bluez to pairable on Linux systems."""
+    if (_os := platform.system()) != "Linux":
+        raise OSError(f"BlueZ is not available on {_os}-based systems")
+
+    # pylint: disable=import-error, import-outside-toplevel
+    from dbus_fast import BusType  # type: ignore
+    from dbus_fast.aio import MessageBus  # type: ignore
+
+    try:
+        path = device.details["props"]["Adapter"]
+    except Exception:  # pylint: disable=broad-except
+        path = "/org/bluez/hci0"
+        _LOGGER.warning(
+            "Couldn't determine BT controller path, defaulting to %s: %s",
+            path,
+            device.details,
+            exc_info=True,
+        )
+
+    try:
+        bus = await MessageBus(bus_type=BusType.SYSTEM).connect()
+        introspection = await bus.introspect("org.bluez", path)
+        pobject = bus.get_proxy_object("org.bluez", path, introspection)
+        iface = pobject.get_interface("org.bluez.Adapter1")
+        if not await iface.get_pairable():
+            await iface.set_pairable(True)
+        bus.disconnect()
+    except Exception as ex:  # pylint: disable=broad-except
+        _LOGGER.error(ex)
+        return False
+
+    return True

{rivian_python_client-1.0.4 → rivian_python_client-1.1.1}/src/rivian/const.py

@@ -36,9 +36,9 @@ VEHICLE_STATE_PROPERTIES: Final[set[str]] = {
     "gnssLocation",
     # TimeStamped(String|Float|Int)
     "alarmSoundStatus",
+    "batteryCapacity",
     "batteryHvThermalEvent",
     "batteryHvThermalEventPropagation",
-    "batteryCapacity",
     "batteryLevel",
     "batteryLimit",
     "brakeFluidLow",
@@ -46,6 +46,7 @@ VEHICLE_STATE_PROPERTIES: Final[set[str]] = {
     "cabinClimateInteriorTemperature",
     "cabinPreconditioningStatus",
     "cabinPreconditioningType",
+    "carWashMode",
     "chargerDerateStatus",
     "chargerState",
     "chargerStatus",
@@ -57,12 +58,16 @@ VEHICLE_STATE_PROPERTIES: Final[set[str]] = {
     "closureLiftgateNextAction",
     "closureSideBinLeftClosed",
     "closureSideBinLeftLocked",
+    "closureSideBinLeftNextAction",
     "closureSideBinRightClosed",
     "closureSideBinRightLocked",
+    "closureSideBinRightNextAction",
     "closureTailgateClosed",
     "closureTailgateLocked",
+    "closureTailgateNextAction",
     "closureTonneauClosed",
     "closureTonneauLocked",
+    "closureTonneauNextAction",
     "defrostDefogStatus",
     "distanceToEmpty",
     "doorFrontLeftClosed",
@@ -79,6 +84,7 @@ VEHICLE_STATE_PROPERTIES: Final[set[str]] = {
     "gearGuardVideoStatus",
     "gearGuardVideoTermsAccepted",
     "gearStatus",
+    "gnssAltitude",
     "gnssBearing",
     "gnssSpeed",
     "otaAvailableVersion",
@@ -123,6 +129,8 @@ VEHICLE_STATE_PROPERTIES: Final[set[str]] = {
     "tirePressureStatusValidFrontRight",
     "tirePressureStatusValidRearLeft",
     "tirePressureStatusValidRearRight",
+    "trailerStatus",
+    "twelveVoltBatteryHealth",
     "vehicleMileage",
     "windowFrontLeftCalibrated",
     "windowFrontLeftClosed",
@@ -132,6 +140,7 @@ VEHICLE_STATE_PROPERTIES: Final[set[str]] = {
     "windowRearLeftClosed",
     "windowRearRightCalibrated",
     "windowRearRightClosed",
+    "windowsNextAction",
     "wiperFluidState",
 }
 

{rivian_python_client-1.0.4 → rivian_python_client-1.1.1}/src/rivian/rivian.py

@@ -248,10 +248,12 @@ class Rivian:
         device_name: str,
         public_key: str,
     ) -> bool:
-        """Enable control of a vehicle by enrolling a phone.
+        """Enroll a phone.
 
         To generate a public/private key for enrollment, use the `utils.generate_key_pair` function.
         The private key will need to be retained to sign commands sent via the `send_vehicle_command` method.
+        To enable vehicle control, the phone will then also need to be paired locally via BLE,
+        which can be done via `ble.pair_phone`.
         """
         url = GRAPHQL_GATEWAY
         headers = BASE_HEADERS | {

rivian_python_client-1.1.1/src/rivian/schemas/charging.graphql

@@ -0,0 +1,179 @@
+type Query {
+  chargepoint: ChargepointQuery
+  getCompletedSessionSummaries($vehicleId: String): [ChargingSessionSummary]
+  getLiveSessionData(vehicleId: ID!): LiveSessionData
+  getLiveSessionHistory(vehicleId: ID!): LiveSessionHistory
+  getNonRivianUserSession: NonRivianUserSessionData
+  getRegisteredWallboxes: [WallboxRecord]
+  getSessionHistory(
+    userId: ID!
+    startDate: String!
+    endDate: String!
+  ): [SessionHistorySummary]
+  getWallboxStatus(wallboxId: String!): WallboxRecord
+  getWallChargerHistory(
+    serialNumber: String!
+    startDate: String
+    endDate: String
+  ): [SessionSummary]
+  payment: PaymentQuery
+}
+
+type Mutation {
+  updateWallbox(
+    wallboxId: String!
+    wifiId: String
+    name: String
+    latitude: String
+    longitude: String
+  ): WallboxRecord
+}
+
+type Card {
+  brand: String!
+  lastFour: String!
+}
+
+type ChargepointQuery {
+  checkByRivianId: Boolean!
+  getLinkedEmailForRivianId: GetLinkedEmailForRivianIdResponse!
+}
+
+type ChargingSessionSummary {
+  chargerType: String
+  currencyCode: String
+  paidTotal: Float
+  startInstant: String!
+  endInstant: String!
+  totalEnergyKwh: Float!
+  rangeAddedKm: Float
+  city: String
+  transactionId: String!
+  vehicleId: String
+  vehicleName: String
+  vendor: String
+  isRoamingNetwork: Boolean
+  isPublic: Boolean
+  isHomeCharger: Boolean
+  meta: ChargingSessionSummaryMeta!
+}
+
+type ChargingSessionSummaryMeta {
+  transactionIdGroupingKey: String!
+  dataSources: [String!]!
+}
+
+type FloatValueRecord {
+  value: Float!
+  updatedAt: String!
+}
+
+type GetLinkedEmailForRivianIdResponse {
+  email: String!
+}
+
+type LiveSessionData {
+  chargerId: String
+  current: FloatValueRecord
+  currentCurrency: String
+  currentMiles: FloatValueRecord
+  currentPrice: Float
+  isFreeSession: Boolean
+  isRivianCharger: Boolean
+  kilometersChargedPerHour: FloatValueRecord
+  locationId: String
+  power: FloatValueRecord
+  rangeAddedThisSession: FloatValueRecord
+  soc: FloatValueRecord
+  startTime: String
+  timeElapsed: Float
+  timeRemaining: StringValueRecord
+  totalChargedEnergy: FloatValueRecord
+  vehicleChargerState: StringValueRecord
+}
+
+type LiveSessionHistory {
+  chartData: [FloatValueRecord]
+  startTime: Float
+  vehicleId: String
+  chargerId: String
+  transactionId: String
+  current: FloatValueRecord
+}
+
+type NonRivianUserSessionData {
+  chargerId: String
+  transactionId: String
+  isRivianCharger: Boolean!
+  vehicleChargerState: StringValueRecord
+}
+
+type PaymentMethod {
+  default: Boolean!
+  card: Card
+}
+
+type PaymentQuery {
+  getPaymentMethods: [PaymentMethod!]!
+}
+
+type SessionHistorySummary {
+  transactionId: String!
+  locationId: String!
+  vehicleId: String
+  startDateTime: String!
+  endDateTime: String!
+  currency: String!
+  cost: Float!
+  paidTotal: Float!
+  energyOffered: Float!
+  energyUnits: String
+  rangeAdded: Float
+  rangeUnits: String
+  vendor: String!
+  chargerType: String!
+  chargerName: String!
+  address: String!
+  city: String!
+  country: String!
+  postalCode: string!
+}
+
+type SessionSummary {
+  transactionId: String
+  vehicleInfo: VehicleInfo
+  startDateTime: String!
+  endDateTime: String!
+  totalEnergyKwh: Float!
+  rangeAddedKm: Float
+}
+
+type StringValueRecord {
+  value: String!
+  updatedAt: String!
+}
+
+type VehicleInfo {
+  name: String
+  vin: String
+}
+
+type WallboxRecord {
+  wallboxId: String!
+  userId: String!
+  wifiId: String!
+  name: String!
+  linked: Boolean!
+  latitude: String!
+  longitude: String!
+  chargingStatus: String!
+  power: String
+  currentVoltage: String
+  currentAmps: String
+  softwareVersion: String!
+  model: String!
+  serialNumber: String!
+  maxPower: String!
+  maxVoltage: String!
+  maxAmps: String
+}

rivian_python_client-1.1.1/src/rivian/schemas/gateway.graphql

@@ -0,0 +1,559 @@
+type Query {
+  currentUser: User
+  delivery(orderId: ID!): Delivery
+  getVehicle(id: String!): Vehicle
+  getVehicleCommand(id: String!): GetVehicleCommandState
+  getVehicleMobileImages(
+    resolution: String
+    extension: String
+    version: String
+  ): VehicleMobileImage
+  getVehicleOrderMobileImages(
+    resolution: String
+    extension: String
+    version: String
+  ): VehicleMobileImage
+  planTrip(
+    origin: CoordinatesInput!
+    destination: CoordinatesInput!
+    bearing: Float!
+    vehicleId: String!
+    startingSoc: Float!
+    startingRangeMeters: Float!
+    targetArrivalSocPercent: Float
+    networkPreferences: [NetworkPreference!]
+  ): PlanTripResponse
+  vehicleState(id: String!): VehicleState
+}
+
+type Mutation {
+  createCsrfToken: CreateCsrfTokenResponse
+  disenrollPhone(attrs: DisenrollPhoneAttributes!): DisenrollPhoneResponse
+  enrollPhone(attrs: EnrollPhoneAttributes!): EnrollPhoneResponse
+  login(email: String!, password: String!): LoginResponse
+  loginWithOTP(
+    email: String!
+    otpToken: String!
+    otpCode: String!
+  ): MobileLoginResponse
+  sendVehicleCommand(attrs: VehicleCommandAttributes!): SendVehicleCommandState
+  setChargingSchedules(
+    vehicleId: String!
+    chargingSchedules: [InputChargingSchedule!]!
+  ): OK
+  setVehicleName(vehicleId: String!, name: String!): OK
+}
+
+type Subscription {
+  vehicleState(id: String!): VehicleState
+}
+
+input CoordinatesInput {
+  latitude: Float!
+  longitude: Float!
+}
+
+input DisenrollPhoneAttributes {
+  enrollmentId: String!
+}
+
+input EnrollPhoneAttributes {
+  userId: String!
+  vehicleId: String!
+  publicKey: String!
+  type: String!
+  name: String
+}
+
+input InputChargingSchedule {
+  weekDays: [String!]!
+  startTime: Int!
+  duration: Int!
+  location: CoordinatesInput!
+  amperage: Int!
+  enabled: Boolean!
+}
+
+input NetworkPreference {
+  networkId: String!
+  preference: Float
+}
+
+input VehicleCommandAttributes {
+  command: String!
+  hmac: String!
+  timestamp: String!
+  vasPhoneId: String!
+  deviceId: String!
+  vehicleId: String!
+  params: VehicleCommandParameters
+}
+
+input VehicleCommandParameters {
+  level: Int
+  HVAC_set_temp: Float
+  SOC_limit: Int
+}
+
+interface TimeStamped {
+  timeStamp: String!
+}
+
+type CampSpeaker {
+  id: String!
+  serialNumber: String!
+}
+
+type ChargingSchedule {
+  startTime: Int!
+  duration: Int!
+  location: GeoCoordinates!
+  amperage: Int!
+  enabled: Boolean!
+  weekDays: [String!]!
+}
+
+type CreateCsrfTokenResponse {
+  csrfToken: String!
+  appSessionToken: String!
+}
+
+type Delivery {
+  status: String!
+  carrier: String!
+  deliveryAddress: DeliveryAddressDetails!
+  appointmentDetails: DeliveryAppointment!
+  vehicleVIN: String!
+}
+
+type DeliveryAddressDetails {
+  addressLine1: String!
+  addressLine2: String
+  city: String!
+  state: String!
+  country: String!
+  zipcode: String!
+}
+
+type DeliveryAppointment {
+  appointmentId: String!
+  startDateTime: String!
+  endDateTime: String!
+  timeZone: String!
+}
+
+type DisenrollPhoneResponse {
+  success: Boolean!
+}
+
+type EnrollPhoneResponse {
+  success: Boolean!
+}
+
+type GeoCoordinates {
+  latitude: Float!
+  longitude: Float!
+}
+
+type GetVehicleCommandState {
+  id: String!
+  command: String!
+  createdAt: String!
+  state: Int!
+  responseCode: Int
+  statusCode: Int
+}
+
+type MobileLoginResponse {
+  accessToken: String!
+  refreshToken: String!
+  userSessionToken: String!
+}
+
+type MobileMFALoginResponse {
+  otpToken: String!
+}
+
+type NameSetting {
+  value: String!
+}
+
+type OK {
+  success: Boolean!
+  value: String
+}
+
+type OTAUpdateDetails {
+  url: String!
+  version: String!
+  locale: String!
+}
+
+type PlanTripResponse {
+  routes: [Route!]!
+  tripPlanStatus: String!
+  chargeStationsAvailable: Boolean!
+  socBelowLimit: Boolean!
+}
+
+type ProvisionedUser {
+  firstName: String!
+  lastName: String!
+  email: String!
+  userId: String!
+  roles: [String!]!
+  devices: [ProvisionedUserDevice!]!
+}
+
+type ProvisionedUserDevice {
+  type: String!
+  mappedIdentityId: String!
+  id: String!
+  hrid: String
+  deviceName: String!
+  isPaired: Boolean!
+  isEnabled: Boolean!
+}
+
+type RegistrationChannel {
+  type: String!
+}
+
+type Route {
+  routeResponse: String!
+  destinationReached: Boolean!
+  totalChargingDuration: Int!
+  arrivalSOC: Int!
+  arrivalReachableDistance: Float!
+  waypoints: [WayPoint!]!
+  energyConsumptionOnLeg: Float
+  batteryEmptyToDestinationDistance: Float
+  batteryEmptyLocationLatitude: Float
+  batteryEmptyLocationLongitude: Float
+}
+
+type SendVehicleCommandState {
+  id: String!
+  command: String!
+  state: Int!
+}
+
+type SupportedFeature {
+  name: String!
+  status: String!
+}
+
+type TimeStampedFloat implements TimeStamped {
+  timeStamp: String!
+  value: Float!
+}
+
+type TimeStampedNullableFloat implements TimeStamped {
+  timeStamp: String!
+  value: Float
+}
+
+type TimeStampedInt implements TimeStamped {
+  timeStamp: String!
+  value: Int!
+}
+
+type TimeStampedString implements TimeStamped {
+  timeStamp: String!
+  value: String!
+}
+
+type UnprovisionedUser {
+  email: String!
+  inviteId: String!
+  status: String!
+}
+
+type User {
+  id: String!
+  firstName: String!
+  lastName: String!
+  email: String!
+  address: UserAddress!
+  enrolledPhones: [UserEnrolledPhone]!
+  pendingInvites: [UserInvitation!]!
+  phones: [UserPhone!]!
+  registrationChannels: [RegistrationChannel!]!
+  vehicles: [UserVehicle!]!
+}
+
+type UserAddress {
+  country: String!
+}
+
+type UserEnrolledPhone {
+  vas: UserEnrolledPhoneAccess!
+  enrolled: [UserEnrolledPhoneEntry!]!
+}
+
+type UserEnrolledPhoneAccess {
+  vasPhoneId: String!
+  publicKey: String!
+}
+
+type UserEnrolledPhoneEntry {
+  deviceType: String!
+  deviceName: String!
+  vehicleId: String!
+  identityId: String!
+  shortName: String!
+}
+
+type UserInvitation {
+  id: String!
+  invitedByFirstName: String
+  role: String
+  status: String
+  vehicleId: String
+  vehicleModel: String
+  email: String
+}
+
+type UserPhone {
+  countryCode: String!
+  formatted: String!
+  phone: String!
+  national: String!
+}
+
+type UserVehicle {
+  id: String!
+  vin: String!
+  name: String!
+  owner: String
+  state: String
+  createdAt: String!
+  updatedAt: String
+  vas: UserVehicleAccess!
+  vehicle: Vehicle!
+  roles: [String!]!
+  connectedProducts: [ConnectedProduct!]!
+}
+
+type UserVehicleAccess {
+  vasVehicleId: String!
+  vehiclePublicKey: String!
+}
+
+type UserVehicleSettingsMap {
+  name: NameSetting!
+}
+
+type Vehicle {
+  id: String!
+  vin: String!
+  make: String!
+  model: String!
+  modelYear: Int!
+  expectedBuildDate: String
+  plannedBuildDate: String
+  expectedGeneralAssemblyStartDate: String
+  actualGeneralAssemblyDate: String
+  otaEarlyAccessStatus: Boolean!
+  currentOTAUpdateDetails: OTAUpdateDetails!
+  availableOTAUpdateDetails: OTAUpdateDetails
+  mobileConfiguration: VehicleMobileConfiguration!
+  settings: UserVehicleSettingsMap!
+  vehicleState: VehicleState!
+  invitedUsers: [InvitedUser!]!
+  chargingSchedules: [ChargingSchedule!]!
+  estimatedRange(startSoc: Float!): Float!
+}
+
+type VehicleCloudConnection {
+  lastSync: String!
+}
+
+type VehicleLocation implements TimeStamped {
+  timeStamp: String!
+  latitude: Float!
+  longitude: Float!
+}
+
+type VehicleMobileConfiguration {
+  trimOption: VehicleMobileConfigurationOption!
+  driveSystemOption: VehicleMobileConfigurationOption!
+  exteriorColorOption: VehicleMobileConfigurationOption!
+  interiorColorOption: VehicleMobileConfigurationOption!
+}
+
+type VehicleMobileConfigurationOption {
+  optionId: String!
+  optionName: String!
+}
+
+type VehicleMobileImage {
+  orderId: String
+  vehicleId: String
+  design: String!
+  extension: String!
+  placement: String!
+  resolution: String!
+  size: String!
+  url: String!
+}
+
+type VehicleState {
+  alarmSoundStatus: TimeStampedString
+
+  batteryCapacity: TimeStampedFloat
+  batteryHvThermalEvent: TimeStampedString
+  batteryHvThermalEventPropagation: TimeStampedString
+  batteryLevel: TimeStampedFloat
+  batteryLimit: TimeStampedInt
+
+  brakeFluidLow: TimeStampedString
+
+  cabinClimateDriverTemperature: TimeStampedFloat
+  cabinClimateInteriorTemperature: TimeStampedFloat
+  cabinPreconditioningStatus: TimeStampedString
+  cabinPreconditioningType: TimeStampedString
+
+  carWashMode: TimeStampedString
+
+  chargerDerateStatus: TimeStampedString
+  chargerState: TimeStampedString
+  chargerStatus: TimeStampedString
+
+  closureFrunkClosed: TimeStampedString
+  closureFrunkLocked: TimeStampedString
+  closureFrunkNextAction: TimeStampedString
+  closureLiftgateClosed: TimeStampedString
+  closureLiftgateLocked: TimeStampedString
+  closureLiftgateNextAction: TimeStampedString
+  closureSideBinLeftClosed: TimeStampedString
+  closureSideBinLeftLocked: TimeStampedString
+  closureSideBinLeftNextAction: TimeStampedString
+  closureSideBinRightClosed: TimeStampedString
+  closureSideBinRightLocked: TimeStampedString
+  closureSideBinRightNextAction: TimeStampedString
+  closureTailgateClosed: TimeStampedString
+  closureTailgateLocked: TimeStampedString
+  closureTailgateNextAction: TimeStampedString
+  closureTonneauClosed: TimeStampedString
+  closureTonneauLocked: TimeStampedString
+  closureTonneauNextAction: TimeStampedString
+
+  cloudConnection: VehicleCloudConnection
+
+  defrostDefogStatus: TimeStampedString
+
+  distanceToEmpty: TimeStampedInt
+
+  doorFrontLeftClosed: TimeStampedString
+  doorFrontLeftLocked: TimeStampedString
+  doorFrontRightClosed: TimeStampedString
+  doorFrontRightLocked: TimeStampedString
+  doorRearLeftClosed: TimeStampedString
+  doorRearLeftLocked: TimeStampedString
+  doorRearRightClosed: TimeStampedString
+  doorRearRightLocked: TimeStampedString
+
+  driveMode: TimeStampedString
+
+  gearGuardLocked: TimeStampedString
+  gearGuardVideoMode: TimeStampedString
+  gearGuardVideoStatus: TimeStampedString
+  gearGuardVideoTermsAccepted: TimeStampedString
+  gearStatus: TimeStampedString
+
+  gnssAltitude: TimeStampedNullableFloat
+  gnssBearing: TimeStampedFloat
+  gnssLocation: VehicleLocation
+  gnssSpeed: TimeStampedFloat
+
+  otaAvailableVersion: TimeStampedString
+  otaAvailableVersionGitHash: TimeStampedString
+  otaAvailableVersionNumber: TimeStampedInt
+  otaAvailableVersionWeek: TimeStampedInt
+  otaAvailableVersionYear: TimeStampedInt
+  otaCurrentStatus: TimeStampedString
+  otaCurrentVersion: TimeStampedString
+  otaCurrentVersionGitHash: TimeStampedString
+  otaCurrentVersionNumber: TimeStampedInt
+  otaCurrentVersionWeek: TimeStampedInt
+  otaCurrentVersionYear: TimeStampedInt
+  otaDownloadProgress: TimeStampedInt
+  otaInstallDuration: TimeStampedInt
+  otaInstallProgress: TimeStampedInt
+  otaInstallReady: TimeStampedString
+  otaInstallTime: TimeStampedInt
+  otaInstallType: TimeStampedString
+  otaStatus: TimeStampedString
+
+  petModeStatus: TimeStampedString
+  petModeTemperatureStatus: TimeStampedString
+
+  powerState: TimeStampedString
+
+  rangeThreshold: TimeStampedString
+
+  remoteChargingAvailable: TimeStampedInt
+
+  seatFrontLeftHeat: TimeStampedString
+  seatFrontLeftVent: TimeStampedString
+  seatFrontRightHeat: TimeStampedString
+  seatFrontRightVent: TimeStampedString
+  seatRearLeftHeat: TimeStampedString
+  seatRearRightHeat: TimeStampedString
+  seatThirdRowLeftHeat: TimeStampedString
+  seatThirdRowRightHeat: TimeStampedString
+
+  serviceMode: TimeStampedString
+
+  steeringWheelHeat: TimeStampedString
+
+  timeToEndOfCharge: TimeStampedFloat
+
+  tirePressureStatusFrontLeft: TimeStampedString
+  tirePressureStatusFrontRight: TimeStampedString
+  tirePressureStatusRearLeft: TimeStampedString
+  tirePressureStatusRearRight: TimeStampedString
+  tirePressureStatusValidFrontLeft: TimeStampedString
+  tirePressureStatusValidFrontRight: TimeStampedString
+  tirePressureStatusValidRearLeft: TimeStampedString
+  tirePressureStatusValidRearRight: TimeStampedString
+
+  trailerStatus: TimeStampedString
+
+  twelveVoltBatteryHealth: TimeStampedString
+
+  vehicleMileage: TimeStampedInt
+
+  windowFrontLeftCalibrated: TimeStampedString
+  windowFrontLeftClosed: TimeStampedString
+  windowFrontRightCalibrated: TimeStampedString
+  windowFrontRightClosed: TimeStampedString
+  windowRearLeftCalibrated: TimeStampedString
+  windowRearLeftClosed: TimeStampedString
+  windowRearRightCalibrated: TimeStampedString
+  windowRearRightClosed: TimeStampedString
+  windowsNextAction: TimeStampedString
+
+  wiperFluidState: TimeStampedString
+
+  supportedFeatures: [SupportedFeature!]!
+}
+
+type WayPoint {
+  waypointType: String!
+  entityId: String
+  name: String
+  latitude: Float!
+  longitude: Float!
+  maxPower: Int
+  chargeDuration: Int
+  arrivalSOC: Int!
+  arrivalReachableDistance: Float!
+  departureSOC: Int!
+  departureReachableDistance: Float!
+}
+
+union ConnectedProduct = CampSpeaker
+union InvitedUser = ProvisionedUser | UnprovisionedUser
+union LoginResponse = MobileLoginResponse | MobileMFALoginResponse

rivian_python_client-1.1.1/src/rivian/schemas/orders.graphql

@@ -0,0 +1,254 @@
+type Query {
+  order(id: String!): Order
+  user: User
+}
+
+enum UserVehicleInviteStateEnum {
+  PENDING
+  COMPLETED
+}
+
+enum OrderSnapshotTypeEnum {
+  PRE_ORDER
+  RETAIL
+  VEHICLE
+}
+
+type Address {
+  id: String!
+  type: [String!]!
+  line1: String!
+  line2: String
+  city: String!
+  state: String!
+  country: String!
+  postalCode: String!
+}
+
+type BankDetails {
+  bankName: String!
+  country: String!
+  last4: String!
+}
+
+type CardDetails {
+  brand: String!
+  last4: String!
+  expiryDate: String!
+}
+
+type ConfiguratorRulesetGroup {
+  name: String
+  attrs: String
+  multiselect: Boolean!
+  required: Boolean!
+  options: [String!]!
+}
+
+type ConfiguratorRulesetOption {
+  name: String
+  attrs: String
+  price: Float!
+  visualExterior: Boolean
+  visualInterior: Boolean
+  hidden: Boolean
+  disabled: Boolean
+  required: Boolean
+}
+
+type Email {
+  email: String!
+}
+
+type Order {
+  id: String!
+  vehicleId: String
+  vin: String
+  state: String!
+  billingAddress: OrderAddress
+  shippingAddress: OrderAddress
+  orderCancelDate: String
+  orderEmail: String
+  currency: String!
+  locale: String!
+  storeId: String!
+  type: String!
+  subtotal: Float!
+  discountTotal: Float!
+  taxTotal: Float!
+  feesTotal: Float!
+  paidTotal: Float!
+  remainingTotal: Float!
+  outstandingBalance: Float!
+  costAfterCredits: Float!
+  total: Float!
+  payments: [OrderPayment!]!
+  tradeIns: [TradeIn!]
+  vehicle: Vehicle
+  items: [OrderItem!]!
+}
+
+type OrderAddress {
+  firstName: String!
+  lastName: String!
+  line1: String!
+  line2: String
+  city: String!
+  state: String!
+  country: String!
+  postalCode: String!
+}
+
+type OrderConfiguration {
+  version: String!
+  basePrice: Float!
+  options: [OrderConfigurationOption!]!
+}
+
+type OrderConfigurationOption {
+  optionId: String!
+  optionName: String!
+  optionDetails: ConfiguratorRulesetOption!
+  groupId: String!
+  groupName: String!
+  groupDetails: ConfiguratorRulesetGroup!
+  price: Float!
+}
+
+type OrderItem {
+  id: String!
+  productId: String!
+  type: String!
+  sku: String!
+  title: String!
+  configuration: OrderConfiguration
+  discounts: [OrderItemDiscount!]
+  subtotal: Float!
+  quantity: Int!
+  unitPrice: Float!
+  fees: [OrderItemFees!]
+  taxes: [OrderItemTaxes!]
+  shippingAddress: OrderItemFulfillmentAddress!
+}
+
+type OrderItemDiscount {
+  total: Float!
+  items: [OrderItemDiscountItem!]
+}
+
+type OrderItemDiscountItem {
+  amount: Float!
+  title: String!
+  code: String!
+}
+
+type OrderItemFeeItem {
+  description: String!
+  amount: Float!
+  code: String!
+  type: String!
+}
+
+type OrderItemFees {
+  items: [OrderItemFeeItem!]!
+  total: Float!
+}
+
+type OrderItemFulfillmentAddress {
+  firstName: String!
+  lastName: String!
+  line1: String!
+  line2: String
+  city: String!
+  state: String!
+  country: String!
+  postalCode: String!
+}
+
+type OrderItemTaxItem {
+  description: String!
+  amount: Float!
+  code: String!
+  rate: Float
+  type: String
+}
+
+type OrderItemTaxes {
+  items: [OrderItemTaxItem!]!
+  total: Float!
+}
+
+type OrderPayment {
+  id: String!
+  intent: String!
+  date: String!
+  method: String!
+  amount: Float!
+  referenceNumber: String
+  status: String!
+  card: CardDetails
+  bank: BankDetails
+  transactionNotes: String!
+}
+
+type OrderSnapshot {
+  id: String!
+  total: Float!
+  paidTotal: Float!
+  subtotal: Float!
+  state: String!
+  configurationStatus: String!
+  currency: String!
+  orderDate: String!
+  type: String!
+  fulfillmentSummaryStatus: String!
+  vehicleId: String
+  vin: String
+  items: [OrderItem!]!
+}
+
+type Phone {
+  formatted: String!
+}
+
+type RivianIdVehicle {
+  id: String!
+  vin: String!
+  highestPriorityRole: String!
+}
+
+type TradeIn {
+  tradeInReferenceId: String!
+  amount: Float!
+}
+
+type User {
+  email: Email!
+  phone: Phone!
+  firstName: String!
+  lastName: String!
+  addresses: [Address!]!
+  newsletterSubscription: Boolean!
+  smsSubscription: Boolean!
+  registrationChannels2FA: String!
+  userId: String!
+  vehicles: [RivianIdVehicle!]!
+  invites(filterStates: [UserVehicleInviteStateEnum!]): [UserVehicleInvite!]!
+  orderSnapshots(filterTypes: [OrderSnapshotTypeEnum!]): [OrderSnapshot!]!
+}
+
+type UserVehicleInvite {
+  id: String!
+  inviteState: String!
+  vehicleModel: String!
+  vehicleId: String!
+  creatorFirstName: String!
+}
+
+type Vehicle {
+  vehicleId: String!
+  vin: String!
+  modelYear: String!
+  model: String!
+  make: String!
+}

{rivian_python_client-1.0.4 → rivian_python_client-1.1.1}/src/rivian/utils.py

@@ -67,6 +67,14 @@ def generate_key_pair() -> tuple[str, str]:
     return (public_key_str, private_key_str)
 
 
+def generate_ble_command_hmac(
+    hmac_data: bytes, vehicle_key: str, private_key: str
+) -> bytes:
+    """Generate ble command hmac."""
+    secret_key = get_secret_key(private_key, vehicle_key)
+    return bytes.fromhex(get_message_signature(secret_key, hmac_data))
+
+
 def generate_vehicle_command_hmac(
     command: str, timestamp: str, vehicle_key: str, private_key: str
 ):