Merge pull request #42 from CoMPaTech/maintenance

Quality improvements

README.md

@@ -120,6 +120,9 @@ Even though available does not mean it's stable yet, the HA part is solid but th
 
 # Changelog
 
+## OCT 2023 [0.2.4]
+ - Improve quality
+
 ## SEP 2023 [0.2.3]
  - Conform to hacs and HA files
  - Adding HACS validation

custom_components/stromer/__init__.py

@@ -9,7 +9,7 @@
 
 from .const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, DOMAIN, LOGGER
 from .coordinator import StromerDataUpdateCoordinator
-from .stromer import Stromer
+from .stromer import Stromer, ApiError
 
 SCAN_INTERVAL = timedelta(minutes=10)
 
@@ -28,7 +28,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
  # Initialize connection to stromer
  stromer = Stromer(username, password, client_id, client_secret)
- await stromer.stromer_connect()
+ try:
+ await stromer.stromer_connect()
+ except ApiError as ex:
+ raise ConfigEntryNotReady("Error while communicating to Stromer API") from ex
+
  LOGGER.debug("Stromer entry: {}".format(entry))
 
  # Use Bike ID as unique id
@@ -63,4 +67,4 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
  if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
  hass.data[DOMAIN].pop(entry.entry_id)
 
- return
+ return unload_ok

custom_components/stromer/config_flow.py

@@ -13,7 +13,6 @@
 from .const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, DOMAIN, LOGGER
 from .stromer import Stromer
 
-# TODO adjust the data schema to the data that you need
 STEP_USER_DATA_SCHEMA = vol.Schema(
  {
  vol.Required(CONF_USERNAME): str,
@@ -24,7 +23,7 @@
 )
 
 
-async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
+async def validate_input(_, data: dict[str, Any]) -> dict[str, Any]:
  """Validate the user input allows us to connect."""
  username = data[CONF_USERNAME]
  password = data[CONF_PASSWORD]

custom_components/stromer/coordinator.py

@@ -7,7 +7,7 @@
  UpdateFailed)
 
 from .const import DOMAIN, LOGGER
-from .stromer import Stromer
+from .stromer import Stromer, ApiError
 
 
 class StromerData(NamedTuple):
@@ -47,7 +47,3 @@ async def _async_update_data(self) -> StromerData:
  except ApiError as err:
  raise UpdateFailed(f"Error communicating with API: {err}")
  return StromerData(*data)
-
-
-class ApiError(BaseException):
- """Error to indicate something wrong with the API."""

custom_components/stromer/manifest.json

@@ -7,5 +7,5 @@
  "iot_class": "cloud_polling",
  "issue_tracker": "https://github.com/CoMPaTech/stromer/issues",
  "requirements": [],
- "version": "0.2.3"
+ "version": "0.2.4"
 }

custom_components/stromer/stromer.py

@@ -90,12 +90,20 @@ async def stromer_update(self):
  LOGGER.error("Stromer error: api call failed: {}".format(e))
  LOGGER.debug("Stromer retry: {}/10".format(attempts))
 
+ LOGGER.error("Stromer error: api call failed 10 times, cowardly failing")
+ raise ApiError
+
  async def stromer_get_code(self):
  url = f"{self.base_url}/mobile/v4/login/"
  if self._api_version == 'v3':
  url = f"{self.base_url}/users/login/"
  res = await self._websession.get(url)
- cookie = res.headers.get("Set-Cookie")
+ try:
+ cookie = res.headers.get("Set-Cookie")
+ except Exception as e:
+ LOGGER.error("Stromer error: api call failed: {}".format(e))
+ raise ApiError
+
  pattern = "=(.*?);"
  csrftoken = re.search(pattern, cookie).group(1)
 
@@ -157,3 +165,7 @@ async def stromer_call_api(self, endpoint, data={}):
  # LOGGER.debug("ret %s" % ret)
  # LOGGER.debug("res status %s" % res.status)
  return ret["data"][0]
+
+class ApiError(Exception):
+ """Error to indicate something wrong with the API."""
+