Adding extra sensors from the API

As requested in #3

Author: golles

README.md

@@ -18,6 +18,7 @@ _Component to integrate with [knmi][knmi]._
 Platform | Description
 -- | --
 `binary_sensor` | Weather alert `True` or `False`, the alert itself is an attribute.
+`sensor` | a few weather related sensors.
 `weather` | Weather data provided by KNMI, https://weerlive.nl/.
 
 ## Installation
@@ -40,7 +41,9 @@ custom_components/knmi/api.py
 custom_components/knmi/binary_sensor.py
 custom_components/knmi/config_flow.py
 custom_components/knmi/const.py
+custom_components/knmi/entity.py
 custom_components/knmi/manifest.json
+custom_components/knmi/sensor.py
 custom_components/knmi/weather.py
 ```
 

custom_components/knmi/binary_sensor.py

@@ -2,8 +2,7 @@
 from homeassistant.components.binary_sensor import BinarySensorEntity
 
 from .const import (
-    BINARY_SENSOR_ALARM_ICON,
-    BINARY_SENSOR_ALARM_NAME,
+    BINARY_SENSORS,
     DEFAULT_NAME,
     DOMAIN,
 )
@@ -13,29 +12,43 @@
 async def async_setup_entry(hass, entry, async_add_devices):
     """Setup binary_sensor platform."""
     coordinator = hass.data[DOMAIN][entry.entry_id]
-    async_add_devices([KnmiBinarySensor(coordinator, entry)])
+    sensors: list[KnmiBinarySensor] = []
+    for sensor in BINARY_SENSORS:
+        sensors.append(KnmiBinarySensor(coordinator, entry, sensor["name"], sensor["unit"], sensor["icon"], sensor["key"]))
+
+    async_add_devices(sensors)
 
 
 class KnmiBinarySensor(KnmiEntity, BinarySensorEntity):
     """knmi binary_sensor class."""
 
+    def __init__(
+        self, coordinator, config_entry, name, unit_of_measurement, icon, data_key
+    ):
+        super().__init__(coordinator, config_entry)
+        self.config_entry = config_entry
+        self.location_name = self.coordinator.data["plaats"]
+        self._name = name
+        self._unit_of_measurement = unit_of_measurement
+        self._icon = icon
+        self._data_key = data_key
+
     @property
     def name(self):
         """Return the name of the binary_sensor."""
-        location = self.coordinator.data["plaats"]
-        return f"{DEFAULT_NAME} {location} {BINARY_SENSOR_ALARM_NAME}"
+        return f"{DEFAULT_NAME} {self.location_name} {self._name}"
 
     @property
     def is_on(self):
         """Return true if the binary_sensor is on."""
-        return self.coordinator.data["alarm"] != "0"
+        return self.coordinator.data[self._data_key] != "0"
 
     @property
     def extra_state_attributes(self):
         """Return the device state attributes."""
-        return {BINARY_SENSOR_ALARM_NAME: self.coordinator.data["alarmtxt"]}
+        return {self._name: self.coordinator.data["alarmtxt"]}
 
     @property
     def icon(self):
         """Return the icon of the sensor."""
-        return BINARY_SENSOR_ALARM_ICON
+        return self._icon

custom_components/knmi/const.py

@@ -16,19 +16,26 @@
 # Base component constants.
 NAME = "KNMI"
 DOMAIN = "knmi"
-VERSION = "1.0.6"
+VERSION = "1.1.0"
 ATTRIBUTION = "KNMI Weergegevens via https://weerlive.nl/"
 
-# Icons.
-BINARY_SENSOR_ALARM_ICON = "mdi:alert"
-
-# Sensor names.
-BINARY_SENSOR_ALARM_NAME = "Waarschuwing"
-
 # Platforms.
 BINARY_SENSOR = "binary_sensor"
+SENSOR = "sensor"
 WEATHER = "weather"
-PLATFORMS = [BINARY_SENSOR, WEATHER]
+PLATFORMS = [BINARY_SENSOR, SENSOR, WEATHER]
+
+# Binary sensors
+BINARY_SENSORS = [
+    {"name": "Waarschuwing", "unit": "", "icon": "mdi:alert", "key": "alarmtxt"}
+]
+
+# Sensors
+SENSORS = [
+    {"name": "Omschrijving", "unit": "", "icon": "mdi:text", "key": "samenv"},
+    {"name": "Korte dagverwachting", "unit": "", "icon": "mdi:text", "key": "verw"},
+    {"name": "Dauwpunt", "unit": "°C", "icon": "mdi:thermometer", "key": "dauwp"},
+]
 
 # Defaults
 DEFAULT_NAME = NAME

custom_components/knmi/entity.py

@@ -12,12 +12,12 @@ def __init__(self, coordinator, config_entry):
     @property
     def unique_id(self):
         """Return a unique ID to use for this entity."""
-        return self.config_entry.entry_id
+        return f"{self.config_entry.entry_id}-{self.name}"
 
     @property
     def device_info(self):
         return {
-            "identifiers": {(DOMAIN, self.unique_id)},
+            "identifiers": {(DOMAIN, self.config_entry.entry_id)},
             "name": NAME,
             "model": VERSION,
             "manufacturer": NAME,

custom_components/knmi/manifest.json

@@ -4,7 +4,7 @@
   "documentation": "https://github.com/golles/ha-knmi/",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/golles/ha-knmi//issues",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "config_flow": true,
   "codeowners": [
     "@golles"

custom_components/knmi/sensor.py

@@ -0,0 +1,49 @@
+"""Sensor platform for knmi."""
+from .const import DEFAULT_NAME, DOMAIN, SENSORS
+from .entity import KnmiEntity
+
+
+async def async_setup_entry(hass, entry, async_add_devices):
+    """Setup sensor platform."""
+    coordinator = hass.data[DOMAIN][entry.entry_id]
+
+    sensors: list[KnmiSensor] = []
+    for sensor in SENSORS:
+        sensors.append(KnmiSensor(coordinator, entry, sensor["name"], sensor["unit"], sensor["icon"], sensor["key"]))
+
+    async_add_devices(sensors)
+
+
+class KnmiSensor(KnmiEntity):
+    """Knmi Sensor class."""
+
+    def __init__(
+        self, coordinator, config_entry, name, unit_of_measurement, icon, data_key
+    ):
+        super().__init__(coordinator, config_entry)
+        self.config_entry = config_entry
+        self.location_name = self.coordinator.data["plaats"]
+        self._name = name
+        self._unit_of_measurement = unit_of_measurement
+        self._icon = icon
+        self._data_key = data_key
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return f"{DEFAULT_NAME} {self.location_name} {self._name}"
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self.coordinator.data[self._data_key]
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity, if any."""
+        return self._unit_of_measurement
+
+    @property
+    def icon(self):
+        """Return the icon of the sensor."""
+        return self._icon

tests/test_config_flow.py

@@ -10,6 +10,7 @@
     BINARY_SENSOR,
     DOMAIN,
     PLATFORMS,
+    SENSOR,
     WEATHER,
 )
 
@@ -106,4 +107,4 @@ async def test_options_flow(hass):
     assert result["title"] == MOCK_CONFIG[CONF_NAME]
 
     # Verify that the options were updated
-    assert entry.options == {BINARY_SENSOR: True, WEATHER: False,}
+    assert entry.options == {BINARY_SENSOR: True, SENSOR: True, WEATHER: False,}