aiohomematic 2025.9.1__py3-none-any.whl → 2025.9.2__py3-none-any.whl

aiohomematic/client/xml_rpc.py

@@ -42,7 +42,8 @@ from aiohomematic.exceptions import (
     NoConnectionException,
     UnsupportedException,
 )
-from aiohomematic.support import extract_exc_args, get_tls_context
+from aiohomematic.property_decorators import info_property
+from aiohomematic.support import LogContextMixin, extract_exc_args, get_tls_context, log_boundary_error
 
 _LOGGER: Final = logging.getLogger(__name__)
 
@@ -83,7 +84,7 @@ _OS_ERROR_CODES: Final[dict[int, str]] = {
 
 
 # noinspection PyProtectedMember,PyUnresolvedReferences
-class XmlRpcProxy(xmlrpc.client.ServerProxy):
+class XmlRpcProxy(xmlrpc.client.ServerProxy, LogContextMixin):
     """ServerProxy implementation with ThreadPoolExecutor when request is executing."""
 
     def __init__(
@@ -95,7 +96,7 @@ class XmlRpcProxy(xmlrpc.client.ServerProxy):
         **kwargs: Any,
     ) -> None:
         """Initialize new proxy for server and get local ip."""
-        self.interface_id: Final = interface_id
+        self._interface_id: Final = interface_id
         self._connection_state: Final = connection_state
         self._looper: Final = Looper()
         self._proxy_executor: Final = (
@@ -120,11 +121,21 @@ class XmlRpcProxy(xmlrpc.client.ServerProxy):
             supported_methods.append(_XmlRpcMethod.PING)
             self._supported_methods = tuple(supported_methods)
 
+    @info_property(log_context=True)
+    def interface_id(self) -> str:
+        """Return the interface_id."""
+        return self._interface_id
+
     @property
     def supported_methods(self) -> tuple[str, ...]:
         """Return the supported methods."""
         return self._supported_methods
 
+    @info_property(log_context=True)
+    def tls(self) -> bool:
+        """Return tls."""
+        return self._tls
+
     async def __async_request(self, *args, **kwargs):  # type: ignore[no-untyped-def]
         """Call method on server side."""
         parent = xmlrpc.client.ServerProxy
@@ -134,7 +145,7 @@ class XmlRpcProxy(xmlrpc.client.ServerProxy):
                 raise UnsupportedException(f"__ASYNC_REQUEST: method '{method} not supported by backend.")
 
             if method in _VALID_XMLRPC_COMMANDS_ON_NO_CONNECTION or not self._connection_state.has_issue(
-                issuer=self, iid=self.interface_id
+                issuer=self, iid=self._interface_id
             ):
                 args = _cleanup_args(*args)
                 _LOGGER.debug("__ASYNC_REQUEST: %s", args)
@@ -148,35 +159,57 @@ class XmlRpcProxy(xmlrpc.client.ServerProxy):
                         executor=self._proxy_executor,
                     )
                 )
-                self._connection_state.remove_issue(issuer=self, iid=self.interface_id)
+                self._connection_state.remove_issue(issuer=self, iid=self._interface_id)
                 return result
-            raise NoConnectionException(f"No connection to {self.interface_id}")
+            raise NoConnectionException(f"No connection to {self._interface_id}")
         except BaseHomematicException:
             raise
         except SSLError as sslerr:
-            message = f"SSLError on {self.interface_id}: {extract_exc_args(exc=sslerr)}"
+            message = f"SSLError on {self._interface_id}: {extract_exc_args(exc=sslerr)}"
+            level = logging.ERROR
             if sslerr.args[0] in _SSL_ERROR_CODES:
