PyPlumIO 0.5.56__py3-none-any.whl → 0.6.0__py3-none-any.whl

pyplumio/__init__.py

@@ -23,17 +23,17 @@ from pyplumio.structures.network_info import EthernetParameters, WirelessParamet
 
 
 def open_serial_connection(
-    device: str,
+    url: str,
     baudrate: int = 115200,
     *,
     protocol: Protocol | None = None,
     reconnect_on_failure: bool = True,
-    **kwargs: Any,
+    **options: Any,
 ) -> SerialConnection:
     r"""Create a serial connection.
 
-    :param device: Serial port device name. e. g. /dev/ttyUSB0
-    :type device: str
+    :param url: Serial port device url. e. g. /dev/ttyUSB0
+    :type url: str
     :param baudrate: Serial port baud rate, defaults to 115200
     :type baudrate: int, optional
     :param protocol: Protocol that will be used for communication with
@@ -42,17 +42,17 @@ def open_serial_connection(
     :param reconnect_on_failure: `True` if PyPlumIO should try
         reconnecting on failure, otherwise `False`, default to `True`
     :type reconnect_on_failure: bool, optional
-    :param \**kwargs: Additional keyword arguments to be passed to
+    :param \**options: Additional arguments to be passed to
         serial_asyncio.open_serial_connection()
     :return: An instance of serial connection
     :rtype: SerialConnection
     """
     return SerialConnection(
-        device,
+        url,
         baudrate,
         protocol=protocol,
         reconnect_on_failure=reconnect_on_failure,
-        **kwargs,
+        **options,
     )
 
 
@@ -62,7 +62,7 @@ def open_tcp_connection(
     *,
     protocol: Protocol | None = None,
     reconnect_on_failure: bool = True,
-    **kwargs: Any,
+    **options: Any,
 ) -> TcpConnection:
     r"""Create a TCP connection.
 
@@ -76,7 +76,7 @@ def open_tcp_connection(
     :param reconnect_on_failure: `True` if PyPlumIO should try
         reconnecting on failure, otherwise `False`, default to `True`
     :type reconnect_on_failure: bool, optional
-    :param \**kwargs: Additional keyword arguments to be passed to
+    :param \**options: Additional arguments to be passed to
         asyncio.open_connection()
     :return: An instance of TCP connection
     :rtype: TcpConnection
@@ -86,7 +86,7 @@ def open_tcp_connection(
         port,
         protocol=protocol,
         reconnect_on_failure=reconnect_on_failure,
-        **kwargs,
+        **options,
     )
 
 

pyplumio/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.56'
-__version_tuple__ = version_tuple = (0, 5, 56)
+__version__ = version = '0.6.0'
+__version_tuple__ = version_tuple = (0, 6, 0)
 
 __commit_id__ = commit_id = None

pyplumio/connection.py

@@ -4,11 +4,14 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 import asyncio
+from collections.abc import AsyncGenerator
+from contextlib import asynccontextmanager
 import logging
 from typing import Any, Final
 
 from serial import EIGHTBITS, PARITY_NONE, STOPBITS_ONE
 
+from pyplumio.devices import PhysicalDevice
 from pyplumio.exceptions import ConnectionFailedError
 from pyplumio.helpers.task_manager import TaskManager
 from pyplumio.protocol import AsyncProtocol, Protocol
@@ -33,15 +36,17 @@ class Connection(ABC, TaskManager):
     All specific connection classes MUST be inherited from this class.
     """
 
+    __slots__ = ("_protocol", "_reconnect_on_failure", "_options")
+
     _protocol: Protocol
     _reconnect_on_failure: bool
-    _kwargs: dict[str, Any]
+    _options: dict[str, Any]
 
     def __init__(
         self,
         protocol: Protocol | None = None,
         reconnect_on_failure: bool = True,
-        **kwargs: Any,
+        **options: Any,
     ) -> None:
         """Initialize a new connection."""
         super().__init__()
@@ -53,7 +58,7 @@ class Connection(ABC, TaskManager):
 
         self._reconnect_on_failure = reconnect_on_failure
         self._protocol = protocol
-        self._kwargs = kwargs
+        self._options = options
 
     async def __aenter__(self) -> Connection:
         """Provide an entry point for the context manager."""
@@ -101,11 +106,62 @@ class Connection(ABC, TaskManager):
         self.cancel_tasks()
         await self.protocol.shutdown()
 
+    @asynccontextmanager
+    async def device(
+        self, name: str, timeout: float | None = None
+    ) -> AsyncGenerator[PhysicalDevice]:
+        """Get the device in context manager."""
+        if not isinstance(self.protocol, AsyncProtocol):
+            raise NotImplementedError
+
+        yield await self.protocol.get(name, timeout=timeout)
+
+    @property
+    def get(self):  # type: ignore[no-untyped-def]
+        """Access the remote device.
+
+        Raise NotImplementedError when using protocol
+        different from AsyncProtocol.
+        """
+        if isinstance(self.protocol, AsyncProtocol):
+            return self.protocol.get
+
+        raise NotImplementedError
+
+    @property
+    def get_nowait(self):  # type: ignore[no-untyped-def]
+        """Access the remote device without waiting.
+
+        Raise NotImplementedError when using protocol
+        different from AsyncProtocol.
+        """
+        if isinstance(self.protocol, AsyncProtocol):
+            return self.protocol.get_nowait
+
+        raise NotImplementedError
+
+    @property
+    def wait_for(self):  # type: ignore[no-untyped-def]
+        """Wait for the remote device to become available.
+
+        Raise NotImplementedError when using protocol
+        different from AsyncProtocol.
+        """
+        if isinstance(self.protocol, AsyncProtocol):
+            return self.protocol.wait_for
+
+        raise NotImplementedError
+
     @property
     def protocol(self) -> Protocol:
         """Return the protocol object."""
         return self._protocol
 
