Merge pull request #45 from plugwise/requestfix

Requestfix counterpart

Author: CoMPaTech

custom_components/plugwise-beta/__init__.py

@@ -8,6 +8,7 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.event import async_track_time_interval
@@ -36,9 +37,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
 
     try:
-        await api.connect()
+        connected = await api.connect()
+
+        if not connected:
+            _LOGGER.error("Unable to connect to Smile: %s",api.smile_status)
+            raise PlatformNotReady
+
+    except Smile.PlugwiseError:
+        _LOGGER.error("Error while communicating to device")
+        raise PlatformNotReady
+
     except asyncio.TimeoutError:
         _LOGGER.error("Timeout while connecting to Smile")
+        raise PlatformNotReady
 
     if api.smile_type == "power":
         update_interval = timedelta(seconds=10)
@@ -47,7 +58,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     api.get_all_devices()
 
-    _LOGGER.debug("Plugwise async update interval %s", update_interval)
+    _LOGGER.debug("Async update interval %s", update_interval)
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
         "api": api,
@@ -56,7 +67,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         ),
     }
 
-    _LOGGER.debug("Plugwise gateway is %s", api.gateway_id)
+    _LOGGER.debug("Gateway is %s", api.gateway_id)
     device_registry = await dr.async_get_registry(hass)
     device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
@@ -66,7 +77,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         model=f"Smile {api.smile_name}",
         sw_version=api.smile_version[0],
     )
-    _LOGGER.debug("Plugwise device registry  %s", result)
 
     single_master_thermostat = api.single_master_thermostat()
     _LOGGER.debug("Single master thermostat = %s", single_master_thermostat)
@@ -148,14 +158,18 @@ def async_remove_listener(self, update_callback):
 
     async def async_refresh_all(self, _now: Optional[int] = None) -> None:
         """Time to update."""
-        _LOGGER.debug("Plugwise Smile updating with interval: %s", self.update_interval)
+        _LOGGER.debug("Smile updating with interval: %s", self.update_interval)
         if not self.listeners:
-            _LOGGER.error("Plugwise Smile has no listeners, not updating")
+            _LOGGER.error("Smile has no listeners, not updating")
             return
 
-        _LOGGER.debug("Plugwise Smile updating data using: %s", self.update_method)
+        _LOGGER.debug("Smile updating data using: %s", self.update_method)
 
-        await self.api.full_update_device()
+        try:
+            await self.api.full_update_device()
+        except Smile.XMLDataMissingError as e:
+            _LOGGER.error("Smile update failed")
+            raise e
 
         for update_callback in self.listeners:
             update_callback()

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.1.23"],
+  "requirements": ["Plugwise_Smile==0.1.24"],
   "dependencies": [],
   "codeowners": ["@CoMPaTech","@bouwew"],
   "config_flow": true

custom_components/plugwise-beta/strings.json

@@ -1,6 +1,5 @@
 {
   "config": {
-    "title": "Plugwise Smile beta",
     "step": {
       "user": {
         "title": "Connect to the device",

…ents/plugwise-beta/.translations/en.json …nents/plugwise-beta/translations/en.jsoncustom_components/plugwise-beta/.translations/en.json renamed to custom_components/plugwise-beta/translations/en.json custom_components/plugwise-beta/.translations/en.json renamed to custom_components/plugwise-beta/translations/en.json

@@ -1,6 +1,5 @@
 {
   "config": {
-    "title": "Plugwise Smile beta",
     "step": {
       "user": {
         "title": "Connect to the device",

…ents/plugwise-beta/.translations/nl.json …nents/plugwise-beta/translations/nl.jsoncustom_components/plugwise-beta/.translations/nl.json renamed to custom_components/plugwise-beta/translations/nl.json custom_components/plugwise-beta/.translations/nl.json renamed to custom_components/plugwise-beta/translations/nl.json

@@ -1,6 +1,5 @@
 {
   "config": {
-    "title": "Plugwise Smile beta",
     "step": {
       "user": {
         "title": "Verbinden met de Smile",