Merge pull request #69 from plugwise/up110

Combined, non-breaking upstream review and 110 compliancy

Author: CoMPaTech

custom_components/plugwise-beta/__init__.py

@@ -46,6 +46,10 @@ async def async_setup_entry(hass, entry):
             _LOGGER.error("Unable to connect to Smile: %s",api.smile_status)
             raise ConfigEntryNotReady
 
+    except Smile.InvalidAuthentication:
+        _LOGGER.error("Invalid Smile ID")
+        return False
+
     except Smile.PlugwiseError:
         _LOGGER.error("Error while communicating to device")
         raise ConfigEntryNotReady
@@ -144,6 +148,12 @@ def __init__(self, api, coordinator):
         """Initialise the sensor."""
         self._api = api
         self._coordinator = coordinator
+        self._unique_id = None
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
 
     @property
     def should_poll(self):

custom_components/plugwise-beta/binary_sensor.py

@@ -5,7 +5,7 @@
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_OPENING,
-    BinarySensorDevice,
+    BinarySensorEntity,
 )
 from homeassistant.const import STATE_OFF, STATE_ON
 
@@ -63,7 +63,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(devices, True)
 
 
-class PwBinarySensor(SmileGateway, BinarySensorDevice):
+class PwBinarySensor(SmileGateway, BinarySensorEntity):
     """Representation of a Plugwise binary_sensor."""
 
     def __init__(self, api, coordinator, name, binary_sensor, dev_id, model):
@@ -90,11 +90,6 @@ def __init__(self, api, coordinator, name, binary_sensor, dev_id, model):
 
         self._unique_id = f"bs-{dev_id}-{self._name}-{binary_sensor}"
 
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self._unique_id
-
     @property
     def name(self):
         """Return the name of the thermostat, if any."""

custom_components/plugwise-beta/climate.py

@@ -4,7 +4,7 @@
 from typing import Dict
 from Plugwise_Smile.Smile import Smile
 
-from homeassistant.components.climate import ClimateDevice
+from homeassistant.components.climate import ClimateEntity
 from homeassistant.components.climate.const import (
     CURRENT_HVAC_COOL,
     CURRENT_HVAC_HEAT,
@@ -73,8 +73,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
     async_add_entities(devices, True)
 
-
-class PwThermostat(SmileGateway, ClimateDevice):
+class PwThermostat(SmileGateway, ClimateEntity):
     """Representation of an Plugwise thermostat."""
 
     def __init__(self, api, coordinator, name, dev_id, loc_id, model, min_temp, max_temp):
@@ -109,14 +108,6 @@ def __init__(self, api, coordinator, name, dev_id, loc_id, model, min_temp, max_
         self._hvac_mode = None
         self._single_thermostat = self._api.single_master_thermostat()
         self._unique_id = f"cl-{dev_id}-{self._name}"
-    
-                
-
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self._unique_id
-
 
     @property
     def hvac_action(self):
@@ -141,7 +132,7 @@ def name(self):
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
 
-        via_device = self._api.gateway_id
+        via_device = (DOMAIN, self._api.gateway_id)
         if self._dev_id is via_device:
             via_device = None
 

custom_components/plugwise-beta/config_flow.py

@@ -5,25 +5,15 @@
 import voluptuous as vol
 
 from homeassistant import config_entries, core, exceptions
+from homeassistant.const import CONF_HOST, CONF_PASSWORD
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from Plugwise_Smile.Smile import Smile
 
 from .const import DOMAIN  # pylint:disable=unused-import
 
 _LOGGER = logging.getLogger(__name__)
 
-
-def _get_config_schema(input_dict: Dict[str, Any] = None) -> vol.Schema:
-    """
-    Return schema defaults for init step based on user input/config dict.
-
-    Retain info already provided for future form views by setting them as defaults in schema.
-    """
-    if input_dict is None:
-        input_dict = {}
-
-    return vol.Schema({vol.Required("host"): str, vol.Required("password"): str})
-
+DATA_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str, vol.Required(CONF_PASSWORD): str})
 
 async def validate_input(hass: core.HomeAssistant, data):
     """
@@ -36,7 +26,11 @@ async def validate_input(hass: core.HomeAssistant, data):
         host=data["host"], password=data["password"], timeout=30, websession=websession
     )
 
-    if not await api.connect():
+    try:
+        await api.connect()
+    except Smile.InvalidAuthentication:
+        raise InvalidAuth
+    except Smile.PlugwiseError:
         raise CannotConnect
 
     return {"title": api.smile_name}
@@ -48,14 +42,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     VERSION = 1
     CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
 
-    def __init__(self) -> None:
-        """Initialize config flow."""
-        self._user_schema = None
-
     async def async_step_user(self, user_input=None):
         """Handle the initial step."""
         errors = {}
-        self._user_schema = _get_config_schema(user_input)
         if user_input is not None:
 
             try:
@@ -71,7 +60,7 @@ async def async_step_user(self, user_input=None):
                 errors["base"] = "unknown"
 
         return self.async_show_form(
-            step_id="user", data_schema=self._user_schema, errors=errors
+            step_id="user", data_schema=DATA_SCHEMA, errors=errors
         )
 
 

custom_components/plugwise-beta/sensor.py

@@ -278,12 +278,6 @@ def __init__(self, api, coordinator, name, dev_id, sensor, sensor_type):
 
         self._unique_id = f"cl-{dev_id}-{self._name}-{sensor}"
 
-
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self._unique_id
-
     @property
     def device_class(self):
         """Device class of this entity."""
@@ -387,12 +381,6 @@ def __init__(self, api, coordinator, name, dev_id, sensor, sensor_type, model):
         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."""
-        return self._unique_id
 
     @property
     def name(self):

custom_components/plugwise-beta/switch.py

@@ -4,7 +4,7 @@
 from typing import Dict
 from Plugwise_Smile.Smile import Smile
 
-from homeassistant.components.switch import SwitchDevice
+from homeassistant.components.switch import SwitchEntity
 
 from .const import DOMAIN, SWITCH_ICON
 
@@ -30,7 +30,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(devices, True)
 
 
-class PwSwitch(SmileGateway, SwitchDevice):
+class PwSwitch(SmileGateway, SwitchEntity):
     """Representation of a Plugwise plug."""
 
     def __init__(self, api, coordinator, name, dev_id, model):
@@ -44,11 +44,6 @@ def __init__(self, api, coordinator, name, dev_id, model):
         self._device_is_on = False
         self._unique_id = f"sw-{dev_id}-{self._name}"
 
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self._unique_id
-
     @property
     def is_on(self):
         """Return true if device is on."""
@@ -57,7 +52,7 @@ def is_on(self):
     @property
     def device_info(self) -> Dict[str, any]:
         """Return the device information."""
-        via_device = self._api.gateway_id
+        via_device = (DOMAIN, self._api.gateway_id)
         if self._dev_id is via_device:
             via_device = None
 

hacs.json

@@ -1,6 +1,6 @@
 {
   "name": "Plugwise beta custom component",
   "domains": ["binary_sensor","climate","sensor","switch"],
-  "homeassistant": "0.109.0",
+  "homeassistant": "0.110.0",
   "render_readme": true
 }