aiohomematic 2025.10.20b0__tar.gz → 2025.10.21__tar.gz

{aiohomematic-2025.10.20b0/aiohomematic.egg-info → aiohomematic-2025.10.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohomematic
-Version: 2025.10.20b0
+Version: 2025.10.21
 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.20b0 → aiohomematic-2025.10.21}/aiohomematic/central/__init__.py

@@ -110,6 +110,7 @@ from aiohomematic.const import (
     DEVICE_FIRMWARE_CHECK_INTERVAL,
     DEVICE_FIRMWARE_DELIVERING_CHECK_INTERVAL,
     DEVICE_FIRMWARE_UPDATING_CHECK_INTERVAL,
+    IDENTIFIER_SEPARATOR,
     IGNORE_FOR_UN_IGNORE_PARAMETERS,
     IP_ANY_V4,
     LOCAL_HOST,
@@ -173,12 +174,16 @@ from aiohomematic.store import (
 from aiohomematic.support import (
     LogContextMixin,
     PayloadMixin,
-    check_config,
+    check_or_create_directory,
+    check_password,
     extract_device_addresses_from_device_descriptions,
     extract_exc_args,
     get_channel_no,
     get_device_address,
     get_ip_addr,
+    is_hostname,
+    is_ipv4_address,
+    is_port,
 )
 
 __all__ = ["CentralConfig", "CentralUnit", "INTERFACE_EVENT_SCHEMA"]
@@ -2219,6 +2224,55 @@ class CentralConnectionState:
             )
 
 
+def check_config(
+    *,
+    central_name: str,
+    host: str,
+    username: str,
+    password: str,
+    storage_directory: str,
+    callback_host: str | None,
+    callback_port_xml_rpc: int | None,
+    json_port: int | None,
+    interface_configs: AbstractSet[hmcl.InterfaceConfig] | None = None,
+) -> list[str]:
+    """Check config. Throws BaseHomematicException on failure."""
+    config_failures: list[str] = []
+    if central_name and IDENTIFIER_SEPARATOR in central_name:
+        config_failures.append(f"Instance name must not contain {IDENTIFIER_SEPARATOR}")
+
+    if not (is_hostname(hostname=host) or is_ipv4_address(address=host)):
+        config_failures.append("Invalid hostname or ipv4 address")
+    if not username:
+        config_failures.append("Username must not be empty")
+    if not password:
+        config_failures.append("Password is required")
+    if not check_password(password=password):
+        config_failures.append("Password is not valid")
+    try:
+        check_or_create_directory(directory=storage_directory)
+    except BaseHomematicException as bhexc:
+        config_failures.append(extract_exc_args(exc=bhexc)[0])
+    if callback_host and not (is_hostname(hostname=callback_host) or is_ipv4_address(address=callback_host)):
+        config_failures.append("Invalid callback hostname or ipv4 address")
+    if callback_port_xml_rpc and not is_port(port=callback_port_xml_rpc):
+        config_failures.append("Invalid xml rpc callback port")
+    if json_port and not is_port(port=json_port):
+        config_failures.append("Invalid json port")
+    if interface_configs and not _has_primary_client(interface_configs=interface_configs):
+        config_failures.append(f"No primary interface ({', '.join(PRIMARY_CLIENT_CANDIDATE_INTERFACES)}) defined")
+
+    return config_failures
+
+
+def _has_primary_client(*, interface_configs: AbstractSet[hmcl.InterfaceConfig]) -> bool:
+    """Check if all configured clients exists in central."""
+    for interface_config in interface_configs:
+        if interface_config.interface in PRIMARY_CLIENT_CANDIDATE_INTERFACES:
+            return True
+    return False
+
+
 def _get_new_data_points(
     *,
     new_devices: set[Device],

{aiohomematic-2025.10.20b0 → aiohomematic-2025.10.21}/aiohomematic/client/__init__.py

@@ -58,8 +58,7 @@ 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_ARM_INTERVAL,
-    CALLBACK_WARN_DISARM_INTERVAL,
+    CALLBACK_WARN_INTERVAL,
     DATETIME_FORMAT_MILLIS,
     DEFAULT_MAX_WORKERS,
     DP_KEY_VALUE,
@@ -146,6 +145,7 @@ 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_ARM_INTERVAL
+        return (datetime.now() - self.modified_at).total_seconds() < CALLBACK_WARN_INTERVAL
 
     def is_callback_alive(self) -> bool:
         """Return if XmlRPC-Server is alive based on received events for this client."""
@@ -404,29 +404,31 @@ 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_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),
-                    },
-                )
+            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
                 _LOGGER.warning(
                     "IS_CALLBACK_ALIVE: Callback for %s has not received events for %is",
                     self.interface_id,
                     seconds_since_last_event,
                 )
                 return False