+    @property
+    def options(self) -> dict[str, Any]:
+        """Return connection options."""
+        return self._options
+
     @timeout(CONNECT_TIMEOUT)
     @abstractmethod
     async def _open_connection(
@@ -117,6 +173,8 @@ class Connection(ABC, TaskManager):
 class TcpConnection(Connection):
     """Represents a TCP connection."""
 
+    __slots__ = ("host", "port")
+
     host: str
     port: int
 
@@ -127,17 +185,17 @@ class TcpConnection(Connection):
         *,
         protocol: Protocol | None = None,
         reconnect_on_failure: bool = True,
-        **kwargs: Any,
+        **options: Any,
     ) -> None:
         """Initialize a new TCP connection."""
-        super().__init__(protocol, reconnect_on_failure, **kwargs)
+        super().__init__(protocol, reconnect_on_failure, **options)
         self.host = host
         self.port = port
 
     def __repr__(self) -> str:
         """Return a serializable string representation."""
         return (
-            f"TcpConnection(host={self.host}, port={self.port}, kwargs={self._kwargs})"
+            f"TcpConnection(host={self.host}, port={self.port}, options={self.options})"
         )
 
     @timeout(CONNECT_TIMEOUT)
@@ -146,37 +204,39 @@ class TcpConnection(Connection):
     ) -> tuple[asyncio.StreamReader, asyncio.StreamWriter]:
         """Open the connection and return reader and writer objects."""
         return await asyncio.open_connection(
-            host=self.host, port=self.port, **self._kwargs
+            host=self.host, port=self.port, **self.options
         )
 
 
 class SerialConnection(Connection):
     """Represents a serial connection."""
 
-    device: str
+    __slots__ = ("url", "baudrate")
+
+    url: str
     baudrate: int
 
     def __init__(
         self,
-        device: str,
+        url: str,
         baudrate: int = 115200,
         *,
         protocol: Protocol | None = None,
         reconnect_on_failure: bool = True,
-        **kwargs: Any,
+        **options: Any,
     ) -> None:
         """Initialize a new serial connection."""
-        super().__init__(protocol, reconnect_on_failure, **kwargs)
-        self.device = device
+        super().__init__(protocol, reconnect_on_failure, **options)
+        self.url = url
         self.baudrate = baudrate
 
     def __repr__(self) -> str:
         """Return a serializable string representation."""
         return (
             "SerialConnection("
-            f"device={self.device}, "
+            f"url={self.url}, "
             f"baudrate={self.baudrate}, "
-            f"kwargs={self._kwargs})"
+            f"options={self.options})"
         )
 
     @timeout(CONNECT_TIMEOUT)
@@ -185,12 +245,12 @@ class SerialConnection(Connection):
     ) -> tuple[asyncio.StreamReader, asyncio.StreamWriter]:
         """Open the connection and return reader and writer objects."""
         return await pyserial_asyncio.open_serial_connection(
-            url=self.device,
+            url=self.url,
             baudrate=self.baudrate,
             bytesize=EIGHTBITS,
             parity=PARITY_NONE,
             stopbits=STOPBITS_ONE,
-            **self._kwargs,
+            **self.options,
         )
 
 

pyplumio/const.py

@@ -3,9 +3,7 @@
 from __future__ import annotations
 
 from enum import Enum, IntEnum, unique
-from typing import Any, Final, Literal
-
-from typing_extensions import TypeAlias
+from typing import Any, Final, Literal, TypeAlias
 
 # General attributes.
 ATTR_CONNECTED: Final = "connected"

pyplumio/filters.py

@@ -15,13 +15,12 @@ from typing import (
     Final,
     Protocol,
     SupportsFloat,
+    TypeAlias,
     TypeVar,
     overload,
     runtime_checkable,
 )
 
-from typing_extensions import TypeAlias
-
 from pyplumio.helpers.event_manager import Callback
 from pyplumio.parameters import Parameter
 
@@ -176,7 +175,7 @@ class _Aggregate(Filter):
 
     async def __call__(self, new_value: Any) -> Any:
         """Set a new value for the callback."""
