aiohomematic 2025.9.8__tar.gz → 2025.10.1__tar.gz

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohomematic
-Version: 2025.9.8
+Version: 2025.10.1
 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.9.8 → aiohomematic-2025.10.1}/aiohomematic/central/__init__.py

@@ -44,12 +44,10 @@ Example (simplified):
 
     cfg = CentralConfig(
         central_id="ccu-main",
-        default_callback_port=43439,
         host="ccu.local",
         interface_configs=iface_cfgs,
         name="MyCCU",
         password="secret",
-        storage_folder=".storage",
         username="admin",
     )
 
@@ -102,10 +100,12 @@ from aiohomematic.const import (
     DEFAULT_MAX_READ_WORKERS,
     DEFAULT_PERIODIC_REFRESH_INTERVAL,
     DEFAULT_PROGRAM_MARKERS,
+    DEFAULT_STORAGE_FOLDER,
     DEFAULT_SYS_SCAN_INTERVAL,
     DEFAULT_SYSVAR_MARKERS,
     DEFAULT_TLS,
     DEFAULT_UN_IGNORES,
+    DEFAULT_USE_GROUP_CHANNEL_FOR_COVER_STATE,
     DEFAULT_VERIFY_TLS,
     DEVICE_FIRMWARE_CHECK_INTERVAL,
     DEVICE_FIRMWARE_DELIVERING_CHECK_INTERVAL,
@@ -1828,16 +1828,15 @@ class CentralConfig:
     def __init__(
         self,
         central_id: str,
-        default_callback_port: int,
         host: str,
         interface_configs: AbstractSet[hmcl.InterfaceConfig],
         name: str,
         password: str,
-        storage_folder: str,
         username: str,
         client_session: ClientSession | None = None,
         callback_host: str | None = None,
         callback_port: int | None = None,
+        default_callback_port: int = PORT_ANY,
         enable_device_firmware_check: bool = DEFAULT_ENABLE_DEVICE_FIRMWARE_CHECK,
         enable_program_scan: bool = DEFAULT_ENABLE_PROGRAM_SCAN,
         enable_sysvar_scan: bool = DEFAULT_ENABLE_SYSVAR_SCAN,
@@ -1851,10 +1850,12 @@ class CentralConfig:
         periodic_refresh_interval: int = DEFAULT_PERIODIC_REFRESH_INTERVAL,
         program_markers: tuple[DescriptionMarker | str, ...] = DEFAULT_PROGRAM_MARKERS,
         start_direct: bool = False,
+        storage_folder: str = DEFAULT_STORAGE_FOLDER,
         sys_scan_interval: int = DEFAULT_SYS_SCAN_INTERVAL,
         sysvar_markers: tuple[DescriptionMarker | str, ...] = DEFAULT_SYSVAR_MARKERS,
         tls: bool = DEFAULT_TLS,
         un_ignore_list: frozenset[str] = DEFAULT_UN_IGNORES,
+        use_group_channel_for_cover_state: bool = DEFAULT_USE_GROUP_CHANNEL_FOR_COVER_STATE,
         verify_tls: bool = DEFAULT_VERIFY_TLS,
     ) -> None:
         """Init the client config."""
@@ -1885,6 +1886,7 @@ class CentralConfig:
         self.sysvar_markers: Final = sysvar_markers
         self.tls: Final = tls
         self.un_ignore_list: Final = un_ignore_list
+        self.use_group_channel_for_cover_state: Final = use_group_channel_for_cover_state
         self.username: Final = username
         self.verify_tls: Final = verify_tls
 

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/aiohomematic/client/xml_rpc.py

@@ -203,7 +203,7 @@ class XmlRpcProxy(xmlrpc.client.ServerProxy):
             if not self._connection_state.has_issue(issuer=self, iid=self._interface_id):
                 if perr.errmsg == "Unauthorized":
                     raise AuthFailure(perr) from perr
-                raise NoConnectionException(perr.errmsg) from perr
+                raise NoConnectionException(f"No connection to {self.log_context} ({perr.errmsg})") from perr
         except Exception as exc:
             raise ClientException(exc) from exc
 

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/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.9.8"
+VERSION: Final = "2025.10.1"
 
 # Detect test speedup mode via environment
 _TEST_SPEEDUP: Final = (
@@ -27,6 +27,7 @@ _TEST_SPEEDUP: Final = (
 )
 
 # default
+DEFAULT_STORAGE_FOLDER: Final = "aiohomematic_storage"
 DEFAULT_CUSTOM_ID: Final = "custom_id"
 DEFAULT_ENABLE_DEVICE_FIRMWARE_CHECK: Final = False
 DEFAULT_ENABLE_PROGRAM_SCAN: Final = True
@@ -44,6 +45,7 @@ DEFAULT_SYSVAR_MARKERS: Final[tuple[DescriptionMarker | str, ...]] = ()
 DEFAULT_SYS_SCAN_INTERVAL: Final = 30
 DEFAULT_TLS: Final = False
 DEFAULT_UN_IGNORES: Final[frozenset[str]] = frozenset()
+DEFAULT_USE_GROUP_CHANNEL_FOR_COVER_STATE: Final = True
 DEFAULT_VERIFY_TLS: Final = False
 
 # Default encoding for json service calls, persistent cache

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/aiohomematic/model/custom/climate.py

@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+from abc import abstractmethod
 from collections.abc import Mapping
 from datetime import datetime, timedelta
 from enum import IntEnum, StrEnum
@@ -26,7 +27,16 @@ from aiohomematic.model.custom.const import DeviceProfile, Field
 from aiohomematic.model.custom.data_point import CustomDataPoint
 from aiohomematic.model.custom.support import CustomConfig
 from aiohomematic.model.data_point import CallParameterCollector, bind_collector
-from aiohomematic.model.generic import DpAction, DpBinarySensor, DpFloat, DpInteger, DpSelect, DpSensor, DpSwitch
+from aiohomematic.model.generic import (
+    DpAction,
+    DpBinarySensor,
+    DpFloat,
+    DpInteger,
+    DpSelect,
+    DpSensor,
+    DpSwitch,
+    GenericDataPoint,
+)
 from aiohomematic.property_decorators import config_property, state_property
 
 _LOGGER: Final = logging.getLogger(__name__)
@@ -174,6 +184,7 @@ class BaseCustomDpClimate(CustomDataPoint):
         "_dp_temperature",
         "_dp_temperature_maximum",
         "_dp_temperature_minimum",
+        "_old_manu_setpoint",
         "_supports_schedule",
     )
     _category = DataPointCategory.CLIMATE
@@ -199,6 +210,7 @@ class BaseCustomDpClimate(CustomDataPoint):
             custom_config=custom_config,
         )
         self._supports_schedule = False
