From 96de4b3828c1ec3f17e7573e58a846ef43a6a647 Mon Sep 17 00:00:00 2001
From: Brett Adams <Bre77@users.noreply.github.com>
Date: Wed, 6 Nov 2024 22:40:37 +1000
Subject: [PATCH] Improve history coordinator in Teslemetry (#128235)

---
 homeassistant/components/teslemetry/__init__.py | 17 +++++++++++------
 homeassistant/components/teslemetry/entity.py   |  2 ++
 homeassistant/components/teslemetry/models.py   |  2 +-
 homeassistant/components/teslemetry/sensor.py   |  3 +--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/teslemetry/__init__.py b/homeassistant/components/teslemetry/__init__.py
index b884f9bbc5c..aa1d2b42660 100644
--- a/homeassistant/components/teslemetry/__init__.py
+++ b/homeassistant/components/teslemetry/__init__.py
@@ -135,11 +135,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
 
         elif "energy_site_id" in product and Scope.ENERGY_DEVICE_DATA in scopes:
             site_id = product["energy_site_id"]
-            if not (
-                product["components"]["battery"]
-                or product["components"]["solar"]
-                or "wall_connectors" in product["components"]
-            ):
+            powerwall = (
+                product["components"]["battery"] or product["components"]["solar"]
+            )
+            wall_connector = "wall_connectors" in product["components"]
+            if not powerwall and not wall_connector:
                 LOGGER.debug(
                     "Skipping Energy Site %s as it has no components",
                     site_id,
@@ -162,7 +162,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
                     info_coordinator=TeslemetryEnergySiteInfoCoordinator(
                         hass, api, product
                     ),
-                    history_coordinator=TeslemetryEnergyHistoryCoordinator(hass, api),
+                    history_coordinator=(
+                        TeslemetryEnergyHistoryCoordinator(hass, api)
+                        if powerwall
+                        else None
+                    ),
                     id=site_id,
                     device=device,
                 )
@@ -185,6 +189,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
         *(
             energysite.history_coordinator.async_config_entry_first_refresh()
             for energysite in energysites
+            if energysite.history_coordinator
         ),
     )
 
diff --git a/homeassistant/components/teslemetry/entity.py b/homeassistant/components/teslemetry/entity.py
index ca40d4d00ce..d14f3a42734 100644
--- a/homeassistant/components/teslemetry/entity.py
+++ b/homeassistant/components/teslemetry/entity.py
@@ -175,6 +175,8 @@ class TeslemetryEnergyHistoryEntity(TeslemetryEntity):
     ) -> None:
         """Initialize common aspects of a Teslemetry Energy Site Info entity."""
 
+        assert data.history_coordinator
+
         self.api = data.api
         self._attr_unique_id = f"{data.id}-{key}"
         self._attr_device_info = data.device
diff --git a/homeassistant/components/teslemetry/models.py b/homeassistant/components/teslemetry/models.py
index 7f8bd37425a..d3969b30a7c 100644
--- a/homeassistant/components/teslemetry/models.py
+++ b/homeassistant/components/teslemetry/models.py
@@ -49,6 +49,6 @@ class TeslemetryEnergyData:
     api: EnergySpecific
     live_coordinator: TeslemetryEnergySiteLiveCoordinator
     info_coordinator: TeslemetryEnergySiteInfoCoordinator
-    history_coordinator: TeslemetryEnergyHistoryCoordinator
+    history_coordinator: TeslemetryEnergyHistoryCoordinator | None
     id: int
     device: DeviceInfo
diff --git a/homeassistant/components/teslemetry/sensor.py b/homeassistant/components/teslemetry/sensor.py
index ba7d930fcd0..95876cc2cf9 100644
--- a/homeassistant/components/teslemetry/sensor.py
+++ b/homeassistant/components/teslemetry/sensor.py
@@ -482,8 +482,7 @@ async def async_setup_entry(
                 TeslemetryEnergyHistorySensorEntity(energysite, description)
                 for energysite in entry.runtime_data.energysites
                 for description in ENERGY_HISTORY_DESCRIPTIONS
-                if energysite.info_coordinator.data.get("components_battery")
-                or energysite.info_coordinator.data.get("components_solar")
+                if energysite.history_coordinator
             ),
         )
     )