Merge pull request #70 from plugwise/up111

Review comments 0.111

Author: bouwew

custom_components/plugwise-beta/binary_sensor.py

@@ -80,13 +80,11 @@ def __init__(self, api, coordinator, name, binary_sensor, dev_id, model):
         if self._dev_id == self._api.heater_id:
             self._name = f"Auxiliary"
 
-        bsensorname = binary_sensor.replace("_", " ").title()
-        self._sensorname = f"{self._name} {bsensorname}"
-
-        self._via_id = self._api.gateway_id
         if self._dev_id == self._api.gateway_id:
             self._name = f"Smile {self._name}"
-            self._via_id = None
+
+        bsensorname = binary_sensor.replace("_", " ").title()
+        self._sensorname = f"{self._name} {bsensorname}"
 
         self._unique_id = f"bs-{dev_id}-{self._name}-{binary_sensor}"
 
@@ -110,14 +108,19 @@ def state(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
-        return {
+
+        device_information = {
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,
             "manufacturer": "Plugwise",
-            "model": self._model.replace("_", " ").title(),
-            "via_device": (DOMAIN, self._via_id),
+            "model": self._model,
         }
 
+        if self._dev_id != self._api.gateway_id:
+            device_information["via_device"] = (DOMAIN, self._api.gateway_id)
+
+        return device_information
+
     @property
     def icon(self):
         """Return the icon to use in the frontend."""

custom_components/plugwise-beta/climate.py

@@ -23,12 +23,14 @@
     THERMOSTAT_ICON,
     DEFAULT_MIN_TEMP,
     DEFAULT_MAX_TEMP,
+    SCHEDULE_ON,
+    SCHEDULE_OFF,
 )
 
 from . import SmileGateway
 
-HVAC_MODES_1 = [HVAC_MODE_HEAT, HVAC_MODE_AUTO]
-HVAC_MODES_2 = [HVAC_MODE_HEAT_COOL, HVAC_MODE_AUTO]
+HVAC_MODES_HEAT_ONLY = [HVAC_MODE_HEAT, HVAC_MODE_AUTO]
+HVAC_MODES_HEAT_COOL = [HVAC_MODE_HEAT_COOL, HVAC_MODE_AUTO]
 
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_PRESET_MODE
 
@@ -132,18 +134,18 @@ def name(self):
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
 
-        via_device = (DOMAIN, self._api.gateway_id)
-        if self._dev_id is via_device:
-            via_device = None
-
-        return {
+        device_information = {
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,
             "manufacturer": "Plugwise",
             "model": self._model.replace("_", " ").title(),
-            "via_device": via_device,
         }
 
+        if self._dev_id != self._api.gateway_id:
+            device_information["via_device"] = (DOMAIN, self._api.gateway_id)
+
+        return device_information
+
     @property
     def icon(self):
         """Return the icon to use in the frontend."""
@@ -159,8 +161,7 @@ def device_state_attributes(self):
         """Return the device specific state attributes."""
         attributes = {}
         if self._schema_names:
-            if len(self._schema_names) > 1:
-                attributes["available_schemas"] = self._schema_names
+            attributes["available_schemas"] = self._schema_names
         if self._selected_schema:
             attributes["selected_schema"] = self._selected_schema
         return attributes
@@ -175,8 +176,8 @@ def hvac_modes(self):
         """Return the available hvac modes list."""
         if self._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
+                return HVAC_MODES_HEAT_COOL
+            return HVAC_MODES_HEAT_ONLY
 
     @property
     def hvac_mode(self):
@@ -234,9 +235,9 @@ async def async_set_temperature(self, **kwargs):
     async def async_set_hvac_mode(self, hvac_mode):
         """Set the hvac mode."""
         _LOGGER.debug("Set hvac_mode to: %s", hvac_mode)
-        state = "false"
+        state = SCHEDULE_OFF
         if hvac_mode == HVAC_MODE_AUTO:
-            state = "true"
+            state = SCHEDULE_ON
             try:
                 await self._api.set_temperature(self._loc_id, self._schedule_temp)
                 self._setpoint = self._schedule_temp

custom_components/plugwise-beta/config_flow.py

@@ -33,7 +33,7 @@ async def validate_input(hass: core.HomeAssistant, data):
     except Smile.PlugwiseError:
         raise CannotConnect
 
-    return {"title": api.smile_name}
+    return api
 
 
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@@ -45,12 +45,13 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_user(self, user_input=None):
         """Handle the initial step."""
         errors = {}
+        errors = None
         if user_input is not None:
 
             try:
-                info = await validate_input(self.hass, user_input)
+                api = await validate_input(self.hass, user_input)
 
-                return self.async_create_entry(title=info["title"], data=user_input)
+                return self.async_create_entry(title=api.smile_name, data=user_input)
             except CannotConnect:
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
@@ -59,6 +60,12 @@ async def async_step_user(self, user_input=None):
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
 
+            if not errors:
+                await self.async_set_unique_id(api.gateway_id)
+                self._abort_if_unique_id_configured()
+
+                return self.async_create_entry(title=api.smile_name, data=user_input)
+
         return self.async_show_form(
             step_id="user", data_schema=DATA_SCHEMA, errors=errors
         )

custom_components/plugwise-beta/const.py

@@ -28,6 +28,9 @@
 CURRENT_HVAC_DHW = "hot_water"
 DEVICE_STATE = "device_state"
 
+SCHEDULE_ON = "true"
+SCHEDULE_OFF = "false"
+
 # Icons
 SWITCH_ICON = "mdi:electric-switch"
 THERMOSTAT_ICON = "mdi:thermometer"

custom_components/plugwise-beta/manifest.json

@@ -2,7 +2,7 @@
   "domain": "plugwise-beta",
   "name": "Plugwise Beta for Home Assistant",
   "documentation": "https://github.com/plugwise/plugwise-beta",
-  "requirements": ["Plugwise_Smile==0.2.11"],
+  "requirements": ["Plugwise_Smile==0.2.12"],
   "dependencies": [],
   "codeowners": ["@CoMPaTech","@bouwew"],
   "config_flow": true

custom_components/plugwise-beta/sensor.py

@@ -251,6 +251,7 @@ def __init__(self, api, coordinator, name, dev_id, sensor, sensor_type):
         self._api = api
         self._dev_id = dev_id
         if sensor_type is not None:
+            self._model = sensor_type[0]
             self._unit_of_measurement = sensor_type[1]
             self._device = sensor_type[2]
             self._icon = sensor_type[3]
@@ -271,10 +272,8 @@ def __init__(self, api, coordinator, name, dev_id, sensor, sensor_type):
         sensorname = sensor.replace("_", " ").title()
         self._sensorname = f"{self._name} {sensorname}"
 
-        self._via_id = self._api.gateway_id
         if self._dev_id == self._api.gateway_id:
             self._name = f"Smile {self._name}"
-            self._via_id = None
 
         self._unique_id = f"cl-{dev_id}-{self._name}-{sensor}"
 
@@ -296,13 +295,19 @@ def state(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
-        return {
+
+        device_information = {
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,
             "manufacturer": "Plugwise",
-            "via_device": (DOMAIN, self._via_id),
+            "model": self._model,
         }
 
+        if self._dev_id != self._api.gateway_id:
+            device_information["via_device"] = (DOMAIN, self._api.gateway_id)
+
+        return device_information
+
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement."""
@@ -377,9 +382,7 @@ def __init__(self, api, coordinator, name, dev_id, sensor, sensor_type, model):
         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
+        if self._dev_id == self._api.gateway_id:
             self._name = f"Smile {self._name}"
 
     @property
@@ -405,14 +408,19 @@ def state(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
-        return {
+
+        device_information = {
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,
             "manufacturer": "Plugwise",
-            "model": self._model,
-            "via_device": (DOMAIN, self._via_id),
+            "model": self._device,
         }
 
+        if self._dev_id != self._api.gateway_id:
+            device_information["via_device"] = (DOMAIN, self._api.gateway_id)
+
+        return device_information
+
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement of this entity, if any."""

custom_components/plugwise-beta/switch.py

@@ -52,18 +52,19 @@ def is_on(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
-        via_device = (DOMAIN, self._api.gateway_id)
-        if self._dev_id is via_device:
-            via_device = None
 
-        return {
+        device_information = {
             "identifiers": {(DOMAIN, self._dev_id)},
             "name": self._name,
             "manufacturer": "Plugwise",
             "model": self._model,
-            "via_device": via_device,
         }
 
+        if self._dev_id != self._api.gateway_id:
+            device_information["via_device"] = (DOMAIN, self._api.gateway_id)
+
+        return device_information
+
     async def turn_on(self, **kwargs):
         """Turn the device on."""
         _LOGGER.debug("Turn switch.%s on.", self._name)