aiohomematic 2025.8.9__py3-none-any.whl → 2025.8.10__py3-none-any.whl

aiohomematic/model/custom/light.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the light category."""
 
 from __future__ import annotations
@@ -471,29 +473,29 @@ class CustomDpIpRGBWLight(CustomDpDimmer):
     @property
     def _relevant_data_points(self) -> tuple[GenericDataPoint, ...]:
         """Returns the list of relevant data points. To be overridden by subclasses."""
-        if self._dp_device_operation_mode.value == _DeviceOperationMode.RGBW:
+        if self._device_operation_mode == _DeviceOperationMode.RGBW:
             return (
                 self._dp_hue,
                 self._dp_level,
                 self._dp_saturation,
                 self._dp_color_temperature_kelvin,
             )
-        if self._dp_device_operation_mode.value == _DeviceOperationMode.RGB:
+        if self._device_operation_mode == _DeviceOperationMode.RGB:
             return self._dp_hue, self._dp_level, self._dp_saturation
-        if self._dp_device_operation_mode.value == _DeviceOperationMode.TUNABLE_WHITE:
+        if self._device_operation_mode == _DeviceOperationMode.TUNABLE_WHITE:
             return self._dp_level, self._dp_color_temperature_kelvin
         return (self._dp_level,)
 
     @property
     def supports_color_temperature(self) -> bool:
         """Flag if light supports color temperature."""
-        return self._dp_device_operation_mode.value == _DeviceOperationMode.TUNABLE_WHITE
+        return self._device_operation_mode == _DeviceOperationMode.TUNABLE_WHITE
 
     @property
     def supports_effects(self) -> bool:
         """Flag if light supports effects."""
         return (
-            self._dp_device_operation_mode.value != _DeviceOperationMode.PWM
+            self._device_operation_mode != _DeviceOperationMode.PWM
             and self.effects is not None
             and len(self.effects) > 0
         )
@@ -501,7 +503,7 @@ class CustomDpIpRGBWLight(CustomDpDimmer):
     @property
     def supports_hs_color(self) -> bool:
         """Flag if light supports color."""
-        return self._dp_device_operation_mode.value in (
+        return self._device_operation_mode in (
             _DeviceOperationMode.RGBW,
             _DeviceOperationMode.RGB,
         )
@@ -514,11 +516,9 @@ class CustomDpIpRGBWLight(CustomDpDimmer):
         Avoid creating data points that are not usable in selected device operation mode.
         """
         if (
-            self._dp_device_operation_mode.value in (_DeviceOperationMode.RGB, _DeviceOperationMode.RGBW)
+            self._device_operation_mode in (_DeviceOperationMode.RGB, _DeviceOperationMode.RGBW)
             and self._channel.no in (2, 3, 4)
-        ) or (
-            self._dp_device_operation_mode.value == _DeviceOperationMode.TUNABLE_WHITE and self._channel.no in (3, 4)
-        ):
+        ) or (self._device_operation_mode == _DeviceOperationMode.TUNABLE_WHITE and self._channel.no in (3, 4)):
             return DataPointUsage.NO_CREATE
         return self._get_data_point_usage()
 
@@ -555,6 +555,13 @@ class CustomDpIpRGBWLight(CustomDpDimmer):
             await self._set_on_time_value(on_time=_NOT_USED, collector=collector)
         await super().turn_off(collector=collector, **kwargs)
 
+    @property
+    def _device_operation_mode(self) -> _DeviceOperationMode:
+        """Return the device operation mode."""
+        if (mode := self._dp_device_operation_mode.value) is None:
+            return _DeviceOperationMode.RGBW
+        return _DeviceOperationMode(mode)
+
     @bind_collector()
     async def _set_on_time_value(self, on_time: float, collector: CallParameterCollector | None = None) -> None:
         """Set the on time value in seconds."""