-        if not isinstance(new_value, (float, int, Decimal)):
+        if not isinstance(new_value, float | int | Decimal):
             raise TypeError(
                 "Aggregate filter can only be used with numeric values, got "
                 f"{type(new_value).__name__}: {new_value}"
@@ -187,7 +186,7 @@ class _Aggregate(Filter):
         time_since_call = current_time - self._last_call_time
         if time_since_call >= self._timeout or len(self._values) >= self._sample_size:
             sum_of_values = (
-                np.sum(self._values) if numpy_installed else sum(self._values)
+                np.sum(np.array(self._values)) if numpy_installed else sum(self._values)
             )
             result = await self._callback(float(sum_of_values))
             self._last_call_time = current_time
@@ -326,7 +325,7 @@ class _Deadband(Filter):
 
     async def __call__(self, new_value: Any) -> Any:
         """Set a new value for the callback."""
-        if not isinstance(new_value, (float, int, Decimal)):
+        if not isinstance(new_value, float | int | Decimal):
             raise TypeError(
                 "Deadband filter can only be used with numeric values, got "
                 f"{type(new_value).__name__}: {new_value}"

pyplumio/frames/__init__.py

@@ -60,12 +60,10 @@ def get_frame_handler(frame_type: int) -> str:
     return f"frames.{module.lower()}s.{type_name}{module.capitalize()}"
 
 
-@dataclass
+@dataclass(slots=True)
 class DataFrameDescription:
     """Describes what data is provided by the frame."""
 
-    __slots__ = ("frame_type", "provides")
-
     frame_type: FrameType
     provides: str
 
@@ -95,6 +93,8 @@ class Frame(ABC):
     _message: bytearray | None
     _data: dict[str, Any] | None
 
+    __hash__ = object.__hash__
+
     def __init__(
         self,
         recipient: DeviceType = DeviceType.ALL,
@@ -114,19 +114,6 @@ class Frame(ABC):
         self._data = data if not kwargs else ensure_dict(data, kwargs)
         self._message = message
 
-    def __hash__(self) -> int:
-        """Return a hash of the frame based on its values."""
-        return hash(
-            (
-                self.recipient,
-                self.sender,
-                self.econet_type,
-                self.econet_version,
-                self._message,
-                frozenset(self._data.items()) if self._data else None,
-            )
-        )
-
     def __eq__(self, other: object) -> bool:
         """Compare if this frame is equal to other."""
         if isinstance(other, Frame):

pyplumio/helpers/async_cache.py

@@ -1,10 +1,8 @@
 """Contains a simple async cache for caching results of async functions."""
 
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
 from functools import wraps
-from typing import Any, Callable, TypeVar, cast
-
-from typing_extensions import ParamSpec, TypeAlias
+from typing import Any, ParamSpec, TypeAlias, TypeVar, cast
 
 T = TypeVar("T")
 P = ParamSpec("P")

pyplumio/helpers/event_manager.py

@@ -5,9 +5,7 @@ from __future__ import annotations
 import asyncio
 from collections.abc import Callable, Coroutine, Generator
 import inspect
-from typing import Any, Generic, TypeVar, overload
-
-from typing_extensions import TypeAlias
+from typing import Any, Generic, TypeAlias, TypeVar, overload
 
 from pyplumio.helpers.task_manager import TaskManager
 

pyplumio/parameters/__init__.py

@@ -7,10 +7,7 @@ import asyncio
 from contextlib import suppress
 from dataclasses import asdict, dataclass
 import logging
-from typing import TYPE_CHECKING, Any, Literal, TypeVar, Union, get_args
-
-from dataslots import dataslots
-from typing_extensions import TypeAlias
+from typing import TYPE_CHECKING, Any, Literal, TypeAlias, TypeVar, get_args
 
 from pyplumio.const import BYTE_UNDEFINED, STATE_OFF, STATE_ON, State, UnitOfMeasurement
 from pyplumio.frames import Request
@@ -47,19 +44,16 @@ def is_valid_parameter(data: bytearray) -> bool:
     return any(x for x in data if x != BYTE_UNDEFINED)
 
 
-@dataclass
+@dataclass(slots=True)
 class ParameterValues:
     """Represents a parameter values."""
 
-    __slots__ = ("value", "min_value", "max_value")
-
     value: int
     min_value: int
     max_value: int
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class ParameterDescription:
     """Represents a parameter description."""
 
@@ -67,7 +61,7 @@ class ParameterDescription:
     optimistic: bool = False
 
 
-NumericType: TypeAlias = Union[int, float]
+NumericType: TypeAlias = int | float
 
 
 class Parameter(ABC):
@@ -128,7 +122,7 @@ class Parameter(ABC):
             handler = getattr(self.values.value, method_to_call)
             return handler(other.value)
 
-        if isinstance(other, (int, float, bool)) or other in get_args(State):
+        if isinstance(other, int | float | bool) or other in get_args(State):
             handler = getattr(self.values.value, method_to_call)
             return handler(self._pack_value(other))
         else:
@@ -317,8 +311,7 @@ class Parameter(ABC):
         """Create a request to change the parameter."""
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class NumberDescription(ParameterDescription):
     """Represents a parameter description."""
 
@@ -395,8 +388,7 @@ class Number(Parameter):
         return self.description.unit_of_measurement
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class OffsetNumberDescription(NumberDescription):
     """Represents a parameter description."""
 
@@ -419,8 +411,7 @@ class OffsetNumber(Number):
         return super()._unpack_value(value - self.description.offset)
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class SwitchDescription(ParameterDescription):
     """Represents a switch description."""
 

pyplumio/parameters/custom/__init__.py

@@ -15,22 +15,18 @@ from pyplumio.utils import to_camelcase
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
+@dataclass(slots=True, kw_only=True)
 class Signature:
     """Represents a product signature."""
 
-    __slots__ = ("id", "model")
-
     id: int
     model: str
 
 
-@dataclass
+@dataclass(slots=True, kw_only=True)
 class CustomParameter:
     """Represents a custom parameter."""
 
-    __slots__ = ("original", "replacement")
-
     original: str
     replacement: ParameterDescription
 

pyplumio/parameters/ecomax.py

@@ -6,8 +6,6 @@ from dataclasses import dataclass
 from functools import partial
 from typing import TYPE_CHECKING
 
-from dataslots import dataslots
-
 from pyplumio.const import (
     ATTR_INDEX,
     ATTR_OFFSET,
@@ -78,12 +76,10 @@ class EcomaxParameter(Parameter):
         )
 
 
-@dataclass
+@dataclass(slots=True)
 class EcomaxNumberDescription(EcomaxParameterDescription, OffsetNumberDescription):
     """Represents an ecoMAX number description."""
 
-    __slots__ = ()
-
 
 class EcomaxNumber(EcomaxParameter, OffsetNumber):
     """Represents a ecoMAX number."""
@@ -93,8 +89,7 @@ class EcomaxNumber(EcomaxParameter, OffsetNumber):
     description: EcomaxNumberDescription
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class EcomaxSwitchDescription(EcomaxParameterDescription, SwitchDescription):
     """Represents an ecoMAX switch description."""
 

pyplumio/parameters/mixer.py

@@ -6,8 +6,6 @@ from dataclasses import dataclass
 from functools import cache
 from typing import TYPE_CHECKING
 
-from dataslots import dataslots
-
 from pyplumio.const import (
     ATTR_DEVICE_INDEX,
     ATTR_INDEX,
@@ -59,12 +57,10 @@ class MixerParameter(Parameter):
         )
 
 
-@dataclass
+@dataclass(slots=True)
 class MixerNumberDescription(MixerParameterDescription, OffsetNumberDescription):
     """Represent a mixer number description."""
 
-    __slots__ = ()
-
 
 class MixerNumber(MixerParameter, OffsetNumber):
     """Represents a mixer number."""
@@ -74,8 +70,7 @@ class MixerNumber(MixerParameter, OffsetNumber):
     description: MixerNumberDescription
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class MixerSwitchDescription(MixerParameterDescription, SwitchDescription):
     """Represents a mixer switch description."""
 

pyplumio/parameters/thermostat.py

@@ -6,8 +6,6 @@ from dataclasses import dataclass
 from functools import cache
 from typing import TYPE_CHECKING
 
-from dataslots import dataslots
-
 from pyplumio.const import (
     ATTR_INDEX,
     ATTR_OFFSET,
@@ -77,8 +75,7 @@ class ThermostatParameter(Parameter):
         )
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class ThermostatNumberDescription(ThermostatParameterDescription, NumberDescription):
     """Represent a thermostat number description."""
 
@@ -91,8 +88,7 @@ class ThermostatNumber(ThermostatParameter, Number):
     description: ThermostatNumberDescription
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class ThermostatSwitchDescription(ThermostatParameterDescription, SwitchDescription):
     """Represents a thermostat switch description."""
 

pyplumio/protocol.py

@@ -8,10 +8,7 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
 from datetime import datetime
 import logging
-from typing import Any, Final, Literal
-
-from dataslots import dataslots
-from typing_extensions import TypeAlias
+from typing import Any, Final, Literal, TypeAlias
 
 from pyplumio.const import ATTR_CONNECTED, ATTR_SETUP, DeviceType
 from pyplumio.devices import PhysicalDevice
@@ -104,12 +101,10 @@ class DummyProtocol(Protocol):
             await self.close_writer()
 
 
-@dataclass
+@dataclass(slots=True)
 class Queues:
     """Represents asyncio queues."""
 
-    __slots__ = ("read", "write")
-
     read: asyncio.Queue[Frame]
     write: asyncio.Queue[Frame]
 
@@ -121,39 +116,35 @@ class Queues:
 NEVER: Final = "never"
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True, kw_only=True)
 class Statistics:
-    """Represents a connection statistics.
-
-    :param received_bytes: Number of received bytes. Resets on reconnect.
-    :type received_bytes: int
-    :param received_frames: Number of received frames. Resets on reconnect.
-    :type received_frames: int
-    :param sent_bytes: Number of sent bytes.  Resets on reconnect.
-    :type sent_bytes: int
-    :param sent_frames: Number of sent frames. Resets on reconnect.
-    :type sent_frames: int
-    :param failed_frames: Number of failed frames. Resets on reconnect.
-    :type failed_frames: int
-    :param connected_since: Datetime object representing connection time.
-    :type connected_since: datetime.datetime | Literal["never"]
-    :param connection_loss_at: Datetime object representing last connection loss event.
-    :type connection_loss_at: datetime.datetime | Literal["never"]
-    :param connection_losses: Number of connection lost event.
-    :type connection_losses: int
-    :param devices: Contains list of statistics for connected devices.
-    :type devices: list[DeviceStatistics]
-    """
+    """Represents a connection statistics."""
 
+    #: Number of received bytes. Resets on reconnect.
     received_bytes: int = 0
+
+    #: Number of received frames. Resets on reconnect.
     received_frames: int = 0
+
+    #: Number of sent bytes. Resets on reconnect.
     sent_bytes: int = 0
+
+    #: Number of sent frames. Resets on reconnect.
     sent_frames: int = 0
+
+    #: Number of failed frames. Resets on reconnect.
     failed_frames: int = 0
+
+    #: Datetime object representing connection time
     connected_since: datetime | Literal["never"] = NEVER
+
+    #: Datetime object representing last connection loss event
     connection_loss_at: datetime | Literal["never"] = NEVER
+
+    #: Number of connection lost event
     connection_losses: int = 0
+
+    #: List of statistics for connected devices
     devices: list[DeviceStatistics] = field(default_factory=list)
 
     def update_transfer_statistics(
@@ -168,6 +159,11 @@ class Statistics:
             self.received_bytes += received.length
             self.received_frames += 1
 
+    def track_connection_loss(self) -> None:
+        """Increase connection loss counter and store the datetime."""
+        self.connection_losses += 1
+        self.connection_loss_at = datetime.now()
+
     def reset_transfer_statistics(self) -> None:
         """Reset transfer statistics."""
         self.sent_bytes = 0
@@ -177,24 +173,20 @@ class Statistics:
         self.failed_frames = 0
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class DeviceStatistics:
-    """Represents a device statistics.
-
-    :param name: Device name.
-    :type name: str
-    :param connected_since: Datetime object representing connection time.
-    :type connected_since: datetime.datetime | Literal["never"]
-    :param last_seen: Datetime object representing time when device was last seen.
-    :type last_seen: datetime.datetime | Literal["never"]
-    """
+    """Represents a device statistics."""
 
+    #: Device name
     name: str
+
+    #: Datetime object representing connection time
     connected_since: datetime | Literal["never"] = NEVER
+
+    #: Datetime object representing time when device was last seen
     last_seen: datetime | Literal["never"] = NEVER
 
-    async def update_last_seen(self, data: Any) -> None:
+    async def update_last_seen(self, _: Any) -> None:
         """Update last seen property."""
         self.last_seen = datetime.now()
 
@@ -308,8 +300,7 @@ class AsyncProtocol(Protocol, EventManager[PhysicalDevice]):
                 statistics.failed_frames += 1
                 _LOGGER.debug("Can't process received frame: %s", e)
             except (OSError, asyncio.TimeoutError):
-                statistics.connection_losses += 1
-                statistics.connection_loss_at = datetime.now()
+                statistics.track_connection_loss()
                 self.create_task(self.connection_lost())
                 break
             except Exception:

pyplumio/structures/__init__.py

@@ -9,12 +9,10 @@ from typing import Any
 from pyplumio.frames import Frame
 
 
-@dataclass
+@dataclass(slots=True)
 class StructureDataClass:
     """Represents a structure dataclass mixin."""
 
-    __slots__ = ("frame",)
-
     frame: Frame
 
 

pyplumio/structures/alerts.py

@@ -56,12 +56,10 @@ def seconds_to_datetime(timestamp: int) -> datetime:
     return datetime(**dict(datetime_kwargs(timestamp)))
 
 
-@dataclass
+@dataclass(slots=True)
 class Alert:
     """Represents a device alert."""
 
-    __slots__ = ("code", "from_dt", "to_dt")
-
     code: int
     from_dt: datetime
     to_dt: datetime | None

pyplumio/structures/modules.py

@@ -6,8 +6,6 @@ from dataclasses import dataclass
 import struct
 from typing import Any, Final
 
-from dataslots import dataslots
-
 from pyplumio.const import BYTE_UNDEFINED
 from pyplumio.structures import StructureDecoder
 from pyplumio.utils import ensure_dict
@@ -32,8 +30,7 @@ struct_version = struct.Struct("<BBB")
 struct_vendor = struct.Struct("<BB")
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class ConnectedModules:
     """Represents a firmware version info for connected module."""
 

pyplumio/structures/network_info.py

@@ -18,7 +18,7 @@ DEFAULT_NETMASK: Final = "255.255.255.0"
 NETWORK_INFO_SIZE: Final = 25
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, slots=True, kw_only=True)
 class EthernetParameters:
     """Represents an ethernet parameters."""
 
@@ -35,7 +35,7 @@ class EthernetParameters:
     status: bool = True
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, slots=True, kw_only=True)
 class WirelessParameters(EthernetParameters):
     """Represents a wireless network parameters."""
 
@@ -50,7 +50,7 @@ class WirelessParameters(EthernetParameters):
     signal_quality: int = 100
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, slots=True, kw_only=True)
 class NetworkInfo:
     """Represents a network parameters."""
 

