Tweaks for US API support

README.md

@@ -17,12 +17,7 @@ This custom component integrates with the Bestway cloud API, providing control o
 
 You must have an account with the Bestway mobile app ([Android][bestway-android]/[iOS][bestway-ios]). Lay-Z-Spa app credentials will not work. Both apps appear to have identical feature sets.
 
-Bestway uses different API endpoints for EU and US. If you get an error stating account could not be found, try using the other api. If this does not help, then create a new account under a supported country.
-
-Confirmed working countries:
-
-* Germany (euapi)
-* United Kingdom (euapi)
+Bestway uses different API endpoints for EU and US. If you get an error stating account could not be found, try using the other endpoint. If this does not help, then create a new account under a supported country.
 
 
 ## Device Support

custom_components/bestway/__init__.py

@@ -15,6 +15,7 @@
 from .bestway import BestwayApi, BestwayDeviceReport
 from .const import (
     CONF_API_ROOT,
+    CONF_API_ROOT_EU,
     CONF_PASSWORD,
     CONF_USER_TOKEN,
     CONF_USER_TOKEN_EXPIRY,
@@ -90,6 +91,26 @@ async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     await async_setup_entry(hass, entry)
 
 
+async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Migrates old config versions to the latest."""
+
+    _LOGGER.debug("Migrating from version %s", entry.version)
+
+    if entry.version == 1:
+        # API root needs to be set
+        # In version 1, this was hard coded to the EU endpoint
+        new = {**entry.data}
+        new[CONF_API_ROOT] = CONF_API_ROOT_EU
+        entry.version = 2
+        hass.config_entries.async_update_entry(entry, data=new)
+
+        _LOGGER.info("Migration to version %s successful", entry.version)
+        return True
+
+    _LOGGER.error("Existing schema version %s is not supported", entry.version)
+    return False
+
+
 class BestwayUpdateCoordinator(DataUpdateCoordinator[dict[str, BestwayDeviceReport]]):
     """Update coordinator that polls the device status for all devices in an account."""
 

custom_components/bestway/config_flow.py

@@ -10,8 +10,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import selector
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import selector
 import voluptuous as vol
 
 from custom_components.bestway.bestway import (
@@ -32,14 +32,20 @@
 )
 
 _LOGGER = getLogger(__name__)
-
-
-def _get_user_data_schema():
-    data_schema = {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
-    data_schema[CONF_API_ROOT] = selector(
-        {"select": {"options": [CONF_API_ROOT_EU, CONF_API_ROOT_US]}}
-    )
-    return vol.Schema(data_schema)
+_STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_USERNAME): str,
+        vol.Required(CONF_PASSWORD): str,
+        vol.Required(CONF_API_ROOT): selector.SelectSelector(
+            selector.SelectSelectorConfig(
+                options=[
+                    selector.SelectOptionDict(value=CONF_API_ROOT_EU, label="EU"),
+                    selector.SelectOptionDict(value=CONF_API_ROOT_US, label="US"),
+                ]
+            )
+        ),
+    }
+)
 
 
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
@@ -66,15 +72,15 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
 class BestwayConfigFlow(ConfigFlow, domain=DOMAIN):  # type: ignore[call-arg]
     """Handle a config flow for bestway."""
 
-    VERSION = 1
+    VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
         """Handle the initial step."""
         if user_input is None:
             return self.async_show_form(
-                step_id="user", data_schema=_get_user_data_schema()
+                step_id="user", data_schema=_STEP_USER_DATA_SCHEMA
             )
 
         errors = {}
@@ -94,7 +100,7 @@ async def async_step_user(
             return self.async_create_entry(title=info["title"], data=user_input)
 
         return self.async_show_form(
-            step_id="user", data_schema=_get_user_data_schema(), errors=errors
+            step_id="user", data_schema=_STEP_USER_DATA_SCHEMA, errors=errors
         )
 
 

custom_components/bestway/entity.py

@@ -1,5 +1,6 @@
 """Home Assistant entity descriptions."""
 from __future__ import annotations
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

custom_components/bestway/translations/en.json

@@ -5,7 +5,8 @@
                 "title": "Bestway Login",
                 "data": {
                     "username": "Username (e-mail address)",
-                    "password": "Password"
+                    "password": "Password",
+                    "apiroot": "API location"
                 }
             }
         },