+        self._old_manu_setpoint: float | None = None
 
     def _init_data_point_fields(self) -> None:
         """Init the data_point fields."""
@@ -219,6 +231,13 @@ class BaseCustomDpClimate(CustomDataPoint):
         self._dp_temperature_minimum: DpFloat = self._get_data_point(
             field=Field.TEMPERATURE_MINIMUM, data_point_type=DpFloat
         )
+        self._unregister_callbacks.append(
+            self._dp_setpoint.register_data_point_updated_callback(cb=self._manu_temp_changed, custom_id="manu_temp")
+        )
+
+    @abstractmethod
+    def _manu_temp_changed(self, data_point: GenericDataPoint) -> None:
+        """Handle device state changes."""
 
     @state_property
     def current_humidity(self) -> int | None:
@@ -311,11 +330,21 @@ class BaseCustomDpClimate(CustomDataPoint):
         return _TEMP_CELSIUS
 
     @property
-    def _min_or_target_temperature(self) -> float:
-        """Return the min or target temperature."""
-        if (temperature := self.target_temperature or self.min_temp) < self.min_temp:
-            return self.min_temp
-        return temperature
+    def _temperature_for_heat_mode(self) -> float:
+        """
+        Return a safe temperature to use when setting mode to HEAT.
+
+        If the current target temperature is None or represents the special OFF value,
+        fall back to the device's minimum valid temperature. Otherwise, return the
+        current target temperature clipped to the valid [min, max] range.
+        """
+        temp = self._old_manu_setpoint or self.target_temperature
+        # Treat None or OFF sentinel as invalid/unsafe to restore.
+        if temp is None or temp <= _OFF_TEMPERATURE or temp < self.min_temp:
+            return self.min_temp if self.min_temp > _OFF_TEMPERATURE else _OFF_TEMPERATURE + 0.5
+        if temp > self.max_temp:
+            return self.max_temp
+        return temp
 
     @property
     def schedule_profile_nos(self) -> int:
@@ -329,10 +358,7 @@ class BaseCustomDpClimate(CustomDataPoint):
         collector: CallParameterCollector | None = None,
         do_validate: bool = True,
     ) -> None:
-        """Set new target temperature."""
-        if not self.is_state_change(temperature=temperature):
-            return
-
+        """Set new target temperature. The temperature must be set in all cases, even if the values are identical."""
         if do_validate and self.mode == ClimateMode.HEAT and self.min_max_value_not_relevant_for_manu_mode:
             do_validate = False
 
@@ -694,6 +720,9 @@ class CustomDpSimpleRfThermostat(BaseCustomDpClimate):
 
     __slots__ = ()
 
+    def _manu_temp_changed(self, data_point: GenericDataPoint) -> None:
+        """Handle device state changes."""
+
 
 class CustomDpRfThermostat(BaseCustomDpClimate):
     """Classic Homematic thermostat like HM-CC-RT-DN."""
@@ -753,6 +782,28 @@ class CustomDpRfThermostat(BaseCustomDpClimate):
             field=Field.WEEK_PROGRAM_POINTER, data_point_type=DpSelect
         )
 
+        self._unregister_callbacks.append(
+            self._dp_control_mode.register_data_point_updated_callback(
+                cb=self._manu_temp_changed, custom_id="manu_temp"
+            )
+        )
+
+    def _manu_temp_changed(self, data_point: GenericDataPoint) -> None:
+        """Handle device state changes."""
+        if (
+            data_point == self._dp_control_mode
+            and self.mode == ClimateMode.HEAT
+            and self._dp_setpoint.refreshed_recently
+        ):
+            self._old_manu_setpoint = self.target_temperature
+
+        if (
+            data_point == self._dp_setpoint
+            and self.mode == ClimateMode.HEAT
+            and self._dp_control_mode.refreshed_recently
+        ):
+            self._old_manu_setpoint = self.target_temperature
+
     @state_property
     def activity(self) -> ClimateActivity | None:
         """Return the current activity."""
@@ -817,7 +868,7 @@ class CustomDpRfThermostat(BaseCustomDpClimate):
         if mode == ClimateMode.AUTO:
             await self._dp_auto_mode.send_value(value=True, collector=collector)
         elif mode == ClimateMode.HEAT:
-            await self._dp_manu_mode.send_value(value=self._min_or_target_temperature, collector=collector)
+            await self._dp_manu_mode.send_value(value=self._temperature_for_heat_mode, collector=collector)
         elif mode == ClimateMode.OFF:
             await self._dp_manu_mode.send_value(value=self.target_temperature, collector=collector)
             # Disable validation here to allow setting a value,
@@ -975,6 +1026,28 @@ class CustomDpIpThermostat(BaseCustomDpClimate):
             field=Field.TEMPERATURE_OFFSET, data_point_type=DpFloat
         )
 
