bugfix, refactor exception handling/messages

Author: zxdavb

src/evohomeasync/auth.py

@@ -123,7 +123,7 @@ async def fetch_session_id(self) -> None:
             if "EmailOrPasswordIncorrect" not in err.message:
                 raise
             self.logger.error(HINT_BAD_CREDS)  # noqa: TRY400
-            raise exc.BadUserCredentialsError(f"{err}", status=err.status) from err
+            raise exc.BadUserCredentialsError(f"{err!r}", status=err.status) from err
 
         self._was_authenticated = True
 
@@ -163,7 +163,7 @@ async def _fetch_session_id(self, credentials: dict[str, str]) -> None:
 
         except (KeyError, TypeError) as err:
             raise exc.AuthenticationFailedError(
-                f"Authenticator response is invalid: {err}, payload={response}"
+                f"Authenticator response is invalid: {err!r}, payload={response}"
             ) from err
 
         self._was_authenticated = True  # i.e. the credentials are valid

src/evohomeasync/main.py

@@ -124,13 +124,21 @@ async def _get_config(self) -> list[EvoTcsInfoDictT]:
                 self._session_manager._clear_session_id()
                 self._user_info = await self.auth.get(url, schema=SCH_GET_ACCOUNT_INFO)  # type: ignore[assignment]
 
-        assert self._user_info is not None  # mypy
+            assert self._user_info is not None  # mypy
 
         if self._user_locs is None:
-            url = f"locations?userId={self._user_info['user_id']}&allData=True"
-            self._user_locs = await self.auth.get(url, schema=SCH_GET_ACCOUNT_LOCS)  # type: ignore[assignment]
+            try:
+                user_id = self._user_info["user_id"]
+            except (KeyError, TypeError) as err:
+                raise exc.BadApiResponseError(
+                    f"User info is invalid: {err!r}, user_info={self._user_info}"
+                ) from err
 
-        assert self._user_locs is not None  # mypy
+            self._user_locs = await self.auth.get(
+                f"locations?userId={user_id}&allData=True", schema=SCH_GET_ACCOUNT_LOCS
+            )  # type: ignore[assignment]
+
+            assert self._user_locs is not None  # mypy
 
         if self._locations is None:
             self._locations = []
@@ -152,7 +160,7 @@ def user_account(self) -> EvoUserAccountDictT:
 
         if self._user_info is None:
             raise exc.InvalidConfigError(
-                f"{self}: The account information is not (yet) available"
+                "The account information is not (yet) available"
             )
 
         return self._user_info
@@ -163,7 +171,7 @@ def locations(self) -> list[Location]:
 
         if self._user_locs is None:
             raise exc.InvalidConfigError(
-                f"{self}: The installation information is not (yet) available"
+                "The installation information is not (yet) available"
             )
 
         return self._locations  # type: ignore[return-value]
@@ -174,7 +182,7 @@ def location_by_id(self) -> dict[str, Location]:
 
         if self._user_locs is None:
             raise exc.InvalidConfigError(
-                f"{self}: The installation information is not (yet) available"
+                "The installation information is not (yet) available"
             )
 
         return self._location_by_id  # type: ignore[return-value]
@@ -189,7 +197,7 @@ def tcs(self) -> Location:
 
         if not (locs := self.locations) or len(locs) != 1:
             raise exc.NoSingleTcsError(
-                f"{self}: There is not a single location (only) for this account"
+                "There is not a single location (only) for this account"
             )
 
         return locs[0]

src/evohomeasync2/auth.py

@@ -211,7 +211,7 @@ async def _fetch_access_token(self, credentials: dict[str, str]) -> None:
 
         except (KeyError, TypeError) as err:
             raise exc.AuthenticationFailedError(
-                f"Authenticator response is invalid: {err}, payload={response}"
+                f"Authenticator response is invalid: {err!r}, payload={response}"
             ) from err
 
         self._was_authenticated = True  # i.e. the credentials are valid

src/evohomeasync2/main.py

@@ -134,13 +134,22 @@ async def _get_config(
                 self._token_manager._clear_access_token()
                 self._user_info = await self.auth.get(url, schema=SCH_USER_ACCOUNT)  # type: ignore[assignment]
 
-        assert self._user_info is not None  # mypy
+            assert self._user_info is not None  # mypy
 
         if self._user_locs is None:
-            url = f"location/installationInfo?userId={self._user_info[SZ_USER_ID]}&includeTemperatureControlSystems=True"
-            self._user_locs = await self.auth.get(url, schema=SCH_USER_LOCATIONS)  # type: ignore[assignment]
+            try:
+                user_id = self._user_info[SZ_USER_ID]
+            except (KeyError, TypeError) as err:
+                raise exc.BadApiResponseError(
+                    f"User info is invalid: {err!r}, user_info={self._user_info}"
+                ) from err
 
-        assert self._user_locs is not None  # mypy
+            self._user_locs = await self.auth.get(
+                f"location/installationInfo?userId={user_id}&includeTemperatureControlSystems=True",
+                schema=SCH_USER_LOCATIONS,
+            )  # type: ignore[assignment]
+
+            assert self._user_locs is not None  # mypy
 
         if self._locations is None:
             self._locations = []
@@ -166,7 +175,7 @@ def user_account(self) -> EvoUsrConfigResponseT:
 
         if not self._user_info:
             raise exc.InvalidConfigError(
-                f"{self}: The account information is not (yet) available"
+                "The account information is not (yet) available"
             )
 
         return self._user_info
@@ -177,7 +186,7 @@ def locations(self) -> list[Location]:
 
         if not self._user_locs:
             raise exc.InvalidConfigError(
-                f"{self}: The installation information is not (yet) available"
+                "The installation information is not (yet) available"
             )
 
         return self._locations  # type: ignore[return-value]
@@ -188,7 +197,7 @@ def location_by_id(self) -> dict[str, Location]:
 
         if not self._user_locs:
             raise exc.InvalidConfigError(
-                f"{self}: The installation information is not (yet) available"
+                "The installation information is not (yet) available"
             )
 
         return self._location_by_id  # type: ignore[return-value]
@@ -203,17 +212,17 @@ def tcs(self) -> ControlSystem:
 
         if not (locs := self.locations) or len(locs) != 1:
             raise exc.NoSingleTcsError(
-                f"{self}: There is not a single location (only) for this account"
+                "There is not a single location (only) for this account"
             )
 
         if not (gwys := locs[0].gateways) or len(gwys) != 1:
             raise exc.NoSingleTcsError(
-                f"{self}: There is not a single gateway (only) for this account/location"
+                "There is not a single gateway (only) for this account/location"
             )
 
         if not (tcss := gwys[0].systems) or len(tcss) != 1:
             raise exc.NoSingleTcsError(
-                f"{self}: There is not a single TCS (only) for this account/location/gateway"
+                "There is not a single TCS (only) for this account/location/gateway"
             )
 
         return tcss[0]