Merge pull request #57 from iprak/fix-missing-message-in-SensiConnect…

…ionError

Fix missing message in sensi connection error

custom_components/sensi/__init__.py

@@ -1,4 +1,5 @@
 """The Sensi thermostat component."""
+
 from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry
@@ -57,9 +58,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
  DOMAIN_DATA_COORDINATOR_KEY: coordinator,
  }
  await hass.config_entries.async_forward_entry_setups(entry, SUPPORTED_PLATFORMS)
- except ConfigEntryAuthFailed as err:
+ except ConfigEntryAuthFailed:
  # Pass ConfigEntryAuthFailed, this can be raised from the coordinator
- raise err
+ raise
  except AuthenticationError as err:
  # Raising ConfigEntryAuthFailed will automatically put the config entry in a
  # failure state and start a reauth flow.

custom_components/sensi/auth.py

@@ -78,7 +78,7 @@ async def _get_new_tokens(hass: HomeAssistant, refresh_token: str) -> any:
  )
  except (asyncio.TimeoutError, aiohttp.ClientError) as err:
  LOGGER.warning("Timed out getting access token", exc_info=True)
- raise SensiConnectionError from err
+ raise SensiConnectionError("Timed out getting access token") from err
 
  if response.status != HTTPStatus.OK:
  LOGGER.warning("Invalid token")

custom_components/sensi/climate.py

@@ -1,8 +1,9 @@
 """Sensi Thermostat."""
+
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import Any, Union
+from typing import Any
 
 from homeassistant.components.climate import (
  ENTITY_ID_FORMAT,
@@ -65,7 +66,7 @@ def __init__(self, device: SensiDevice, entry: ConfigEntry) -> None:
  )
 
  @property
- def extra_state_attributes(self) -> Union[Mapping[str, Any], None]:
+ def extra_state_attributes(self) -> Mapping[str, Any] | None:
  """Return the state attributes."""
  return self._device.attributes
 

custom_components/sensi/config_flow.py

@@ -1,4 +1,5 @@
 """Config flow for Sensi thermostat."""
+
 from __future__ import annotations
 
 from collections.abc import Mapping
@@ -45,7 +46,7 @@ async def _try_login(self, config: AuthenticationConfig):
  return {"base": "cannot_connect"}
  except AuthenticationError:
  return {"base": "invalid_auth"}
- except Exception as err: # pylint: disable=broad-except
+ except Exception as err: # pylint: disable=broad-except # noqa: BLE001
  LOGGER.exception(str(err))
  return {"base": "unknown"}
 

custom_components/sensi/coordinator.py

@@ -1,4 +1,5 @@
 """The Sensi data coordinator."""
+
 from __future__ import annotations
 
 import asyncio
@@ -669,8 +670,8 @@ async def _fetch_device_data(self) -> dict[str, SensiDevice]:
  async with websockets.client.connect(
  url, extra_headers=self._headers
  ) as websocket:
- while (not done) and (fetch_count < MAX_DATA_FETCH_COUNT):
- try:
+ try:
+ while (not done) and (fetch_count < MAX_DATA_FETCH_COUNT):
  msg = await asyncio.wait_for(websocket.recv(), timeout=10)
  done = self._parse_socket_response(msg, self._devices)
  fetch_count = fetch_count + 1
@@ -679,14 +680,14 @@ async def _fetch_device_data(self) -> dict[str, SensiDevice]:
  LOGGER.debug("Data updated, it failed last time")
  self._last_update_failed = False
 
-  except (
-  asyncio.TimeoutError,
-  websockets.exceptions.WebSocketException,
-  ) as exception:
-  done = True
-  self._last_update_failed = True
-  raise UpdateFailed(exception) from exception
-  # Pass AuthenticationError
+ except (
+ asyncio.TimeoutError,
+ websockets.exceptions.WebSocketException,
+ ) as exception:
+ done = True
+ self._last_update_failed = True
+ raise UpdateFailed(exception) from exception
+ # Pass AuthenticationError
 
  for device in self.get_devices():
  device.authenticated = True
@@ -711,7 +712,7 @@ async def async_send_event_priv(self, data: str) -> None:
  msg = await asyncio.wait_for(websocket.recv(), timeout=5)
  self._last_event_time_stamp = datetime.now()
  LOGGER.debug("async_send_event response=%s", msg)
- except Exception as err: # pylint: disable=broad-except
+ except Exception as err: # pylint: disable=broad-except # noqa: BLE001
  LOGGER.warning("Sending event with %s failed", data)
  LOGGER.warning(str(err))
 

custom_components/sensi/switch.py

@@ -1,4 +1,5 @@
 """Sensi thermostat setting switches."""
+
 from __future__ import annotations
 
 from dataclasses import dataclass
@@ -87,10 +88,12 @@ async def async_setup_entry(
 
  entities = []
  for device in coordinator.get_devices():
- for description in SWITCH_TYPES:
- # A device might not support a setting e.g. Continuous Backlight
- if device.supports(description.capability):
- entities.append(SensiCapabilitySettingSwitch(device, description))
+ # A device might not support a setting e.g. Continuous Backlight
+ entities.extend(
+ SensiCapabilitySettingSwitch(device, description)
+ for description in SWITCH_TYPES
+ if device.supports(description.capability)
+ )
 
  entities.append(SensiFanSupportSwitch(device, entry))
  entities.append(SensiAuxHeatSwitch(device, entry))