-                _LOGGER.debug(message)
-            else:
-                _LOGGER.error(message)
+                message = (
+                    f"{message} - {sslerr.args[0]}: {sslerr.args[1]}. "
+                    f"Please check your configuration for {self._interface_id}."
+                )
+                if not self._connection_state.add_issue(issuer=self, iid=self._interface_id):
+                    level = logging.DEBUG
+
+            log_boundary_error(
+                logger=_LOGGER,
+                boundary="xml-rpc",
+                action=str(args[0]),
+                err=sslerr,
+                level=level,
+                message=message,
+                log_context=self.log_context,
+            )
             raise NoConnectionException(message) from sslerr
         except OSError as oserr:
-            message = f"OSError on {self.interface_id}: {extract_exc_args(exc=oserr)}"
-            if oserr.args[0] in _OS_ERROR_CODES:
-                if self._connection_state.add_issue(issuer=self, iid=self.interface_id):
-                    _LOGGER.error(message)
-                else:
-                    _LOGGER.debug(message)
-            else:
-                _LOGGER.error(message)
+            message = f"OSError on {self._interface_id}: {extract_exc_args(exc=oserr)}"
+            level = (
+                logging.ERROR
+                if oserr.args[0] in _OS_ERROR_CODES
+                and not self._connection_state.add_issue(issuer=self, iid=self._interface_id)
+                else logging.DEBUG
+            )
+
+            log_boundary_error(
+                logger=_LOGGER,
+                boundary="xml-rpc",
+                action=str(args[0]),
+                err=oserr,
+                level=level,
+                log_context=self.log_context,
+            )
             raise NoConnectionException(message) from oserr
         except xmlrpc.client.Fault as flt:
-            ctx = RpcContext(protocol="xml-rpc", method=str(args[0]), interface=self.interface_id)
+            ctx = RpcContext(protocol="xml-rpc", method=str(args[0]), interface=self._interface_id)
             raise map_xmlrpc_fault(code=flt.faultCode, fault_string=flt.faultString, ctx=ctx) from flt
         except TypeError as terr:
             raise ClientException(terr) from terr
         except xmlrpc.client.ProtocolError as perr:
-            if not self._connection_state.has_issue(issuer=self, iid=self.interface_id):
+            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

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.1"
+VERSION: Final = "2025.9.2"
 
 # Detect test speedup mode via environment
 _TEST_SPEEDUP: Final = (
@@ -856,7 +856,7 @@ __all__ = tuple(
         )
         and (
             getattr(obj, "__module__", __name__) == __name__
-            if not isinstance(obj, (int, float, str, bytes, tuple, frozenset, dict))
+            if not isinstance(obj, int | float | str | bytes | tuple | frozenset | dict)
             else True
         )
     )

aiohomematic/decorators.py

@@ -13,15 +13,12 @@ from functools import wraps
 import inspect
 import logging
 from time import monotonic
-from typing import Any, Final, ParamSpec, TypeVar, cast
+from typing import Any, Final, cast, overload
 from weakref import WeakKeyDictionary
 
 from aiohomematic.context import IN_SERVICE_VAR
 from aiohomematic.exceptions import BaseHomematicException
-from aiohomematic.support import build_log_context_from_obj, extract_exc_args
-
-P = ParamSpec("P")
-R = TypeVar("R")
+from aiohomematic.support import LogContextMixin, log_boundary_error
 
 _LOGGER_PERFORMANCE: Final = logging.getLogger(f"{__package__}.performance")
 
@@ -30,26 +27,59 @@ _LOGGER_PERFORMANCE: Final = logging.getLogger(f"{__package__}.performance")
 _SERVICE_CALLS_CACHE: WeakKeyDictionary[type, tuple[str, ...]] = WeakKeyDictionary()
 
 
