rivian-python-client 2.2.0b2__tar.gz → 2.2.0b4__tar.gz

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rivian-python-client
-Version: 2.2.0b2
+Version: 2.2.0b4
 Summary: Rivian API Client (Unofficial)
 Author-email: Brian Retterer <bretterer@gmail.com>, "J.R. Gutierrez" <jrgutier@gmail.com>, Nathan Spencer <natekspencer@gmail.com>, Trevor Mack <drummer8001@gmail.com>
 License-Expression: MIT

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/__version__.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '2.2.0b2'
+__version__ = VERSION = '2.2.0b4'

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/body.py

@@ -196,7 +196,7 @@ def decode_wiper_fluid_level(m: body_pb2.WiperFluidLevel) -> dict[str, Any]:
     """body.wipers.fluid_level — washer fluid level.
 
     Fields:
-        _wiperFluidLevel: int — raw (1 so far, presumably normal)
+        _wiperFluidLevel: int — raw
     """
     if (v := _present(m, "field_2")) is None:
         return {}

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/charging.py

@@ -219,20 +219,30 @@ _CHARGER_STATUS_MAP: Final[dict[int, str]] = {
 
 @RVMDecoder.register("charging.energy.state", charging_pb2.EnergyState)
 def decode_energy_state(m: charging_pb2.EnergyState) -> dict[str, Any]:
-    """charging.energy.state — charger connection status.
+    """charging.energy.state — charger connection and charging state.
 
     Fields:
         chargerStatus: str — GraphQL chargerStatus values
             ("chrgr_sts_not_connected" | "chrgr_sts_connected_no_chrg" |
             "chrgr_sts_connected_charging"); inferred
-        _field1, _field3, _field11: int — raw
+        chargerState, connectionState: str | None — as in
+            charging.session.status
+        _field3: int — raw
     """
-    result: dict[str, Any] = {}
+    result: dict[str, Any] = {
+        "chargerState": _enum(
+            _CHARGING_STATE_MAP, m.charging_state or None, what="charging state"
+        ),
+        "connectionState": _enum(
+            _CONNECTION_STATE_MAP,
+            m.connection_state or None,
+            what="charging connection state",
+        ),
+    }
     if (v := _present(m, "charger_status")) is not None:
         result["chargerStatus"] = _enum(_CHARGER_STATUS_MAP, v, what="charger status")
-    for num in (1, 3, 11):
-        if (v := _present(m, f"field_{num}")) is not None:
-            result[f"_field{num}"] = v
+    if (v := _present(m, "field_3")) is not None:
+        result["_field3"] = v
     return result
 
 

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/comfort.py

@@ -17,9 +17,7 @@ def decode_hvac_settings_status(m: comfort_pb2.HvacSettingsStatus) -> dict[str,
     Fields:
         hvacTargetTemperature: float (°C; 63.5 = "HI", set while defrosting)
     """
-    if (v := _present(m, "target_temperature")) is None:
-        return {}
-    return {"hvacTargetTemperature": round(v, 1)}
+    return {"hvacTargetTemperature": round(m.target_temperature, 1)}
 
 
 @RVMDecoder.register("comfort.user_modes.state", comfort_pb2.UserModesState)
@@ -132,12 +130,10 @@ def decode_cabin_temperatures(m: comfort_pb2.CabinTemperatures) -> dict[str, Any
         cabinClimateDriverTemperature: float (°C) — set point, same as
             `hvacTargetTemperature`
     """
-    result: dict[str, Any] = {}
-    if (v := _present(m, "interior_temperature")) is not None:
-        result["cabinClimateInteriorTemperature"] = round(v, 1)
-    if (v := _present(m, "driver_set_point")) is not None:
-        result["cabinClimateDriverTemperature"] = round(v, 1)
-    return result
+    return {
+        "cabinClimateInteriorTemperature": round(m.interior_temperature, 1),
+        "cabinClimateDriverTemperature": round(m.driver_set_point, 1),
+    }
 
 
 @RVMDecoder.register(
@@ -146,24 +142,20 @@ def decode_cabin_temperatures(m: comfort_pb2.CabinTemperatures) -> dict[str, Any
 def decode_cabin_ventilation(m: comfort_pb2.CabinVentilationSetting) -> dict[str, Any]:
     """comfort.cabin.cabin_ventilation_setting — passive ventilation settings.
 
-    Fields (each only when sent):
+    Fields:
         cabinVentilationEnabled: bool
-        cabinVentilationMode: str ("AUTO" | "MANUAL" | "OFF")
+        cabinVentilationMode: str | None ("AUTO" | "MANUAL" | "OFF")
         cabinVentilationWindowsPosition: int (percent open)
         cabinVentilationSunroofPosition: int (percent open)
         cabinVentilationDuration: int (minutes)
     """
-    result: dict[str, Any] = {}
-    for field, key in (
-        ("enabled", "cabinVentilationEnabled"),
-        ("mode", "cabinVentilationMode"),
-        ("windows_position", "cabinVentilationWindowsPosition"),
-        ("sunroof_position", "cabinVentilationSunroofPosition"),
-        ("duration", "cabinVentilationDuration"),
-    ):
-        if (v := _present(m, field)) is not None:
-            result[key] = v
-    return result
+    return {
+        "cabinVentilationEnabled": m.enabled,
+        "cabinVentilationMode": m.mode or None,
+        "cabinVentilationWindowsPosition": m.windows_position,
+        "cabinVentilationSunroofPosition": m.sunroof_position,
+        "cabinVentilationDuration": m.duration,
+    }
 
 
 @RVMDecoder.register(
@@ -185,29 +177,26 @@ def decode_climate_hold_status(m: comfort_pb2.ClimateHoldStatus) -> dict[str, An
     Fields:
         climateHoldStatus: str ("off" | "on" | "unavailable" | "fault" | "unspecified")
         climateHoldAvailability: str
-        climateHoldUnavailabilityReason: str (only when not "unspecified")
-        climateHoldEndTime: int (epoch seconds, only while a hold runs)
+        climateHoldUnavailabilityReason: str | None — None when unspecified
+        climateHoldEndTime: int | None (epoch seconds; None unless a hold runs)
     """
-    result: dict[str, Any] = {}
-    if (val := _present(m, "status")) is not None:
-        result["climateHoldStatus"] = _enum(
-            _CLIMATE_HOLD_STATUS_MAP, val, what="climate hold status"
-        )
-    if (val := _present(m, "availability")) is not None:
-        result["climateHoldAvailability"] = _enum(
-            _CLIMATE_HOLD_AVAILABILITY_MAP, val, what="climate hold availability"
-        )
-    if (val := _present(m, "unavailability_reason")) is not None:
-        reason = _enum(
-            _CLIMATE_HOLD_UNAVAILABILITY_REASON_MAP,
-            val,
-            what="climate hold unavailability reason",
-        )
-        if reason != "unspecified":
-            result["climateHoldUnavailabilityReason"] = reason
-    if m.end_time.seconds:
-        result["climateHoldEndTime"] = m.end_time.seconds
-    return result
+    reason = _enum(
+        _CLIMATE_HOLD_UNAVAILABILITY_REASON_MAP,
+        m.unavailability_reason,
+        what="climate hold unavailability reason",
+    )
+    return {
+        "climateHoldStatus": _enum(
+            _CLIMATE_HOLD_STATUS_MAP, m.status, what="climate hold status"
+        ),
+        "climateHoldAvailability": _enum(
+            _CLIMATE_HOLD_AVAILABILITY_MAP,
+            m.availability,
+            what="climate hold availability",
+        ),
+        "climateHoldUnavailabilityReason": None if reason == "unspecified" else reason,
+        "climateHoldEndTime": m.end_time.seconds or None,
+    }
 
 
 @RVMDecoder.register(
@@ -259,13 +248,12 @@ def decode_seat_conditioning(m: comfort_pb2.SeatConditioningStatus) -> dict[str,
         plus <surface>Heat/Vent for any other surface sent (middle seats,
         rearGlass, frontGlass, sideviewMirrors, wiperArea)
 
-    Entries without a state are skipped.
+    A surface sent without a state is off.
     """
     result: dict[str, Any] = {}
     for surface in m.surface:
         surface_id, hvac_type = surface.id, surface.type
-        if (state_val := _present(surface, "state")) is None:
-            continue
+        state_val = _present(surface, "state")
         if surface_id in _CABIN_SURFACE_MAP and hvac_type in _CONDITIONING_TYPE_MAP:
             key = f"{_CABIN_SURFACE_MAP[surface_id]}{_CONDITIONING_TYPE_MAP[hvac_type]}"
             result[key] = _CONDITIONING_LEVEL_MAP.get(state_val, state_val)

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/device_table.py

@@ -45,7 +45,7 @@ def decode_vas_keyper_devices(m: device_table_pb2.VasKeyperDevices) -> dict[str,
             deleted keys
         infoC: int — 1 while active, 2147483647 while inactive, else the
             pairing attempt number
-        infoA, infoB: int — unknown; always equal
+        infoA, infoB: int — unknown
         deviceId: str — hex; for a key card, the GraphQL `devices[].id`
         phoneId: str — the phone's UUID; phone keys
         credentialHex: str — hex; likely key material

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/dynamics.py

@@ -71,8 +71,8 @@ def decode_drive_mode(m: dynamics_pb2.DriveMode) -> dict[str, Any]:
     """
     return {
         "driveMode": _enum(_DRIVE_MODE_MAP, _present(m, "mode"), what="drive mode"),
-        "limitedAccelCold": _present(m, "limited_accel_cold"),
-        "limitedRegenCold": _present(m, "limited_regen_cold"),
+        "limitedAccelCold": m.limited_accel_cold,
+        "limitedRegenCold": m.limited_regen_cold,
     }
 
 
@@ -83,12 +83,12 @@ def decode_gear(m: dynamics_pb2.Gear) -> dict[str, Any]:
     Fields:
         gearStatus: str
     """
-    return {"gearStatus": _enum(_GEAR_MAP, _present(m, "gear"), what="gear")}
+    return {"gearStatus": _enum(_GEAR_MAP, m.gear, what="gear")}
 
 
 @RVMDecoder.register("dynamics.vehicle.gnss", dynamics_pb2.Gnss)
 def decode_gnss(m: dynamics_pb2.Gnss) -> dict[str, Any]:
-    """dynamics.vehicle.gnss — GPS position, altitude and bearing.
+    """dynamics.vehicle.gnss — GPS position, altitude, bearing and speed.
 
     Fields:
         gnssTimeStamp: datetime — time of the fix
@@ -96,30 +96,32 @@ def decode_gnss(m: dynamics_pb2.Gnss) -> dict[str, Any]:
             (the gateway's VehicleLocation shape)
         gnssAltitude: float (meters)
         gnssBearing: float (degrees)
+        gnssSpeed: float (m/s)
+        gnssError: {"timeStamp": datetime, "positionVertical": float (m),
+            "positionHorizontal": float (m), "speed": float (m/s),
+            "bearing": float} (the gateway's gnssError shape)
     """
-    lat = _present(m, "latitude")
-    lon = _present(m, "longitude")
-    alt = _present(m, "altitude")
-    bearing = _present(m, "bearing")
-    epoch = _present(m, "time")
-    fix_time = from_epoch(epoch) if epoch is not None else None
-
-    result: dict[str, Any] = {}
-    if fix_time is not None:
-        result["gnssTimeStamp"] = fix_time
-    if lat is not None and lon is not None:
-        location: dict[str, Any] = {
-            "latitude": round(lat, 6),
-            "longitude": round(lon, 6),
-        }
-        if fix_time is not None:
-            location["timeStamp"] = fix_time
-        result["gnssLocation"] = location
-    if alt is not None:
-        result["gnssAltitude"] = round(alt, 1)
-    if bearing is not None:
-        result["gnssBearing"] = round(bearing, 1)
-    return result
+    if not m.ByteSize():
+        return {}
+    fix_time = from_epoch(m.time)
+    return {
+        "gnssTimeStamp": fix_time,
+        "gnssLocation": {
+            "latitude": round(m.latitude, 6),
+            "longitude": round(m.longitude, 6),
+            "timeStamp": fix_time,
+        },
+        "gnssAltitude": round(m.altitude, 1),
+        "gnssBearing": round(m.bearing, 1),
+        "gnssSpeed": round(m.speed, 2),
+        "gnssError": {
+            "timeStamp": fix_time,
+            "positionVertical": round(m.position_vertical_error, 1),
+            "positionHorizontal": round(m.position_horizontal_error, 1),
+            "speed": round(m.speed_error, 1),
+            "bearing": round(m.bearing_error, 1),
+        },
+    }
 
 
 @RVMDecoder.register("dynamics.vehicle.location", dynamics_pb2.KnownLocation)
@@ -158,7 +160,7 @@ def decode_range(m: dynamics_pb2.Range) -> dict[str, Any]:
         coldRangeNotification: str
     """
     return {
-        "distanceToEmpty": _present(m, "distance_to_empty"),
+        "distanceToEmpty": m.distance_to_empty,
         "rangeThreshold": _enum(
             _RANGE_THRESHOLD_MAP, _present(m, "threshold"), what="range threshold"
         ),
@@ -238,7 +240,7 @@ def decode_brake_fluid_level(m: dynamics_pb2.BrakeFluidLevel) -> dict[str, Any]:
     """dynamics.brakes.fluid_level — brake fluid level.
 
     Fields:
-        _brakeFluidLevel: int — raw (1 so far, presumably normal)
+        _brakeFluidLevel: int — raw
     """
     if (v := _present(m, "field_1")) is None:
         return {}

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/energy.py

@@ -50,26 +50,21 @@ def decode_battery_state(m: energy_pb2.BatteryState) -> dict[str, Any]:
         batteryLevel: float (percent)
         batteryCapacity: float (kWh)
         range: float (km, if present)
-        batteryTempMin, batteryTempMid, batteryTempMax: float (°C, if present)
+        batteryTempMin, batteryTempMid, batteryTempMax: float (°C)
         _bmsStateRaw: int — 4 idle, 5 discharging, 6 charging, others unnamed
     """
     result: dict[str, Any] = {}
     if m.HasField("charge_state"):
         charge_state = m.charge_state
-        if (v := _present(charge_state, "soc")) is not None:
-            result["batteryLevel"] = round(v, 2)
-        if (v := _present(charge_state, "pack_energy")) is not None:
-            result["batteryCapacity"] = round(v, 2)
+        result["batteryLevel"] = round(charge_state.soc, 2)
+        result["batteryCapacity"] = round(charge_state.pack_energy, 2)
         if (v := _present(charge_state, "range")) is not None:
             result["range"] = round(v, 1)
     if m.HasField("temperatures"):
         temps = m.temperatures
-        if (v := _present(temps, "min")) is not None:
-            result["batteryTempMin"] = round(v, 1)
-        if (v := _present(temps, "mid")) is not None:
-            result["batteryTempMid"] = round(v, 1)
-        if (v := _present(temps, "max")) is not None:
-            result["batteryTempMax"] = round(v, 1)
+        result["batteryTempMin"] = round(temps.min, 1)
+        result["batteryTempMid"] = round(temps.mid, 1)
+        result["batteryTempMax"] = round(temps.max, 1)
     if (v := _present(m, "bms_state_raw")) is not None:
         result["_bmsStateRaw"] = v
     return result

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/energy_edge_compute.py

@@ -70,14 +70,12 @@ def decode_parked_energy_distributions(
         if not m.HasField(field):
             continue
         distribution = getattr(m, field)
-        window: dict[str, float] = {}
-        for measure, measure_key in _ENERGY_DISTRIBUTION_MAP.items():
-            if (v := _present(distribution, measure)) is not None:
-                window[measure_key] = round(v, 4)
-        if (v := _present(distribution, "duration")) is not None:
-            window["duration"] = v
-        if window:
-            result[key] = window
+        window: dict[str, float] = {
+            measure_key: round(getattr(distribution, measure), 4)
+            for measure, measure_key in _ENERGY_DISTRIBUTION_MAP.items()
+        }
+        window["duration"] = distribution.duration
+        result[key] = window
     return result
 
 

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/holiday_celebration.py

@@ -45,9 +45,7 @@ def decode_car_costume_state(
     Fields:
         costumeId: int (0 = none; other ids unmapped)
     """
-    if (v := _present(m, "costume_id")) is None:
-        return {}
-    return {"costumeId": v}
+    return {"costumeId": m.costume_id}
 
 
 # Wrapped HalloweenCelebrationSettings field -> result key.
@@ -74,7 +72,7 @@ def decode_halloween_celebration_settings(
 ) -> dict[str, Any]:
     """holiday_celebration.mobile_vehicle_settings.halloween_celebration_settings.
 
-    Names come from the app; most fields have only been sent empty.
+    Names come from the app.
 
     Fields (each only when set):
         halloweenCostumeTheme: str

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/navigation.py

@@ -60,8 +60,7 @@ def _decode_origin(origin: TripInfo.Origin) -> dict[str, Any]:
     result = _decode_geocoordinate(
         _present(origin, "location"), "originLatitude", "originLongitude"
     )
-    if (v := _present(origin, "heading")) is not None:
-        result["originHeading"] = v
+    result["originHeading"] = origin.heading
     if (origin_epoch := _present(origin, "time")) is not None:
         result["originTime"] = from_epoch(origin_epoch)
     return result
@@ -93,11 +92,11 @@ def _decode_place(place: TripInfo.Place) -> dict[str, Any]:
                 ("place_type", "placeType"),
                 ("name", "name"),
                 ("place_id", "placeId"),
-                ("soc", "stateOfCharge"),
-                ("range", "rangeRemaining"),
             ),
         )
     )
+    entry["stateOfCharge"] = place.soc
+    entry["rangeRemaining"] = place.range
     if (arrival := _decode_timestamp(_present(place, "arrival"))) is not None:
         entry["arrivalTime"] = arrival
     return entry
@@ -170,17 +169,12 @@ def _decode_categorized_ranges(leg: TripInfo.Leg) -> list[dict[str, Any]]:
 
 def _decode_leg(leg: TripInfo.Leg) -> dict[str, Any]:
     """Decode one route leg."""
-    entry = _copy_present(
-        leg,
-        (
-            ("distance", "distance"),
-            ("duration", "duration"),
-            ("road_label", "roadLabel"),
-            ("polyline", "polyline"),
-        ),
+    entry: dict[str, Any] = {"distance": leg.distance, "duration": leg.duration}
+    entry.update(
+        _copy_present(leg, (("road_label", "roadLabel"), ("polyline", "polyline")))
     )
-    if leg.HasField("energy") and (v := _present(leg.energy, "kwh")) is not None:
-        entry["energyUsed"] = v
+    if leg.HasField("energy"):
+        entry["energyUsed"] = leg.energy.kwh
     # flagged/unflagged_ranges_packed duplicate the index ranges.
     if index_ranges := _decode_index_ranges(leg):
         entry["indexRangeSegments"] = index_ranges
@@ -307,29 +301,15 @@ def decode_trip_progress(m: navigation_pb2.TripProgress) -> dict[str, Any]:
         result["nextWaypointArrivalTime"] = eta
     if (eta := _decode_timestamp(_present(m, "final_destination"))) is not None:
         result["finalDestinationArrivalTime"] = eta
-    result.update(
-        _copy_present(
-            m,
-            (
-                ("distance_remaining", "distanceRemaining"),
-                ("duration_remaining", "durationRemaining"),
-            ),
-        )
-    )
+    result["distanceRemaining"] = m.distance_remaining
+    result["durationRemaining"] = m.duration_remaining
     if m.HasField("location_fix"):
         fix = m.location_fix
         result.update(
             _decode_geocoordinate(_present(fix, "location"), "latitude", "longitude")
         )
-        result.update(
-            _copy_present(
-                fix,
-                (
-                    ("speed", "speed"),
-                    ("heading", "heading"),
-                ),
-            )
-        )
+        result["speed"] = fix.speed
+        result["heading"] = fix.heading
         if (fix_epoch := _present(fix, "time")) is not None:
             result["locationTime"] = from_epoch(fix_epoch)
     return result

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/ota.py

@@ -110,13 +110,10 @@ def decode_deployment_state(m: ota_pb2.DeploymentState) -> dict[str, Any]:
         and (v := _present(progress.install_progress, "field_2")) is not None
     ):
         result["otaInstallProgress"] = v
-    for field, key in (
-        ("time_remaining", "otaTimeRemaining"),
-        ("update_cycle_count", "otaUpdateCycleCount"),
-        ("field_9", "_otaProgressField9"),
-    ):
-        if (v := _present(progress, field)) is not None:
-            result[key] = v
+    result["otaTimeRemaining"] = progress.time_remaining
+    result["otaUpdateCycleCount"] = progress.update_cycle_count
+    if (v := _present(progress, "field_9")) is not None:
+        result["_otaProgressField9"] = v
     return result
 
 

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/proto/body.proto

@@ -100,7 +100,7 @@ enum LockFault {
 // body.trailer.state
 message TrailerState {
   optional TrailerPresence presence = 1;
-  int32 field_2 = 2; // unknown; constant
+  int32 field_2 = 2; // unknown
 }
 
 enum ClosureFault {
@@ -218,5 +218,5 @@ enum WindowsNextAction {
 
 // body.wipers.fluid_level
 message WiperFluidLevel {
-  optional int32 field_2 = 2; // unknown; 1 so far
+  optional int32 field_2 = 2; // unknown
 }

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/proto/charging.proto

@@ -123,12 +123,13 @@ message TimeEstimation {
 }
 
 // charging.energy.state
+// The states match charging.session.status, give or take a message.
 message EnergyState {
-  optional int32 field_1 = 1; // inferred: ChargingState (1 ready ... 4 complete)
+  ChargingState charging_state = 1;
   optional ChargerStatus charger_status = 2; // inferred
-  optional int32 field_3 = 3; // unknown; 1 so far
-  string field_10 = 10; // always empty so far
-  optional int32 field_11 = 11; // unknown; 1 or 2
+  optional int32 field_3 = 3; // unknown
+  string field_10 = 10; // unknown
+  ConnectionState connection_state = 11;
 }
 
 enum ChargerStatus {
@@ -140,5 +141,5 @@ enum ChargerStatus {
 
 // charging.session.power -- live charging power; empty when not charging.
 message SessionPower {
-  optional float power = 1; // kW
+  float power = 1; // kW
 }

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/proto/charging_pb2.py

@@ -24,21 +24,21 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$rivian/parallax/proto/charging.proto\x12\x18rivian.parallax.charging\"\xe8\x04\n\x12ScheduleTimeWindow\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x43\n\x06window\x18\x02 \x01(\x0b\x32\x33.rivian.parallax.charging.ScheduleTimeWindow.Window\x1a\xbe\x02\n\x06Window\x12\x12\n\nstart_time\x18\x01 \x01(\x05\x12\x10\n\x08\x65nd_time\x18\x02 \x01(\x05\x12\x10\n\x08\x64uration\x18\x03 \x01(\x05\x12\x11\n\x04\x61mps\x18\x04 \x01(\x05H\x00\x88\x01\x01\x12L\n\x08location\x18\x05 \x01(\x0b\x32:.rivian.parallax.charging.ScheduleTimeWindow.GeoCoordinate\x12I\n\tstart_day\x18\x06 \x01(\x0e\x32\x36.rivian.parallax.charging.ScheduleTimeWindow.DayOfWeek\x12G\n\x07\x65nd_day\x18\x07 \x01(\x0e\x32\x36.rivian.parallax.charging.ScheduleTimeWindow.DayOfWeekB\x07\n\x05_amps\x1a\x34\n\rGeoCoordinate\x12\x10\n\x08latitude\x18\x01 \x01(\x01\x12\x11\n\tlongitude\x18\x02 \x01(\x01\"\x84\x01\n\tDayOfWeek\x12\x1b\n\x17\x44\x41Y_OF_WEEK_UNSPECIFIED\x10\x00\x12\n\n\x06SUNDAY\x10\x01\x12\n\n\x06MONDAY\x10\x02\x12\x0b\n\x07TUESDAY\x10\x03\x12\r\n\tWEDNESDAY\x10\x04\x12\x0c\n\x08THURSDAY\x10\x05\x12\n\n\x06\x46RIDAY\x10\x06\x12\x0c\n\x08SATURDAY\x10\x07\"5\n\x13SessionNotification\x12\x13\n\x06\x66ield1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x42\t\n\x07_field1\"a\n\x14SessionRemoteCommand\x12=\n\x07\x63ommand\x18\x01 \x01(\x0e\x32\'.rivian.parallax.charging.RemoteCommandH\x00\x88\x01\x01\x42\n\n\x08_command\"1\n\tSocSlider\x12\x16\n\tsoc_limit\x18\x01 \x01(\x05H\x00\x88\x01\x01\x42\x0c\n\n_soc_limit\",\n\nTripTarget\x12\x13\n\x06\x66ield2\x18\x02 \x01(\x05H\x00\x88\x01\x01\x42\t\n\x07_field2\"\x17\n\x15SmartChargingSettings\"\x13\n\x11SmartChargingInfo\"\x1a\n\x18WeightedChargingForecast\"\xda\x01\n\rSessionStatus\x12H\n\x10\x63onnection_state\x18\x01 \x01(\x0e\x32).rivian.parallax.charging.ConnectionStateH\x00\x88\x01\x01\x12\x44\n\x0e\x63harging_state\x18\x02 \x01(\x0e\x32\'.rivian.parallax.charging.ChargingStateH\x01\x88\x01\x01\x12\x11\n\tis_active\x18\x03 \x01(\x08\x42\x13\n\x11_connection_stateB\x11\n\x0f_charging_state\"2\n\x0eTimeEstimation\x12 \n\x18\x65stimated_time_remaining\x18\x02 \x01(\x05\"\xe0\x01\n\x0b\x45nergyState\x12\x14\n\x07\x66ield_1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x44\n\x0e\x63harger_status\x18\x02 \x01(\x0e\x32\'.rivian.parallax.charging.ChargerStatusH\x01\x88\x01\x01\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x02\x88\x01\x01\x12\x10\n\x08\x66ield_10\x18\n \x01(\t\x12\x15\n\x08\x66ield_11\x18\x0b \x01(\x05H\x03\x88\x01\x01\x42\n\n\x08_field_1B\x11\n\x0f_charger_statusB\n\n\x08_field_3B\x0b\n\t_field_11\",\n\x0cSessionPower\x12\x12\n\x05power\x18\x01 \x01(\x02H\x00\x88\x01\x01\x42\x08\n\x06_power*b\n\rRemoteCommand\x12\x1e\n\x1aREMOTE_COMMAND_UNSPECIFIED\x10\x00\x12\x18\n\x14REMOTE_COMMAND_START\x10\x01\x12\x17\n\x13REMOTE_COMMAND_STOP\x10\x02*v\n\x0f\x43onnectionState\x12 \n\x1c\x43ONNECTION_STATE_UNSPECIFIED\x10\x00\x12!\n\x1d\x43ONNECTION_STATE_DISCONNECTED\x10\x01\x12\x1e\n\x1a\x43ONNECTION_STATE_CONNECTED\x10\x02*\xfc\x05\n\rChargingState\x12\x1e\n\x1a\x43HARGING_STATE_UNSPECIFIED\x10\x00\x12\x12\n\x0e\x43HARGING_READY\x10\x01\x12\x17\n\x13\x43HARGING_CONNECTING\x10\x02\x12\x13\n\x0f\x43HARGING_ACTIVE\x10\x03\x12\x15\n\x11\x43HARGING_COMPLETE\x10\x04\x12\x16\n\x12\x43HARGING_SCHEDULED\x10\x05\x12\x1a\n\x16\x43HARGING_VEHICLE_ERROR\x10\x06\x12\x1a\n\x16\x43HARGING_STATION_ERROR\x10\x07\x12\x19\n\x15\x43HARGING_USER_STOPPED\x10\x08\x12\x1c\n\x18\x43HARGING_STATION_STOPPED\x10\t\x12\x1a\n\x16\x43HARGING_PAYMENT_ERROR\x10\n\x12\x17\n\x13\x43HARGING_CERT_ERROR\x10\x0b\x12\x16\n\x12\x43HARGING_TLS_ERROR\x10\x0c\x12(\n$CHARGING_ERROR_AC_ADAPTER_USED_ON_DC\x10\r\x12(\n$CHARGING_ERROR_DC_ADAPTER_USED_ON_AC\x10\x0e\x12\'\n#CHARGING_ERROR_INCOMPATIBLE_CHARGER\x10\x0f\x12\x1c\n\x18\x43HARGING_SD_COMPENSATION\x10\x10\x12\x16\n\x12WAITING_ON_CHARGER\x10\x11\x12%\n!CHARGER_NOT_READY_OR_INCOMPATIBLE\x10\x12\x12\x1c\n\x18\x43HARGING_VEHICLE_STOPPED\x10\x13\x12+\n\'CHARGING_PAYMENT_ERROR_START_RIVIAN_APP\x10\x14\x12&\n\"CHARGING_TLS_ERROR_UNKNOWN_CHARGER\x10\x15\x12&\n\"CHARGING_TLS_ERROR_UNEXPECTED_FAIL\x10\x16\x12\'\n#CHARGING_TLS_ERROR_START_RIVIAN_APP\x10\x17*\xa0\x01\n\rChargerStatus\x12\x1e\n\x1a\x43HARGER_STATUS_UNSPECIFIED\x10\x00\x12 \n\x1c\x43HARGER_STATUS_NOT_CONNECTED\x10\x01\x12&\n\"CHARGER_STATUS_CONNECTED_NO_CHARGE\x10\x02\x12%\n!CHARGER_STATUS_CONNECTED_CHARGING\x10\x03\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$rivian/parallax/proto/charging.proto\x12\x18rivian.parallax.charging\"\xe8\x04\n\x12ScheduleTimeWindow\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x43\n\x06window\x18\x02 \x01(\x0b\x32\x33.rivian.parallax.charging.ScheduleTimeWindow.Window\x1a\xbe\x02\n\x06Window\x12\x12\n\nstart_time\x18\x01 \x01(\x05\x12\x10\n\x08\x65nd_time\x18\x02 \x01(\x05\x12\x10\n\x08\x64uration\x18\x03 \x01(\x05\x12\x11\n\x04\x61mps\x18\x04 \x01(\x05H\x00\x88\x01\x01\x12L\n\x08location\x18\x05 \x01(\x0b\x32:.rivian.parallax.charging.ScheduleTimeWindow.GeoCoordinate\x12I\n\tstart_day\x18\x06 \x01(\x0e\x32\x36.rivian.parallax.charging.ScheduleTimeWindow.DayOfWeek\x12G\n\x07\x65nd_day\x18\x07 \x01(\x0e\x32\x36.rivian.parallax.charging.ScheduleTimeWindow.DayOfWeekB\x07\n\x05_amps\x1a\x34\n\rGeoCoordinate\x12\x10\n\x08latitude\x18\x01 \x01(\x01\x12\x11\n\tlongitude\x18\x02 \x01(\x01\"\x84\x01\n\tDayOfWeek\x12\x1b\n\x17\x44\x41Y_OF_WEEK_UNSPECIFIED\x10\x00\x12\n\n\x06SUNDAY\x10\x01\x12\n\n\x06MONDAY\x10\x02\x12\x0b\n\x07TUESDAY\x10\x03\x12\r\n\tWEDNESDAY\x10\x04\x12\x0c\n\x08THURSDAY\x10\x05\x12\n\n\x06\x46RIDAY\x10\x06\x12\x0c\n\x08SATURDAY\x10\x07\"5\n\x13SessionNotification\x12\x13\n\x06\x66ield1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x42\t\n\x07_field1\"a\n\x14SessionRemoteCommand\x12=\n\x07\x63ommand\x18\x01 \x01(\x0e\x32\'.rivian.parallax.charging.RemoteCommandH\x00\x88\x01\x01\x42\n\n\x08_command\"1\n\tSocSlider\x12\x16\n\tsoc_limit\x18\x01 \x01(\x05H\x00\x88\x01\x01\x42\x0c\n\n_soc_limit\",\n\nTripTarget\x12\x13\n\x06\x66ield2\x18\x02 \x01(\x05H\x00\x88\x01\x01\x42\t\n\x07_field2\"\x17\n\x15SmartChargingSettings\"\x13\n\x11SmartChargingInfo\"\x1a\n\x18WeightedChargingForecast\"\xda\x01\n\rSessionStatus\x12H\n\x10\x63onnection_state\x18\x01 \x01(\x0e\x32).rivian.parallax.charging.ConnectionStateH\x00\x88\x01\x01\x12\x44\n\x0e\x63harging_state\x18\x02 \x01(\x0e\x32\'.rivian.parallax.charging.ChargingStateH\x01\x88\x01\x01\x12\x11\n\tis_active\x18\x03 \x01(\x08\x42\x13\n\x11_connection_stateB\x11\n\x0f_charging_state\"2\n\x0eTimeEstimation\x12 \n\x18\x65stimated_time_remaining\x18\x02 \x01(\x05\"\xa0\x02\n\x0b\x45nergyState\x12?\n\x0e\x63harging_state\x18\x01 \x01(\x0e\x32\'.rivian.parallax.charging.ChargingState\x12\x44\n\x0e\x63harger_status\x18\x02 \x01(\x0e\x32\'.rivian.parallax.charging.ChargerStatusH\x00\x88\x01\x01\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12\x10\n\x08\x66ield_10\x18\n \x01(\t\x12\x43\n\x10\x63onnection_state\x18\x0b \x01(\x0e\x32).rivian.parallax.charging.ConnectionStateB\x11\n\x0f_charger_statusB\n\n\x08_field_3\"\x1d\n\x0cSessionPower\x12\r\n\x05power\x18\x01 \x01(\x02*b\n\rRemoteCommand\x12\x1e\n\x1aREMOTE_COMMAND_UNSPECIFIED\x10\x00\x12\x18\n\x14REMOTE_COMMAND_START\x10\x01\x12\x17\n\x13REMOTE_COMMAND_STOP\x10\x02*v\n\x0f\x43onnectionState\x12 \n\x1c\x43ONNECTION_STATE_UNSPECIFIED\x10\x00\x12!\n\x1d\x43ONNECTION_STATE_DISCONNECTED\x10\x01\x12\x1e\n\x1a\x43ONNECTION_STATE_CONNECTED\x10\x02*\xfc\x05\n\rChargingState\x12\x1e\n\x1a\x43HARGING_STATE_UNSPECIFIED\x10\x00\x12\x12\n\x0e\x43HARGING_READY\x10\x01\x12\x17\n\x13\x43HARGING_CONNECTING\x10\x02\x12\x13\n\x0f\x43HARGING_ACTIVE\x10\x03\x12\x15\n\x11\x43HARGING_COMPLETE\x10\x04\x12\x16\n\x12\x43HARGING_SCHEDULED\x10\x05\x12\x1a\n\x16\x43HARGING_VEHICLE_ERROR\x10\x06\x12\x1a\n\x16\x43HARGING_STATION_ERROR\x10\x07\x12\x19\n\x15\x43HARGING_USER_STOPPED\x10\x08\x12\x1c\n\x18\x43HARGING_STATION_STOPPED\x10\t\x12\x1a\n\x16\x43HARGING_PAYMENT_ERROR\x10\n\x12\x17\n\x13\x43HARGING_CERT_ERROR\x10\x0b\x12\x16\n\x12\x43HARGING_TLS_ERROR\x10\x0c\x12(\n$CHARGING_ERROR_AC_ADAPTER_USED_ON_DC\x10\r\x12(\n$CHARGING_ERROR_DC_ADAPTER_USED_ON_AC\x10\x0e\x12\'\n#CHARGING_ERROR_INCOMPATIBLE_CHARGER\x10\x0f\x12\x1c\n\x18\x43HARGING_SD_COMPENSATION\x10\x10\x12\x16\n\x12WAITING_ON_CHARGER\x10\x11\x12%\n!CHARGER_NOT_READY_OR_INCOMPATIBLE\x10\x12\x12\x1c\n\x18\x43HARGING_VEHICLE_STOPPED\x10\x13\x12+\n\'CHARGING_PAYMENT_ERROR_START_RIVIAN_APP\x10\x14\x12&\n\"CHARGING_TLS_ERROR_UNKNOWN_CHARGER\x10\x15\x12&\n\"CHARGING_TLS_ERROR_UNEXPECTED_FAIL\x10\x16\x12\'\n#CHARGING_TLS_ERROR_START_RIVIAN_APP\x10\x17*\xa0\x01\n\rChargerStatus\x12\x1e\n\x1a\x43HARGER_STATUS_UNSPECIFIED\x10\x00\x12 \n\x1c\x43HARGER_STATUS_NOT_CONNECTED\x10\x01\x12&\n\"CHARGER_STATUS_CONNECTED_NO_CHARGE\x10\x02\x12%\n!CHARGER_STATUS_CONNECTED_CHARGING\x10\x03\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'rivian.parallax.proto.charging_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   DESCRIPTOR._loaded_options = None
-  _globals['_REMOTECOMMAND']._serialized_start=1556
-  _globals['_REMOTECOMMAND']._serialized_end=1654
-  _globals['_CONNECTIONSTATE']._serialized_start=1656
-  _globals['_CONNECTIONSTATE']._serialized_end=1774
-  _globals['_CHARGINGSTATE']._serialized_start=1777
-  _globals['_CHARGINGSTATE']._serialized_end=2541
-  _globals['_CHARGERSTATUS']._serialized_start=2544
-  _globals['_CHARGERSTATUS']._serialized_end=2704
+  _globals['_REMOTECOMMAND']._serialized_start=1605
+  _globals['_REMOTECOMMAND']._serialized_end=1703
+  _globals['_CONNECTIONSTATE']._serialized_start=1705
+  _globals['_CONNECTIONSTATE']._serialized_end=1823
+  _globals['_CHARGINGSTATE']._serialized_start=1826
+  _globals['_CHARGINGSTATE']._serialized_end=2590
+  _globals['_CHARGERSTATUS']._serialized_start=2593
+  _globals['_CHARGERSTATUS']._serialized_end=2753
   _globals['_SCHEDULETIMEWINDOW']._serialized_start=67
   _globals['_SCHEDULETIMEWINDOW']._serialized_end=683
   _globals['_SCHEDULETIMEWINDOW_WINDOW']._serialized_start=176
@@ -66,7 +66,7 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_TIMEESTIMATION']._serialized_start=1231
   _globals['_TIMEESTIMATION']._serialized_end=1281
   _globals['_ENERGYSTATE']._serialized_start=1284
-  _globals['_ENERGYSTATE']._serialized_end=1508
-  _globals['_SESSIONPOWER']._serialized_start=1510
-  _globals['_SESSIONPOWER']._serialized_end=1554
+  _globals['_ENERGYSTATE']._serialized_end=1572
+  _globals['_SESSIONPOWER']._serialized_start=1574
+  _globals['_SESSIONPOWER']._serialized_end=1603
 # @@protoc_insertion_point(module_scope)

{rivian_python_client-2.2.0b2 → rivian_python_client-2.2.0b4}/src/rivian/parallax/proto/charging_pb2.pyi

@@ -189,18 +189,18 @@ class TimeEstimation(_message.Message):
     def __init__(self, estimated_time_remaining: _Optional[int] = ...) -> None: ...
 
 class EnergyState(_message.Message):
-    __slots__ = ("field_1", "charger_status", "field_3", "field_10", "field_11")
-    FIELD_1_FIELD_NUMBER: _ClassVar[int]
+    __slots__ = ("charging_state", "charger_status", "field_3", "field_10", "connection_state")
+    CHARGING_STATE_FIELD_NUMBER: _ClassVar[int]
     CHARGER_STATUS_FIELD_NUMBER: _ClassVar[int]
     FIELD_3_FIELD_NUMBER: _ClassVar[int]
     FIELD_10_FIELD_NUMBER: _ClassVar[int]
-    FIELD_11_FIELD_NUMBER: _ClassVar[int]
-    field_1: int
+    CONNECTION_STATE_FIELD_NUMBER: _ClassVar[int]
+    charging_state: ChargingState
     charger_status: ChargerStatus
     field_3: int
     field_10: str
-    field_11: int
-    def __init__(self, field_1: _Optional[int] = ..., charger_status: _Optional[_Union[ChargerStatus, str]] = ..., field_3: _Optional[int] = ..., field_10: _Optional[str] = ..., field_11: _Optional[int] = ...) -> None: ...
+    connection_state: ConnectionState
+    def __init__(self, charging_state: _Optional[_Union[ChargingState, str]] = ..., charger_status: _Optional[_Union[ChargerStatus, str]] = ..., field_3: _Optional[int] = ..., field_10: _Optional[str] = ..., connection_state: _Optional[_Union[ConnectionState, str]] = ...) -> None: ...
 
 class SessionPower(_message.Message):
     __slots__ = ("power",)