Add more details to Energy History.

homeassistant/components/tesla_fleet/coordinator.py

@@ -220,33 +220,79 @@ async def _async_update_data(self) -> dict[str, Any]:
             raise UpdateFailed(e.message) from e
         self.updated_once = True
         formatted_data = {
-            "grid_in": 0,
-            "grid_out": 0,
+            "total_grid_import": 0,
+            "total_grid_export": 0,
             "solar_production": 0,
-            "battery_in": 0,
-            "battery_out": 0,
+            "total_battery_import": 0,
+            "total_battery_export": 0,
+            "total_generator_production": 0,
+            "total_home_usage": 0,
+            "grid_export_from_solar": 0,
+            "grid_export_from_generator": 0,
+            "grid_export_from_battery": 0,
+            "battery_import_from_solar": 0,
+            "battery_import_from_grid": 0,
+            "battery_import_from_generator": 0,
+            "home_usage_from_grid": 0,
+            "home_usage_from_solar": 0,
+            "home_usage_from_battery": 0,
+            "home_usage_from_generator": 0,
         }
         for time_entity in data["time_series"]:
-            formatted_data["grid_in"] += time_entity["grid_energy_imported"]
-            formatted_data["grid_out"] += (
+            formatted_data["total_grid_import"] += time_entity["grid_energy_imported"]
+            formatted_data["total_grid_export"] += (
                 time_entity["grid_energy_exported_from_solar"]
                 + time_entity["grid_energy_exported_from_generator"]
                 + time_entity["grid_energy_exported_from_battery"]
             )
-            formatted_data["solar_production"] = (
-                formatted_data["solar_production"]
-                + time_entity["solar_energy_exported"]
-            )
-            formatted_data["battery_in"] = (
-                formatted_data["battery_in"]
-                + time_entity["battery_energy_imported_from_grid"]
+            formatted_data["solar_production"] += time_entity["solar_energy_exported"]
+            formatted_data["total_battery_import"] += (
+                time_entity["battery_energy_imported_from_grid"]
                 + time_entity["battery_energy_imported_from_solar"]
                 + time_entity["battery_energy_imported_from_generator"]
             )
-            formatted_data["battery_out"] = (
-                formatted_data["battery_out"] + time_entity["battery_energy_exported"]
+            formatted_data["total_battery_export"] += time_entity[
+                "battery_energy_exported"
+            ]
+            formatted_data["total_generator_production"] += time_entity[
+                "generator_energy_exported"
+            ]
+            formatted_data["total_home_usage"] += (
+                time_entity["consumer_energy_imported_from_grid"]
+                + time_entity["consumer_energy_imported_from_solar"]
+                + time_entity["consumer_energy_imported_from_battery"]
+                + time_entity["consumer_energy_imported_from_generator"]
             )
-
+            formatted_data["grid_export_from_solar"] += time_entity[
+                "grid_energy_exported_from_solar"
+            ]
+            formatted_data["grid_export_from_generator"] += time_entity[
+                "grid_energy_exported_from_generator"
+            ]
+            formatted_data["grid_export_from_battery"] += time_entity[
+                "grid_energy_exported_from_battery"
+            ]
+            formatted_data["battery_import_from_solar"] += time_entity[
+                "battery_energy_imported_from_solar"
+            ]
+            formatted_data["battery_import_from_grid"] += time_entity[
+                "battery_energy_imported_from_grid"
+            ]
+            formatted_data["battery_import_from_generator"] += time_entity[
+                "battery_energy_imported_from_generator"
+            ]
+            formatted_data["home_usage_from_grid"] += time_entity[
+                "consumer_energy_imported_from_grid"
+            ]
+            formatted_data["home_usage_from_solar"] += time_entity[
+                "consumer_energy_imported_from_solar"
+            ]
+            formatted_data["home_usage_from_battery"] += time_entity[
+                "consumer_energy_imported_from_battery"
+            ]
+            formatted_data["home_usage_from_generator"] += time_entity[
+                "consumer_energy_imported_from_generator"
+            ]
         return formatted_data
 
 

homeassistant/components/tesla_fleet/icons.json

@@ -223,29 +223,68 @@
       "wall_connector_state": {
         "default": "mdi:ev-station"
       },
-      "grid_in": {
+      "total_grid_import": {
         "default": "mdi:transmission-tower-import"
       },
-      "grid_out": {
+      "total_grid_export": {
         "default": "mdi:transmission-tower-export"
       },
       "solar_production": {
         "default": "mdi:solar-power-variant"
       },
-      "battery_in": {
+      "total_battery_import": {
         "default": "mdi:battery-arrow-up"
       },
-      "battery_out": {
+      "total_battery_export": {
         "default": "mdi:battery-arrow-down"
       },
       "storm_mode_active": {
         "default": "mdi:weather-lightning"
       },
       "island_status": {
+        "default": "mdi:help-circle",
         "state": {
           "on_grid": "mdi:transmission-tower",
-          "off_grid": "mdi:transmission-tower-off"
+          "off_grid": "mdi:transmission-tower-off",
+          "island_status_unknown": "mdi:help-circle",
+          "off_grid_intentional": "mdi:account-cancel"
         }
+      },
+      "total_generator_production": {
+        "default": "mdi:generator-stationary"
+      },
+      "total_home_usage": {
+        "default": "mdi:home-lightning-bolt"
+      },
+      "grid_export_from_solar": {
+        "default": "mdi:transmission-tower-export"
+      },
+      "grid_export_from_generator": {
+        "default": "mdi:transmission-tower-export"
+      },
+      "grid_export_from_battery": {
+        "default": "mdi:transmission-tower-export"
+      },
+      "battery_import_from_solar": {
+        "default": "mdi:battery-arrow-up"
+      },
+      "battery_import_from_grid": {
+        "default": "mdi:battery-arrow-up"
+      },
+      "battery_import_from_generator": {
+        "default": "mdi:battery-arrow-up"
+      },
+      "home_usage_from_grid": {
+        "default": "mdi:home-lightning-bolt"
+      },
+      "home_usage_from_solar": {
+        "default": "mdi:home-lightning-bolt"
+      },
+      "home_usage_from_battery": {
+        "default": "mdi:home-lightning-bolt"
+      },
+      "home_usage_from_generator": {
+        "default": "mdi:home-lightning-bolt"
       }
     },
     "switch": {

homeassistant/components/tesla_fleet/sensor.py

@@ -415,15 +415,15 @@ class TeslaFleetTimeEntityDescription(SensorEntityDescription):
 
 ENERGY_HISTORY_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
-        key="grid_in",
+        key="total_grid_import",
         state_class=SensorStateClass.TOTAL,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         suggested_display_precision=2,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
-        key="grid_out",
+        key="total_grid_export",
         state_class=SensorStateClass.TOTAL,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
@@ -439,21 +439,121 @@ class TeslaFleetTimeEntityDescription(SensorEntityDescription):
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
-        key="battery_in",
+        key="total_battery_import",
         state_class=SensorStateClass.TOTAL,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         suggested_display_precision=2,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
-        key="battery_out",
+        key="total_battery_export",
         state_class=SensorStateClass.TOTAL,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         suggested_display_precision=2,
         device_class=SensorDeviceClass.ENERGY,
     ),
+    SensorEntityDescription(
+        key="total_generator_production",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False,
+    ),
+    SensorEntityDescription(
+        key="total_home_usage",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="grid_export_from_solar",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="grid_export_from_generator",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False,
+    ),
+    SensorEntityDescription(
+        key="grid_export_from_battery",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="battery_import_from_solar",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="battery_import_from_grid",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="battery_import_from_generator",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False,
+    ),
+    SensorEntityDescription(
+        key="home_usage_from_grid",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="home_usage_from_solar",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="home_usage_from_battery",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+    ),
+    SensorEntityDescription(
+        key="home_usage_from_generator",
+        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False,
+    ),
 )
 
 ENERGY_INFO_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (