v5.1.0

Bre77 · Bre77 · commit 631d66861930 · 2026-02-10T09:18:17.000+10:00
diff --git a/custom_components/teslemetry/manifest.json b/custom_components/teslemetry/manifest.json
@@ -1,13 +1,23 @@
 {
   "domain": "teslemetry",
   "name": "Teslemetry",
-  "codeowners": ["@Bre77"],
+  "codeowners": [
+    "@Bre77"
+  ],
   "config_flow": true,
-  "dependencies": ["application_credentials"],
+  "dependencies": [
+    "application_credentials"
+  ],
   "documentation": "https://www.home-assistant.io/integrations/teslemetry",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/Teslemetry/hass-teslemetry/issues",
-  "loggers": ["tesla-fleet-api"],
-  "requirements": ["tesla-fleet-api==1.3.0", "teslemetry-stream==0.8.2"]
+  "loggers": [
+    "tesla-fleet-api"
+  ],
+  "requirements": [
+    "tesla-fleet-api==1.4.2",
+    "teslemetry-stream==0.9.0"
+  ],
+  "version": "5.1.0"
 }
diff --git a/homeassistant/components/teslemetry/__init__.py b/homeassistant/components/teslemetry/__init__.py
@@ -111,7 +111,6 @@ async def _get_access_token(oauth_session: OAuth2Session) -> str:
     return oauth_session.token[CONF_ACCESS_TOKEN]
 
 
-<<<<<<< ours
 def beta_migration_fix(hass: HomeAssistant, entry: TeslemetryConfigEntry):
     """Fix beta migration issues."""
     # This is needed to migrate beta users to the new OAuth credential system.
@@ -120,7 +119,8 @@ def beta_migration_fix(hass: HomeAssistant, entry: TeslemetryConfigEntry):
             entry,
             data={**entry.data, "auth_implementation": DOMAIN},
         )
-=======
+
+
 def _setup_dynamic_discovery(
     hass: HomeAssistant,
     entry: TeslemetryConfigEntry,
@@ -165,14 +165,9 @@ def _handle_metadata_update() -> None:
             )
             hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
 
-<<<<<<< ours
-    metadata_coordinator.async_add_listener(_handle_metadata_update)
->>>>>>> theirs
-=======
     entry.async_on_unload(
         metadata_coordinator.async_add_listener(_handle_metadata_update)
     )
->>>>>>> theirs
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -> bool:
@@ -287,18 +282,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
             firmware = vehicle_metadata[vin].get("firmware", "Unknown")
             poll = vehicle_metadata[vin].get("polling", False)
 
-<<<<<<< ours
-            entry.async_on_unload(
-                stream.async_add_listener(
-                    create_handle_vehicle_stream(vin, coordinator),
-                    {"vin": vin},
-                )
-=======
             # Set up stream for this vehicle
             remove_listener = stream.async_add_listener(
                 create_handle_vehicle_stream(vin, coordinator),
                 {"vin": vin},
->>>>>>> theirs
             )
             stream_vehicle = stream.get_vehicle(vin)
 
@@ -313,6 +300,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
                     vin=vin,
                     firmware=firmware,
                     device=device,
+                    remove_listener=remove_listener,
                 )
             )
 
diff --git a/homeassistant/components/teslemetry/manifest.json b/homeassistant/components/teslemetry/manifest.json
@@ -1,13 +1,23 @@
 {
   "domain": "teslemetry",
   "name": "Teslemetry",
-  "codeowners": ["@Bre77"],
+  "codeowners": [
+    "@Bre77"
+  ],
   "config_flow": true,
-  "dependencies": ["application_credentials"],
+  "dependencies": [
+    "application_credentials"
+  ],
   "documentation": "https://www.home-assistant.io/integrations/teslemetry",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/Teslemetry/hass-teslemetry/issues",
-  "loggers": ["tesla-fleet-api"],
-  "requirements": ["tesla-fleet-api==1.4.2", "teslemetry-stream==0.9.0"]
+  "loggers": [
+    "tesla-fleet-api"
+  ],
+  "requirements": [
+    "tesla-fleet-api==1.4.2",
+    "teslemetry-stream==0.9.0"
+  ],
+  "version": "5.1.0"
 }
diff --git a/homeassistant/components/teslemetry/translations/en.json b/homeassistant/components/teslemetry/translations/en.json
@@ -7,6 +7,7 @@
         "end_time": "End time",
         "end_time_description": "The time this schedule ends, e.g. 01:05 for 1:05 AM.",
         "location_description": "The approximate location the vehicle must be at to use this schedule. Defaults to Home Assistant's configured location.",
+        "not_available": "Not available",
         "one_time": "One-time",
         "one_time_description": "If this is a one-time schedule.",
         "precondition_time": "Precondition time",
@@ -18,7 +19,6 @@
         "schedule_name_description": "The name of the schedule.",
         "start_time": "Start time",
         "start_time_description": "The time this schedule begins, e.g. 01:05 for 1:05 AM.",
-        "unavailable": "Unavailable",
         "vehicle": "Vehicle",
         "vehicle_to_remove_schedule": "Vehicle to remove schedule from.",
         "vehicle_to_schedule": "Vehicle to schedule.",
