Add Nettigo Air Monitor uptime sensor (#50834)

homeassistant/components/nam/__init__.py

@@ -31,7 +31,7 @@ PLATFORMS = ["air_quality", "sensor"]
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Nettigo as config entry."""
-    host = entry.data[CONF_HOST]
+    host: str = entry.data[CONF_HOST]
 
     websession = async_get_clientsession(hass)
 

homeassistant/components/nam/air_quality.py

@@ -19,9 +19,9 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Add a Nettigo Air Monitor entities from a config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator: NAMDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
 
-    entities = []
+    entities: list[NAMAirQuality] = []
     for sensor in AIR_QUALITY_SENSORS:
         if f"{sensor}{SUFFIX_P1}" in coordinator.data:
             entities.append(NAMAirQuality(coordinator, sensor))

homeassistant/components/nam/const.py

@@ -10,6 +10,7 @@ from homeassistant.const import (
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_TIMESTAMP,
     PERCENTAGE,
     PRESSURE_HPA,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
@@ -127,4 +128,11 @@ SENSORS: Final[dict[str, SensorDescription]] = {
         "icon": None,
         "enabled": True,
     },
+    "uptime": {
+        "label": f"{DEFAULT_NAME} Uptime",
+        "unit": None,
+        "device_class": DEVICE_CLASS_TIMESTAMP,
+        "icon": None,
+        "enabled": False,
+    },
 }

homeassistant/components/nam/manifest.json

@@ -3,7 +3,7 @@
   "name": "Nettigo Air Monitor",
   "documentation": "https://www.home-assistant.io/integrations/nam",
   "codeowners": ["@bieniu"],
-  "requirements": ["nettigo-air-monitor==0.2.5"],
+  "requirements": ["nettigo-air-monitor==0.2.6"],
   "zeroconf": [{"type": "_http._tcp.local.", "name": "nam-*"}],
   "config_flow": true,
   "quality_scale": "platinum",

homeassistant/components/nam/sensor.py

@@ -1,6 +1,7 @@
 """Support for the Nettigo Air Monitor service."""
 from __future__ import annotations
 
+from datetime import timedelta
 from typing import Any
 
 from homeassistant.components.sensor import SensorEntity
@@ -9,6 +10,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util.dt import utcnow
 
 from . import NAMDataUpdateCoordinator
 from .const import DOMAIN, SENSORS
@@ -20,12 +22,15 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Add a Nettigo Air Monitor entities from a config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator: NAMDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
 
-    sensors = []
+    sensors: list[NAMSensor | NAMSensorUptime] = []
     for sensor in SENSORS:
         if sensor in coordinator.data:
-            sensors.append(NAMSensor(coordinator, sensor))
+            if sensor == "uptime":
+                sensors.append(NAMSensorUptime(coordinator, sensor))
+            else:
+                sensors.append(NAMSensor(coordinator, sensor))
 
     async_add_entities(sensors, False)
 
@@ -92,3 +97,17 @@ class NAMSensor(CoordinatorEntity, SensorEntity):
         return available and bool(
             getattr(self.coordinator.data, self.sensor_type, None)
         )
+
+
+class NAMSensorUptime(NAMSensor):
+    """Define an Nettigo Air Monitor uptime sensor."""
+
+    @property
+    def state(self) -> str:
+        """Return the state."""
+        uptime_sec = getattr(self.coordinator.data, self.sensor_type)
+        return (
+            (utcnow() - timedelta(seconds=uptime_sec))
+            .replace(microsecond=0)
+            .isoformat()
+        )

requirements_all.txt

@@ -997,7 +997,7 @@ netdata==0.2.0
 netdisco==2.8.3
 
 # homeassistant.components.nam
-nettigo-air-monitor==0.2.5
+nettigo-air-monitor==0.2.6
 
 # homeassistant.components.neurio_energy
 neurio==0.3.1

requirements_test_all.txt

@@ -551,7 +551,7 @@ nessclient==0.9.15
 netdisco==2.8.3
 
 # homeassistant.components.nam
-nettigo-air-monitor==0.2.5
+nettigo-air-monitor==0.2.6
 
 # homeassistant.components.nexia
 nexia==0.9.7

tests/components/nam/__init__.py

@@ -12,6 +12,7 @@ INCOMPLETE_NAM_DATA = {
 
 nam_data = {
     "software_version": "NAMF-2020-36",
+    "uptime": "456987",
     "sensordatavalues": [
         {"value_type": "SDS_P1", "value": "18.65"},
         {"value_type": "SDS_P2", "value": "11.03"},

tests/components/nam/test_sensor.py

@@ -14,6 +14,7 @@ from homeassistant.const import (
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_TIMESTAMP,
     PERCENTAGE,
     PRESSURE_HPA,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
@@ -42,6 +43,14 @@ async def test_sensor(hass):
         disabled_by=None,
     )
 
+    registry.async_get_or_create(
+        SENSOR_DOMAIN,
+        DOMAIN,
+        "aa:bb:cc:dd:ee:ff-uptime",
+        suggested_object_id="nettigo_air_monitor_uptime",
+        disabled_by=None,
+    )
+
     await init_integration(hass)
 
     state = hass.states.get("sensor.nettigo_air_monitor_bme280_humidity")
@@ -167,6 +176,18 @@ async def test_sensor(hass):
     assert entry
     assert entry.unique_id == "aa:bb:cc:dd:ee:ff-signal"
 
+    state = hass.states.get("sensor.nettigo_air_monitor_uptime")
+    assert state
+    assert (
+        state.state
+        == (utcnow() - timedelta(seconds=456987)).replace(microsecond=0).isoformat()
+    )
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == DEVICE_CLASS_TIMESTAMP
+
+    entry = registry.async_get("sensor.nettigo_air_monitor_uptime")
+    assert entry
+    assert entry.unique_id == "aa:bb:cc:dd:ee:ff-uptime"
+
 
 async def test_sensor_disabled(hass):
     """Test sensor disabled by default."""