+        self._unregister_callbacks.append(
+            self._dp_set_point_mode.register_data_point_updated_callback(
+                cb=self._manu_temp_changed, custom_id="manu_temp"
+            )
+        )
+
+    def _manu_temp_changed(self, data_point: GenericDataPoint) -> None:
+        """Handle device state changes."""
+        if (
+            data_point == self._dp_set_point_mode
+            and self.mode == ClimateMode.HEAT
+            and self._dp_setpoint.refreshed_recently
+        ):
+            self._old_manu_setpoint = self.target_temperature
+
+        if (
+            data_point == self._dp_setpoint
+            and self.mode == ClimateMode.HEAT
+            and self._dp_set_point_mode.refreshed_recently
+        ):
+            self._old_manu_setpoint = self.target_temperature
+
     @property
     def _is_heating_mode(self) -> bool:
         """Return the heating_mode of the device."""
@@ -1074,7 +1147,7 @@ class CustomDpIpThermostat(BaseCustomDpClimate):
             await self._dp_control_mode.send_value(value=_ModeHmIP.AUTO, collector=collector)
         elif mode in (ClimateMode.HEAT, ClimateMode.COOL):
             await self._dp_control_mode.send_value(value=_ModeHmIP.MANU, collector=collector)
-            await self.set_temperature(temperature=self._min_or_target_temperature, collector=collector)
+            await self.set_temperature(temperature=self._temperature_for_heat_mode, collector=collector)
         elif mode == ClimateMode.OFF:
             await self._dp_control_mode.send_value(value=_ModeHmIP.MANU, collector=collector)
             await self.set_temperature(temperature=_OFF_TEMPERATURE, collector=collector, do_validate=False)

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/aiohomematic/model/custom/cover.py

@@ -100,6 +100,7 @@ class CustomDpCover(CustomDataPoint):
         "_dp_group_level",
         "_dp_level",
         "_dp_stop",
+        "_use_group_channel_for_cover_state",
     )
     _category = DataPointCategory.COVER
     _closed_level: float = _CLOSED_LEVEL
@@ -118,11 +119,16 @@ class CustomDpCover(CustomDataPoint):
         self._dp_group_level: DpSensor[float | None] = self._get_data_point(
             field=Field.GROUP_LEVEL, data_point_type=DpSensor[float | None]
         )
+        self._use_group_channel_for_cover_state = self.central.config.use_group_channel_for_cover_state
 
     @property
     def _group_level(self) -> float:
         """Return the channel level of the cover."""
-        if self._dp_group_level.value is not None and self.usage == DataPointUsage.CDP_PRIMARY:
+        if (
+            self._use_group_channel_for_cover_state
+            and self._dp_group_level.value is not None
+            and self.usage == DataPointUsage.CDP_PRIMARY
+        ):
             return float(self._dp_group_level.value)
         return self._dp_level.value if self._dp_level.value is not None else self._closed_level
 
@@ -276,7 +282,11 @@ class CustomDpBlind(CustomDpCover):
     @property
     def _group_tilt_level(self) -> float:
         """Return the group level of the tilt."""
-        if self._dp_group_level_2.value is not None and self.usage == DataPointUsage.CDP_PRIMARY:
+        if (
+            self._use_group_channel_for_cover_state
+            and self._dp_group_level_2.value is not None
+            and self.usage == DataPointUsage.CDP_PRIMARY
+        ):
             return float(self._dp_group_level_2.value)
         return self._dp_level_2.value if self._dp_level_2.value is not None else self._closed_level
 

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/aiohomematic/model/data_point.py