pyplumio/structures/product_info.py

@@ -63,12 +63,10 @@ def format_model_name(model_name: str) -> str:
     return model_name
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, slots=True)
 class ProductInfo:
     """Represents a product info provided by an UID response."""
 
-    __slots__ = ("type", "id", "uid", "logo", "image", "model")
-
     type: ProductType
     id: int
     uid: str

pyplumio/structures/program_version.py

@@ -6,8 +6,6 @@ from dataclasses import dataclass
 import struct
 from typing import Any, Final
 
-from dataslots import dataslots
-
 from pyplumio._version import __version_tuple__
 from pyplumio.structures import Structure
 from pyplumio.utils import ensure_dict
@@ -21,8 +19,7 @@ SOFTWARE_VERSION: Final = ".".join(str(x) for x in __version_tuple__[0:3])
 struct_program_version = struct.Struct("<2sB2s3s3HB")
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class VersionInfo:
     """Represents a version info provided in program version response."""
 

pyplumio/structures/schedules.py

@@ -8,8 +8,6 @@ import datetime as dt
 from functools import lru_cache, reduce
 from typing import Annotated, Any, Final, get_args
 
-from dataslots import dataslots
-
 from pyplumio.const import (
     ATTR_PARAMETER,
     ATTR_SCHEDULE,
@@ -91,8 +89,6 @@ SCHEDULES: tuple[str, ...] = (
 class ScheduleParameterDescription(ParameterDescription):
     """Represent a schedule parameter description."""
 
-    __slots__ = ()
-
 
 class ScheduleParameter(Parameter):
     """Represents a schedule parameter."""
@@ -112,8 +108,7 @@ class ScheduleParameter(Parameter):
         )
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class ScheduleNumberDescription(ScheduleParameterDescription, NumberDescription):
     """Represents a schedule number description."""
 
@@ -126,8 +121,7 @@ class ScheduleNumber(ScheduleParameter, Number):
     description: ScheduleNumberDescription
 
 
-@dataslots
-@dataclass
+@dataclass(slots=True)
 class ScheduleSwitchDescription(ScheduleParameterDescription, SwitchDescription):
     """Represents a schedule switch description."""
 
@@ -273,22 +267,10 @@ class ScheduleDay(MutableMapping):
         return cls({get_time(index): state for index, state in enumerate(intervals)})
 
 
-@dataclass
+@dataclass(slots=True)
 class Schedule(Iterable):
     """Represents a weekly schedule."""
 
-    __slots__ = (
-        "name",
-        "device",
-        "sunday",
-        "monday",
-        "tuesday",
-        "wednesday",
-        "thursday",
-        "friday",
-        "saturday",
-    )
-
     name: str
     device: PhysicalDevice
 

pyplumio/utils.py

@@ -5,9 +5,7 @@ from __future__ import annotations
 import asyncio
 from collections.abc import Awaitable, Callable, Mapping
 from functools import wraps
-from typing import TypeVar
-
-from typing_extensions import ParamSpec
+from typing import ParamSpec, TypeVar
 
 KT = TypeVar("KT")  # Key type.
 VT = TypeVar("VT")  # Value type.

{pyplumio-0.5.56.dist-info → pyplumio-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.5.56
+Version: 0.6.0
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -13,30 +13,27 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Home Automation
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dataslots==1.2.0
 Requires-Dist: pyserial-asyncio==0.6
-Requires-Dist: typing-extensions<5.0,>=4.14.0
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.10.5; extra == "test"
+Requires-Dist: coverage==7.10.6; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
-Requires-Dist: mypy==1.17.1; extra == "test"
+Requires-Dist: mypy==1.18.1; extra == "test"
 Requires-Dist: numpy<3.0.0,>=2.0.0; extra == "test"
 Requires-Dist: pyserial-asyncio-fast==0.16; extra == "test"
-Requires-Dist: pytest==8.4.1; extra == "test"
+Requires-Dist: pytest==8.4.2; extra == "test"
 Requires-Dist: pytest-asyncio==1.1.0; extra == "test"
-Requires-Dist: ruff==0.12.10; extra == "test"
-Requires-Dist: tox==4.28.4; extra == "test"
+Requires-Dist: ruff==0.13.0; extra == "test"
+Requires-Dist: tox==4.30.2; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20250822; extra == "test"
 Provides-Extra: docs
 Requires-Dist: sphinx==8.1.3; extra == "docs"
@@ -53,8 +50,8 @@ Dynamic: license-file
 [![PyPI version](https://badge.fury.io/py/PyPlumIO.svg)](https://badge.fury.io/py/PyPlumIO)
 [![PyPI Supported Python Versions](https://img.shields.io/pypi/pyversions/pyplumio.svg)](https://pypi.python.org/pypi/pyplumio/)
 [![PyPlumIO CI](https://github.com/denpamusic/PyPlumIO/actions/workflows/ci.yml/badge.svg)](https://github.com/denpamusic/PyPlumIO/actions/workflows/ci.yml)
-[![Maintainability](https://qlty.sh/badges/2455933c-6c18-45bc-a205-da5cc0b49d0b/maintainability.svg)](https://qlty.sh/gh/denpamusic/projects/PyPlumIO)
-[![Code Coverage](https://qlty.sh/badges/2455933c-6c18-45bc-a205-da5cc0b49d0b/test_coverage.svg)](https://qlty.sh/gh/denpamusic/projects/PyPlumIO)
+[![Maintainability](https://qlty.sh/gh/denpamusic/projects/PyPlumIO/maintainability.svg)](https://qlty.sh/gh/denpamusic/projects/PyPlumIO)
+[![Code Coverage](https://qlty.sh/gh/denpamusic/projects/PyPlumIO/coverage.svg)](https://qlty.sh/gh/denpamusic/projects/PyPlumIO)
 [![stability-release-candidate](https://img.shields.io/badge/stability-pre--release-48c9b0.svg)](https://guidelines.denpa.pro/stability#release-candidate)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
@@ -82,11 +79,13 @@ through network by using RS-485 to Ethernet/WiFi converter.
 - [Callbacks](https://pyplumio.denpa.pro/callbacks.html)
 - [Mixers/Thermostats](https://pyplumio.denpa.pro/mixers_thermostats.html)
 - [Schedules](https://pyplumio.denpa.pro/schedules.html)
+- [Statistics](https://pyplumio.denpa.pro/statistics.html)
 - [Protocol](https://pyplumio.denpa.pro/protocol.html)
   - [Frame Structure](https://pyplumio.denpa.pro/protocol.html#frame-structure)
   - [Requests and Responses](https://pyplumio.denpa.pro/protocol.html#requests-and-responses)
   - [Communication](https://pyplumio.denpa.pro/protocol.html#communication)
   - [Versioning](https://pyplumio.denpa.pro/protocol.html#versioning)
+- [Supported frames](https://pyplumio.denpa.pro/frames.html)
 
 ## Quickstart
 

{pyplumio-0.5.56.dist-info → pyplumio-0.6.0.dist-info}/RECORD

@@ -1,37 +1,37 @@
-pyplumio/__init__.py,sha256=3H5SO4WFw5mBTFeEyD4w0H8-MsNo93NyOH3RyMN7IS0,3337
+pyplumio/__init__.py,sha256=DQg-ZTAxLYuNKyqsGrcO0QrVAMw9aPA69Bv2mZ7ubXQ,3314
 pyplumio/__main__.py,sha256=3IwHHSq-iay5FaeMc95klobe-xv82yydSKcBE7BFZ6M,500
-pyplumio/_version.py,sha256=AF48JunwQGeZYZUVpG4oP5XCtgX_ssZWD1yfHXBvb9I,706
-pyplumio/connection.py,sha256=u-iOzEUqoEEL4YLpLtzBWi5Qy8_RABgKD8DyXf-er-4,5892
-pyplumio/const.py,sha256=eoq-WNJ8TO3YlP7dC7KkVQRKGjt9FbRZ6M__s29vb1U,5659
+pyplumio/_version.py,sha256=MAYWefOLb6kbIRub18WSzK6ggSjz1LNLy9aDRlX9Ea4,704
+pyplumio/connection.py,sha256=9Gzg6FXMU-HjspsDnm9XH8ZPBO29AZ6dKS2-eg8P8Z0,7686
+pyplumio/const.py,sha256=oYwXB3N6bvFLc6411icbABbBkSoQcj5BGuyD-NaKYp8,5629
 pyplumio/data_types.py,sha256=BTDxwErRo_odvFT5DNfIniNh8ZfyjRKEDaJmoEJqdEg,9426
 pyplumio/exceptions.py,sha256=_B_0EgxDxd2XyYv3WpZM733q0cML5m6J-f55QOvYRpI,996
-pyplumio/filters.py,sha256=QEtOptXym2Fb82cdPpS1dajkTpvYi3VuQaYoLl4CSQ4,15658
-pyplumio/protocol.py,sha256=ndsdnd7juX-NlrBMIAhEkx8x5DNlh_Q4FZ4pzvbT1yQ,12276
+pyplumio/filters.py,sha256=sBEnr0i_1XMbIwIEA24npbpe5yevSRneynlsqJMyfko,15642
+pyplumio/protocol.py,sha256=jGx5b8y_1jbdFbjL_ZbUjpDvgBYhn5JUBsVsf_De6Ls,11614
 pyplumio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyplumio/stream.py,sha256=zFMKZ_GxsSGcaBTJigVM1CK3uGjlEJXgcvKqus8MDzk,7740
-pyplumio/utils.py,sha256=ktV8_Th2DiwQ0W6afOCau9kBJ8pOrqR-SM2Y2GRy-xE,1869
+pyplumio/utils.py,sha256=SV47Y6QC_KL-gPmk6KQgx7ArExzNHGKuaddGAHjT9rs,1839
 pyplumio/devices/__init__.py,sha256=d0E5hTV7UPa8flq8TNlKf_jt4cOSbRigSE9jjDHrmDI,8302
 pyplumio/devices/ecomax.py,sha256=1QasnLFgNCplSoDXXe5wUr8JQjr6ChSEGijamXtJZVM,16356
 pyplumio/devices/ecoster.py,sha256=X46ky5XT8jHMFq9sBW0ve8ZI_tjItQDMt4moXsW-ogY,307
 pyplumio/devices/mixer.py,sha256=7WdUVgwO4VXmaPNzh3ZWpKr2ooRXWemz2KFHAw35_Rk,2731
 pyplumio/devices/thermostat.py,sha256=MHMKe45fQ7jKlhBVObJ7McbYQKuF6-LOKSHy-9VNsCU,2253
-pyplumio/frames/__init__.py,sha256=QAjdvZxQj5Av1OKFqdlSgZBn3RbCcRVMQv_lCnTkW5M,8272
+pyplumio/frames/__init__.py,sha256=jIYP31yP60FVXp8ygOcKkbJCosodiqWCvnrY9FOgH4g,7885
 pyplumio/frames/messages.py,sha256=ImQGWFFTa2eaXfytQmFZKC-IxyPRkxD8qp0bEm16-ws,3628
 pyplumio/frames/requests.py,sha256=jr-_XSSCCDDTbAmrw95CKyWa5nb7JNeGzZ2jDXIxlAo,7348
 pyplumio/frames/responses.py,sha256=M6Ky4gg2AoShmRXX0x6nftajxrvmQLKPVRWbwyhvI0E,6663
 pyplumio/helpers/__init__.py,sha256=H2xxdkF-9uADLwEbfBUoxNTdwru3L5Z2cfJjgsuRsn0,31
-pyplumio/helpers/async_cache.py,sha256=EGQcU8LWJpVx3Hk6iaI-3mqAhnR5ACfBOGb9tWw-VSY,1305
-pyplumio/helpers/event_manager.py,sha256=aKNlhsPNTy3eOSfWVb9TJxtIsN9GAQv9XxhOi_BOhlM,8097
+pyplumio/helpers/async_cache.py,sha256=PUkUTo3lmIhslejg0dGWjbcES09E62d9YYgDcBK_G6Q,1275
+pyplumio/helpers/event_manager.py,sha256=cev3_X5a7rBvT4KXIwGpyAnOdWd-3svWDETN3yumkhg,8067
 pyplumio/helpers/factory.py,sha256=c3sitnkUjJWz7fPpTE9uRIpa8h46Qim3xsAblMw3eDo,1049
 pyplumio/helpers/task_manager.py,sha256=N71F6Ag1HHxdf5zJeCMcEziFdH9lmJKtMPoRGjJ-E40,1209
-pyplumio/parameters/__init__.py,sha256=YKIXmb_-E2HeIVljDHdD2bLbsfUsQ8sVhl9sl7kLzyo,16220
-pyplumio/parameters/ecomax.py,sha256=4UqI7cokCt7qS9Du4-7JgLhM7mhHCHt8SWPl_qncmXQ,26239
-pyplumio/parameters/mixer.py,sha256=RjhfUU_62STyNV0Ud9A4G4FEvVwo02qGVl8h1QvqQXI,6646
-pyplumio/parameters/thermostat.py,sha256=-DK2Mb78CGrKmdhwAD0M3GiGJatczPnl1e2gVeT19tI,5070
-pyplumio/parameters/custom/__init__.py,sha256=o1khThLf4FMrjErFIcikAc6jI9gn5IyZlo7LNKKqJG4,3194
+pyplumio/parameters/__init__.py,sha256=d2gLX-Ve6UxwxLbiTQU6AGNYrC4ywXK1dJ7F92OkfgM,16108
+pyplumio/parameters/ecomax.py,sha256=KjHlkVZK2XYEl4HNSdCRLAnv0KEn7gjnEO_CsKFZwIw,26199
+pyplumio/parameters/mixer.py,sha256=cjwe6AJdboAIEnCeiYNqIRmOVo3dSQqbMTWgiCSx8J8,6606
+pyplumio/parameters/thermostat.py,sha256=sRAndI87jANM8uvdQc1LdkT6_baDxf0AEAFVYRstzNE,5039
+pyplumio/parameters/custom/__init__.py,sha256=EeddoseRsh2Gxche3e3woRBgNszraOnLUs9TciK7dCA,3168
 pyplumio/parameters/custom/ecomax_860d3_hb.py,sha256=IsNgDXmV90QpBilDV4fGSBtIUEQJJbR9rjnfCr3-pHE,2840
-pyplumio/structures/__init__.py,sha256=emZVH5OFgdTUPbEJoznMKitmK0nlPm0I4SmF86It1Do,1345
-pyplumio/structures/alerts.py,sha256=Whl_WyHV9sXr321SuJAYBc1wUawNzi7xMZc41M8qToY,3724
+pyplumio/structures/__init__.py,sha256=tb62y-x466WSogdjNpsvqcD3Kiz7xMW604m2-yJH3jc,1329
+pyplumio/structures/alerts.py,sha256=9cBzxo1R5erJVeQUdWOmEDG82wXgm7vAU9X6xJjRAjk,3690
 pyplumio/structures/boiler_load.py,sha256=e-6itp9L6iJeeOyhSTiOclHLuYmqG7KkcepsHwJSQSI,894
 pyplumio/structures/boiler_power.py,sha256=7CdOk-pYLEpy06oRBAeichvq8o-a2RcesB0tzo9ccBs,951
 pyplumio/structures/ecomax_parameters.py,sha256=E_s5bO0RqX8p1rM5DtYAsEXcHqS8P6Tg4AGm21cxsnM,1663
@@ -42,22 +42,22 @@ pyplumio/structures/fuel_level.py,sha256=-zUKApVJaZZzc1q52vqO3K2Mya43c6vRgw45d2x
 pyplumio/structures/lambda_sensor.py,sha256=09nM4Hwn1X275LzFpDihtpzkazwgJXAbx4NFqUkhbNM,1609
 pyplumio/structures/mixer_parameters.py,sha256=JMSySqI7TUGKdFtDp1P5DJm5EAbijMSz-orRrAe1KlQ,2041
 pyplumio/structures/mixer_sensors.py,sha256=ChgLhC3p4fyoPy1EKe0BQTvXOPZEISbcK2HyamrNaN8,2450
-pyplumio/structures/modules.py,sha256=LviFz3_pPvSQ5i_Mr2S9o5miVad8O4qn48CR_z7yG24,2791
-pyplumio/structures/network_info.py,sha256=HYhROSMbVxqYxsOa7aF3xetQXEs0xGvhzH-4OHETZVQ,4327
+pyplumio/structures/modules.py,sha256=-8krDmCtrLwP3GvVMe3e-dN8Zbe4R0F1cZZuEo6N2zc,2759
+pyplumio/structures/network_info.py,sha256=g5SkVS8QhUKa-Pt8rxJ5BAbz09hck6-npZb5a8KjIEg,4405
 pyplumio/structures/output_flags.py,sha256=upVIgAH2JNncHFXvjE-t6oTFF-JNwwZbyGjfrcKWtz0,1508
 pyplumio/structures/outputs.py,sha256=3NP5lArzQiihRC4QzBuWAHL9hhjvGxNkKmeoYZnDD-0,2291
 pyplumio/structures/pending_alerts.py,sha256=b1uMmDHTGv8eE0h1vGBrKsPxlwBmUad7HgChnDDLK_g,801
-pyplumio/structures/product_info.py,sha256=Y5Q5UzKcxrixkB3Fd_BZaj1DdUNvUw1XASqR1oKMqn0,3308
-pyplumio/structures/program_version.py,sha256=qHmmPComCOa-dgq7cFAucEGuRS-jWYwWi40VCiPS7cc,2621
+pyplumio/structures/product_info.py,sha256=QEr2x8GAoXCc1_UzdaVWALRdi2ouMrBtGb684OBNgAQ,3255
+pyplumio/structures/program_version.py,sha256=QLe_jFZcUOjWsEXrnXRiueFb4MR0coIGOymTtBiYtyg,2589
 pyplumio/structures/regulator_data.py,sha256=SYKI1YPC3mDAth-SpYejttbD0IzBfobjgC-uy_uUKnw,2333
 pyplumio/structures/regulator_data_schema.py,sha256=0SapbZCGzqAHmHC7dwhufszJ9FNo_ZO_XMrFGNiUe-w,1547
-pyplumio/structures/schedules.py,sha256=SGD9p12G_BVU2PSR1k5AS1cgx_bujFw8rqKSFohtEbc,12052
+pyplumio/structures/schedules.py,sha256=IJ7hxGmLxgCtzGrMncXJBRddbc4quf91Wv_R-Y3ZJXA,11820
 pyplumio/structures/statuses.py,sha256=1h-EUw1UtuS44E19cNOSavUgZeAxsLgX3iS0eVC8pLI,1325
 pyplumio/structures/temperatures.py,sha256=2VD3P_vwp9PEBkOn2-WhifOR8w-UYNq35aAxle0z2Vg,2831
 pyplumio/structures/thermostat_parameters.py,sha256=st3x3HkjQm3hqBrn_fpvPDQu8fuc-Sx33ONB19ViQak,3007
 pyplumio/structures/thermostat_sensors.py,sha256=rO9jTZWGQpThtJqVdbbv8sYMYHxJi4MfwZQza69L2zw,3399
-pyplumio-0.5.56.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
-pyplumio-0.5.56.dist-info/METADATA,sha256=2YzNOAb-PMDVCsLFfR0VLgsPGnQWGzOXL6nzuCTncTk,5617
-pyplumio-0.5.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyplumio-0.5.56.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
-pyplumio-0.5.56.dist-info/RECORD,,
+pyplumio-0.6.0.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
+pyplumio-0.6.0.dist-info/METADATA,sha256=fyZvRedY6toO1OuENZe4ytYtPA0EFJqYb7CJy-Tswlo,5579
+pyplumio-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyplumio-0.6.0.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
+pyplumio-0.6.0.dist-info/RECORD,,