-            if ((datetime.now() - last_events_dt).total_seconds()) < CALLBACK_WARN_DISARM_INTERVAL:
+
+            if not self._is_callback_alive:
                 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

{aiohomematic-2025.10.20b0 → aiohomematic-2025.10.21}/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.20b"
+VERSION: Final = "2025.10.21"
 
 # Detect test speedup mode via environment
 _TEST_SPEEDUP: Final = (
@@ -133,8 +133,7 @@ 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_ARM_INTERVAL: Final = CONNECTION_CHECKER_INTERVAL * 40
-CALLBACK_WARN_DISARM_INTERVAL: Final = CONNECTION_CHECKER_INTERVAL * 20
+CALLBACK_WARN_INTERVAL: Final = CONNECTION_CHECKER_INTERVAL * 40
 
 # Path
 PROGRAM_SET_PATH_ROOT: Final = "program/set"
@@ -304,6 +303,7 @@ class EventKey(StrEnum):
     INTERFACE_ID = "interface_id"
     MODEL = "model"
     PARAMETER = "parameter"
+    PONG_MISMATCH_ALLOWED = "pong_mismatch_allowed"
     PONG_MISMATCH_COUNT = "pong_mismatch_count"
     SECONDS_SINCE_LAST_EVENT = "seconds_since_last_event"
     TYPE = "type"

{aiohomematic-2025.10.20b0 → aiohomematic-2025.10.21}/aiohomematic/model/custom/data_point.py

@@ -204,12 +204,12 @@ class CustomDataPoint(BaseDataPoint):
     def _init_data_points(self) -> None:
         """Init data point collection."""
         # Add repeating fields
-        for field_name, parameter in self._device_def.get(hmed.CDPD.REPEATABLE_FIELDS, {}).items():
+        for field_name, parameter in self._device_def.get(CDPD.REPEATABLE_FIELDS, {}).items():
             if dp := self._device.get_generic_data_point(channel_address=self._channel.address, parameter=parameter):
                 self._add_data_point(field=field_name, data_point=dp, is_visible=False)
 
         # Add visible repeating fields
-        for field_name, parameter in self._device_def.get(hmed.CDPD.VISIBLE_REPEATABLE_FIELDS, {}).items():
+        for field_name, parameter in self._device_def.get(CDPD.VISIBLE_REPEATABLE_FIELDS, {}).items():
             if dp := self._device.get_generic_data_point(channel_address=self._channel.address, parameter=parameter):
                 self._add_data_point(field=field_name, data_point=dp, is_visible=True)
 
@@ -229,11 +229,11 @@ class CustomDataPoint(BaseDataPoint):
 
         # Add device fields
         self._add_data_points(
-            field_dict_name=hmed.CDPD.FIELDS,
+            field_dict_name=CDPD.FIELDS,
         )
         # Add visible device fields
         self._add_data_points(
-            field_dict_name=hmed.CDPD.VISIBLE_FIELDS,
+            field_dict_name=CDPD.VISIBLE_FIELDS,
             is_visible=True,
         )
 
@@ -243,7 +243,7 @@ class CustomDataPoint(BaseDataPoint):
         if hmed.get_include_default_data_points(device_profile=self._device_profile):
             self._mark_data_points(custom_data_point_def=hmed.get_default_data_points())
 
-    def _add_data_points(self, *, field_dict_name: hmed.CDPD, is_visible: bool | None = None) -> None:
+    def _add_data_points(self, *, field_dict_name: CDPD, is_visible: bool | None = None) -> None:
         """Add data points to custom data point."""
         fields = self._device_def.get(field_dict_name, {})
         for channel_no, channel in fields.items():

{aiohomematic-2025.10.20b0 → aiohomematic-2025.10.21}/aiohomematic/model/support.py

@@ -32,7 +32,7 @@ from aiohomematic.const import (
     ParameterType,
 )
 from aiohomematic.model import device as hmd
-from aiohomematic.model.custom import definition as hmed
+from aiohomematic.model.custom.const import CDPD
 from aiohomematic.support import to_bool
 
 __all__ = [
@@ -565,7 +565,7 @@ def check_channel_is_the_only_primary_channel(
     device_has_multiple_channels: bool,
 ) -> bool:
     """Check if this channel is the only primary channel."""
-    primary_channel: int = device_def[hmed.CDPD.PRIMARY_CHANNEL]
+    primary_channel: int = device_def[CDPD.PRIMARY_CHANNEL]
     return bool(primary_channel == current_channel_no and device_has_multiple_channels is False)
 
 

{aiohomematic-2025.10.20b0 → aiohomematic-2025.10.21}/aiohomematic/store/dynamic.py

@@ -386,6 +386,11 @@ class PingPongCache:
         self._pending_pong_logged: bool = False
         self._unknown_pong_logged: bool = False
 
+    @property
+    def allowed_delta(self) -> int:
+        """Return the allowed delta."""
+        return self._allowed_delta
+
     @property
     def high_pending_pongs(self) -> bool:
         """Check, if store contains too many pending pongs."""
@@ -515,6 +520,7 @@ class PingPongCache:
                             EventKey.TYPE: event_type,
                             EventKey.DATA: {
                                 EventKey.CENTRAL_NAME: self._central.name,
+                                EventKey.PONG_MISMATCH_ALLOWED: mismatch_count <= self._allowed_delta,
                                 EventKey.PONG_MISMATCH_COUNT: mismatch_count,
                             },
                         }

{aiohomematic-2025.10.20b0 → aiohomematic-2025.10.21}/aiohomematic/support.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 
 import base64
 from collections import defaultdict
-from collections.abc import Callable, Collection, Mapping, Set as AbstractSet
+from collections.abc import Callable, Collection, Mapping
 import contextlib
 from dataclasses import dataclass
 from datetime import datetime
@@ -30,7 +30,6 @@ from typing import Any, Final, cast
 
 import orjson
 
-from aiohomematic import client as hmcl
 from aiohomematic.const import (
     ADDRESS_SEPARATOR,
     ALLOWED_HOSTNAME_PATTERN,
@@ -38,12 +37,10 @@ from aiohomematic.const import (
     CHANNEL_ADDRESS_PATTERN,
     DEVICE_ADDRESS_PATTERN,
     HTMLTAG_PATTERN,
-    IDENTIFIER_SEPARATOR,
     INIT_DATETIME,
     ISO_8859_1,
     MAX_CACHE_AGE,
     NO_CACHE_ENTRY,
-    PRIMARY_CLIENT_CANDIDATE_INTERFACES,
     TIMEOUT,
     UTF_8,
     CommandRxMode,
@@ -95,55 +92,6 @@ def build_xml_rpc_headers(
     return [("Authorization", f"Basic {base64_message}")]
 
 
-def check_config(
-    *,
-    central_name: str,
-    host: str,
-    username: str,
-    password: str,
-    storage_directory: str,
-    callback_host: str | None,
-    callback_port_xml_rpc: int | None,
-    json_port: int | None,
-    interface_configs: AbstractSet[hmcl.InterfaceConfig] | None = None,
-) -> list[str]:
-    """Check config. Throws BaseHomematicException on failure."""
-    config_failures: list[str] = []
-    if central_name and IDENTIFIER_SEPARATOR in central_name:
-        config_failures.append(f"Instance name must not contain {IDENTIFIER_SEPARATOR}")
-
-    if not (is_hostname(hostname=host) or is_ipv4_address(address=host)):
-        config_failures.append("Invalid hostname or ipv4 address")
-    if not username:
-        config_failures.append("Username must not be empty")
-    if not password:
-        config_failures.append("Password is required")
-    if not check_password(password=password):
-        config_failures.append("Password is not valid")
-    try:
-        check_or_create_directory(directory=storage_directory)
-    except BaseHomematicException as bhexc:
-        config_failures.append(extract_exc_args(exc=bhexc)[0])
-    if callback_host and not (is_hostname(hostname=callback_host) or is_ipv4_address(address=callback_host)):
-        config_failures.append("Invalid callback hostname or ipv4 address")
-    if callback_port_xml_rpc and not is_port(port=callback_port_xml_rpc):
-        config_failures.append("Invalid xml rpc callback port")
-    if json_port and not is_port(port=json_port):
-        config_failures.append("Invalid json port")
-    if interface_configs and not has_primary_client(interface_configs=interface_configs):
-        config_failures.append(f"No primary interface ({', '.join(PRIMARY_CLIENT_CANDIDATE_INTERFACES)}) defined")
-
-    return config_failures
-
-
-def has_primary_client(*, interface_configs: AbstractSet[hmcl.InterfaceConfig]) -> bool:
-    """Check if all configured clients exists in central."""
-    for interface_config in interface_configs:
-        if interface_config.interface in PRIMARY_CLIENT_CANDIDATE_INTERFACES:
-            return True
-    return False
-
-
 def delete_file(directory: str, file_name: str) -> None:  # kwonly: disable
     """Delete the file. File can contain a wildcard."""
     if os.path.exists(directory):

{aiohomematic-2025.10.20b0 → aiohomematic-2025.10.21/aiohomematic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohomematic
-Version: 2025.10.20b0
+Version: 2025.10.21
 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.20b0 → aiohomematic-2025.10.21}/pyproject.toml

@@ -126,6 +126,7 @@ disable = [
     "cyclic-import",
     "duplicate-code",
     "inconsistent-return-statements",
+    "import-outside-toplevel",  # C0415
     "locally-disabled",
     "not-context-manager",
     "too-few-public-methods",