Rework device registry

Author: CoMPaTech

custom_components/plugwise-beta/__init__.py

@@ -23,6 +23,7 @@
 SINGLE = ["binary_sensor", "climate", "sensor", "switch"]
 MULTI = ["binary_sensor", "climate", "sensor", "switch", "water_heater"]
 
+
 async def async_setup(hass: HomeAssistant, config: dict):
     """Set up the Plugwise platform."""
     return True
@@ -44,6 +45,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     else:
         update_interval = timedelta(seconds=60)
 
+    api.get_all_devices()
+
     _LOGGER.debug("Plugwise async update interval %s", update_interval)
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
@@ -55,13 +58,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     _LOGGER.debug("Plugwise gateway is %s", api.gateway_id)
     device_registry = await dr.async_get_registry(hass)
-    _LOGGER.debug("Plugwise device registry  %s", device_registry)
     result = device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, api.gateway_id)},
         manufacturer="Plugwise",
         name="{} - {} Gateway".format(entry.title, api.smile_name),
-        model=api.smile_name,
+        model=f"Smile {api.smile_name}",
         sw_version=api.smile_version[0],
     )
     _LOGGER.debug("Plugwise device registry  %s", result)

custom_components/plugwise-beta/binary_sensor.py

@@ -40,7 +40,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     ]
     all_devices = api.get_all_devices()
     for dev_id, device in all_devices.items():
-        if device["class"] in binary_sensor_classes: 
+        if device["class"] in binary_sensor_classes:
             _LOGGER.debug("Plugwise device_class %s found", device["class"])
             data = api.get_device_data(dev_id)
             for binary_sensor in BINARY_SENSOR_LIST:
@@ -49,14 +49,10 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                     _LOGGER.debug("Plugwise binary_sensor Dev %s", device["name"])
                     devices.append(
                         PwBinarySensor(
-                            api,
-                            updater,
-                            "{}_{}".format(device["name"], binary_sensor),
-                            binary_sensor,
-                            dev_id,
+                            api, updater, device["name"], binary_sensor, dev_id,
                         )
                     )
-                    _LOGGER.info("Added binary_sensor.%s", binary_sensor)
+                    _LOGGER.info("Added binary_sensor.%s", device["name"])
 
     async_add_entities(devices, True)
 
@@ -96,7 +92,7 @@ def _update_callback(self):
     @property
     def name(self):
         """Return the name of the thermostat, if any."""
-        return f"{self._name.replace('_', ' ')}"
+        return self._name
 
     @property
     def should_poll(self):

custom_components/plugwise-beta/climate.py

@@ -135,7 +135,7 @@ def hvac_action(self):
             return CURRENT_HVAC_IDLE
         else:
             if (
-                self._central_heating_state is not None 
+                self._central_heating_state is not None
                 or self._boiler_state is not None
             ):
                 if self._thermostat > self._temperature:
@@ -145,7 +145,7 @@ def hvac_action(self):
     @property
     def name(self):
         """Return the name of the thermostat, if any."""
-        return self._name.replace('_', ' ')
+        return self._name
 
     @property
     def device_info(self) -> Dict[str, any]:
@@ -190,10 +190,7 @@ def preset_modes(self):
     @property
     def hvac_modes(self):
         """Return the available hvac modes list."""
-        if (
-            self._central_heating_state is not None 
-            or self._boiler_state is not None
-        ):
+        if self._central_heating_state is not None or self._boiler_state is not None:
             if self._cooling_state is not None:
                 return HVAC_MODES_2
             return HVAC_MODES_1
@@ -328,5 +325,3 @@ def update(self):
             self._hvac_mode = HVAC_MODE_COOL
         else:
             self._hvac_mode = HVAC_MODE_OFF
-
-

custom_components/plugwise-beta/sensor.py

@@ -164,7 +164,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                             PwPowerSensor(
                                 api,
                                 updater,
-                                "{}_{}".format(device["name"], sensor),
+                                device["name"],
                                 dev_id,
                                 sensor,
                                 sensor_type,
@@ -175,15 +175,13 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                             PwThermostatSensor(
                                 api,
                                 updater,
-                                "{}_{}".format(device["name"], sensor),
+                                device["name"],
                                 dev_id,
                                 sensor,
                                 sensor_type,
                             )
                         )
-                    _LOGGER.info(
-                        "Added sensor.%s", "{}_{}".format(device["name"], sensor)
-                    )
+                    _LOGGER.info("Added sensor.%s", device["name"])
 
     async_add_entities(devices, True)
 
@@ -195,21 +193,30 @@ def __init__(self, api, updater, name, dev_id, sensor, sensor_type):
         """Set up the Plugwise API."""
         self._api = api
         self._updater = updater
-        self._name = name
         self._dev_id = dev_id
         self._device = sensor_type[2]
+        self._name = name
         self._sensor = sensor
         self._sensor_type = sensor_type
         self._unit_of_measurement = sensor_type[1]
         self._icon = sensor_type[3]
         self._class = sensor_type[2]
         self._state = None