-def inspector(  # noqa: C901
+@overload
+def inspector[**P, R](
+    func: Callable[P, R],
+    /,
+    *,
+    log_level: int = ...,
+    re_raise: bool = ...,
+    no_raise_return: Any = ...,
+    measure_performance: bool = ...,
+) -> Callable[P, R]: ...
+
+
+@overload
+def inspector[**P, R](
+    func: None = ...,
+    /,
+    *,
+    log_level: int = ...,
+    re_raise: bool = ...,
+    no_raise_return: Any = ...,
+    measure_performance: bool = ...,
+) -> Callable[[Callable[P, R]], Callable[P, R]]: ...
+
+
+def inspector[**P, R](  # noqa: C901
+    func: Callable[P, R] | None = None,
+    /,
+    *,
     log_level: int = logging.ERROR,
     re_raise: bool = True,
     no_raise_return: Any = None,
     measure_performance: bool = False,
-) -> Callable[[Callable[P, R]], Callable[P, R]]:
+) -> Callable[[Callable[P, R]], Callable[P, R]] | Callable[P, R]:
     """
     Support with exception handling and performance measurement.
 
     A decorator that works for both synchronous and asynchronous functions,
     providing common functionality such as exception handling and performance measurement.
 
+    Can be used both with and without parameters:
+      - @inspector
+      - @inspector(log_level=logging.ERROR, re_raise=True, ...)
+
     Args:
+        func: The function to decorate when used without parameters.
         log_level: Logging level for exceptions.
         re_raise: Whether to re-raise exceptions.
         no_raise_return: Value to return when an exception is caught and not re-raised.
         measure_performance: Whether to measure function execution time.
 
     Returns:
-        A decorator that wraps sync or async functions.
+        Either the decorated function (when used without parameters) or
+        a decorator that wraps sync or async functions (when used with parameters).
 
     """
 
