aiohomematic 2025.10.18__tar.gz → 2025.10.19__tar.gz

{aiohomematic-2025.10.18/aiohomematic.egg-info → aiohomematic-2025.10.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohomematic
-Version: 2025.10.18
+Version: 2025.10.19
 Summary: Homematic interface for Home Assistant running on Python 3.
 Home-page: https://github.com/sukramj/aiohomematic
 Author-email: SukramJ <sukramj@icloud.com>, Daniel Perna <danielperna84@gmail.com>

{aiohomematic-2025.10.18 → aiohomematic-2025.10.19}/aiohomematic/async_support.py

@@ -8,9 +8,11 @@ import asyncio
 from collections.abc import Callable, Collection, Coroutine
 from concurrent.futures import ThreadPoolExecutor
 from concurrent.futures._base import CancelledError
+import contextlib
 from functools import wraps
 import logging
 from time import monotonic
+from types import CoroutineType
 from typing import Any, Final, cast
 
 from aiohomematic.const import BLOCK_LOG_TIMEOUT
@@ -100,20 +102,35 @@ class Looper:
                 return pending_set
         return set()
 
-    def create_task(self, *, target: Coroutine[Any, Any, Any], name: str) -> None:
-        """Add task to the executor pool."""
+    def create_task(
+        self, *, target: Coroutine[Any, Any, Any] | Callable[[], Coroutine[Any, Any, Any]], name: str
+    ) -> None:
+        """
+        Schedule a coroutine to run in the loop.
+
+        Accepts either an already-created coroutine object or a zero-argument
+        callable that returns a coroutine. The callable form defers coroutine
+        creation until inside the event loop, which avoids "was never awaited"
+        warnings if callers only inspect the parameters (e.g. in tests).
+        """
         try:
             self._loop.call_soon_threadsafe(self._async_create_task, target, name)
         except CancelledError:
-            _LOGGER.debug(
-                "create_task: task cancelled for %s",
-                name,
-            )
+            # Scheduling failed; if a coroutine object was provided, close it to
+            # avoid 'was never awaited' warnings.
+            if asyncio.iscoroutine(target):
+                with contextlib.suppress(Exception):
+                    cast(CoroutineType, target).close()
+            _LOGGER.debug("create_task: task cancelled for %s", name)
             return
 
-    def _async_create_task[R](self, target: Coroutine[Any, Any, R], name: str) -> asyncio.Task[R]:  # kwonly: disable
-        """Create a task from within the event_loop. This method must be run in the event_loop."""
-        task = self._loop.create_task(target, name=name)
+    def _async_create_task[R](  # kwonly: disable
+        self, target: Coroutine[Any, Any, R] | Callable[[], Coroutine[Any, Any, R]], name: str
+    ) -> asyncio.Task[R]:
+        """Create a task from within the event loop. Must be run in the event loop."""
+        # If target is a callable, call it here to create the coroutine inside the loop
+        coro: Coroutine[Any, Any, R] = target if asyncio.iscoroutine(target) else target()
+        task = self._loop.create_task(coro, name=name)
         self._tasks.add(task)
         task.add_done_callback(self._tasks.remove)
         return task

{aiohomematic-2025.10.18 → aiohomematic-2025.10.19}/aiohomematic/client/__init__.py

@@ -58,7 +58,8 @@ from aiohomematic import central as hmcu
 from aiohomematic.client.json_rpc import AioJsonRpcAioHttpClient
 from aiohomematic.client.rpc_proxy import AioXmlRpcProxy, BaseRpcProxy
 from aiohomematic.const import (
-    CALLBACK_WARN_INTERVAL,
+    CALLBACK_WARN_ARM_INTERVAL,
+    CALLBACK_WARN_DISARM_INTERVAL,
     DATETIME_FORMAT_MILLIS,
     DEFAULT_MAX_WORKERS,
     DP_KEY_VALUE,
@@ -145,7 +146,6 @@ class Client(ABC, LogContextMixin):
         self._last_value_send_cache = CommandCache(interface_id=client_config.interface_id)
         self._available: bool = True
         self._connection_error_count: int = 0
-        self._is_callback_alive: bool = True
         self._is_initialized: bool = False
         self._ping_pong_cache: Final = PingPongCache(
             central=client_config.central, interface_id=client_config.interface_id
@@ -395,7 +395,7 @@ class Client(ABC, LogContextMixin):
             return False
         if not self.supports_push_updates:
             return True
-        return (datetime.now() - self.modified_at).total_seconds() < CALLBACK_WARN_INTERVAL
+        return (datetime.now() - self.modified_at).total_seconds() < CALLBACK_WARN_ARM_INTERVAL
 
     def is_callback_alive(self) -> bool:
         """Return if XmlRPC-Server is alive based on received events for this client."""
@@ -404,31 +404,29 @@ class Client(ABC, LogContextMixin):
         if (
             last_events_dt := self.central.get_last_event_seen_for_interface(interface_id=self.interface_id)
         ) is not None:
-            if (seconds_since_last_event := (datetime.now() - last_events_dt).total_seconds()) > CALLBACK_WARN_INTERVAL:
-                if self._is_callback_alive:
-                    self.central.fire_interface_event(
-                        interface_id=self.interface_id,
-                        interface_event_type=InterfaceEventType.CALLBACK,
-                        data={
-                            EventKey.AVAILABLE: False,
-                            EventKey.SECONDS_SINCE_LAST_EVENT: int(seconds_since_last_event),
-                        },
-                    )
-                    self._is_callback_alive = False
+            if (
+                seconds_since_last_event := (datetime.now() - last_events_dt).total_seconds()
+            ) > CALLBACK_WARN_ARM_INTERVAL:
+                self.central.fire_interface_event(
+                    interface_id=self.interface_id,
+                    interface_event_type=InterfaceEventType.CALLBACK,
+                    data={
+                        EventKey.AVAILABLE: False,
+                        EventKey.SECONDS_SINCE_LAST_EVENT: int(seconds_since_last_event),
+                    },
+                )
                 _LOGGER.warning(
                     "IS_CALLBACK_ALIVE: Callback for %s has not received events for %is",
                     self.interface_id,
                     seconds_since_last_event,
                 )
                 return False
-
-            if not self._is_callback_alive:
+            if ((datetime.now() - last_events_dt).total_seconds()) < CALLBACK_WARN_DISARM_INTERVAL:
                 self.central.fire_interface_event(
                     interface_id=self.interface_id,
                     interface_event_type=InterfaceEventType.CALLBACK,
                     data={EventKey.AVAILABLE: True},
                 )
-                self._is_callback_alive = True
         return True
 
     @abstractmethod
@@ -1510,8 +1508,13 @@ class ClientJsonCCU(ClientCCU):
         return True
 
 
-class ClientHomegear(Client):
-    """Client implementation for Homegear backend."""
+class ClientHomegear(ClientCCU):
+    """
+    Client implementation for Homegear backend.
+
+    Inherit from ClientCCU to share common behavior used by tests and code paths
+    that expect a CCU-like client interface for Homegear selections.
+    """
 
     @property
     def model(self) -> str:
@@ -1525,7 +1528,7 @@ class ClientHomegear(Client):
         """Return the supports_ping_pong info of the backend."""
         return False
 
-    @inspector(re_raise=False)
+    @inspector(re_raise=False, measure_performance=True)
     async def fetch_all_device_data(self) -> None:
         """Fetch all device data from the backend."""
         return

{aiohomematic-2025.10.18 → aiohomematic-2025.10.19}/aiohomematic/client/json_rpc.py

@@ -483,18 +483,6 @@ class AioJsonRpcAioHttpClient(LogContextMixin):
             )
             raise
 
-        except ClientConnectorError as cceerr:
-            self.clear_session()
-            message = f"ClientConnectorError[{cceerr}]"
-            log_boundary_error(
-                logger=_LOGGER,
-                boundary="json-rpc",
-                action=str(method),
-                err=cceerr,
-                level=logging.ERROR,
-                log_context=self.log_context,
-            )
-            raise ClientException(message) from cceerr
         except ClientConnectorCertificateError as cccerr:
             self.clear_session()
             message = f"ClientConnectorCertificateError[{cccerr}]"
@@ -512,6 +500,18 @@ class AioJsonRpcAioHttpClient(LogContextMixin):
                 log_context=self.log_context,
             )
             raise ClientException(message) from cccerr
+        except ClientConnectorError as cceerr:
+            self.clear_session()
+            message = f"ClientConnectorError[{cceerr}]"
+            log_boundary_error(
+                logger=_LOGGER,
+                boundary="json-rpc",
+                action=str(method),
+                err=cceerr,
+                level=logging.ERROR,
+                log_context=self.log_context,
+            )
+            raise ClientException(message) from cceerr
         except (ClientError, OSError) as err:
             self.clear_session()
             log_boundary_error(
@@ -1182,11 +1182,11 @@ class AioJsonRpcAioHttpClient(LogContextMixin):
         """Get the supported methods of the backend."""
         supported_methods: tuple[str, ...] = ()
 
-        await self._login_or_renew()
-        if not (session_id := self._session_id):
-            raise ClientException("Error while logging in")
-
         try:
+            await self._login_or_renew()
+            if not (session_id := self._session_id):
+                raise ClientException("Error while logging in")
+
             response = await self._do_post(
                 session_id=session_id,
                 method=_JsonRpcMethod.SYSTEM_LIST_METHODS,

{aiohomematic-2025.10.18 → aiohomematic-2025.10.19}/aiohomematic/const.py

@@ -19,7 +19,7 @@ import sys
 from types import MappingProxyType
 from typing import Any, Final, NamedTuple, Required, TypeAlias, TypedDict
 
-VERSION: Final = "2025.10.18"
+VERSION: Final = "2025.10.19"
 
 # Detect test speedup mode via environment
 _TEST_SPEEDUP: Final = (
@@ -133,7 +133,8 @@ WAIT_FOR_CALLBACK: Final[int | None] = None
 SCHEDULER_NOT_STARTED_SLEEP: Final = 0.2 if _TEST_SPEEDUP else 10
 SCHEDULER_LOOP_SLEEP: Final = 0.2 if _TEST_SPEEDUP else 5
 
-CALLBACK_WARN_INTERVAL: Final = CONNECTION_CHECKER_INTERVAL * 40
+CALLBACK_WARN_ARM_INTERVAL: Final = CONNECTION_CHECKER_INTERVAL * 40
+CALLBACK_WARN_DISARM_INTERVAL: Final = CONNECTION_CHECKER_INTERVAL * 20
 
 # Path
 PROGRAM_SET_PATH_ROOT: Final = "program/set"

{aiohomematic-2025.10.18 → aiohomematic-2025.10.19}/aiohomematic/model/device.py

@@ -640,7 +640,7 @@ class Device(LogContextMixin, PayloadMixin):
                 await self._central.refresh_firmware_data(device_address=self._address)
 
         if refresh_after_update_intervals:
-            self._central.looper.create_task(target=refresh_data(), name="refresh_firmware_data")
+            self._central.looper.create_task(target=refresh_data, name="refresh_firmware_data")
 
         return update_result
 

{aiohomematic-2025.10.18 → aiohomematic-2025.10.19/aiohomematic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohomematic
-Version: 2025.10.18
+Version: 2025.10.19
 Summary: Homematic interface for Home Assistant running on Python 3.
 Home-page: https://github.com/sukramj/aiohomematic
 Author-email: SukramJ <sukramj@icloud.com>, Daniel Perna <danielperna84@gmail.com>