filter entities and fix ids

Author: LDprg

custom_components/fronius_local/api.py

@@ -8,6 +8,7 @@
 from homeassistant.helpers import httpx_client
 
 from . import auth
+from . import const as fl
 
 if TYPE_CHECKING:
     from homeassistant.core import HomeAssistant
@@ -23,6 +24,18 @@ def meta(item: str) -> str:
     return "_" + item + "_meta"
 
 
+def get_type(data: dict, key: str) -> Platform:
+    """Get type of sensor."""
+    if key in fl.FILTER:
+        return Platform.SENSOR
+    if (
+        data[meta(key)]["writePermission"]["RoleCustomer"]
+        and data[meta(key)]["displayType"] == "Integer"
+    ):
+        return Platform.NUMBER
+    return Platform.SENSOR
+
+
 class FroniusApiClient:
     """Fronius auth class."""
 
@@ -67,10 +80,7 @@ async def async_get_data(self) -> dict:
         battery = {
             "conf_batteries_" + k: {
                 "value": v,
-                "type": Platform.NUMBER
-                if battery[meta(k)]["writePermission"]["RoleCustomer"]
-                and battery[meta(k)]["displayType"] == "Integer"
-                else Platform.SENSOR,
+                "type": get_type(battery, k),
                 "name": (await self.async_get_translation(self.hass.config.language))[
                     "BATTERIES"
                 ].get(k)

custom_components/fronius_local/const.py

@@ -10,3 +10,10 @@
 LOGGER: logging.Logger = logging.getLogger(DOMAIN)
 
 UPDATE_INTERVAL = 9
+
+FILTER = [
+    "PV_PEAK_POWER",
+    "supportSoc",
+    "supportSocHysteresisMin",
+    "supportSocHysteresisEnergy",
+]

custom_components/fronius_local/number.py

@@ -49,6 +49,9 @@ def __init__(
         """Initialize the sensor class."""
         super().__init__(coordinator, unique_id)
         self.entity_description = entity_description
+        self.entity_id = "number." + unique_id
+
+        self.extra_state_attributes = {"id": self.data()["id"]}
 
         self.mode = "box"
         self.native_unit_of_measurement = self.data()["unit"]

custom_components/fronius_local/sensor.py

@@ -54,6 +54,9 @@ def __init__(
         """Initialize the sensor class."""
         super().__init__(coordinator, unique_id)
         self.entity_description = entity_description
+        self.entity_id = "sensor." + unique_id
+
+        self.extra_state_attributes = {"id": self.data()["id"]}
 
         if self.data()["unit"] is not None:
             self.native_unit_of_measurement = self.data()["unit"]