Add Sense Devices for entities

homeassistant/components/sense/__init__.py

@@ -113,7 +113,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: SenseConfigEntry) -> boo
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
     return True
 
 

homeassistant/components/sense/sensor.py

@@ -93,10 +93,16 @@ async def async_setup_entry(
 
     sense_monitor_id = data.sense_monitor_id
 
-    entities: list[SensorEntity] = [
-        SenseDevicePowerSensor(device, sense_monitor_id, realtime_coordinator)
-        for device in config_entry.runtime_data.data.devices
-    ]
+    entities: list[SensorEntity] = []
+
+    for device in config_entry.runtime_data.data.devices:
+        entities.append(
+            SenseDevicePowerSensor(device, sense_monitor_id, realtime_coordinator)
+        )
+        entities += [
+            SenseDeviceEnergySensor(device, scale, trends_coordinator, sense_monitor_id)
+            for scale in Scale
+        ]
 
     for variant_id, variant_name in SENSOR_VARIANTS:
         entities.append(
@@ -195,6 +201,13 @@ def __init__(
         self._attr_name = f"L{index + 1} Voltage"
         self._data = data
         self._voltage_index = index
+        self._attr_device_info = DeviceInfo(
+            name=f"Sense {sense_monitor_id}",
+            identifiers={(DOMAIN, sense_monitor_id)},
+            model="Sense",
+            manufacturer="Sense Labs, Inc.",
+            configuration_url="https://home.sense.com",
+        )
 
     @property
     def native_value(self) -> float:
@@ -276,8 +289,54 @@ def __init__(
         self._id = device.id
         self._attr_icon = sense_to_mdi(device.icon)
         self._device = device
+        self._attr_device_info = DeviceInfo(
+            name=f"Sense {sense_monitor_id} - {device.name}",
+            identifiers={(DOMAIN, f"{sense_monitor_id}:{device.id}")},
+            model="Sense",
+            manufacturer="Sense Labs, Inc.",
+            configuration_url="https://home.sense.com",
+        )
 
     @property
     def native_value(self) -> float:
         """Return the state of the sensor."""
         return self._device.power_w
+
+
+class SenseDeviceEnergySensor(SenseBaseSensor):
+    """Implementation of a Sense device energy sensor."""
+
+    _attr_native_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR
+    _attr_state_class = SensorStateClass.TOTAL_INCREASING
+    _attr_device_class = SensorDeviceClass.ENERGY
+
+    def __init__(
+        self,
+        device: SenseDevice,
+        scale: Scale,
+        trends_coordinator: SenseTrendCoordinator,
+        sense_monitor_id: str,
+    ) -> None:
+        """Initialize the Sense sensor."""
+        super().__init__(
+            trends_coordinator,
+            sense_monitor_id,
+            f"{device.id}-{TRENDS_SENSOR_TYPES[scale].lower()}",
+        )
+        self._attr_name = f"{device.name} {TRENDS_SENSOR_TYPES[scale]} Energy"
+        self._scale = scale
+        self._had_any_update = False
+        self._attr_icon = sense_to_mdi(device.icon)
+        self._device = device
+        self._attr_device_info = DeviceInfo(
+            name=f"Sense - {device.name}",
+            identifiers={(DOMAIN, f"{sense_monitor_id}:{device.id}")},
+            model="Sense",
+            manufacturer="Sense Labs, Inc.",
+            configuration_url="https://home.sense.com",
+        )
+
+    @property
+    def native_value(self) -> float:
+        """Return the state of the sensor."""
+        return round(self._device.energy_kwh[self._scale], 2)

tests/components/sense/conftest.py

@@ -7,14 +7,17 @@
 from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
 
 import pytest
+from sense_energy import Scale
 
 from homeassistant.components.sense.binary_sensor import SenseDevice
 from homeassistant.components.sense.const import DOMAIN
 
 from .const import (
+    DEVICE_1_DAY_ENERGY,
     DEVICE_1_ID,
     DEVICE_1_NAME,
     DEVICE_1_POWER,
+    DEVICE_2_DAY_ENERGY,
     DEVICE_2_ID,
     DEVICE_2_NAME,
     DEVICE_2_POWER,
@@ -68,12 +71,14 @@ def mock_sense() -> Generator[MagicMock]:
         device_1.icon = "car"
         device_1.is_on = False
         device_1.power_w = DEVICE_1_POWER
+        device_1.energy_kwh[Scale.DAY] = DEVICE_1_DAY_ENERGY
 
         device_2 = SenseDevice(DEVICE_2_ID)
         device_2.name = DEVICE_2_NAME
         device_2.icon = "stove"
         device_2.is_on = False
         device_2.power_w = DEVICE_2_POWER
+        device_2.energy_kwh[Scale.DAY] = DEVICE_2_DAY_ENERGY
         type(gateway).devices = PropertyMock(return_value=[device_1, device_2])
 
         yield gateway

tests/components/sense/const.py

@@ -15,10 +15,12 @@
 DEVICE_1_ID = "abc123"
 DEVICE_1_ICON = "car-electric"
 DEVICE_1_POWER = 100.0
+DEVICE_1_DAY_ENERGY = 500
 
 DEVICE_2_NAME = "Oven"
 DEVICE_2_ID = "def456"
 DEVICE_2_ICON = "stove"
 DEVICE_2_POWER = 50.0
+DEVICE_2_DAY_ENERGY = 42
 
 MONITOR_ID = "12345"