@@ -71,16 +101,16 @@ def inspector(  # noqa: C901
             """Handle exceptions for decorated functions with structured logging."""
             if not is_sub_service_call and log_level > logging.NOTSET:
                 logger = logging.getLogger(func.__module__)
-                extra = {
-                    "err_type": exc.__class__.__name__,
-                    "err": extract_exc_args(exc=exc),
-                    "function": func.__name__,
-                    **build_log_context_from_obj(obj=context_obj),
-                }
-                if log_level >= logging.ERROR:
-                    logger.exception("service_error", extra=extra)
-                else:
-                    logger.log(level=log_level, msg="service_error", extra=extra)
+                log_context = context_obj.log_context if isinstance(context_obj, LogContextMixin) else None
+                # Reuse centralized boundary logging to ensure consistent 'extra' structure
+                log_boundary_error(
+                    logger=logger,
+                    boundary="service",
+                    action=func.__name__,
+                    err=exc,
+                    level=log_level,
+                    log_context=log_context,
+                )
             if re_raise or not is_homematic:
                 raise exc
             return cast(R, no_raise_return)
@@ -168,10 +198,15 @@ def inspector(  # noqa: C901
         setattr(wrap_sync_function, "ha_service", True)
         return wrap_sync_function
 
+    # If used without parameters: @inspector
+    if func is not None:
+        return create_wrapped_decorator(func)
+
+    # If used with parameters: @inspector(...)
     return create_wrapped_decorator
 
 
-def _log_performance_message(func: Callable, start: float, *args: P.args, **kwargs: P.kwargs) -> None:  # type: ignore[valid-type]
+def _log_performance_message[**P](func: Callable[P, Any], start: float, *args: P.args, **kwargs: P.kwargs) -> None:
     delta = monotonic() - start
     caller = str(args[0]) if len(args) > 0 else ""
 
@@ -245,8 +280,8 @@ def measure_execution_time[CallableT: Callable[..., Any]](func: CallableT) -> Ca
                 _log_performance_message(func, start, *args, **kwargs)
 
     if inspect.iscoroutinefunction(func):
-        return async_measure_wrapper  # type: ignore[return-value]
-    return measure_wrapper  # type: ignore[return-value]
+        return cast(CallableT, async_measure_wrapper)
+    return cast(CallableT, measure_wrapper)
 
 
 # Define public API for this module

aiohomematic/model/__init__.py

@@ -45,7 +45,7 @@ _ALLOWED_INTERNAL_PARAMETERS: Final[tuple[Parameter, ...]] = (Parameter.DIRECTIO
 _LOGGER: Final = logging.getLogger(__name__)
 
 
-@inspector()
+@inspector
 def create_data_points_and_events(device: hmd.Device) -> None:
     """Create the data points associated to this device."""
     for channel in device.channels.values():

aiohomematic/model/calculated/__init__.py

@@ -59,7 +59,7 @@ _CALCULATED_DATA_POINTS: Final = (ApparentTemperature, DewPoint, FrostPoint, Ope
 _LOGGER: Final = logging.getLogger(__name__)
 
 
-@inspector()
+@inspector
 def create_calculated_data_points(channel: hmd.Channel) -> None:
     """Decides which data point category should be used, and creates the required data points."""
     for dp in _CALCULATED_DATA_POINTS:

aiohomematic/model/calculated/climate.py

@@ -16,8 +16,8 @@ from aiohomematic.model.calculated.support import (
     calculate_frost_point,
     calculate_vapor_concentration,
 )
-from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic import DpSensor
+from aiohomematic.property_decorators import state_property
 from aiohomematic.support import element_matches_key
 
 _LOGGER: Final = logging.getLogger(__name__)

aiohomematic/model/calculated/data_point.py

@@ -23,7 +23,6 @@ from aiohomematic.const import (
 from aiohomematic.model import device as hmd
 from aiohomematic.model.custom import definition as hmed
 from aiohomematic.model.data_point import BaseDataPoint, NoneTypeDataPoint
-from aiohomematic.model.decorators import cached_slot_property, config_property, state_property
 from aiohomematic.model.generic import data_point as hmge
 from aiohomematic.model.support import (
     DataPointNameData,
@@ -33,6 +32,7 @@ from aiohomematic.model.support import (
     generate_unique_id,
     get_data_point_name_data,
 )
+from aiohomematic.property_decorators import cached_slot_property, config_property, state_property
 
 _LOGGER: Final = logging.getLogger(__name__)
 
@@ -306,7 +306,7 @@ class CalculatedDataPoint[ParameterT: GenericParameterType](BaseDataPoint):
     @property
     def _should_fire_data_point_updated_callback(self) -> bool:
         """Check if a data point has been updated or refreshed."""
-        if self.fired_recently:
+        if self.fired_recently:  # pylint: disable=using-constant-test
             return False
 
         if (relevant_values_data_point := self._relevant_values_data_points) is not None and len(

aiohomematic/model/calculated/operating_voltage_level.py

@@ -13,8 +13,9 @@ from typing import Any, Final
 from aiohomematic.const import CalulatedParameter, DataPointCategory, Parameter, ParameterType, ParamsetKey
 from aiohomematic.model import device as hmd
 from aiohomematic.model.calculated.data_point import CalculatedDataPoint
-from aiohomematic.model.decorators import state_property
+from aiohomematic.model.calculated.support import calculate_operating_voltage_level
 from aiohomematic.model.generic import DpFloat, DpSensor
+from aiohomematic.property_decorators import state_property
 from aiohomematic.support import element_matches_key, extract_exc_args
 
 _BATTERY_QTY: Final = "Battery Qty"
@@ -139,32 +140,17 @@ class OperatingVoltageLevel[SensorT: float | None](CalculatedDataPoint[SensorT])
     def value(self) -> float | None:
         """Return the value."""
         try:
-            if (low_bat_limit := self._low_bat_limit) is None or self._voltage_max is None:
-                return None
-            if self._dp_operating_voltage and self._dp_operating_voltage.value is not None:
-                return max(
-                    0,
-                    min(
-                        100,
-                        float(
-                            round(
-                                (
-                                    (float(self._dp_operating_voltage.value) - low_bat_limit)
-                                    / (self._voltage_max - low_bat_limit)
-                                    * 100
-                                ),
-                                1,
-                            )
-                        ),
-                    ),
-                )
+            return calculate_operating_voltage_level(
+                operating_voltage=self._dp_operating_voltage.value,
+                low_bat_limit=self._low_bat_limit_default,
+                voltage_max=self._voltage_max,
+            )
         except Exception as exc:
             _LOGGER.debug(
                 "OperatingVoltageLevel: Failed to calculate sensor for %s: %s",
                 self._channel.name,
                 extract_exc_args(exc=exc),
             )
-            return None
         return None
 
     @property

aiohomematic/model/calculated/support.py

@@ -174,3 +174,23 @@ def calculate_frost_point(temperature: float, humidity: int) -> float | None:
             extract_exc_args(exc=verr),
         )
     return None
+
+
+def calculate_operating_voltage_level(
+    operating_voltage: float | None, low_bat_limit: float | None, voltage_max: float | None
+) -> float | None:
+    """Return the operating voltage level."""
+    if operating_voltage is None or low_bat_limit is None or voltage_max is None:
+        return None
+    return max(
+        0,
+        min(
+            100,
+            float(
+                round(
+                    ((float(operating_voltage) - low_bat_limit) / (voltage_max - low_bat_limit) * 100),
+                    1,
+                )
+            ),
+        ),
+    )

aiohomematic/model/custom/__init__.py

@@ -151,7 +151,7 @@ __all__ = [
 _LOGGER: Final = logging.getLogger(__name__)
 
 
-@inspector()
+@inspector
 def create_custom_data_points(device: hmd.Device) -> None:
     """Decides which data point category should be used, and creates the required data points."""
 

aiohomematic/model/custom/climate.py

@@ -26,8 +26,8 @@ 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.decorators import config_property, state_property
 from aiohomematic.model.generic import DpAction, DpBinarySensor, DpFloat, DpInteger, DpSelect, DpSensor, DpSwitch
+from aiohomematic.property_decorators import config_property, state_property
 
 _LOGGER: Final = logging.getLogger(__name__)
 
@@ -351,15 +351,15 @@ class BaseCustomDpClimate(CustomDataPoint):
     async def set_profile(self, profile: ClimateProfile, collector: CallParameterCollector | None = None) -> None:
         """Set new profile."""
 
-    @inspector()
+    @inspector
     async def enable_away_mode_by_calendar(self, start: datetime, end: datetime, away_temperature: float) -> None:
         """Enable the away mode by calendar on thermostat."""
 
-    @inspector()
+    @inspector
     async def enable_away_mode_by_duration(self, hours: int, away_temperature: float) -> None:
         """Enable the away mode by duration on thermostat."""
 
-    @inspector()
+    @inspector
     async def disable_away_mode(self) -> None:
         """Disable the away mode on thermostat."""
 
@@ -375,7 +375,7 @@ class BaseCustomDpClimate(CustomDataPoint):
             return True
         return super().is_state_change(**kwargs)
 
-    @inspector()
+    @inspector
     async def copy_schedule(self, target_climate_data_point: BaseCustomDpClimate) -> None:
         """Copy schedule to target device."""
 
@@ -388,7 +388,7 @@ class BaseCustomDpClimate(CustomDataPoint):
             values=raw_schedule,
         )
 
-    @inspector()
+    @inspector
     async def copy_schedule_profile(
         self,
         source_profile: ScheduleProfile,
@@ -418,7 +418,7 @@ class BaseCustomDpClimate(CustomDataPoint):
             do_validate=False,
         )
 
-    @inspector()
+    @inspector
     async def get_schedule_profile(self, profile: ScheduleProfile) -> PROFILE_DICT:
         """Return a schedule by climate profile."""
         if not self._supports_schedule:
@@ -426,7 +426,7 @@ class BaseCustomDpClimate(CustomDataPoint):
         schedule_data = await self._get_schedule_profile(profile=profile)
         return schedule_data.get(profile, {})
 
-    @inspector()
+    @inspector
     async def get_schedule_profile_weekday(self, profile: ScheduleProfile, weekday: ScheduleWeekday) -> WEEKDAY_DICT:
         """Return a schedule by climate profile."""
         if not self._supports_schedule:
@@ -478,7 +478,7 @@ class BaseCustomDpClimate(CustomDataPoint):
 
         return schedule_data
 
-    @inspector()
+    @inspector
     async def set_schedule_profile(
         self, profile: ScheduleProfile, profile_data: PROFILE_DICT, do_validate: bool = True
     ) -> None:
@@ -518,7 +518,7 @@ class BaseCustomDpClimate(CustomDataPoint):
             values=_get_raw_schedule_paramset(schedule_data=schedule_data),
         )
 
-    @inspector()
+    @inspector
     async def set_simple_schedule_profile(
         self,
         profile: ScheduleProfile,
@@ -531,7 +531,7 @@ class BaseCustomDpClimate(CustomDataPoint):
         )
         await self.set_schedule_profile(profile=profile, profile_data=profile_data)
 
-    @inspector()
+    @inspector
     async def set_schedule_profile_weekday(
         self,
         profile: ScheduleProfile,
@@ -559,7 +559,7 @@ class BaseCustomDpClimate(CustomDataPoint):
             values=_get_raw_schedule_paramset(schedule_data=schedule_data),
         )
 
-    @inspector()
+    @inspector
     async def set_simple_schedule_profile_weekday(
         self,
         profile: ScheduleProfile,
@@ -844,7 +844,7 @@ class CustomDpRfThermostat(BaseCustomDpClimate):
                     value=_HM_WEEK_PROFILE_POINTERS_TO_NAMES[profile_idx], collector=collector
                 )
 
-    @inspector()
+    @inspector
     async def enable_away_mode_by_calendar(self, start: datetime, end: datetime, away_temperature: float) -> None:
         """Enable the away mode by calendar on thermostat."""
         await self._client.set_value(
@@ -854,14 +854,14 @@ class CustomDpRfThermostat(BaseCustomDpClimate):
             value=_party_mode_code(start=start, end=end, away_temperature=away_temperature),
         )
 
-    @inspector()
+    @inspector
     async def enable_away_mode_by_duration(self, hours: int, away_temperature: float) -> None:
         """Enable the away mode by duration on thermostat."""
         start = datetime.now() - timedelta(minutes=10)
         end = datetime.now() + timedelta(hours=hours)
         await self.enable_away_mode_by_calendar(start=start, end=end, away_temperature=away_temperature)
 
-    @inspector()
+    @inspector
     async def disable_away_mode(self) -> None:
         """Disable the away mode on thermostat."""
         start = datetime.now() - timedelta(hours=11)
@@ -1095,7 +1095,7 @@ class CustomDpIpThermostat(BaseCustomDpClimate):
             if profile_idx := self._profiles.get(profile):
                 await self._dp_active_profile.send_value(value=profile_idx, collector=collector)
 
-    @inspector()
+    @inspector
     async def enable_away_mode_by_calendar(self, start: datetime, end: datetime, away_temperature: float) -> None:
         """Enable the away mode by calendar on thermostat."""
         await self._client.put_paramset(
@@ -1109,14 +1109,14 @@ class CustomDpIpThermostat(BaseCustomDpClimate):
             },
         )
 
-    @inspector()
+    @inspector
     async def enable_away_mode_by_duration(self, hours: int, away_temperature: float) -> None:
         """Enable the away mode by duration on thermostat."""
         start = datetime.now() - timedelta(minutes=10)
         end = datetime.now() + timedelta(hours=hours)
         await self.enable_away_mode_by_calendar(start=start, end=end, away_temperature=away_temperature)
 
-    @inspector()
+    @inspector
     async def disable_away_mode(self) -> None:
         """Disable the away mode on thermostat."""
         await self._client.put_paramset(

aiohomematic/model/custom/cover.py

@@ -18,8 +18,8 @@ from aiohomematic.model.custom.const import DeviceProfile, Field
 from aiohomematic.model.custom.data_point import CustomDataPoint
 from aiohomematic.model.custom.support import CustomConfig, ExtendedConfig
 from aiohomematic.model.data_point import CallParameterCollector, bind_collector
-from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic import DpAction, DpFloat, DpSelect, DpSensor
+from aiohomematic.property_decorators import state_property
 
 _LOGGER: Final = logging.getLogger(__name__)
 

aiohomematic/model/custom/data_point.py

@@ -15,7 +15,6 @@ from aiohomematic.model.custom import definition as hmed
 from aiohomematic.model.custom.const import CDPD, DeviceProfile, Field
 from aiohomematic.model.custom.support import CustomConfig
 from aiohomematic.model.data_point import BaseDataPoint, NoneTypeDataPoint
-from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic import data_point as hmge
 from aiohomematic.model.support import (
     DataPointNameData,
@@ -24,6 +23,7 @@ from aiohomematic.model.support import (
     check_channel_is_the_only_primary_channel,
     get_custom_data_point_name,
 )
+from aiohomematic.property_decorators import state_property
 from aiohomematic.support import get_channel_address
 
 _LOGGER: Final = logging.getLogger(__name__)

aiohomematic/model/custom/light.py

@@ -16,8 +16,8 @@ from aiohomematic.model.custom.const import DeviceProfile, Field
 from aiohomematic.model.custom.data_point import CustomDataPoint
 from aiohomematic.model.custom.support import CustomConfig, ExtendedConfig
 from aiohomematic.model.data_point import CallParameterCollector, bind_collector
-from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic import DpAction, DpFloat, DpInteger, DpSelect, DpSensor, GenericDataPoint
+from aiohomematic.property_decorators import state_property
 
 _DIMMER_OFF: Final = 0.0
 _EFFECT_OFF: Final = "Off"

aiohomematic/model/custom/lock.py

@@ -15,8 +15,8 @@ from aiohomematic.model.custom.const import DeviceProfile, Field
 from aiohomematic.model.custom.data_point import CustomDataPoint
 from aiohomematic.model.custom.support import CustomConfig, ExtendedConfig
 from aiohomematic.model.data_point import CallParameterCollector, bind_collector
-from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic import DpAction, DpSensor, DpSwitch
+from aiohomematic.property_decorators import state_property
 
 
 class _LockActivity(StrEnum):

aiohomematic/model/custom/siren.py

@@ -17,8 +17,8 @@ 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.decorators import state_property
 from aiohomematic.model.generic import DpAction, DpBinarySensor, DpSensor
+from aiohomematic.property_decorators import state_property
 
 _SMOKE_DETECTOR_ALARM_STATUS_IDLE_OFF: Final = "IDLE_OFF"
 

aiohomematic/model/custom/switch.py

@@ -16,8 +16,8 @@ from aiohomematic.model.custom.const import DeviceProfile, Field
 from aiohomematic.model.custom.data_point import CustomDataPoint
 from aiohomematic.model.custom.support import CustomConfig, ExtendedConfig
 from aiohomematic.model.data_point import CallParameterCollector, bind_collector
-from aiohomematic.model.decorators import state_property
 from aiohomematic.model.generic import DpAction, DpBinarySensor, DpSwitch
+from aiohomematic.property_decorators import state_property
 
 _LOGGER: Final = logging.getLogger(__name__)
 

aiohomematic/model/custom/valve.py

@@ -16,8 +16,8 @@ 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.decorators import state_property
 from aiohomematic.model.generic import DpAction, DpBinarySensor, DpSwitch
+from aiohomematic.property_decorators import state_property
 
 _LOGGER: Final = logging.getLogger(__name__)