BREAKING: Require Home Assistant 2025.12+ (drop async_timeout and FlowResult)

- Replace deprecated `FlowResult` with `ConfigFlowResult` from `homeassistant.config_entries`
- Replace `async_timeout.timeout` with `asyncio.timeout` (Python 3.11+)
- Update OptionsFlow to use framework-injected `config_entry` instead of constructor parameter
- Bump version to 14.0.0

Closes #21

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: thematrixdev

custom_components/clphk/__init__.py

@@ -3,7 +3,7 @@
 import logging
 
 import aiohttp
-import async_timeout
+import asyncio
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import padding
@@ -53,7 +53,7 @@ async def request_otp(session, email, timeout=30):
         )).decode(),
     }
     try:
-        async with async_timeout.timeout(timeout):
+        async with asyncio.timeout(timeout):
             async with session.post(url, json=json_payload, headers=API_DEFAULT_HEADERS) as response:
                 response.raise_for_status()
                 data = await response.json()
@@ -74,7 +74,7 @@ async def verify_otp(session, email, otp, timeout=30):
         "otp": otp,
     }
     try:
-        async with async_timeout.timeout(timeout):
+        async with asyncio.timeout(timeout):
             async with session.post(url, json=json_payload, headers=API_DEFAULT_HEADERS) as response:
                 response.raise_for_status()
                 data = await response.json()

custom_components/clphk/config_flow.py

@@ -7,15 +7,16 @@
 import re
 from typing import Any
 
-import async_timeout
+import asyncio
+
 import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import (
     CONF_NAME,
     CONF_TIMEOUT,
     CONF_TYPE,
 )
-from homeassistant.data_entry_flow import FlowResult
+from homeassistant.config_entries import ConfigFlowResult
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.selector import (
     BooleanSelector,
@@ -227,7 +228,7 @@ async def _validate_access_token(session, token: str, timeout: int = 30) -> tupl
         "Authorization": normalized,
     }
     try:
-        async with async_timeout.timeout(timeout):
+        async with asyncio.timeout(timeout):
             async with session.get(
                 "https://api.clp.com.hk/ts1/ms/profile/accountdetails/myServicesCA",
                 headers=headers,
@@ -247,21 +248,20 @@ async def _validate_access_token(session, token: str, timeout: int = 30) -> tupl
 class CLPHKOptionsFlowHandler(config_entries.OptionsFlow):
     """Options flow: tokens -> options."""
 
-    def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
-        self.config_entry = config_entry
-        self._merged_data = {**config_entry.data, **config_entry.options}
+    def __init__(self) -> None:
         self._pending: dict[str, Any] = {}
 
-    async def async_step_init(self, user_input=None) -> FlowResult:
+    async def async_step_init(self, user_input=None) -> ConfigFlowResult:
         return await self.async_step_tokens(user_input)
 
-    async def async_step_tokens(self, user_input=None) -> FlowResult:
+    async def async_step_tokens(self, user_input=None) -> ConfigFlowResult:
         errors: dict[str, str] = {}
         if user_input is not None:
             access_token_input = user_input[CONF_ACCESS_TOKEN]
             refresh_token_input = user_input[CONF_REFRESH_TOKEN]
+            merged = {**self.config_entry.data, **self.config_entry.options}
             session = aiohttp_client.async_get_clientsession(self.hass)
-            timeout = int(self._merged_data.get(CONF_TIMEOUT, 30))
+            timeout = int(merged.get(CONF_TIMEOUT, 30))
             normalized_access_token, error_key = await _validate_access_token(
                 session=session,
                 token=access_token_input,
@@ -279,7 +279,7 @@ async def async_step_tokens(self, user_input=None) -> FlowResult:
                     self._pending[CONF_REFRESH_TOKEN] = normalized_refresh_token
                     return await self.async_step_options()
 
-        defaults = self._merged_data
+        defaults = {**self.config_entry.data, **self.config_entry.options}
         return self.async_show_form(
             step_id="tokens",
             data_schema=vol.Schema(
@@ -291,7 +291,7 @@ async def async_step_tokens(self, user_input=None) -> FlowResult:
             errors=errors,
         )
 
-    async def async_step_options(self, user_input=None) -> FlowResult:
+    async def async_step_options(self, user_input=None) -> ConfigFlowResult:
         if user_input is not None:
             self.hass.config_entries.async_update_entry(
                 self.config_entry,
@@ -307,7 +307,7 @@ async def async_step_options(self, user_input=None) -> FlowResult:
 
         return self.async_show_form(
             step_id="options",
-            data_schema=_build_options_schema(self._merged_data),
+            data_schema=_build_options_schema({**self.config_entry.data, **self.config_entry.options}),
             errors={},
         )
 
@@ -320,10 +320,10 @@ class ConfigFlow(config_entries.ConfigFlow, domain="clphk"):
     def __init__(self) -> None:
         self._pending: dict[str, Any] = {}
 
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         return await self.async_step_tokens(user_input)
 
-    async def async_step_tokens(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    async def async_step_tokens(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         errors: dict[str, str] = {}
         if user_input is not None:
             access_token_input = user_input[CONF_ACCESS_TOKEN]
@@ -357,7 +357,7 @@ async def async_step_tokens(self, user_input: dict[str, Any] | None = None) -> F
             errors=errors,
         )
 
-    async def async_step_options(self, user_input: dict[str, Any] | None = None) -> FlowResult:
+    async def async_step_options(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
         if user_input is not None:
             data = {
                 **user_input,
@@ -374,4 +374,4 @@ async def async_step_options(self, user_input: dict[str, Any] | None = None) ->
 
     @staticmethod
     def async_get_options_flow(config_entry):
-        return CLPHKOptionsFlowHandler(config_entry)
+        return CLPHKOptionsFlowHandler()

custom_components/clphk/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "13.0.1",
+  "version": "14.0.0",
   "issue_tracker": "https://github.com/thematrixdev/home-assistant-clp/issues",
 
   "domain": "clphk",

custom_components/clphk/sensor.py

@@ -7,7 +7,6 @@
 import logging
 
 import aiohttp
-import async_timeout
 import homeassistant.helpers.config_validation as cv
 import pytz
 import voluptuous as vol
@@ -402,7 +401,7 @@ async def api_request(
         if headers:
             merged_headers.update(headers)
 
-        async with async_timeout.timeout(self._timeout):
+        async with asyncio.timeout(self._timeout):
             response = await self._session.request(
                 method,
                 url,
@@ -501,7 +500,7 @@ async def _refresh_access_token(self):
         refresh_headers = dict(API_DEFAULT_HEADERS)
         refresh_headers["Content-Type"] = "application/json"
 
-        async with async_timeout.timeout(self._timeout):
+        async with asyncio.timeout(self._timeout):
             response = await self._session.request(
                 "POST",
                 "https://api.clp.com.hk/ts1/ms/profile/identity/manage/account/refresh_token",