@@ -30,10 +30,13 @@
             "already_configured": "Account is already configured",
             "oauth_error": "Received invalid token data.",
             "oauth_failed": "Error while obtaining access token.",
+            "oauth_implementation_unavailable": "No OAuth2 implementations are currently available.",
             "oauth_timeout": "Timeout resolving OAuth token.",
             "oauth_unauthorized": "OAuth authorization error while obtaining access token.",
             "reauth_account_mismatch": "The reauthentication account does not match the original account",
-            "reauth_successful": "Re-authentication was successful"
+            "reauth_successful": "Re-authentication was successful",
+            "reconfigure_account_mismatch": "The reconfiguration account does not match the original account",
+            "reconfigure_successful": "Re-configuration was successful"
         },
         "error": {
             "cannot_connect": "Failed to connect",
@@ -269,6 +272,17 @@
                 "name": "Wake"
             }
         },
+        "calendar": {
+            "charge_schedule_data_charge_schedules": {
+                "name": "Charging schedule"
+            },
+            "tariff_content_v2": {
+                "name": "Buy tariff"
+            },
+            "tariff_content_v2_sell_tariff": {
+                "name": "Sell tariff"
+            }
+        },
         "climate": {
             "climate_state_cabin_overheat_protection": {
                 "name": "Cabin overheat protection"
@@ -633,8 +647,8 @@
                     "abort": "Abort",
                     "enabled": "Enabled",
                     "fault": "Fault",
-                    "standby": "Standby",
-                    "unavailable": "Unavailable"
+                    "not_available": "Not available",
+                    "standby": "Standby"
                 }
             },
             "di_state_r": {
@@ -643,8 +657,8 @@
                     "abort": "Abort",
                     "enabled": "Enabled",
                     "fault": "Fault",
-                    "standby": "Standby",
-                    "unavailable": "Unavailable"
+                    "not_available": "Not available",
+                    "standby": "Standby"
                 }
             },
             "di_state_rel": {
@@ -653,8 +667,8 @@
                     "abort": "Abort",
                     "enabled": "Enabled",
                     "fault": "Fault",
-                    "standby": "Standby",
-                    "unavailable": "Unavailable"
+                    "not_available": "Not available",
+                    "standby": "Standby"
                 }
             },
             "di_state_rer": {
@@ -663,8 +677,8 @@
                     "abort": "Abort",
                     "enabled": "Enabled",
                     "fault": "Fault",
-                    "standby": "Standby",
-                    "unavailable": "Unavailable"
+                    "not_available": "Not available",
+                    "standby": "Standby"
                 }
             },
             "di_stator_temp_f": {
@@ -1029,9 +1043,6 @@
             "vehicle_state_tpms_pressure_rr": {
                 "name": "Tire pressure rear right"
             },
-            "version": {
-                "name": "Version"
-            },
             "vin": {
                 "name": "Vehicle",
                 "state": {
@@ -1090,12 +1101,27 @@
         }
     },
     "exceptions": {
+        "auth_failed": {
+            "message": "Authentication failed, please reauthenticate"
+        },
+        "auth_failed_invalid_token": {
+            "message": "Access token is invalid, please reauthenticate"
+        },
+        "auth_failed_migration": {
+            "message": "Failed to migrate to OAuth, please reauthenticate"
+        },
+        "auth_failed_subscription_required": {
+            "message": "Teslemetry subscription required"
+        },
         "command_error": {
             "message": "Command returned error: {error}"
         },
         "command_exception": {
             "message": "Command returned exception: {message}"
         },
+        "command_no_response": {
+            "message": "Command had no response"
+        },
         "command_no_result": {
             "message": "Command had no result"
         },
@@ -1123,6 +1149,33 @@
         "no_vehicle_data_for_device": {
             "message": "No vehicle data for device ID: {device_id}"
         },
+        "not_ready_api_error": {
+            "message": "Error communicating with Teslemetry API"
+        },
+        "not_ready_connection_error": {
+            "message": "Unable to connect to Teslemetry"
+        },
+        "oauth_implementation_not_available": {
+            "message": "OAuth implementation not available, try reauthenticating"
+        },
+        "set_scheduled_charging_time": {
+            "message": "Scheduled charging time is required when enabling"
+        },
+        "set_scheduled_departure_off_peak": {
+            "message": "Off-peak charging end time is required when enabling"
+        },
+        "set_scheduled_departure_preconditioning": {
+            "message": "Preconditioning departure time is required when enabling"
+        },
+        "token_data_malformed": {
+            "message": "Token data malformed, try reauthenticating"
+        },
+        "update_failed": {
+            "message": "Error fetching data from Teslemetry API"
+        },
+        "update_failed_invalid_data": {
+            "message": "Received invalid data from API"
+        },
         "wake_up_failed": {
             "message": "Failed to wake up vehicle: {message}"
         },
diff --git a/tests/components/teslemetry/snapshots/test_calendar.ambr b/tests/components/teslemetry/snapshots/test_calendar.ambr