-        self._unique_id = f"sr-{dev_id}-{name}"
-        _LOGGER.debug("Registering Plugwise %s", self._unique_id)
+        self._unique_id = f"cl-{dev_id}-{name}-{sensor}"
+
+        sensorname = sensor.replace("_"," ").title()
+        self._sensorname = f"{name} {sensorname}"
+
+
+        self._via_id = self._api.gateway_id
+        if self._dev_id == self._via_id:
+            self._via_id = None
+            self._name = f"Smile {self._name}"
 
     @property
     def unique_id(self):
         """Return a unique ID."""
+        _LOGGER.debug("Uniq id = %s",self._unique_id)
         return self._unique_id
 
     async def async_added_to_hass(self):
@@ -239,7 +246,7 @@ def should_poll(self):
     @property
     def name(self):
         """Return the name of the thermostat, if any."""
-        return self._name.replace('_', ' ')
+        return self._sensorname
 
     @property
     def state(self):
@@ -253,7 +260,7 @@ def device_info(self) -> Dict[str, any]:
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,
             "manufacturer": "Plugwise",
-            "via_device": (DOMAIN, self._api.gateway_id),
+            "via_device": (DOMAIN, self._via_id),
         }
 
     @property
@@ -299,8 +306,16 @@ def __init__(self, api, updater, name, dev_id, sensor, sensor_type):
         self._class = sensor_type[2]
         self._sensor = sensor
         self._state = None
-        self._unique_id = f"{dev_id}-{name}-{sensor_type[2]}"
-        _LOGGER.debug("Registering Plugwise %s", self._unique_id)
+        self._unique_id = f"{dev_id}-{name}-{sensor}"
+
+        sensorname = sensor.replace("_"," ").title()
+        self._sensorname = f"{name} {sensorname}"
+
+        self._via_id = self._api.gateway_id
+        if self._dev_id == self._via_id:
+            self._via_id = None
+            self._name = f"Smile {self._name}"
+
 
     @property
     def unique_id(self):
@@ -329,7 +344,7 @@ def should_poll(self):
     @property
     def name(self):
         """Return the name of the sensor."""
-        return self._name.replace('_', ' ')
+        return self._sensorname
 
     @property
     def icon(self):
@@ -353,7 +368,7 @@ def device_info(self) -> Dict[str, any]:
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,
             "manufacturer": "Plugwise",
-            "via_device": (DOMAIN, self._api.gateway_id),
+            "via_device": (DOMAIN, self._via_id),
         }
 
     @property

custom_components/plugwise-beta/switch.py

@@ -21,14 +21,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     for dev_id, device in all_devices.items():
         if "plug" in device["types"]:
             _LOGGER.debug("Plugwise switch Dev %s", device["name"])
-            devices.append(
-                PwSwitch(
-                    api,
-                    updater,
-                    device["name"],
-                    dev_id,
-                )
-            )
+            devices.append(PwSwitch(api, updater, device["name"], dev_id,))
             _LOGGER.info("Added switch.%s", "{}".format(device["name"]))
 
     async_add_entities(devices, True)
@@ -102,7 +95,7 @@ async def turn_off(self, **kwargs):
     @property
     def name(self):
         """Return the name of the thermostat, if any."""
-        return self._name.replace('_', ' ')
+        return self._name
 
     @property
     def icon(self):

custom_components/plugwise-beta/water_heater.py

@@ -44,9 +44,13 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                 if state in data:
                     if idx == 1:
                         _LOGGER.debug("Plugwise water_heater Dev %s", device["name"])
-                        water_heater = PwWaterHeater(api, updater, device["name"], dev_id)
+                        water_heater = PwWaterHeater(
+                            api, updater, device["name"], dev_id
+                        )
                         devices.append(water_heater)
-                        _LOGGER.info("Added water_heater.%s", "{}".format(device["name"]))
+                        _LOGGER.info(
+                            "Added water_heater.%s", "{}".format(device["name"])
+                        )
                         idx += 1
 
     async_add_entities(devices, True)
@@ -91,7 +95,7 @@ def _update_callback(self):
     @property
     def name(self):
         """Return the name of the thermostat, if any."""
-        return self._name.replace('_', ' ')
+        return self._name
 
     @property
     def device_info(self) -> Dict[str, any]:
@@ -108,7 +112,11 @@ def state(self):
         """Return the state of the water_heater."""
         if self._cooling_state:
             return CURRENT_HVAC_COOL
-        elif self._central_heating_state or self._boiler_state or self._domestic_hot_water_state:
+        elif (
+            self._central_heating_state
+            or self._boiler_state
+            or self._domestic_hot_water_state
+        ):
             return CURRENT_HVAC_HEAT
         else:
             return CURRENT_HVAC_IDLE
@@ -127,7 +135,11 @@ def icon(self):
         """Return the icon to use in the frontend."""
         if self._cooling_state:
             return COOL_ICON
-        elif self._central_heating_state or self._boiler_state or self._domestic_hot_water_state:
+        elif (
+            self._central_heating_state
+            or self._boiler_state
+            or self._domestic_hot_water_state
+        ):
             return FLAME_ICON
         else:
             return IDLE_ICON