@@ -1068,6 +1075,7 @@ DEVICES: Mapping[str, CustomConfig | tuple[CustomConfig, ...]] = {
     "HmIP-FDT": CustomConfig(make_ce_func=make_ip_dimmer, channels=(2,)),
     "HmIP-PDT": CustomConfig(make_ce_func=make_ip_dimmer, channels=(3,)),
     "HmIP-RGBW": CustomConfig(make_ce_func=make_ip_rgbw_light),
+    "HmIP-LSC": CustomConfig(make_ce_func=make_ip_rgbw_light),
     "HmIP-SCTH230": CustomConfig(
         make_ce_func=make_ip_dimmer,
         channels=(12,),

aiohomematic/model/custom/lock.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the lock category."""
 
 from __future__ import annotations

aiohomematic/model/custom/siren.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the siren category."""
 
 from __future__ import annotations
@@ -8,6 +10,7 @@ from enum import StrEnum
 from typing import Final, TypedDict, Unpack
 
 from aiohomematic.const import DataPointCategory
+from aiohomematic.exceptions import ValidationException
 from aiohomematic.model import device as hmd
 from aiohomematic.model.custom import definition as hmed
 from aiohomematic.model.custom.const import DeviceProfile, Field
@@ -147,14 +150,14 @@ class CustomDpIpSiren(BaseCustomDpSiren):
 
         acoustic_alarm = kwargs.get("acoustic_alarm", self._dp_acoustic_alarm_selection.default)
         if self.available_tones and acoustic_alarm and acoustic_alarm not in self.available_tones:
-            raise ValueError(
+            raise ValidationException(
                 f"Invalid tone specified for data_point {self.full_name}: {acoustic_alarm}, "
                 "check the available_tones attribute for valid tones to pass in"
             )
 
         optical_alarm = kwargs.get("optical_alarm", self._dp_optical_alarm_selection.default)
         if self.available_lights and optical_alarm and optical_alarm not in self.available_lights:
-            raise ValueError(
+            raise ValidationException(
                 f"Invalid light specified for data_point {self.full_name}: {optical_alarm}, "
                 "check the available_lights attribute for valid tones to pass in"
             )

aiohomematic/model/custom/support.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Support classes used by aiohomematic custom data points."""
 
 from __future__ import annotations

aiohomematic/model/custom/switch.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the switch category."""
 
 from __future__ import annotations

aiohomematic/model/custom/valve.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the valve category."""
 
 from __future__ import annotations

aiohomematic/model/data_point.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """
 Core data point model for AioHomematic.
 
@@ -80,7 +82,6 @@ __all__ = [
     "BaseParameterDataPoint",
     "CallParameterCollector",
     "CallbackDataPoint",
-    "EVENT_DATA_SCHEMA",
     "bind_collector",
 ]
 
@@ -1085,12 +1086,23 @@ def bind_collector(
                     IN_SERVICE_VAR.reset(token)
                 in_service = IN_SERVICE_VAR.get()
                 if not in_service and log_level > logging.NOTSET:
-                    logging.getLogger(args[0].__module__).log(level=log_level, msg=extract_exc_args(exc=bhexc))
+                    logger = logging.getLogger(args[0].__module__)
+                    extra = {
+                        "err_type": bhexc.__class__.__name__,
+                        "err": extract_exc_args(exc=bhexc),
+                        "function": func.__name__,
+                        **hms.build_log_context_from_obj(obj=args[0]),
+                    }
+                    if log_level >= logging.ERROR:
+                        logger.exception("service_error", extra=extra)
+                    else:
+                        logger.log(level=log_level, msg="service_error", extra=extra)
+                # Re-raise domain-specific exceptions so callers and tests can handle them
+                raise
             else:
                 if token:
                     IN_SERVICE_VAR.reset(token)
                 return return_value
-            return None
 
         setattr(bind_wrapper, "ha_service", True)
         return bind_wrapper  # type: ignore[return-value]

aiohomematic/model/decorators.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Decorators for data points used within aiohomematic."""
 
 from __future__ import annotations
@@ -6,6 +8,7 @@ from collections.abc import Callable, Mapping
 from datetime import datetime
 from enum import Enum
 from typing import Any, ParamSpec, TypeVar, cast
+from weakref import WeakKeyDictionary
 
 __all__ = [
     "config_property",
@@ -18,7 +21,6 @@ __all__ = [
 
 P = ParamSpec("P")
 T = TypeVar("T")
-R = TypeVar("R")
 
 
 # pylint: disable=invalid-name
@@ -91,8 +93,9 @@ class state_property[GETTER, SETTER](generic_property[GETTER, SETTER]):
 
 
 # Cache for per-class attribute names by decorator to avoid repeated dir() scans
-# Keyed by (class, decorator class); value is a tuple of attribute names
-_PUBLIC_ATTR_CACHE: dict[tuple[type, type], tuple[str, ...]] = {}
+# Use WeakKeyDictionary to allow classes to be garbage-collected without leaking cache entries.
+# Structure: {cls: {decorator_class: (attr_name1, attr_name2, ...)}}
+_PUBLIC_ATTR_CACHE: WeakKeyDictionary[type, dict[type, tuple[str, ...]]] = WeakKeyDictionary()
 
 
 def _get_public_attributes_by_class_decorator(data_object: Any, class_decorator: type) -> Mapping[str, Any]:
@@ -102,15 +105,33 @@ def _get_public_attributes_by_class_decorator(data_object: Any, class_decorator:
     This caches the attribute names per (class, decorator) to reduce overhead
     from repeated dir()/getattr() scans. Values are not cached as they are
     instance-dependent and may change over time.
+
+    To minimize side effects, exceptions raised by property getters are caught
+    and the corresponding value is set to None. This ensures that payload
+    construction and attribute introspection do not fail due to individual
+    properties with transient errors or expensive side effects.
     """
     cls = data_object.__class__
-    cache_key = (cls, class_decorator)
 
-    if (names := _PUBLIC_ATTR_CACHE.get(cache_key)) is None:
-        names = tuple(y for y in dir(cls) if not y.startswith("_") and isinstance(getattr(cls, y), class_decorator))
-        _PUBLIC_ATTR_CACHE[cache_key] = names
+    # Get or create the per-class cache dict
+    if (decorator_cache := _PUBLIC_ATTR_CACHE.get(cls)) is None:
+        decorator_cache = {}
+        _PUBLIC_ATTR_CACHE[cls] = decorator_cache
 
-    return {name: _get_text_value(getattr(data_object, name)) for name in names}
+    # Get or compute the attribute names for this decorator
+    if (names := decorator_cache.get(class_decorator)) is None:
+        names = tuple(y for y in dir(cls) if not y.startswith("_") and isinstance(getattr(cls, y), class_decorator))
+        decorator_cache[class_decorator] = names
+
+    result: dict[str, Any] = {}
+    for name in names:
+        try:
+            value = getattr(data_object, name)
+        except Exception:
+            # Avoid propagating side effects/errors from getters
+            value = None
+        result[name] = _get_text_value(value)
+    return result
 
 
 def _get_text_value(value: Any) -> Any:

aiohomematic/model/device.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """
 Device and channel model for AioHomematic.
 

aiohomematic/model/event.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """
 Event model for AioHomematic.
 

aiohomematic/model/generic/__init__.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """
 Generic data points for AioHomematic.
 

aiohomematic/model/generic/action.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """
 Module for action data points.
 

aiohomematic/model/generic/binary_sensor.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the binary_sensor category."""
 
 from __future__ import annotations

aiohomematic/model/generic/button.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the button category."""
 
 from __future__ import annotations

aiohomematic/model/generic/data_point.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Generic python representation of a CCU parameter."""
 
 from __future__ import annotations
@@ -16,6 +18,7 @@ from aiohomematic.const import (
     ParamsetKey,
 )
 from aiohomematic.decorators import inspector
+from aiohomematic.exceptions import ValidationException
 from aiohomematic.model import data_point as hme, device as hmd
 from aiohomematic.model.decorators import cached_slot_property
 from aiohomematic.model.support import DataPointNameData, GenericParameterType, get_data_point_name_data
@@ -101,7 +104,7 @@ class GenericDataPoint[ParameterT: GenericParameterType, InputParameterT: Generi
             return set()
         try:
             prepared_value = self._prepare_value_for_sending(value=value, do_validate=do_validate)
-        except ValueError as verr:
+        except (ValueError, ValidationException) as verr:
             _LOGGER.warning(verr)
             return set()
 

aiohomematic/model/generic/number.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the number category."""
 
 from __future__ import annotations
@@ -5,6 +7,7 @@ from __future__ import annotations
 from typing import cast
 
 from aiohomematic.const import DataPointCategory
+from aiohomematic.exceptions import ValidationException
 from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic.data_point import GenericDataPoint
 
@@ -30,7 +33,7 @@ class BaseDpNumber[NumberParameterT: int | float | None](GenericDataPoint[Number
             return cast(NumberParameterT, type_converter(value))
         if self._special and isinstance(value, str) and value in self._special:
             return cast(NumberParameterT, type_converter(self._special[value]))
-        raise ValueError(
+        raise ValidationException(
             f"NUMBER failed: Invalid value: {value} (min: {self._min}, max: {self._max}, special:{self._special})"
         )
 

aiohomematic/model/generic/select.py

@@ -1,8 +1,11 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the select category."""
 
 from __future__ import annotations
 
 from aiohomematic.const import DataPointCategory
+from aiohomematic.exceptions import ValidationException
 from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic.data_point import GenericDataPoint
 from aiohomematic.model.support import get_value_from_value_list
@@ -33,4 +36,4 @@ class DpSelect(GenericDataPoint[int | str, int | float | str]):
             return int(value)
         if self._values and value in self._values:
             return self._values.index(value)
-        raise ValueError(f"Value not in value_list for {self.name}/{self.unique_id}")
+        raise ValidationException(f"Value not in value_list for {self.name}/{self.unique_id}")

aiohomematic/model/generic/sensor.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the sensor category."""
 
 from __future__ import annotations

aiohomematic/model/generic/switch.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the switch category."""
 
 from __future__ import annotations

aiohomematic/model/generic/text.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the text category."""
 
 from __future__ import annotations

aiohomematic/model/hub/__init__.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """
 Hub (backend) data points for AioHomematic.
 

aiohomematic/model/hub/binary_sensor.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for hub data points implemented using the binary_sensor category."""
 
 from __future__ import annotations

aiohomematic/model/hub/button.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for hub data points implemented using the button category."""
 
 from __future__ import annotations

aiohomematic/model/hub/data_point.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for AioHomematic hub data points."""
 
 from __future__ import annotations

aiohomematic/model/hub/number.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the number category."""
 
 from __future__ import annotations

aiohomematic/model/hub/select.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for hub data points implemented using the select category."""
 
 from __future__ import annotations

aiohomematic/model/hub/sensor.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for hub data points implemented using the sensor category."""
 
 from __future__ import annotations

aiohomematic/model/hub/switch.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for hub data points implemented using the switch category."""
 
 from __future__ import annotations

aiohomematic/model/hub/text.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for hub data points implemented using the text category."""
 
 from __future__ import annotations

aiohomematic/model/support.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Support for data points used within aiohomematic."""
 
 from __future__ import annotations
@@ -5,6 +7,7 @@ from __future__ import annotations
 from abc import abstractmethod
 from collections.abc import Mapping
 from enum import StrEnum
+from functools import lru_cache
 import logging
 from typing import Any, Final
 
@@ -533,7 +536,29 @@ def _check_channel_name_with_channel_no(name: str) -> bool:
 
 
 def convert_value(value: Any, target_type: ParameterType, value_list: tuple[str, ...] | None) -> Any:
-    """Convert a value to target_type."""
+    """
+    Convert a value to target_type with safe memoization.
+
+    To avoid redundant conversions across layers, we use an internal
+    LRU-cached helper for hashable inputs. For unhashable inputs, we
+    fall back to a direct conversion path.
+    """
+    # Normalize value_list to tuple to ensure hashability where possible
+    norm_value_list: tuple[str, ...] | None = tuple(value_list) if isinstance(value_list, list) else value_list
+    try:
+        # This will be cached if all arguments are hashable
+        return _convert_value_cached(value, target_type, norm_value_list)
+    except TypeError:
+        # Fallback non-cached path if any argument is unhashable
+        return _convert_value_noncached(value, target_type, norm_value_list)
+
+
+@lru_cache(maxsize=2048)
+def _convert_value_cached(value: Any, target_type: ParameterType, value_list: tuple[str, ...] | None) -> Any:
+    return _convert_value_noncached(value, target_type, value_list)
+
+
+def _convert_value_noncached(value: Any, target_type: ParameterType, value_list: tuple[str, ...] | None) -> Any:
     if value is None:
         return None
     if target_type == ParameterType.BOOL:

aiohomematic/model/update.py

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2021-2025 Daniel Perna, SukramJ
 """Module for data points implemented using the update category."""
 
 from __future__ import annotations