Entity migration bug fix #28

Author: erikkastelec

custom_components/wemportal/__init__.py

@@ -104,19 +104,22 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await coordinator.async_config_entry_first_refresh()
 
-    try:
-        version = entry.version
-        if version < 2:
-            await migrate_unique_ids(hass, entry, coordinator)
-    except Exception:
-        await migrate_unique_ids(hass, entry, coordinator)
+    # try:
+    #     version = entry.version
+    #     if version < 2:
+    #         await migrate_unique_ids(hass, entry, coordinator)
+    # except Exception:
+    #     await migrate_unique_ids(hass, entry, coordinator)
+
+    # Is there an on_update function that we can add listener to?
+    _LOGGER.debug("Migrating entity names for wemportal")
+    await migrate_unique_ids(hass, entry, coordinator)
 
     hass.data[DOMAIN][entry.entry_id] = {
         "api": api,
         # "config": entry.data,
         "coordinator": coordinator,
     }
-
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     entry.async_on_unload(entry.add_update_listener(_async_entry_updated))
 
@@ -129,6 +132,10 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
 
 async def _async_entry_updated(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
     """Handle entry updates."""
+    _LOGGER.debug("Migrating entity names for wemportal because of config entry update")
+    await migrate_unique_ids(
+        hass, config_entry, hass.data[DOMAIN][config_entry.entry_id]["coordinator"]
+    )
     await hass.config_entries.async_reload(config_entry.entry_id)
 
 

custom_components/wemportal/const.py

@@ -12,9 +12,9 @@
 CONF_MODE: Final = "mode"
 PLATFORMS = ["sensor", "number", "select", "switch"]
 REFRESH_WAIT_TIME: Final = 360
-DATA_GATHERING_ERROR: Final = "An error occurred while gathering parameters data. \
+DATA_GATHERING_ERROR: Final = "An error occurred while gathering data. \
                     This issue should resolve by itself. If this problem persists, \
-                    open an issue at https://github.com/erikkastelec/hass-WEM-Portal/issues "
+                    open an issue at https://github.com/erikkastelec/hass-WEM-Portal/issues"
 DEFAULT_CONF_SCAN_INTERVAL_API_VALUE: Final = 300
 DEFAULT_CONF_SCAN_INTERVAL_VALUE: Final = 1800
 DEFAULT_CONF_LANGUAGE_VALUE: Final = "en"

custom_components/wemportal/wemportalapi.py

@@ -163,7 +163,10 @@ def api_login(self):
                     f"Authentication Error: Encountered an unknown authentication error. Received response code: {response.status_code}, response: {response.content}"
                 ) from exc
 
-    def make_api_call(self, url: str, headers=None, data=None) -> reqs.Response:
+    def make_api_call(
+        self, url: str, headers=None, data=None, login_retry=False, delay=1
+    ) -> reqs.Response:
+        response = None
         try:
             if not headers:
                 headers = self.headers
@@ -175,23 +178,31 @@ def make_api_call(self, url: str, headers=None, data=None) -> reqs.Response:
                     url, headers=headers, data=json.dumps(data)
                 )
             response.raise_for_status()
-        except reqs.exceptions.HTTPError as exc:
-            if response.status_code == 401:
+        except Exception as exc:
+            if response.status_code == 401 and not login_retry:
                 self.api_login()
-                if not headers:
-                    headers = self.headers
-                if not data:
-                    response = self.session.get(url, headers=headers)
-                else:
-                    headers["Content-Type"] = "application/json"
-                    response = self.session.post(
-                        url, headers=headers, data=json.dumps(data)
-                    )
-                response.raise_for_status()
+                headers = headers or self.headers
+                time.sleep(delay)
+                response = self.make_api_call(
+                    url,
+                    headers=headers,
+                    data=data,
+                    login_retry=True,
+                    delay=delay,
+                )
             else:
-                raise WemPortalError(DATA_GATHERING_ERROR) from exc
-        except Exception as exc:
-            raise WemPortalError(DATA_GATHERING_ERROR) from exc
+                try:
+                    response_data = response.json()
+                    # Status we get back from server
+                    server_status = response_data["Status"]
+                    server_message = response_data["Message"]
+                    raise WemPortalError(
+                        f"{DATA_GATHERING_ERROR} Server returned status code: {server_status} and message: {server_message}"
+                    ) from exc
+                # If there is no Status or Message in response
+                except KeyError:
+                    raise WemPortalError(DATA_GATHERING_ERROR) from exc
+
         return response
 
     def get_devices(self):