feat: Add INTL region support and reconfigure flow

custom_components/smarthashtag/__init__.py

@@ -10,13 +10,16 @@
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from pysmarthashtag.account import SmartAccount
-from pysmarthashtag.const import EndpointUrls
+from pysmarthashtag.const import EndpointUrls, SmartRegion, get_endpoint_urls_for_region
 
 from .const import (
     CONF_API_BASE_URL,
     CONF_API_BASE_URL_V2,
     CONF_REGION,
+    DEFAULT_REGION,
     REGION_CUSTOM,
+    REGION_EU,
+    REGION_INTL,
 )
 from .coordinator import SmartHashtagDataUpdateCoordinator
 
@@ -57,7 +60,7 @@ async def async_setup_entry(
     """
     # Determine endpoint URLs based on region or custom settings
     endpoint_urls = None
-    region = entry.data.get(CONF_REGION)
+    region = entry.data.get(CONF_REGION, DEFAULT_REGION)
 
     if region == REGION_CUSTOM:
         # Use custom endpoints if provided
@@ -68,8 +71,14 @@ async def async_setup_entry(
                 api_base_url=custom_api_base_url or None,
                 api_base_url_v2=custom_api_base_url_v2 or None,
             )
-    # For EU region (default) or unrecognized region, endpoint_urls remains None
-    # and SmartAccount will use default EU endpoints
+    elif region == REGION_INTL:
+        # Use international endpoints
+        endpoint_urls = get_endpoint_urls_for_region(SmartRegion.INTL)
+    elif region == REGION_EU:
+        # Use EU endpoints (default)
+        endpoint_urls = get_endpoint_urls_for_region(SmartRegion.EU)
+    # If region is None or unrecognized, endpoint_urls remains None
+    # and SmartAccount will use default endpoints
 
     entry.runtime_data = SmartHashtagDataUpdateCoordinator(
         hass=hass,

custom_components/smarthashtag/config_flow.py

@@ -15,7 +15,7 @@
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import selector
 from pysmarthashtag.account import SmartAccount
-from pysmarthashtag.const import EndpointUrls
+from pysmarthashtag.const import EndpointUrls, SmartRegion, get_endpoint_urls_for_region
 from pysmarthashtag.models import (
     SmartAPIError,
 )
@@ -40,6 +40,8 @@
     MIN_SCAN_INTERVAL,
     NAME,
     REGION_CUSTOM,
+    REGION_EU,
+    REGION_INTL,
     REGIONS,
 )
 
@@ -167,6 +169,9 @@ async def async_step_custom_endpoints(
                     self.init_info[CONF_API_BASE_URL] = api_base_url
                     self.init_info[CONF_API_BASE_URL_V2] = api_base_url_v2
                     self.init_info[CONF_VEHICLES] = list(vehicles)
+                    # If reconfiguring, skip vehicle selection and update directly
+                    if self._is_reconfigure:
+                        return await self._finish_reconfigure()
                     return await self.async_step_vehicle()
 
         return self.async_show_form(
@@ -194,6 +199,155 @@ async def async_step_custom_endpoints(
             errors=_errors,
         )
 
+    @property
+    def _is_reconfigure(self) -> bool:
+        """Check if we are in a reconfigure flow."""
+        return self.init_info.get("_reconfigure", False)
+
+    async def async_step_reconfigure(
+        self,
+        user_input: dict | None = None,
+    ) -> config_entries.FlowResult:
+        """Handle reconfiguration of credentials and region."""
+        _errors = {}
+        reconfigure_entry = self._get_reconfigure_entry()
+
+        if user_input is not None:
+            # Check if custom endpoints are selected and redirect to custom step
+            if user_input.get(CONF_REGION) == REGION_CUSTOM:
+                self.init_info = user_input
+                self.init_info["_reconfigure"] = True
+                return await self.async_step_custom_endpoints()
+
+            try:
+                vehicles = await self._test_credentials(
+                    username=user_input[CONF_USERNAME],
+                    password=user_input[CONF_PASSWORD],
+                    region=user_input.get(CONF_REGION, DEFAULT_REGION),
+                )
+            except SmartAPIError as exception:
+                LOGGER.warning(exception)
+                _errors["base"] = "auth"
+            else:
+                self.init_info = user_input
+                self.init_info["_reconfigure"] = True
+                self.init_info[CONF_VEHICLES] = list(vehicles)
+                return await self._finish_reconfigure()
+
+        return self.async_show_form(
+            step_id="reconfigure",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(
+                        CONF_USERNAME,
+                        default=(user_input or {}).get(
+                            CONF_USERNAME, reconfigure_entry.data.get(CONF_USERNAME)
+                        ),
+                    ): selector.TextSelector(
+                        selector.TextSelectorConfig(
+                            type=selector.TextSelectorType.EMAIL,
+                            autocomplete="username",
+                        ),
+                    ),
+                    vol.Required(
+                        CONF_PASSWORD,
+                    ): selector.TextSelector(
+                        selector.TextSelectorConfig(
+                            type=selector.TextSelectorType.PASSWORD,
+                            autocomplete="current-password",
+                        ),
+                    ),
+                    vol.Optional(
+                        CONF_REGION,
+                        default=(user_input or {}).get(
+                            CONF_REGION,
+                            reconfigure_entry.data.get(CONF_REGION, DEFAULT_REGION),
+                        ),
+                    ): selector.SelectSelector(
+                        selector.SelectSelectorConfig(
+                            options=[
+                                selector.SelectOptionDict(value=k, label=v)
+                                for k, v in REGIONS.items()
+                            ],
+                            mode=selector.SelectSelectorMode.DROPDOWN,
+                        ),
+                    ),
+                }
+            ),
+            errors=_errors,
+        )
+
+    async def _finish_reconfigure(self) -> config_entries.FlowResult:
+        """Complete reconfiguration by selecting a vehicle and updating the entry."""
+        reconfigure_entry = self._get_reconfigure_entry()
+        vehicles = self.init_info[CONF_VEHICLES]
+
+        # Build updated data, removing internal flags
+        data_updates = {
+            CONF_USERNAME: self.init_info[CONF_USERNAME],
+            CONF_PASSWORD: self.init_info[CONF_PASSWORD],
+            CONF_REGION: self.init_info.get(CONF_REGION, DEFAULT_REGION),
+        }
+
+        # Include custom endpoint URLs if present
+        if CONF_API_BASE_URL in self.init_info:
+            data_updates[CONF_API_BASE_URL] = self.init_info[CONF_API_BASE_URL]
+        if CONF_API_BASE_URL_V2 in self.init_info:
+            data_updates[CONF_API_BASE_URL_V2] = self.init_info[CONF_API_BASE_URL_V2]
+
+        # If only one vehicle or if the current vehicle is still available, auto-select
+        current_vehicle = reconfigure_entry.data.get(CONF_VEHICLE)
+        if len(vehicles) == 1:
+            data_updates[CONF_VEHICLE] = vehicles[0]
+            data_updates[CONF_VEHICLES] = vehicles
+        elif current_vehicle and current_vehicle in vehicles:
+            data_updates[CONF_VEHICLE] = current_vehicle
+            data_updates[CONF_VEHICLES] = vehicles
+        else:
+            # Multiple vehicles and current one not found - show vehicle picker
+            return await self.async_step_reconfigure_vehicle()
+
+        return self.async_update_reload_and_abort(
+            reconfigure_entry,
+            data_updates=data_updates,
+        )
+
+    async def async_step_reconfigure_vehicle(
+        self,
+        user_input: dict | None = None,
+    ) -> config_entries.FlowResult:
+        """Handle vehicle selection during reconfigure."""
+        reconfigure_entry = self._get_reconfigure_entry()
+
+        if user_input is not None:
+            data_updates = {
+                CONF_USERNAME: self.init_info[CONF_USERNAME],
+                CONF_PASSWORD: self.init_info[CONF_PASSWORD],
+                CONF_REGION: self.init_info.get(CONF_REGION, DEFAULT_REGION),
+                CONF_VEHICLE: user_input[CONF_VEHICLE],
+                CONF_VEHICLES: self.init_info[CONF_VEHICLES],
+            }
+            if CONF_API_BASE_URL in self.init_info:
+                data_updates[CONF_API_BASE_URL] = self.init_info[CONF_API_BASE_URL]
+            if CONF_API_BASE_URL_V2 in self.init_info:
+                data_updates[CONF_API_BASE_URL_V2] = self.init_info[CONF_API_BASE_URL_V2]
+
+            return self.async_update_reload_and_abort(
+                reconfigure_entry,
+                data_updates=data_updates,
+            )
+
+        return self.async_show_form(
+            step_id="reconfigure_vehicle",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_VEHICLE): vol.In(
+                        self.init_info[CONF_VEHICLES]
+                    )
+                }
+            ),
+        )
+
     async def _test_credentials(
         self,
         username: str,
@@ -212,7 +366,12 @@ async def _test_credentials(
                 api_base_url=custom_api_base_url or None,
                 api_base_url_v2=custom_api_base_url_v2 or None,
             )
-        # For EU region (default) or other regions, use default endpoints
+        elif region and region != REGION_CUSTOM:
+            # Predefined region
+            if region == REGION_EU:
+                endpoint_urls = get_endpoint_urls_for_region(SmartRegion.EU)
+            elif region == REGION_INTL:
+                endpoint_urls = get_endpoint_urls_for_region(SmartRegion.INTL)
 
         client = SmartAccount(
             username=username,

custom_components/smarthashtag/const.py

@@ -9,7 +9,7 @@
 NAME = "Smart"
 DOMAIN = "smarthashtag"
 DOMAIN_DATA = f"{DOMAIN}_data"
-VERSION = "0.8.0"
+VERSION = "0.8.0-intl"
 
 ATTRIBUTION = "Data provided by http://smart.com/"
 ISSUE_URL = "https://github.com/DasBasti/SmartHashtag/issues"
@@ -51,10 +51,12 @@
 
 # Region options
 REGION_EU = "eu"
+REGION_INTL = "intl"
 REGION_CUSTOM = "custom"
 
 REGIONS = {
     REGION_EU: "Europe (Hello Smart EU)",
+    REGION_INTL: "International (Hello Smart International - Australia, Singapore, etc.)",
     REGION_CUSTOM: "Custom Endpoints",
 }
 

custom_components/smarthashtag/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/DasBasti/SmartHashtag/issues",
   "requirements": ["pysmarthashtag==0.8.1"],
-  "version": "0.8.0"
+  "version": "0.8.0-intl"
 }

custom_components/smarthashtag/translations/de.json

@@ -22,13 +22,29 @@
           "api_base_url": "API-Basis-URL",
           "api_base_url_v2": "API-Basis-URL v2"
         }
+      },
+      "reconfigure": {
+        "description": "Aktualisieren Sie Ihre Smart-Kontodaten oder ändern Sie die Region. Die Integration wird nach dem Speichern neu geladen.",
+        "data": {
+          "username": "Benutzername",
+          "password": "Passwort",
+          "region": "Region / Endpunkt"
+        }
+      },
+      "reconfigure_vehicle": {
+        "description": "Fahrzeug-VIN für das aktualisierte Konto auswählen",
+        "data": {
+          "vehicle": "Vehicle Identification Number"
+        }
       }
     },
     "error": {
       "auth": "Authentifizierung fehlgeschlagen, bitte überprüfen Sie Ihre Anmeldeinformationen und versuchen Sie es erneut.",
       "custom_endpoints_required": "Mindestens eine benutzerdefinierte Endpunkt-URL muss angegeben werden"
     },
-    "abort": {}
+    "abort": {
+      "reconfigure_successful": "Konto erfolgreich aktualisiert. Die Integration wird neu geladen."
+    }
   },
   "options": {
     "step": {

custom_components/smarthashtag/translations/en.json

@@ -22,13 +22,29 @@
           "api_base_url": "API Base URL",
           "api_base_url_v2": "API Base URL v2"
         }
+      },
+      "reconfigure": {
+        "description": "Update your Smart account credentials or change region. The integration will reload after saving.",
+        "data": {
+          "username": "Username",
+          "password": "Password",
+          "region": "Region / Endpoint"
+        }
+      },
+      "reconfigure_vehicle": {
+        "description": "Select vehicle VIN for the updated account",
+        "data": {
+          "vehicle": "Vehicle identification number"
+        }
       }
     },
     "error": {
       "auth": "Auth failed, please check your username and password",
       "custom_endpoints_required": "At least one custom endpoint URL must be provided"
     },
-    "abort": {}
+    "abort": {
+      "reconfigure_successful": "Account updated successfully. The integration will reload."
+    }
   },
   "options": {
     "step": {