@@ -757,7 +757,7 @@ class BaseParameterDataPoint[
 
     @property
     def service(self) -> bool:
-        """Return the if data_point is visible in the backend."""
+        """Return the if data_point is relevant for service messages in the backend."""
         return self._service
 
     @property

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/aiohomematic/model/generic/data_point.py

@@ -107,10 +107,12 @@ class GenericDataPoint[ParameterT: GenericParameterType, InputParameterT: Generi
             return set()
 
         converted_value = self._convert_value(value=prepared_value)
+        # if collector is set, then add value to collector
         if collector:
             collector.add_data_point(self, value=converted_value, collector_order=collector_order)
             return set()
 
+        # if collector is not set, then send value directly
         if self._validate_state_change and not self.is_state_change(value=converted_value):
             return set()
 

{aiohomematic-2025.9.8 → aiohomematic-2025.10.1}/aiohomematic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohomematic
-Version: 2025.9.8
+Version: 2025.10.1
 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.9.8 → aiohomematic-2025.10.1}/tests/test_climate.py

@@ -379,15 +379,26 @@ async def test_cerfthermostat_with_profiles(
     await central.data_point_event(const.INTERFACE_ID, "VCU0000341:2", "CONTROL_MODE", _ModeHmIP.MANU.value)
     assert climate.mode == ClimateMode.HEAT
 
+    await climate.set_temperature(13.0)
+    assert mock_client.method_calls[-1] == call.set_value(
+        channel_address="VCU0000341:2",
+        paramset_key=ParamsetKey.VALUES,
+        parameter="SET_TEMPERATURE",
+        value=13.0,
+        wait_for_callback=WAIT_FOR_CALLBACK,
+    )
+    assert climate._old_manu_setpoint == 13.0
+
     await climate.set_mode(ClimateMode.OFF)
     assert mock_client.method_calls[-1] == call.put_paramset(
         channel_address="VCU0000341:2",
         paramset_key_or_link_address=ParamsetKey.VALUES,
-        values={"MANU_MODE": 12.0, "SET_TEMPERATURE": 4.5},
+        values={"MANU_MODE": 13.0, "SET_TEMPERATURE": 4.5},
         wait_for_callback=WAIT_FOR_CALLBACK,
     )
 
     assert climate.mode == ClimateMode.OFF
+    assert climate._old_manu_setpoint == 13.0
 
     await climate.set_mode(ClimateMode.AUTO)
     assert mock_client.method_calls[-1] == call.set_value(
@@ -397,10 +408,35 @@ async def test_cerfthermostat_with_profiles(
         value=True,
         wait_for_callback=WAIT_FOR_CALLBACK,
     )
-    await central.data_point_event(const.INTERFACE_ID, "VCU0000341:2", "CONTROL_MODE", 0)
+    await central.data_point_event(const.INTERFACE_ID, "VCU0000341:2", "CONTROL_MODE", _ModeHmIP.AUTO.value)
     await central.data_point_event(const.INTERFACE_ID, "VCU0000341:2", "SET_TEMPERATURE", 24.0)
     assert climate.mode == ClimateMode.AUTO
+    assert climate._old_manu_setpoint == 13.0
+    assert climate.target_temperature == 24.0
+    await climate.set_mode(ClimateMode.HEAT)
+    assert mock_client.method_calls[-1] == call.set_value(
+        channel_address="VCU0000341:2",
+        paramset_key=ParamsetKey.VALUES,
+        parameter="MANU_MODE",
+        value=climate._temperature_for_heat_mode,
+        wait_for_callback=WAIT_FOR_CALLBACK,
+    )
+    await central.data_point_event(const.INTERFACE_ID, "VCU0000341:2", "CONTROL_MODE", _ModeHmIP.MANU.value)
+    await central.data_point_event(
+        const.INTERFACE_ID, "VCU0000341:2", "SET_TEMPERATURE", climate._temperature_for_heat_mode
+    )
+    assert climate.mode == ClimateMode.HEAT
 
+    await climate.set_mode(ClimateMode.AUTO)
+    assert mock_client.method_calls[-1] == call.set_value(
+        channel_address="VCU0000341:2",
+        paramset_key=ParamsetKey.VALUES,
+        parameter="AUTO_MODE",
+        value=True,
+        wait_for_callback=WAIT_FOR_CALLBACK,
+    )
+    await central.data_point_event(const.INTERFACE_ID, "VCU0000341:2", "CONTROL_MODE", _ModeHmIP.AUTO.value)
+    await central.data_point_event(const.INTERFACE_ID, "VCU0000341:2", "SET_TEMPERATURE", 24.0)
     assert climate.profile == ClimateProfile.WEEK_PROGRAM_1
     assert climate.profiles == (
         ClimateProfile.BOOST,
@@ -568,7 +604,7 @@ async def test_ceipthermostat(
     assert climate.activity == ClimateActivity.HEAT
     await central.data_point_event(const.INTERFACE_ID, "VCU1769958:9", "STATE", 0)
     assert climate.activity == ClimateActivity.IDLE
-
+    assert climate._old_manu_setpoint is None
     assert climate.current_humidity is None
     await central.data_point_event(const.INTERFACE_ID, "VCU1769958:1", "HUMIDITY", 75)
     assert climate.current_humidity == 75
@@ -609,8 +645,18 @@ async def test_ceipthermostat(
         values={"CONTROL_MODE": 1, "SET_POINT_TEMPERATURE": 5.0},
         wait_for_callback=WAIT_FOR_CALLBACK,
     )
+    await climate.set_temperature(19.5)
+    assert mock_client.method_calls[-1] == call.set_value(
+        channel_address="VCU1769958:1",
+        paramset_key=ParamsetKey.VALUES,
+        parameter="SET_POINT_TEMPERATURE",
+        value=19.5,
+        wait_for_callback=WAIT_FOR_CALLBACK,
+    )
+    await central.data_point_event(const.INTERFACE_ID, "VCU1769958:1", "SET_POINT_TEMPERATURE", 19.5)
     await central.data_point_event(const.INTERFACE_ID, "VCU1769958:1", "SET_POINT_MODE", _ModeHmIP.MANU.value)
     assert climate.mode == ClimateMode.HEAT
+    assert climate._old_manu_setpoint == 19.5
 
     assert climate.profile == ClimateProfile.NONE
     assert climate.profiles == (
@@ -648,13 +694,26 @@ async def test_ceipthermostat(
         "week_program_5",
         "week_program_6",
     )
+
+    await climate.set_mode(ClimateMode.HEAT)
+    assert mock_client.method_calls[-1] == call.put_paramset(
+        channel_address="VCU1769958:1",
+        paramset_key_or_link_address=ParamsetKey.VALUES,
+        values={"BOOST_MODE": False, "CONTROL_MODE": 1, "SET_POINT_TEMPERATURE": climate._temperature_for_heat_mode},
+        wait_for_callback=None,
+    )
+
+    await central.data_point_event(const.INTERFACE_ID, "VCU1769958:1", "SET_POINT_TEMPERATURE", 19.5)
+    await central.data_point_event(const.INTERFACE_ID, "VCU1769958:1", "SET_POINT_MODE", _ModeHmIP.MANU.value)
+    assert climate.mode == ClimateMode.HEAT
+    assert climate.target_temperature == 19.5
+
     await climate.set_profile(ClimateProfile.NONE)
-    assert mock_client.method_calls[-1] == call.set_value(
+    assert mock_client.method_calls[-1] == call.put_paramset(
         channel_address="VCU1769958:1",
-        paramset_key=ParamsetKey.VALUES,
-        parameter="BOOST_MODE",
-        value=False,
-        wait_for_callback=WAIT_FOR_CALLBACK,
+        paramset_key_or_link_address=ParamsetKey.VALUES,
+        values={"BOOST_MODE": False, "CONTROL_MODE": 1, "SET_POINT_TEMPERATURE": 19.5},
+        wait_for_callback=None,
     )
     await central.data_point_event(const.INTERFACE_ID, "VCU1769958:1", "SET_POINT_MODE", _ModeHmIP.AWAY.value)
     assert climate.profile == ClimateProfile.AWAY
@@ -716,7 +775,7 @@ async def test_ceipthermostat(
     await central.data_point_event(const.INTERFACE_ID, "VCU1769958:1", "SET_POINT_TEMPERATURE", 12.0)
     call_count = len(mock_client.method_calls)
     await climate.set_temperature(12.0)
-    assert call_count == len(mock_client.method_calls)
+    assert call_count + 1 == len(mock_client.method_calls)
 
     await climate.set_mode(ClimateMode.AUTO)
     call_count = len(mock_client.method_calls)