rivian-python-client 2.2.0b0__tar.gz → 2.2.0b1__tar.gz

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rivian-python-client
-Version: 2.2.0b0
+Version: 2.2.0b1
 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.0b0 → rivian_python_client-2.2.0b1}/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.0b0'
+__version__ = VERSION = '2.2.0b1'

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/__init__.py

@@ -50,7 +50,9 @@ from .core import (
 PARALLAX_RVMS: list[str] = list(RVMDecoder.decoders)
 
 CHARGING_RVMS: list[str] = [
+    "charging.energy.state",
     "charging.session.notification",
+    "charging.session.power",
     "charging.session.remote_command",
     "charging.session.soc_slider",
     "charging.session.status",

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/charging.py

@@ -210,17 +210,37 @@ def decode_time_estimation(m: charging_pb2.TimeEstimation) -> dict[str, Any]:
     return {"timeToEndOfCharge": m.estimated_time_remaining}
 
 
+_CHARGER_STATUS_MAP: Final[dict[int, str]] = {
+    1: "chrgr_sts_not_connected",
+    2: "chrgr_sts_connected_no_chrg",
+    3: "chrgr_sts_connected_charging",
+}
+
+
 @RVMDecoder.register("charging.energy.state", charging_pb2.EnergyState)
 def decode_energy_state(m: charging_pb2.EnergyState) -> dict[str, Any]:
-    """charging.energy.state — unmapped; `_field1`-`_field3`, `_field11` raw."""
-    return {
-        f"_field{num}": v
-        for num in (1, 2, 3, 11)
-        if (v := _present(m, f"field_{num}")) is not None
-    }
+    """charging.energy.state — charger connection status.
+
+    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
+    """
+    result: dict[str, Any] = {}
+    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
+    return result
 
 
 @RVMDecoder.register("charging.session.power", charging_pb2.SessionPower)
-def decode_session_power(_m: charging_pb2.SessionPower) -> dict[str, Any]:
-    """charging.session.power — unmapped; empty so far."""
-    return {}
+def decode_session_power(m: charging_pb2.SessionPower) -> dict[str, Any]:
+    """charging.session.power — live charging power, about every 5 seconds.
+
+    Fields:
+        power: float (kW; 0 when not charging)
+    """
+    return {"power": round(m.power, 2)}

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/holiday_celebration.py

@@ -62,7 +62,7 @@ def decode_halloween_celebration_settings(
     Each field's wrapped value, when set, as a raw `_fieldN`.
     """
     result: dict[str, Any] = {}
-    for num in (1, 2, 3, 4, 7, 8, 9, 10):
+    for num in (1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12):
         field = f"field_{num}"
         if (
             m.HasField(field)

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/navigation.py

@@ -149,6 +149,8 @@ def _decode_index_ranges(leg: TripInfo.Leg) -> list[dict[str, Any]]:
     return [
         {
             **_copy_present(seg, (("start", "start"), ("end", "end"))),
+            "startFraction": round(seg.start_fraction, 4),
+            "endFraction": round(seg.end_fraction, 4),
             "flagged": seg.HasField("flag"),
         }
         for seg in leg.index_range_segment
@@ -255,9 +257,10 @@ def decode_trip_info(m: navigation_pb2.TripInfo) -> dict[str, Any]:
                 RangeRemaining (percent, meters), departureTime
         legs: list[dict] — distance, duration (meters, seconds),
             roadLabel, polyline (Google-encoded), energyUsed (kWh;
-            unverified), indexRangeSegments ({start, end, flagged}) and
-            categorizedIndexRanges ({start, end, category}), index ranges
-            into the polyline whose meaning is unknown
+            unverified), indexRangeSegments ({start, startFraction, end,
+            endFraction, flagged}; fractions are 0-1 positions past those
+            points) and categorizedIndexRanges ({start, end, category}),
+            index ranges into the polyline whose meaning is unknown
         overviewPolyline: str — Google-encoded, whole trip
         nextWaypointDepartureTime: datetime — the next stop's departure if
             it's a charging stop, else its arrival

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/ota.py

@@ -122,20 +122,25 @@ def decode_deployment_state(m: ota_pb2.DeploymentState) -> dict[str, Any]:
 
 @RVMDecoder.register("ota.user_schedule.ota_config", ota_pb2.OtaConfig)
 def decode_ota_config(m: ota_pb2.OtaConfig) -> dict[str, Any]:
-    """ota.user_schedule.ota_config — the auto-install schedule.
+    """ota.user_schedule.ota_config — install schedules.
 
     Fields:
         otaSchedules: list[dict] (empty when none is set), each with:
+            type: str — "one_time" (a scheduled install) or "recurring"
+                (auto-install)
             id: str — UUID, when sent
-            enabled: bool — whether auto-install is on
-            startTime: int — minutes after local midnight
-            location: str — a saved location (e.g. "home") or "anywhere"
-            _field4: unknown; on the entry with no install time
+            enabled: bool
+            installTime: datetime — one-time only, once a time is picked;
+                kept after the install or a cancel
+            startTime: int — recurring only; minutes after local midnight
+            location: str — recurring only; a saved location (e.g.
+                "home") or "anywhere"
         otaScheduleUpdatedAt: datetime
     """
     schedules: list[dict[str, Any]] = []
     for schedule in m.schedule:
-        entry: dict[str, Any] = {}
+        one_time = schedule.HasField("one_time")
+        entry: dict[str, Any] = {"type": "one_time" if one_time else "recurring"}
         if (v := _present(schedule, "id")) is not None:
             entry["id"] = v
         if schedule.HasField("time_of_day"):
@@ -147,9 +152,11 @@ def decode_ota_config(m: ota_pb2.OtaConfig) -> dict[str, Any]:
                 and (v := _present(time_of_day.location, "name")) is not None
             ):
                 entry["location"] = v
+        if one_time and (
+            seconds := _present(schedule.one_time.install_time, "seconds")
+        ):
+            entry["installTime"] = from_epoch(seconds)
         entry["enabled"] = schedule.enabled
-        if schedule.HasField("field_4"):
-            entry["_field4"] = schedule.field_4.field_1
         schedules.append(entry)
 
     result: dict[str, Any] = {"otaSchedules": schedules}

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/charging.proto

@@ -122,14 +122,23 @@ message TimeEstimation {
   int32 estimated_time_remaining = 2; // minutes
 }
 
-// charging.energy.state -- unmapped.
+// charging.energy.state
 message EnergyState {
-  optional int32 field_1 = 1;
-  optional int32 field_2 = 2;
-  optional int32 field_3 = 3;
+  optional int32 field_1 = 1; // inferred: ChargingState (1 ready ... 4 complete)
+  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;
+  optional int32 field_11 = 11; // unknown; 1 or 2
 }
 
-// charging.session.power -- unmapped; empty so far.
-message SessionPower {}
+enum ChargerStatus {
+  CHARGER_STATUS_UNSPECIFIED = 0;
+  CHARGER_STATUS_NOT_CONNECTED = 1;
+  CHARGER_STATUS_CONNECTED_NO_CHARGE = 2;
+  CHARGER_STATUS_CONNECTED_CHARGING = 3;
+}
+
+// charging.session.power -- live charging power; empty when not charging.
+message SessionPower {
+  optional float power = 1; // kW
+}

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/charging_pb2.py

@@ -24,19 +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\"\xa9\x01\n\x0b\x45nergyState\x12\x14\n\x07\x66ield_1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\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\n\n\x08_field_2B\n\n\x08_field_3B\x0b\n\t_field_11\"\x0e\n\x0cSessionPower*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\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\"\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')
 
 _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=1471
-  _globals['_REMOTECOMMAND']._serialized_end=1569
-  _globals['_CONNECTIONSTATE']._serialized_start=1571
-  _globals['_CONNECTIONSTATE']._serialized_end=1689
-  _globals['_CHARGINGSTATE']._serialized_start=1692
-  _globals['_CHARGINGSTATE']._serialized_end=2456
+  _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['_SCHEDULETIMEWINDOW']._serialized_start=67
   _globals['_SCHEDULETIMEWINDOW']._serialized_end=683
   _globals['_SCHEDULETIMEWINDOW_WINDOW']._serialized_start=176
@@ -64,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=1453
-  _globals['_SESSIONPOWER']._serialized_start=1455
-  _globals['_SESSIONPOWER']._serialized_end=1469
+  _globals['_ENERGYSTATE']._serialized_end=1508
+  _globals['_SESSIONPOWER']._serialized_start=1510
+  _globals['_SESSIONPOWER']._serialized_end=1554
 # @@protoc_insertion_point(module_scope)

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/charging_pb2.pyi

@@ -44,6 +44,13 @@ class ChargingState(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     CHARGING_TLS_ERROR_UNKNOWN_CHARGER: _ClassVar[ChargingState]
     CHARGING_TLS_ERROR_UNEXPECTED_FAIL: _ClassVar[ChargingState]
     CHARGING_TLS_ERROR_START_RIVIAN_APP: _ClassVar[ChargingState]
+
+class ChargerStatus(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    CHARGER_STATUS_UNSPECIFIED: _ClassVar[ChargerStatus]
+    CHARGER_STATUS_NOT_CONNECTED: _ClassVar[ChargerStatus]
+    CHARGER_STATUS_CONNECTED_NO_CHARGE: _ClassVar[ChargerStatus]
+    CHARGER_STATUS_CONNECTED_CHARGING: _ClassVar[ChargerStatus]
 REMOTE_COMMAND_UNSPECIFIED: RemoteCommand
 REMOTE_COMMAND_START: RemoteCommand
 REMOTE_COMMAND_STOP: RemoteCommand
@@ -74,6 +81,10 @@ CHARGING_PAYMENT_ERROR_START_RIVIAN_APP: ChargingState
 CHARGING_TLS_ERROR_UNKNOWN_CHARGER: ChargingState
 CHARGING_TLS_ERROR_UNEXPECTED_FAIL: ChargingState
 CHARGING_TLS_ERROR_START_RIVIAN_APP: ChargingState
+CHARGER_STATUS_UNSPECIFIED: ChargerStatus
+CHARGER_STATUS_NOT_CONNECTED: ChargerStatus
+CHARGER_STATUS_CONNECTED_NO_CHARGE: ChargerStatus
+CHARGER_STATUS_CONNECTED_CHARGING: ChargerStatus
 
 class ScheduleTimeWindow(_message.Message):
     __slots__ = ("enabled", "window")
@@ -178,19 +189,21 @@ class TimeEstimation(_message.Message):
     def __init__(self, estimated_time_remaining: _Optional[int] = ...) -> None: ...
 
 class EnergyState(_message.Message):
-    __slots__ = ("field_1", "field_2", "field_3", "field_10", "field_11")
+    __slots__ = ("field_1", "charger_status", "field_3", "field_10", "field_11")
     FIELD_1_FIELD_NUMBER: _ClassVar[int]
-    FIELD_2_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
-    field_2: int
+    charger_status: ChargerStatus
     field_3: int
     field_10: str
     field_11: int
-    def __init__(self, field_1: _Optional[int] = ..., field_2: _Optional[int] = ..., field_3: _Optional[int] = ..., field_10: _Optional[str] = ..., field_11: _Optional[int] = ...) -> None: ...
+    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: ...
 
 class SessionPower(_message.Message):
-    __slots__ = ()
-    def __init__(self) -> None: ...
+    __slots__ = ("power",)
+    POWER_FIELD_NUMBER: _ClassVar[int]
+    power: float
+    def __init__(self, power: _Optional[float] = ...) -> None: ...

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/holiday_celebration.proto

@@ -31,16 +31,19 @@ message CarCostumeState {
 }
 
 // holiday_celebration.mobile_vehicle_settings.halloween_celebration_settings
-// All fields unknown; 1, 3 and 8-10 only sent empty.
+// All fields unknown; 1, 3, 5 and 8-12 only sent empty.
 message HalloweenCelebrationSettings {
   Value field_1 = 1;
   Value field_2 = 2;
   Value field_3 = 3;
   Value field_4 = 4;
+  Value field_5 = 5;
   Value field_7 = 7;
   Value field_8 = 8;
   Value field_9 = 9;
   Value field_10 = 10;
+  Value field_11 = 11;
+  Value field_12 = 12;
 
   message Value {
     optional int32 value = 1;

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/holiday_celebration_pb2.py

@@ -24,7 +24,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n/rivian/parallax/proto/holiday_celebration.proto\x12#rivian.parallax.holiday_celebration\"\x1b\n\x19HolidayCelebrationEnabled\"\xa8\x02\n\x12\x43\x61rCostumeSettings\x12\x14\n\x07\x66ield_1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x02\x88\x01\x01\x12\x14\n\x07\x66ield_6\x18\x06 \x01(\x05H\x03\x88\x01\x01\x12\x14\n\x07\x66ield_7\x18\x07 \x01(\x05H\x04\x88\x01\x01\x12\x14\n\x07\x66ield_9\x18\t \x01(\x05H\x05\x88\x01\x01\x12\x15\n\x08\x66ield_11\x18\x0b \x01(\x05H\x06\x88\x01\x01\x12\x15\n\x08\x66ield_12\x18\x0c \x01(\x05H\x07\x88\x01\x01\x42\n\n\x08_field_1B\n\n\x08_field_2B\n\n\x08_field_3B\n\n\x08_field_6B\n\n\x08_field_7B\n\n\x08_field_9B\x0b\n\t_field_11B\x0b\n\t_field_12\"\x9f\x01\n\x0f\x43\x61rCostumeState\x12\x17\n\ncostume_id\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x02\x88\x01\x01\x12\x14\n\x07\x66ield_6\x18\x06 \x01(\x05H\x03\x88\x01\x01\x42\r\n\x0b_costume_idB\n\n\x08_field_2B\n\n\x08_field_3B\n\n\x08_field_6\"\x96\x06\n\x1cHalloweenCelebrationSettings\x12X\n\x07\x66ield_1\x18\x01 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_2\x18\x02 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_3\x18\x03 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_4\x18\x04 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_7\x18\x07 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_8\x18\x08 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_9\x18\t \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12Y\n\x08\x66ield_10\x18\n \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x1a%\n\x05Value\x12\x12\n\x05value\x18\x01 \x01(\x05H\x00\x88\x01\x01\x42\x08\n\x06_valueb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n/rivian/parallax/proto/holiday_celebration.proto\x12#rivian.parallax.holiday_celebration\"\x1b\n\x19HolidayCelebrationEnabled\"\xa8\x02\n\x12\x43\x61rCostumeSettings\x12\x14\n\x07\x66ield_1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x02\x88\x01\x01\x12\x14\n\x07\x66ield_6\x18\x06 \x01(\x05H\x03\x88\x01\x01\x12\x14\n\x07\x66ield_7\x18\x07 \x01(\x05H\x04\x88\x01\x01\x12\x14\n\x07\x66ield_9\x18\t \x01(\x05H\x05\x88\x01\x01\x12\x15\n\x08\x66ield_11\x18\x0b \x01(\x05H\x06\x88\x01\x01\x12\x15\n\x08\x66ield_12\x18\x0c \x01(\x05H\x07\x88\x01\x01\x42\n\n\x08_field_1B\n\n\x08_field_2B\n\n\x08_field_3B\n\n\x08_field_6B\n\n\x08_field_7B\n\n\x08_field_9B\x0b\n\t_field_11B\x0b\n\t_field_12\"\x9f\x01\n\x0f\x43\x61rCostumeState\x12\x17\n\ncostume_id\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x02\x88\x01\x01\x12\x14\n\x07\x66ield_6\x18\x06 \x01(\x05H\x03\x88\x01\x01\x42\r\n\x0b_costume_idB\n\n\x08_field_2B\n\n\x08_field_3B\n\n\x08_field_6\"\xa6\x08\n\x1cHalloweenCelebrationSettings\x12X\n\x07\x66ield_1\x18\x01 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_2\x18\x02 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_3\x18\x03 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_4\x18\x04 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_5\x18\x05 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_7\x18\x07 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_8\x18\x08 \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12X\n\x07\x66ield_9\x18\t \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12Y\n\x08\x66ield_10\x18\n \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12Y\n\x08\x66ield_11\x18\x0b \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x12Y\n\x08\x66ield_12\x18\x0c \x01(\x0b\x32G.rivian.parallax.holiday_celebration.HalloweenCelebrationSettings.Value\x1a%\n\x05Value\x12\x12\n\x05value\x18\x01 \x01(\x05H\x00\x88\x01\x01\x42\x08\n\x06_valueb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -38,7 +38,7 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_CARCOSTUMESTATE']._serialized_start=417
   _globals['_CARCOSTUMESTATE']._serialized_end=576
   _globals['_HALLOWEENCELEBRATIONSETTINGS']._serialized_start=579
-  _globals['_HALLOWEENCELEBRATIONSETTINGS']._serialized_end=1369
-  _globals['_HALLOWEENCELEBRATIONSETTINGS_VALUE']._serialized_start=1332
-  _globals['_HALLOWEENCELEBRATIONSETTINGS_VALUE']._serialized_end=1369
+  _globals['_HALLOWEENCELEBRATIONSETTINGS']._serialized_end=1641
+  _globals['_HALLOWEENCELEBRATIONSETTINGS_VALUE']._serialized_start=1604
+  _globals['_HALLOWEENCELEBRATIONSETTINGS_VALUE']._serialized_end=1641
 # @@protoc_insertion_point(module_scope)

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/holiday_celebration_pb2.pyi

@@ -42,7 +42,7 @@ class CarCostumeState(_message.Message):
     def __init__(self, costume_id: _Optional[int] = ..., field_2: _Optional[int] = ..., field_3: _Optional[int] = ..., field_6: _Optional[int] = ...) -> None: ...
 
 class HalloweenCelebrationSettings(_message.Message):
-    __slots__ = ("field_1", "field_2", "field_3", "field_4", "field_7", "field_8", "field_9", "field_10")
+    __slots__ = ("field_1", "field_2", "field_3", "field_4", "field_5", "field_7", "field_8", "field_9", "field_10", "field_11", "field_12")
     class Value(_message.Message):
         __slots__ = ("value",)
         VALUE_FIELD_NUMBER: _ClassVar[int]
@@ -52,16 +52,22 @@ class HalloweenCelebrationSettings(_message.Message):
     FIELD_2_FIELD_NUMBER: _ClassVar[int]
     FIELD_3_FIELD_NUMBER: _ClassVar[int]
     FIELD_4_FIELD_NUMBER: _ClassVar[int]
+    FIELD_5_FIELD_NUMBER: _ClassVar[int]
     FIELD_7_FIELD_NUMBER: _ClassVar[int]
     FIELD_8_FIELD_NUMBER: _ClassVar[int]
     FIELD_9_FIELD_NUMBER: _ClassVar[int]
     FIELD_10_FIELD_NUMBER: _ClassVar[int]
+    FIELD_11_FIELD_NUMBER: _ClassVar[int]
+    FIELD_12_FIELD_NUMBER: _ClassVar[int]
     field_1: HalloweenCelebrationSettings.Value
     field_2: HalloweenCelebrationSettings.Value
     field_3: HalloweenCelebrationSettings.Value
     field_4: HalloweenCelebrationSettings.Value
+    field_5: HalloweenCelebrationSettings.Value
     field_7: HalloweenCelebrationSettings.Value
     field_8: HalloweenCelebrationSettings.Value
     field_9: HalloweenCelebrationSettings.Value
     field_10: HalloweenCelebrationSettings.Value
-    def __init__(self, field_1: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_2: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_3: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_4: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_7: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_8: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_9: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_10: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ...) -> None: ...
+    field_11: HalloweenCelebrationSettings.Value
+    field_12: HalloweenCelebrationSettings.Value
+    def __init__(self, field_1: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_2: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_3: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_4: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_5: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_7: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_8: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_9: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_10: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_11: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ..., field_12: _Optional[_Union[HalloweenCelebrationSettings.Value, _Mapping]] = ...) -> None: ...

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/navigation.proto

@@ -130,7 +130,9 @@ message TripInfo {
 
     message IndexRangeSegment {
       optional int32 start = 1;
+      float start_fraction = 2; // position past the start point, 0-1
       optional int32 end = 3;
+      float end_fraction = 4;   // position past the end point, 0-1
       optional bool flag = 5; // present means flagged
     }
   }
@@ -145,9 +147,14 @@ message TripInfo {
 
   message TripMeta {
     optional int32 field_1 = 1;
-    optional int32 field_2 = 2;
+    Unmapped2 field_2 = 2;
     optional int32 field_3 = 3;
     optional int32 field_4 = 4;
+
+    message Unmapped2 {
+      int32 field_2 = 2;
+      int32 field_4 = 4;
+    }
   }
 }
 

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/navigation_pb2.py

@@ -24,7 +24,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&rivian/parallax/proto/navigation.proto\x12\x1arivian.parallax.navigation\"Y\n\rGeoCoordinate\x12\x15\n\x08latitude\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x16\n\tlongitude\x18\x02 \x01(\x01H\x01\x88\x01\x01\x42\x0b\n\t_latitudeB\x0c\n\n_longitude\"K\n\tTimestamp\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x12\x12\n\x05nanos\x18\x02 \x01(\x05H\x01\x88\x01\x01\x42\n\n\x08_secondsB\x08\n\x06_nanos\"\xd6\x1a\n\x08TripInfo\x12\x14\n\x07trip_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12;\n\x06origin\x18\x02 \x01(\x0b\x32+.rivian.parallax.navigation.TripInfo.Origin\x12\x37\n\x04trip\x18\x03 \x01(\x0b\x32).rivian.parallax.navigation.TripInfo.Trip\x12P\n\x11route_preferences\x18\x04 \x01(\x0b\x32\x35.rivian.parallax.navigation.TripInfo.RoutePreferences\x12\x17\n\norigin_soc\x18\x05 \x01(\x01H\x01\x88\x01\x01\x12[\n\x17next_waypoint_departure\x18\x06 \x01(\x0b\x32:.rivian.parallax.navigation.TripInfo.NextWaypointDeparture\x1a\x83\x01\n\x06Origin\x12;\n\x08location\x18\x01 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x14\n\x07heading\x18\x03 \x01(\x02H\x00\x88\x01\x01\x12\x11\n\x04time\x18\x05 \x01(\x03H\x01\x88\x01\x01\x42\n\n\x08_headingB\x07\n\x05_time\x1a\x39\n\x15NextWaypointDeparture\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\x95\x03\n\x04Trip\x12\x15\n\x08\x64istance\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x15\n\x08\x64uration\x18\x02 \x01(\x01H\x01\x88\x01\x01\x12\x46\n\x08waypoint\x18\x03 \x03(\x0b\x32\x34.rivian.parallax.navigation.TripInfo.WaypointWrapper\x12\x35\n\x03leg\x18\x04 \x03(\x0b\x32(.rivian.parallax.navigation.TripInfo.Leg\x12\x16\n\tfinal_soc\x18\x06 \x01(\x01H\x02\x88\x01\x01\x12\x18\n\x0b\x66inal_range\x18\x07 \x01(\x01H\x03\x88\x01\x01\x12\x1e\n\x11overview_polyline\x18\n \x01(\tH\x04\x88\x01\x01\x12@\n\ttrip_meta\x18\r \x01(\x0b\x32-.rivian.parallax.navigation.TripInfo.TripMetaB\x0b\n\t_distanceB\x0b\n\t_durationB\x0c\n\n_final_socB\x0e\n\x0c_final_rangeB\x14\n\x12_overview_polyline\x1a\x96\x01\n\x0fWaypointWrapper\x12\x39\n\x05place\x18\x01 \x01(\x0b\x32*.rivian.parallax.navigation.TripInfo.Place\x12H\n\rcharging_stop\x18\x02 \x01(\x0b\x32\x31.rivian.parallax.navigation.TripInfo.ChargingStop\x1a\xe1\x02\n\x05Place\x12;\n\x08location\x18\x01 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x43\n\x10snapped_location\x18\x02 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x17\n\nplace_type\x18\x03 \x01(\x05H\x00\x88\x01\x01\x12\x11\n\x04name\x18\x04 \x01(\tH\x01\x88\x01\x01\x12\x15\n\x08place_id\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x10\n\x03soc\x18\x07 \x01(\x01H\x03\x88\x01\x01\x12\x12\n\x05range\x18\x08 \x01(\x01H\x04\x88\x01\x01\x12\x36\n\x07\x61rrival\x18\t \x01(\x0b\x32%.rivian.parallax.navigation.TimestampB\r\n\x0b_place_typeB\x07\n\x05_nameB\x0b\n\t_place_idB\x06\n\x04_socB\x08\n\x06_range\x1a\xb9\x06\n\x0c\x43hargingStop\x12\x17\n\nstation_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x12\n\x05label\x18\x02 \x01(\tH\x01\x88\x01\x01\x12;\n\x08location\x18\x03 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x1c\n\x0f\x63harge_duration\x18\x04 \x01(\x01H\x02\x88\x01\x01\x12\x18\n\x0b\x61rrival_soc\x18\x06 \x01(\x01H\x03\x88\x01\x01\x12\x1a\n\rarrival_range\x18\x07 \x01(\x01H\x04\x88\x01\x01\x12\x1a\n\rdeparture_soc\x18\x08 \x01(\x01H\x05\x88\x01\x01\x12\x1c\n\x0f\x64\x65parture_range\x18\t \x01(\x01H\x06\x88\x01\x01\x12^\n\x0e\x64\x65parture_time\x18\n \x01(\x0b\x32\x46.rivian.parallax.navigation.TripInfo.ChargingStop.DepartureTimeWrapper\x12Z\n\x0c\x61rrival_time\x18\x0b \x01(\x0b\x32\x44.rivian.parallax.navigation.TripInfo.ChargingStop.ArrivalTimeWrapper\x12\x15\n\x08\x66ield_12\x18\x0c \x01(\x05H\x07\x88\x01\x01\x12\x15\n\x08\x66ield_13\x18\r \x01(\x05H\x08\x88\x01\x01\x12\x15\n\x08\x66ield_14\x18\x0e \x01(\x05H\t\x88\x01\x01\x12\x15\n\x08\x66ield_17\x18\x11 \x01(\x05H\n\x88\x01\x01\x1a\x38\n\x14\x44\x65partureTimeWrapper\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\x36\n\x12\x41rrivalTimeWrapper\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_secondsB\r\n\x0b_station_idB\x08\n\x06_labelB\x12\n\x10_charge_durationB\x0e\n\x0c_arrival_socB\x10\n\x0e_arrival_rangeB\x10\n\x0e_departure_socB\x12\n\x10_departure_rangeB\x0b\n\t_field_12B\x0b\n\t_field_13B\x0b\n\t_field_14B\x0b\n\t_field_17\x1a\x9c\x06\n\x03Leg\x12\x15\n\x08\x64istance\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x15\n\x08\x64uration\x18\x02 \x01(\x01H\x01\x88\x01\x01\x12\x17\n\nroad_label\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x15\n\x08polyline\x18\x04 \x01(\tH\x03\x88\x01\x01\x12\"\n\x15\x66lagged_ranges_packed\x18\x05 \x01(\x0cH\x04\x88\x01\x01\x12$\n\x17unflagged_ranges_packed\x18\x06 \x01(\x0cH\x05\x88\x01\x01\x12?\n\x06\x65nergy\x18\x08 \x01(\x0b\x32/.rivian.parallax.navigation.TripInfo.Leg.Energy\x12\x63\n\x19\x63\x61tegorized_range_segment\x18\t \x03(\x0b\x32@.rivian.parallax.navigation.TripInfo.Leg.CategorizedRangeSegment\x12W\n\x13index_range_segment\x18\n \x03(\x0b\x32:.rivian.parallax.navigation.TripInfo.Leg.IndexRangeSegment\x1a\"\n\x06\x45nergy\x12\x10\n\x03kwh\x18\x01 \x01(\x01H\x00\x88\x01\x01\x42\x06\n\x04_kwh\x1au\n\x17\x43\x61tegorizedRangeSegment\x12\x12\n\x05start\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x10\n\x03\x65nd\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12\x15\n\x08\x63\x61tegory\x18\x03 \x01(\x05H\x02\x88\x01\x01\x42\x08\n\x06_startB\x06\n\x04_endB\x0b\n\t_category\x1ag\n\x11IndexRangeSegment\x12\x12\n\x05start\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x10\n\x03\x65nd\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12\x11\n\x04\x66lag\x18\x05 \x01(\x08H\x02\x88\x01\x01\x42\x08\n\x06_startB\x06\n\x04_endB\x07\n\x05_flagB\x0b\n\t_distanceB\x0b\n\t_durationB\r\n\x0b_road_labelB\x0b\n\t_polylineB\x18\n\x16_flagged_ranges_packedB\x1a\n\x18_unflagged_ranges_packed\x1a\x94\x01\n\x10RoutePreferences\x12\x15\n\x08weight_a\x18\x01 \x01(\x02H\x00\x88\x01\x01\x12\x15\n\x08weight_b\x18\x02 \x01(\x02H\x01\x88\x01\x01\x12\x16\n\x0eroad_avoidance\x18\x03 \x03(\t\x12 \n\x18\x63harging_network_filters\x18\x04 \x03(\tB\x0b\n\t_weight_aB\x0b\n\t_weight_b\x1a\x92\x01\n\x08TripMeta\x12\x14\n\x07\x66ield_1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x02\x88\x01\x01\x12\x14\n\x07\x66ield_4\x18\x04 \x01(\x05H\x03\x88\x01\x01\x42\n\n\x08_field_1B\n\n\x08_field_2B\n\n\x08_field_3B\n\n\x08_field_4B\n\n\x08_trip_idB\r\n\x0b_origin_soc\"\xff\x04\n\x0cTripProgress\x12L\n\rnext_waypoint\x18\x01 \x01(\x0b\x32\x35.rivian.parallax.navigation.TripProgress.NextWaypoint\x12T\n\x11\x66inal_destination\x18\x02 \x01(\x0b\x32\x39.rivian.parallax.navigation.TripProgress.FinalDestination\x12\x1f\n\x12\x64istance_remaining\x18\x04 \x01(\x01H\x00\x88\x01\x01\x12\x1f\n\x12\x64uration_remaining\x18\x05 \x01(\x01H\x01\x88\x01\x01\x12J\n\x0clocation_fix\x18\x06 \x01(\x0b\x32\x34.rivian.parallax.navigation.TripProgress.LocationFix\x1a\x30\n\x0cNextWaypoint\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\x34\n\x10\x46inalDestination\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\xa6\x01\n\x0bLocationFix\x12;\n\x08location\x18\x01 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x12\n\x05speed\x18\x02 \x01(\x02H\x00\x88\x01\x01\x12\x14\n\x07heading\x18\x03 \x01(\x02H\x01\x88\x01\x01\x12\x11\n\x04time\x18\x05 \x01(\x03H\x02\x88\x01\x01\x42\x08\n\x06_speedB\n\n\x08_headingB\x07\n\x05_timeB\x15\n\x13_distance_remainingB\x15\n\x13_duration_remainingb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&rivian/parallax/proto/navigation.proto\x12\x1arivian.parallax.navigation\"Y\n\rGeoCoordinate\x12\x15\n\x08latitude\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x16\n\tlongitude\x18\x02 \x01(\x01H\x01\x88\x01\x01\x42\x0b\n\t_latitudeB\x0c\n\n_longitude\"K\n\tTimestamp\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x12\x12\n\x05nanos\x18\x02 \x01(\x05H\x01\x88\x01\x01\x42\n\n\x08_secondsB\x08\n\x06_nanos\"\xdc\x1b\n\x08TripInfo\x12\x14\n\x07trip_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12;\n\x06origin\x18\x02 \x01(\x0b\x32+.rivian.parallax.navigation.TripInfo.Origin\x12\x37\n\x04trip\x18\x03 \x01(\x0b\x32).rivian.parallax.navigation.TripInfo.Trip\x12P\n\x11route_preferences\x18\x04 \x01(\x0b\x32\x35.rivian.parallax.navigation.TripInfo.RoutePreferences\x12\x17\n\norigin_soc\x18\x05 \x01(\x01H\x01\x88\x01\x01\x12[\n\x17next_waypoint_departure\x18\x06 \x01(\x0b\x32:.rivian.parallax.navigation.TripInfo.NextWaypointDeparture\x1a\x83\x01\n\x06Origin\x12;\n\x08location\x18\x01 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x14\n\x07heading\x18\x03 \x01(\x02H\x00\x88\x01\x01\x12\x11\n\x04time\x18\x05 \x01(\x03H\x01\x88\x01\x01\x42\n\n\x08_headingB\x07\n\x05_time\x1a\x39\n\x15NextWaypointDeparture\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\x95\x03\n\x04Trip\x12\x15\n\x08\x64istance\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x15\n\x08\x64uration\x18\x02 \x01(\x01H\x01\x88\x01\x01\x12\x46\n\x08waypoint\x18\x03 \x03(\x0b\x32\x34.rivian.parallax.navigation.TripInfo.WaypointWrapper\x12\x35\n\x03leg\x18\x04 \x03(\x0b\x32(.rivian.parallax.navigation.TripInfo.Leg\x12\x16\n\tfinal_soc\x18\x06 \x01(\x01H\x02\x88\x01\x01\x12\x18\n\x0b\x66inal_range\x18\x07 \x01(\x01H\x03\x88\x01\x01\x12\x1e\n\x11overview_polyline\x18\n \x01(\tH\x04\x88\x01\x01\x12@\n\ttrip_meta\x18\r \x01(\x0b\x32-.rivian.parallax.navigation.TripInfo.TripMetaB\x0b\n\t_distanceB\x0b\n\t_durationB\x0c\n\n_final_socB\x0e\n\x0c_final_rangeB\x14\n\x12_overview_polyline\x1a\x96\x01\n\x0fWaypointWrapper\x12\x39\n\x05place\x18\x01 \x01(\x0b\x32*.rivian.parallax.navigation.TripInfo.Place\x12H\n\rcharging_stop\x18\x02 \x01(\x0b\x32\x31.rivian.parallax.navigation.TripInfo.ChargingStop\x1a\xe1\x02\n\x05Place\x12;\n\x08location\x18\x01 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x43\n\x10snapped_location\x18\x02 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x17\n\nplace_type\x18\x03 \x01(\x05H\x00\x88\x01\x01\x12\x11\n\x04name\x18\x04 \x01(\tH\x01\x88\x01\x01\x12\x15\n\x08place_id\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x10\n\x03soc\x18\x07 \x01(\x01H\x03\x88\x01\x01\x12\x12\n\x05range\x18\x08 \x01(\x01H\x04\x88\x01\x01\x12\x36\n\x07\x61rrival\x18\t \x01(\x0b\x32%.rivian.parallax.navigation.TimestampB\r\n\x0b_place_typeB\x07\n\x05_nameB\x0b\n\t_place_idB\x06\n\x04_socB\x08\n\x06_range\x1a\xb9\x06\n\x0c\x43hargingStop\x12\x17\n\nstation_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x12\n\x05label\x18\x02 \x01(\tH\x01\x88\x01\x01\x12;\n\x08location\x18\x03 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x1c\n\x0f\x63harge_duration\x18\x04 \x01(\x01H\x02\x88\x01\x01\x12\x18\n\x0b\x61rrival_soc\x18\x06 \x01(\x01H\x03\x88\x01\x01\x12\x1a\n\rarrival_range\x18\x07 \x01(\x01H\x04\x88\x01\x01\x12\x1a\n\rdeparture_soc\x18\x08 \x01(\x01H\x05\x88\x01\x01\x12\x1c\n\x0f\x64\x65parture_range\x18\t \x01(\x01H\x06\x88\x01\x01\x12^\n\x0e\x64\x65parture_time\x18\n \x01(\x0b\x32\x46.rivian.parallax.navigation.TripInfo.ChargingStop.DepartureTimeWrapper\x12Z\n\x0c\x61rrival_time\x18\x0b \x01(\x0b\x32\x44.rivian.parallax.navigation.TripInfo.ChargingStop.ArrivalTimeWrapper\x12\x15\n\x08\x66ield_12\x18\x0c \x01(\x05H\x07\x88\x01\x01\x12\x15\n\x08\x66ield_13\x18\r \x01(\x05H\x08\x88\x01\x01\x12\x15\n\x08\x66ield_14\x18\x0e \x01(\x05H\t\x88\x01\x01\x12\x15\n\x08\x66ield_17\x18\x11 \x01(\x05H\n\x88\x01\x01\x1a\x38\n\x14\x44\x65partureTimeWrapper\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\x36\n\x12\x41rrivalTimeWrapper\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_secondsB\r\n\x0b_station_idB\x08\n\x06_labelB\x12\n\x10_charge_durationB\x0e\n\x0c_arrival_socB\x10\n\x0e_arrival_rangeB\x10\n\x0e_departure_socB\x12\n\x10_departure_rangeB\x0b\n\t_field_12B\x0b\n\t_field_13B\x0b\n\t_field_14B\x0b\n\t_field_17\x1a\xcb\x06\n\x03Leg\x12\x15\n\x08\x64istance\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x15\n\x08\x64uration\x18\x02 \x01(\x01H\x01\x88\x01\x01\x12\x17\n\nroad_label\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x15\n\x08polyline\x18\x04 \x01(\tH\x03\x88\x01\x01\x12\"\n\x15\x66lagged_ranges_packed\x18\x05 \x01(\x0cH\x04\x88\x01\x01\x12$\n\x17unflagged_ranges_packed\x18\x06 \x01(\x0cH\x05\x88\x01\x01\x12?\n\x06\x65nergy\x18\x08 \x01(\x0b\x32/.rivian.parallax.navigation.TripInfo.Leg.Energy\x12\x63\n\x19\x63\x61tegorized_range_segment\x18\t \x03(\x0b\x32@.rivian.parallax.navigation.TripInfo.Leg.CategorizedRangeSegment\x12W\n\x13index_range_segment\x18\n \x03(\x0b\x32:.rivian.parallax.navigation.TripInfo.Leg.IndexRangeSegment\x1a\"\n\x06\x45nergy\x12\x10\n\x03kwh\x18\x01 \x01(\x01H\x00\x88\x01\x01\x42\x06\n\x04_kwh\x1au\n\x17\x43\x61tegorizedRangeSegment\x12\x12\n\x05start\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x10\n\x03\x65nd\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12\x15\n\x08\x63\x61tegory\x18\x03 \x01(\x05H\x02\x88\x01\x01\x42\x08\n\x06_startB\x06\n\x04_endB\x0b\n\t_category\x1a\x95\x01\n\x11IndexRangeSegment\x12\x12\n\x05start\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x16\n\x0estart_fraction\x18\x02 \x01(\x02\x12\x10\n\x03\x65nd\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12\x14\n\x0c\x65nd_fraction\x18\x04 \x01(\x02\x12\x11\n\x04\x66lag\x18\x05 \x01(\x08H\x02\x88\x01\x01\x42\x08\n\x06_startB\x06\n\x04_endB\x07\n\x05_flagB\x0b\n\t_distanceB\x0b\n\t_durationB\r\n\x0b_road_labelB\x0b\n\t_polylineB\x18\n\x16_flagged_ranges_packedB\x1a\n\x18_unflagged_ranges_packed\x1a\x94\x01\n\x10RoutePreferences\x12\x15\n\x08weight_a\x18\x01 \x01(\x02H\x00\x88\x01\x01\x12\x15\n\x08weight_b\x18\x02 \x01(\x02H\x01\x88\x01\x01\x12\x16\n\x0eroad_avoidance\x18\x03 \x03(\t\x12 \n\x18\x63harging_network_filters\x18\x04 \x03(\tB\x0b\n\t_weight_aB\x0b\n\t_weight_b\x1a\xe9\x01\n\x08TripMeta\x12\x14\n\x07\x66ield_1\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12H\n\x07\x66ield_2\x18\x02 \x01(\x0b\x32\x37.rivian.parallax.navigation.TripInfo.TripMeta.Unmapped2\x12\x14\n\x07\x66ield_3\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12\x14\n\x07\x66ield_4\x18\x04 \x01(\x05H\x02\x88\x01\x01\x1a-\n\tUnmapped2\x12\x0f\n\x07\x66ield_2\x18\x02 \x01(\x05\x12\x0f\n\x07\x66ield_4\x18\x04 \x01(\x05\x42\n\n\x08_field_1B\n\n\x08_field_3B\n\n\x08_field_4B\n\n\x08_trip_idB\r\n\x0b_origin_soc\"\xff\x04\n\x0cTripProgress\x12L\n\rnext_waypoint\x18\x01 \x01(\x0b\x32\x35.rivian.parallax.navigation.TripProgress.NextWaypoint\x12T\n\x11\x66inal_destination\x18\x02 \x01(\x0b\x32\x39.rivian.parallax.navigation.TripProgress.FinalDestination\x12\x1f\n\x12\x64istance_remaining\x18\x04 \x01(\x01H\x00\x88\x01\x01\x12\x1f\n\x12\x64uration_remaining\x18\x05 \x01(\x01H\x01\x88\x01\x01\x12J\n\x0clocation_fix\x18\x06 \x01(\x0b\x32\x34.rivian.parallax.navigation.TripProgress.LocationFix\x1a\x30\n\x0cNextWaypoint\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\x34\n\x10\x46inalDestination\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a\xa6\x01\n\x0bLocationFix\x12;\n\x08location\x18\x01 \x01(\x0b\x32).rivian.parallax.navigation.GeoCoordinate\x12\x12\n\x05speed\x18\x02 \x01(\x02H\x00\x88\x01\x01\x12\x14\n\x07heading\x18\x03 \x01(\x02H\x01\x88\x01\x01\x12\x11\n\x04time\x18\x05 \x01(\x03H\x02\x88\x01\x01\x42\x08\n\x06_speedB\n\n\x08_headingB\x07\n\x05_timeB\x15\n\x13_distance_remainingB\x15\n\x13_duration_remainingb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -36,7 +36,7 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_TIMESTAMP']._serialized_start=161
   _globals['_TIMESTAMP']._serialized_end=236
   _globals['_TRIPINFO']._serialized_start=239
-  _globals['_TRIPINFO']._serialized_end=3653
+  _globals['_TRIPINFO']._serialized_end=3787
   _globals['_TRIPINFO_ORIGIN']._serialized_start=592
   _globals['_TRIPINFO_ORIGIN']._serialized_end=723
   _globals['_TRIPINFO_NEXTWAYPOINTDEPARTURE']._serialized_start=725
@@ -54,23 +54,25 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_TRIPINFO_CHARGINGSTOP_ARRIVALTIMEWRAPPER']._serialized_start=2304
   _globals['_TRIPINFO_CHARGINGSTOP_ARRIVALTIMEWRAPPER']._serialized_end=2358
   _globals['_TRIPINFO_LEG']._serialized_start=2530
-  _globals['_TRIPINFO_LEG']._serialized_end=3326
+  _globals['_TRIPINFO_LEG']._serialized_end=3373
   _globals['_TRIPINFO_LEG_ENERGY']._serialized_start=2960
   _globals['_TRIPINFO_LEG_ENERGY']._serialized_end=2994
   _globals['_TRIPINFO_LEG_CATEGORIZEDRANGESEGMENT']._serialized_start=2996
   _globals['_TRIPINFO_LEG_CATEGORIZEDRANGESEGMENT']._serialized_end=3113
-  _globals['_TRIPINFO_LEG_INDEXRANGESEGMENT']._serialized_start=3115
-  _globals['_TRIPINFO_LEG_INDEXRANGESEGMENT']._serialized_end=3218
-  _globals['_TRIPINFO_ROUTEPREFERENCES']._serialized_start=3329
-  _globals['_TRIPINFO_ROUTEPREFERENCES']._serialized_end=3477
-  _globals['_TRIPINFO_TRIPMETA']._serialized_start=3480
-  _globals['_TRIPINFO_TRIPMETA']._serialized_end=3626
-  _globals['_TRIPPROGRESS']._serialized_start=3656
-  _globals['_TRIPPROGRESS']._serialized_end=4295
-  _globals['_TRIPPROGRESS_NEXTWAYPOINT']._serialized_start=3978
-  _globals['_TRIPPROGRESS_NEXTWAYPOINT']._serialized_end=4026
-  _globals['_TRIPPROGRESS_FINALDESTINATION']._serialized_start=4028
-  _globals['_TRIPPROGRESS_FINALDESTINATION']._serialized_end=4080
-  _globals['_TRIPPROGRESS_LOCATIONFIX']._serialized_start=4083
-  _globals['_TRIPPROGRESS_LOCATIONFIX']._serialized_end=4249
+  _globals['_TRIPINFO_LEG_INDEXRANGESEGMENT']._serialized_start=3116
+  _globals['_TRIPINFO_LEG_INDEXRANGESEGMENT']._serialized_end=3265
+  _globals['_TRIPINFO_ROUTEPREFERENCES']._serialized_start=3376
+  _globals['_TRIPINFO_ROUTEPREFERENCES']._serialized_end=3524
+  _globals['_TRIPINFO_TRIPMETA']._serialized_start=3527
+  _globals['_TRIPINFO_TRIPMETA']._serialized_end=3760
+  _globals['_TRIPINFO_TRIPMETA_UNMAPPED2']._serialized_start=3679
+  _globals['_TRIPINFO_TRIPMETA_UNMAPPED2']._serialized_end=3724
+  _globals['_TRIPPROGRESS']._serialized_start=3790
+  _globals['_TRIPPROGRESS']._serialized_end=4429
+  _globals['_TRIPPROGRESS_NEXTWAYPOINT']._serialized_start=4112
+  _globals['_TRIPPROGRESS_NEXTWAYPOINT']._serialized_end=4160
+  _globals['_TRIPPROGRESS_FINALDESTINATION']._serialized_start=4162
+  _globals['_TRIPPROGRESS_FINALDESTINATION']._serialized_end=4214
+  _globals['_TRIPPROGRESS_LOCATIONFIX']._serialized_start=4217
+  _globals['_TRIPPROGRESS_LOCATIONFIX']._serialized_end=4383
 # @@protoc_insertion_point(module_scope)

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/navigation_pb2.pyi

@@ -141,14 +141,18 @@ class TripInfo(_message.Message):
             category: int
             def __init__(self, start: _Optional[int] = ..., end: _Optional[int] = ..., category: _Optional[int] = ...) -> None: ...
         class IndexRangeSegment(_message.Message):
-            __slots__ = ("start", "end", "flag")
+            __slots__ = ("start", "start_fraction", "end", "end_fraction", "flag")
             START_FIELD_NUMBER: _ClassVar[int]
+            START_FRACTION_FIELD_NUMBER: _ClassVar[int]
             END_FIELD_NUMBER: _ClassVar[int]
+            END_FRACTION_FIELD_NUMBER: _ClassVar[int]
             FLAG_FIELD_NUMBER: _ClassVar[int]
             start: int
+            start_fraction: float
             end: int
+            end_fraction: float
             flag: bool
-            def __init__(self, start: _Optional[int] = ..., end: _Optional[int] = ..., flag: _Optional[bool] = ...) -> None: ...
+            def __init__(self, start: _Optional[int] = ..., start_fraction: _Optional[float] = ..., end: _Optional[int] = ..., end_fraction: _Optional[float] = ..., flag: _Optional[bool] = ...) -> None: ...
         DISTANCE_FIELD_NUMBER: _ClassVar[int]
         DURATION_FIELD_NUMBER: _ClassVar[int]
         ROAD_LABEL_FIELD_NUMBER: _ClassVar[int]
@@ -181,15 +185,22 @@ class TripInfo(_message.Message):
         def __init__(self, weight_a: _Optional[float] = ..., weight_b: _Optional[float] = ..., road_avoidance: _Optional[_Iterable[str]] = ..., charging_network_filters: _Optional[_Iterable[str]] = ...) -> None: ...
     class TripMeta(_message.Message):
         __slots__ = ("field_1", "field_2", "field_3", "field_4")
+        class Unmapped2(_message.Message):
+            __slots__ = ("field_2", "field_4")
+            FIELD_2_FIELD_NUMBER: _ClassVar[int]
+            FIELD_4_FIELD_NUMBER: _ClassVar[int]
+            field_2: int
+            field_4: int
+            def __init__(self, field_2: _Optional[int] = ..., field_4: _Optional[int] = ...) -> None: ...
         FIELD_1_FIELD_NUMBER: _ClassVar[int]
         FIELD_2_FIELD_NUMBER: _ClassVar[int]
         FIELD_3_FIELD_NUMBER: _ClassVar[int]
         FIELD_4_FIELD_NUMBER: _ClassVar[int]
         field_1: int
-        field_2: int
+        field_2: TripInfo.TripMeta.Unmapped2
         field_3: int
         field_4: int
-        def __init__(self, field_1: _Optional[int] = ..., field_2: _Optional[int] = ..., field_3: _Optional[int] = ..., field_4: _Optional[int] = ...) -> None: ...
+        def __init__(self, field_1: _Optional[int] = ..., field_2: _Optional[_Union[TripInfo.TripMeta.Unmapped2, _Mapping]] = ..., field_3: _Optional[int] = ..., field_4: _Optional[int] = ...) -> None: ...
     TRIP_ID_FIELD_NUMBER: _ClassVar[int]
     ORIGIN_FIELD_NUMBER: _ClassVar[int]
     TRIP_FIELD_NUMBER: _ClassVar[int]

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/ota.proto

@@ -67,17 +67,18 @@ message DeploymentState {
   }
 }
 
-// ota.user_schedule.ota_config -- auto-install schedule. Entries may be
-// resent without their ids.
+// ota.user_schedule.ota_config -- install schedules: a one-time scheduled
+// install and the recurring auto-install. Entries may be resent without
+// their ids.
 message OtaConfig {
   repeated Schedule schedule = 1;
   UpdatedAt updated_at = 2;
 
   message Schedule {
     optional string id = 1;     // UUID
-    bool enabled = 2;           // whether auto-install is on
-    TimeOfDay time_of_day = 3;
-    Unmapped4 field_4 = 4;      // unknown; on the entry with no time of day
+    bool enabled = 2;
+    TimeOfDay time_of_day = 3;  // recurring auto-install
+    OneTime one_time = 4;       // one-time scheduled install
   }
 
   message TimeOfDay {
@@ -89,8 +90,12 @@ message OtaConfig {
     optional string name = 1; // a saved location (e.g. "home") or "anywhere"
   }
 
-  message Unmapped4 {
-    string field_1 = 1; // always empty
+  message OneTime {
+    InstallTime install_time = 1; // empty until a time is picked
+
+    message InstallTime {
+      optional int64 seconds = 1; // epoch seconds
+    }
   }
 
   message UpdatedAt {

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/ota_pb2.py

@@ -24,7 +24,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1frivian/parallax/proto/ota.proto\x12\x13rivian.parallax.ota\"\xd5\x0c\n\x0f\x44\x65ploymentState\x12\x43\n\ndeployment\x18\x01 \x01(\x0b\x32/.rivian.parallax.ota.DeploymentState.Deployment\x1a\xb9\x01\n\nDeployment\x12\x12\n\x05state\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12=\n\x07version\x18\x02 \x01(\x0b\x32,.rivian.parallax.ota.DeploymentState.Version\x12N\n\x10progress_wrapper\x18\x04 \x01(\x0b\x32\x34.rivian.parallax.ota.DeploymentState.ProgressWrapperB\x08\n\x06_state\x1a\xb7\x01\n\x07Version\x12\x1b\n\x0eversion_string\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0cversion_year\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12\x1a\n\rversion_build\x18\x04 \x01(\x05H\x02\x88\x01\x01\x12\x15\n\x08\x62uild_id\x18\x06 \x01(\tH\x03\x88\x01\x01\x42\x11\n\x0f_version_stringB\x0f\n\r_version_yearB\x10\n\x0e_version_buildB\x0b\n\t_build_id\x1a\xd2\x02\n\x0fProgressWrapper\x12\x1a\n\rdeployment_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x44\n\x0etarget_version\x18\x02 \x01(\x0b\x32,.rivian.parallax.ota.DeploymentState.Version\x12\x18\n\x0b\x61\x63tive_flag\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12?\n\x08progress\x18\x05 \x01(\x0b\x32-.rivian.parallax.ota.DeploymentState.Progress\x12\x1b\n\x0etimeout_budget\x18\x07 \x01(\x05H\x02\x88\x01\x01\x12\x1c\n\x0flate_stage_flag\x18\x0b \x01(\x05H\x03\x88\x01\x01\x42\x10\n\x0e_deployment_idB\x0e\n\x0c_active_flagB\x11\n\x0f_timeout_budgetB\x12\n\x10_late_stage_flag\x1a\xa3\x04\n\x08Progress\x12\x41\n\x05phase\x18\x01 \x01(\x0e\x32-.rivian.parallax.ota.DeploymentState.OtaPhaseH\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12T\n\x11\x64ownload_progress\x18\x03 \x01(\x0b\x32\x39.rivian.parallax.ota.DeploymentState.Progress.Progress100\x12S\n\x10install_progress\x18\x04 \x01(\x0b\x32\x39.rivian.parallax.ota.DeploymentState.Progress.Progress100\x12\x14\n\x07\x66ield_5\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x1b\n\x0etime_remaining\x18\x06 \x01(\x05H\x03\x88\x01\x01\x12\x14\n\x07\x66ield_7\x18\x07 \x01(\x05H\x04\x88\x01\x01\x12\x1f\n\x12update_cycle_count\x18\x08 \x01(\x05H\x05\x88\x01\x01\x12\x14\n\x07\x66ield_9\x18\t \x01(\x05H\x06\x88\x01\x01\x1a/\n\x0bProgress100\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x00\x88\x01\x01\x42\n\n\x08_field_2B\x08\n\x06_phaseB\n\n\x08_field_2B\n\n\x08_field_5B\x11\n\x0f_time_remainingB\n\n\x08_field_7B\x15\n\x13_update_cycle_countB\n\n\x08_field_9\"\x8b\x02\n\x08OtaPhase\x12\x19\n\x15OTA_PHASE_UNSPECIFIED\x10\x00\x12\x12\n\x0eOTA_PHASE_IDLE\x10\x01\x12\x1f\n\x1bOTA_PHASE_INSTALL_COUNTDOWN\x10\x05\x12\x17\n\x13OTA_PHASE_PREPARING\x10\x06\x12\x19\n\x15OTA_PHASE_DOWNLOADING\x10\x07\x12\"\n\x1eOTA_PHASE_SCHEDULED_TO_INSTALL\x10\x08\x12\x1e\n\x1aOTA_PHASE_AWAITING_INSTALL\x10\n\x12\x18\n\x14OTA_PHASE_INSTALLING\x10\x0b\x12\x1d\n\x19OTA_PHASE_INSTALL_SUCCESS\x10\x0c\"\x97\x04\n\tOtaConfig\x12\x39\n\x08schedule\x18\x01 \x03(\x0b\x32\'.rivian.parallax.ota.OtaConfig.Schedule\x12<\n\nupdated_at\x18\x02 \x01(\x0b\x32(.rivian.parallax.ota.OtaConfig.UpdatedAt\x1a\xad\x01\n\x08Schedule\x12\x0f\n\x02id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\x12=\n\x0btime_of_day\x18\x03 \x01(\x0b\x32(.rivian.parallax.ota.OtaConfig.TimeOfDay\x12\x39\n\x07\x66ield_4\x18\x04 \x01(\x0b\x32(.rivian.parallax.ota.OtaConfig.Unmapped4B\x05\n\x03_id\x1an\n\tTimeOfDay\x12\x17\n\nstart_time\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x39\n\x08location\x18\x02 \x01(\x0b\x32\'.rivian.parallax.ota.OtaConfig.LocationB\r\n\x0b_start_time\x1a&\n\x08Location\x12\x11\n\x04name\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_name\x1a\x1c\n\tUnmapped4\x12\x0f\n\x07\x66ield_1\x18\x01 \x01(\t\x1a+\n\tUpdatedAt\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\"\x1f\n\x0fVehicleOtaState\x12\x0c\n\x04name\x18\x01 \x01(\tb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1frivian/parallax/proto/ota.proto\x12\x13rivian.parallax.ota\"\xd5\x0c\n\x0f\x44\x65ploymentState\x12\x43\n\ndeployment\x18\x01 \x01(\x0b\x32/.rivian.parallax.ota.DeploymentState.Deployment\x1a\xb9\x01\n\nDeployment\x12\x12\n\x05state\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12=\n\x07version\x18\x02 \x01(\x0b\x32,.rivian.parallax.ota.DeploymentState.Version\x12N\n\x10progress_wrapper\x18\x04 \x01(\x0b\x32\x34.rivian.parallax.ota.DeploymentState.ProgressWrapperB\x08\n\x06_state\x1a\xb7\x01\n\x07Version\x12\x1b\n\x0eversion_string\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0cversion_year\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12\x1a\n\rversion_build\x18\x04 \x01(\x05H\x02\x88\x01\x01\x12\x15\n\x08\x62uild_id\x18\x06 \x01(\tH\x03\x88\x01\x01\x42\x11\n\x0f_version_stringB\x0f\n\r_version_yearB\x10\n\x0e_version_buildB\x0b\n\t_build_id\x1a\xd2\x02\n\x0fProgressWrapper\x12\x1a\n\rdeployment_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x44\n\x0etarget_version\x18\x02 \x01(\x0b\x32,.rivian.parallax.ota.DeploymentState.Version\x12\x18\n\x0b\x61\x63tive_flag\x18\x03 \x01(\x05H\x01\x88\x01\x01\x12?\n\x08progress\x18\x05 \x01(\x0b\x32-.rivian.parallax.ota.DeploymentState.Progress\x12\x1b\n\x0etimeout_budget\x18\x07 \x01(\x05H\x02\x88\x01\x01\x12\x1c\n\x0flate_stage_flag\x18\x0b \x01(\x05H\x03\x88\x01\x01\x42\x10\n\x0e_deployment_idB\x0e\n\x0c_active_flagB\x11\n\x0f_timeout_budgetB\x12\n\x10_late_stage_flag\x1a\xa3\x04\n\x08Progress\x12\x41\n\x05phase\x18\x01 \x01(\x0e\x32-.rivian.parallax.ota.DeploymentState.OtaPhaseH\x00\x88\x01\x01\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12T\n\x11\x64ownload_progress\x18\x03 \x01(\x0b\x32\x39.rivian.parallax.ota.DeploymentState.Progress.Progress100\x12S\n\x10install_progress\x18\x04 \x01(\x0b\x32\x39.rivian.parallax.ota.DeploymentState.Progress.Progress100\x12\x14\n\x07\x66ield_5\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x1b\n\x0etime_remaining\x18\x06 \x01(\x05H\x03\x88\x01\x01\x12\x14\n\x07\x66ield_7\x18\x07 \x01(\x05H\x04\x88\x01\x01\x12\x1f\n\x12update_cycle_count\x18\x08 \x01(\x05H\x05\x88\x01\x01\x12\x14\n\x07\x66ield_9\x18\t \x01(\x05H\x06\x88\x01\x01\x1a/\n\x0bProgress100\x12\x14\n\x07\x66ield_2\x18\x02 \x01(\x05H\x00\x88\x01\x01\x42\n\n\x08_field_2B\x08\n\x06_phaseB\n\n\x08_field_2B\n\n\x08_field_5B\x11\n\x0f_time_remainingB\n\n\x08_field_7B\x15\n\x13_update_cycle_countB\n\n\x08_field_9\"\x8b\x02\n\x08OtaPhase\x12\x19\n\x15OTA_PHASE_UNSPECIFIED\x10\x00\x12\x12\n\x0eOTA_PHASE_IDLE\x10\x01\x12\x1f\n\x1bOTA_PHASE_INSTALL_COUNTDOWN\x10\x05\x12\x17\n\x13OTA_PHASE_PREPARING\x10\x06\x12\x19\n\x15OTA_PHASE_DOWNLOADING\x10\x07\x12\"\n\x1eOTA_PHASE_SCHEDULED_TO_INSTALL\x10\x08\x12\x1e\n\x1aOTA_PHASE_AWAITING_INSTALL\x10\n\x12\x18\n\x14OTA_PHASE_INSTALLING\x10\x0b\x12\x1d\n\x19OTA_PHASE_INSTALL_SUCCESS\x10\x0c\"\xff\x04\n\tOtaConfig\x12\x39\n\x08schedule\x18\x01 \x03(\x0b\x32\'.rivian.parallax.ota.OtaConfig.Schedule\x12<\n\nupdated_at\x18\x02 \x01(\x0b\x32(.rivian.parallax.ota.OtaConfig.UpdatedAt\x1a\xac\x01\n\x08Schedule\x12\x0f\n\x02id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\x12=\n\x0btime_of_day\x18\x03 \x01(\x0b\x32(.rivian.parallax.ota.OtaConfig.TimeOfDay\x12\x38\n\x08one_time\x18\x04 \x01(\x0b\x32&.rivian.parallax.ota.OtaConfig.OneTimeB\x05\n\x03_id\x1an\n\tTimeOfDay\x12\x17\n\nstart_time\x18\x01 \x01(\x05H\x00\x88\x01\x01\x12\x39\n\x08location\x18\x02 \x01(\x0b\x32\'.rivian.parallax.ota.OtaConfig.LocationB\r\n\x0b_start_time\x1a&\n\x08Location\x12\x11\n\x04name\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_name\x1a\x84\x01\n\x07OneTime\x12H\n\x0cinstall_time\x18\x01 \x01(\x0b\x32\x32.rivian.parallax.ota.OtaConfig.OneTime.InstallTime\x1a/\n\x0bInstallTime\x12\x14\n\x07seconds\x18\x01 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_seconds\x1a+\n\tUpdatedAt\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x12\r\n\x05nanos\x18\x02 \x01(\x05\"\x1f\n\x0fVehicleOtaState\x12\x0c\n\x04name\x18\x01 \x01(\tb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -46,17 +46,19 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_DEPLOYMENTSTATE_OTAPHASE']._serialized_start=1411
   _globals['_DEPLOYMENTSTATE_OTAPHASE']._serialized_end=1678
   _globals['_OTACONFIG']._serialized_start=1681
-  _globals['_OTACONFIG']._serialized_end=2216
+  _globals['_OTACONFIG']._serialized_end=2320
   _globals['_OTACONFIG_SCHEDULE']._serialized_start=1816
-  _globals['_OTACONFIG_SCHEDULE']._serialized_end=1989
-  _globals['_OTACONFIG_TIMEOFDAY']._serialized_start=1991
-  _globals['_OTACONFIG_TIMEOFDAY']._serialized_end=2101
-  _globals['_OTACONFIG_LOCATION']._serialized_start=2103
-  _globals['_OTACONFIG_LOCATION']._serialized_end=2141
-  _globals['_OTACONFIG_UNMAPPED4']._serialized_start=2143
-  _globals['_OTACONFIG_UNMAPPED4']._serialized_end=2171
-  _globals['_OTACONFIG_UPDATEDAT']._serialized_start=2173
-  _globals['_OTACONFIG_UPDATEDAT']._serialized_end=2216
-  _globals['_VEHICLEOTASTATE']._serialized_start=2218
-  _globals['_VEHICLEOTASTATE']._serialized_end=2249
+  _globals['_OTACONFIG_SCHEDULE']._serialized_end=1988
+  _globals['_OTACONFIG_TIMEOFDAY']._serialized_start=1990
+  _globals['_OTACONFIG_TIMEOFDAY']._serialized_end=2100
+  _globals['_OTACONFIG_LOCATION']._serialized_start=2102
+  _globals['_OTACONFIG_LOCATION']._serialized_end=2140
+  _globals['_OTACONFIG_ONETIME']._serialized_start=2143
+  _globals['_OTACONFIG_ONETIME']._serialized_end=2275
+  _globals['_OTACONFIG_ONETIME_INSTALLTIME']._serialized_start=2228
+  _globals['_OTACONFIG_ONETIME_INSTALLTIME']._serialized_end=2275
+  _globals['_OTACONFIG_UPDATEDAT']._serialized_start=2277
+  _globals['_OTACONFIG_UPDATEDAT']._serialized_end=2320
+  _globals['_VEHICLEOTASTATE']._serialized_start=2322
+  _globals['_VEHICLEOTASTATE']._serialized_end=2353
 # @@protoc_insertion_point(module_scope)

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/parallax/proto/ota_pb2.pyi

@@ -97,16 +97,16 @@ class DeploymentState(_message.Message):
 class OtaConfig(_message.Message):
     __slots__ = ("schedule", "updated_at")
     class Schedule(_message.Message):
-        __slots__ = ("id", "enabled", "time_of_day", "field_4")
+        __slots__ = ("id", "enabled", "time_of_day", "one_time")
         ID_FIELD_NUMBER: _ClassVar[int]
         ENABLED_FIELD_NUMBER: _ClassVar[int]
         TIME_OF_DAY_FIELD_NUMBER: _ClassVar[int]
-        FIELD_4_FIELD_NUMBER: _ClassVar[int]
+        ONE_TIME_FIELD_NUMBER: _ClassVar[int]
         id: str
         enabled: bool
         time_of_day: OtaConfig.TimeOfDay
-        field_4: OtaConfig.Unmapped4
-        def __init__(self, id: _Optional[str] = ..., enabled: _Optional[bool] = ..., time_of_day: _Optional[_Union[OtaConfig.TimeOfDay, _Mapping]] = ..., field_4: _Optional[_Union[OtaConfig.Unmapped4, _Mapping]] = ...) -> None: ...
+        one_time: OtaConfig.OneTime
+        def __init__(self, id: _Optional[str] = ..., enabled: _Optional[bool] = ..., time_of_day: _Optional[_Union[OtaConfig.TimeOfDay, _Mapping]] = ..., one_time: _Optional[_Union[OtaConfig.OneTime, _Mapping]] = ...) -> None: ...
     class TimeOfDay(_message.Message):
         __slots__ = ("start_time", "location")
         START_TIME_FIELD_NUMBER: _ClassVar[int]
@@ -119,11 +119,16 @@ class OtaConfig(_message.Message):
         NAME_FIELD_NUMBER: _ClassVar[int]
         name: str
         def __init__(self, name: _Optional[str] = ...) -> None: ...
-    class Unmapped4(_message.Message):
-        __slots__ = ("field_1",)
-        FIELD_1_FIELD_NUMBER: _ClassVar[int]
-        field_1: str
-        def __init__(self, field_1: _Optional[str] = ...) -> None: ...
+    class OneTime(_message.Message):
+        __slots__ = ("install_time",)
+        class InstallTime(_message.Message):
+            __slots__ = ("seconds",)
+            SECONDS_FIELD_NUMBER: _ClassVar[int]
+            seconds: int
+            def __init__(self, seconds: _Optional[int] = ...) -> None: ...
+        INSTALL_TIME_FIELD_NUMBER: _ClassVar[int]
+        install_time: OtaConfig.OneTime.InstallTime
+        def __init__(self, install_time: _Optional[_Union[OtaConfig.OneTime.InstallTime, _Mapping]] = ...) -> None: ...
     class UpdatedAt(_message.Message):
         __slots__ = ("seconds", "nanos")
         SECONDS_FIELD_NUMBER: _ClassVar[int]

{rivian_python_client-2.2.0b0 → rivian_python_client-2.2.0b1}/src/rivian/ws_monitor.py

@@ -26,6 +26,10 @@ if TYPE_CHECKING:
 
 _LOGGER = logging.getLogger(__name__)
 
+RATE_LIMITED = "Rate limited"
+RATE_LIMIT_BACKOFF_MIN = 30
+RATE_LIMIT_BACKOFF_MAX = 900
+
 
 async def cancel_task(*tasks: asyncio.Task | None) -> None:
     """Cancel task(s)."""
@@ -54,6 +58,8 @@ class WebSocketMonitor:
 
         self._connection_ack: asyncio.Event = asyncio.Event()
         self._disconnect = False
+        self._rate_limited = False
+        self._rate_limit_attempt = 0
         self._ws: ClientWebSocketResponse[bool] | None = None
         self._monitor_task: asyncio.Task | None = None
         self._receiver_task: asyncio.Task | None = None
@@ -88,6 +94,7 @@ class WebSocketMonitor:
         """Create a new connection and, optionally, start the monitor."""
         await cancel_task(self._receiver_task)
         self._disconnect = False
+        self._rate_limited = False
         # pylint: disable=protected-access
         assert self._account._session
         self._ws = await self._account._session.ws_connect(
@@ -145,6 +152,8 @@ class WebSocketMonitor:
                     self._log_message(msg)
                     if msg.extra == "Unauthenticated":
                         self._disconnect = True
+                    elif msg.extra == RATE_LIMITED:
+                        self._rate_limited = True
                     break
                 self._last_received = datetime.now(timezone.utc)
                 if msg.type == WSMsgType.TEXT:
@@ -152,6 +161,7 @@ class WebSocketMonitor:
                     if (data_type := data.get("type")) == "connection_ack":
                         self._connection_ack.set()
                     elif data_type == "next":
+                        self._rate_limit_attempt = 0
                         if (_id := data.get("id")) in self._subscriptions:
                             _fn = self._subscriptions[_id][0]
                             if inspect.iscoroutinefunction(_fn):
@@ -164,6 +174,8 @@ class WebSocketMonitor:
                     self._log_message(msg, True)
                     continue
             except asyncio.TimeoutError:
+                # The connection has stayed open, so any rate limit has passed
+                self._rate_limit_attempt = 0
                 await self._resubscribe_all()
         self._connection_ack.clear()
         self._log_message("web socket stopped")
@@ -177,6 +189,10 @@ class WebSocketMonitor:
                     # Need to restart the receiver
                     self._receiver_task = asyncio.ensure_future(self._receiver())
                 await asyncio.sleep(1)
+            if self._rate_limited:
+                await self._rate_limit_backoff()
+                if self._disconnect or self.connected:
+                    continue
             if not self._disconnect:
                 try:
                     await self.new_connection()
@@ -190,6 +206,21 @@ class WebSocketMonitor:
                 self._log_message("web socket connection reopened")
                 await self._resubscribe_all()
 
+    async def _rate_limit_backoff(self) -> None:
+        """Wait before reconnecting after the server closed the connection due to rate limiting."""
+        self._rate_limited = False
+        delay = min(
+            RATE_LIMIT_BACKOFF_MIN * 2**self._rate_limit_attempt
+            + uniform(0, RATE_LIMIT_BACKOFF_MIN),
+            RATE_LIMIT_BACKOFF_MAX,
+        )
+        self._rate_limit_attempt += 1
+        _LOGGER.warning(
+            "Web socket connection was rate limited, reconnecting in %.0f seconds",
+            delay,
+        )
+        await asyncio.sleep(delay)
+
     async def start_monitor(self) -> None:
         """Start or restart the monitor task."""
         if self._monitor_task is None or self._monitor_task.done():