PyPlumIO 0.6.5__tar.gz → 0.6.7__tar.gz

{pyplumio-0.6.5 → pyplumio-0.6.7}/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v4

{pyplumio-0.6.5 → pyplumio-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.6.5
+Version: 0.6.7
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -17,6 +17,7 @@ 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: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
@@ -25,14 +26,14 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.11.3; extra == "test"
+Requires-Dist: coverage==7.12.0; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
-Requires-Dist: mypy==1.18.2; extra == "test"
+Requires-Dist: mypy==1.19.0; 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.2; extra == "test"
-Requires-Dist: pytest-asyncio==1.2.0; extra == "test"
-Requires-Dist: ruff==0.14.4; extra == "test"
+Requires-Dist: pytest==9.0.1; extra == "test"
+Requires-Dist: pytest-asyncio==1.3.0; extra == "test"
+Requires-Dist: ruff==0.14.7; extra == "test"
 Requires-Dist: tox==4.32.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20251001; extra == "test"
 Provides-Extra: docs
@@ -41,7 +42,7 @@ Requires-Dist: sphinx_rtd_theme==3.0.2; extra == "docs"
 Requires-Dist: readthedocs-sphinx-search==0.3.2; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: pyplumio[docs,test]; extra == "dev"
-Requires-Dist: pre-commit==4.4.0; extra == "dev"
+Requires-Dist: pre-commit==4.5.0; extra == "dev"
 Requires-Dist: tomli==2.3.0; extra == "dev"
 Dynamic: license-file
 

{pyplumio-0.6.5 → pyplumio-0.6.7}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.6.5
+Version: 0.6.7
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -17,6 +17,7 @@ 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: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
@@ -25,14 +26,14 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.11.3; extra == "test"
+Requires-Dist: coverage==7.12.0; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
-Requires-Dist: mypy==1.18.2; extra == "test"
+Requires-Dist: mypy==1.19.0; 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.2; extra == "test"
-Requires-Dist: pytest-asyncio==1.2.0; extra == "test"
-Requires-Dist: ruff==0.14.4; extra == "test"
+Requires-Dist: pytest==9.0.1; extra == "test"
+Requires-Dist: pytest-asyncio==1.3.0; extra == "test"
+Requires-Dist: ruff==0.14.7; extra == "test"
 Requires-Dist: tox==4.32.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20251001; extra == "test"
 Provides-Extra: docs
@@ -41,7 +42,7 @@ Requires-Dist: sphinx_rtd_theme==3.0.2; extra == "docs"
 Requires-Dist: readthedocs-sphinx-search==0.3.2; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: pyplumio[docs,test]; extra == "dev"
-Requires-Dist: pre-commit==4.4.0; extra == "dev"
+Requires-Dist: pre-commit==4.5.0; extra == "dev"
 Requires-Dist: tomli==2.3.0; extra == "dev"
 Dynamic: license-file
 

{pyplumio-0.6.5 → pyplumio-0.6.7}/PyPlumIO.egg-info/SOURCES.txt

@@ -61,7 +61,6 @@ pyplumio/frames/responses.py
 pyplumio/helpers/__init__.py
 pyplumio/helpers/async_cache.py
 pyplumio/helpers/event_manager.py
-pyplumio/helpers/factory.py
 pyplumio/helpers/task_manager.py
 pyplumio/parameters/__init__.py
 pyplumio/parameters/ecomax.py
@@ -106,7 +105,6 @@ tests/frames/test_responses.py
 tests/helpers/__init__.py
 tests/helpers/test_async_cache.py
 tests/helpers/test_event_manager.py
-tests/helpers/test_factory.py
 tests/helpers/test_task_manager.py
 tests/helpers/test_uid.py
 tests/parameters/__init__.py

{pyplumio-0.6.5 → pyplumio-0.6.7}/PyPlumIO.egg-info/requires.txt

@@ -2,7 +2,7 @@ pyserial-asyncio==0.6
 
 [dev]
 pyplumio[docs,test]
-pre-commit==4.4.0
+pre-commit==4.5.0
 tomli==2.3.0
 
 [docs]
@@ -12,13 +12,13 @@ readthedocs-sphinx-search==0.3.2
 
 [test]
 codespell==2.4.1
-coverage==7.11.3
+coverage==7.12.0
 freezegun==1.5.5
-mypy==1.18.2
+mypy==1.19.0
 numpy<3.0.0,>=2.0.0
 pyserial-asyncio-fast==0.16
-pytest==8.4.2
-pytest-asyncio==1.2.0
-ruff==0.14.4
+pytest==9.0.1
+pytest-asyncio==1.3.0
+ruff==0.14.7
 tox==4.32.0
 types-pyserial==3.5.0.20251001

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.6.5'
-__version_tuple__ = version_tuple = (0, 6, 5)
+__version__ = version = '0.6.7'
+__version_tuple__ = version_tuple = (0, 6, 7)
 
-__commit_id__ = commit_id = 'g0a7324eaa'
+__commit_id__ = commit_id = 'g6d0ba3b08'

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/connection.py

@@ -7,6 +7,7 @@ import asyncio
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 import logging
+from types import MappingProxyType
 from typing import Any, Final
 
 from serial import EIGHTBITS, PARITY_NONE, STOPBITS_ONE
@@ -122,9 +123,9 @@ class Connection(ABC, TaskManager):
         return self._protocol
 
     @property
-    def options(self) -> dict[str, Any]:
+    def options(self) -> MappingProxyType[str, Any]:
         """Return connection options."""
-        return self._options
+        return MappingProxyType(self._options)
 
     @timeout(TRY_CONNECT_FOR_SECONDS)
     @abstractmethod

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/devices/__init__.py

@@ -14,10 +14,9 @@ from pyplumio.exceptions import RequestError, UnknownDeviceError
 from pyplumio.filters import on_change
 from pyplumio.frames import Frame, Request, is_known_frame_type
 from pyplumio.helpers.event_manager import EventManager, event_listener
-from pyplumio.helpers.factory import create_instance
 from pyplumio.parameters import Numeric, Parameter
 from pyplumio.structures.network_info import NetworkInfo
-from pyplumio.utils import to_camelcase
+from pyplumio.utils import create_instance, to_camelcase
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -131,7 +130,7 @@ class PhysicalDevice(Device, ABC):
     """Represents a physical device.
 
     Physical device have network address and can have multiple
-    virtual devices associated with them via parent property.
+    logical devices associated with them via parent property.
     """
 
     __slots__ = ("address", "_network_info", "_frame_versions")
@@ -222,8 +221,8 @@ class PhysicalDevice(Device, ABC):
         return await create_instance(get_device_handler(device_type), cls=cls, **kwargs)
 
 
-class VirtualDevice(Device, ABC):
-    """Represents a virtual device associated with physical device."""
+class LogicalDevice(Device, ABC):
+    """Represents a logical device associated with physical device."""
 
     __slots__ = ("parent", "index")
 
@@ -258,7 +257,7 @@ def device_handler(
 __all__ = [
     "Device",
     "PhysicalDevice",
-    "VirtualDevice",
+    "LogicalDevice",
     "device_hander",
     "get_device_handler",
     "is_known_device_type",

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/devices/ecomax.py

@@ -43,7 +43,7 @@ from pyplumio.structures.ecomax_parameters import (
 )
 from pyplumio.structures.mixer_parameters import ATTR_MIXER_PARAMETERS
 from pyplumio.structures.network_info import ATTR_NETWORK_INFO, NetworkInfo
-from pyplumio.structures.product_info import ATTR_PRODUCT, ProductInfo
+from pyplumio.structures.product_info import ATTR_PRODUCT
 from pyplumio.structures.regulator_data_schema import ATTR_REGDATA_SCHEMA
 from pyplumio.structures.schedules import (
     ATTR_SCHEDULES,
@@ -142,7 +142,9 @@ class EcoMAX(PhysicalDevice):
     def handle_frame(self, frame: Frame) -> None:
         """Handle frame received from the ecoMAX device."""
         if isinstance(frame, Request) and (
-            response := frame.response(data={ATTR_NETWORK_INFO: self._network_info})
+            response := frame.create_response(
+                data={ATTR_NETWORK_INFO: self._network_info}
+            )
         ):
             self.queue_send(response)
 
@@ -253,10 +255,10 @@ class EcoMAX(PhysicalDevice):
     ) -> bool:
         """Update ecoMAX parameters and dispatch the events."""
         _LOGGER.debug("Received device parameters")
-        product_info: ProductInfo = await self.get(ATTR_PRODUCT)
+        product_info = await self.get(ATTR_PRODUCT)
         parameter_types = await get_ecomax_parameter_types(product_info)
 
-        def _ecomax_parameter_events() -> Generator[Coroutine]:
+        def _ecomax_parameter_events() -> Generator[Coroutine[Any, Any, None]]:
             """Get dispatch calls for ecoMAX parameter events."""
             for index, values in parameters:
                 try:
@@ -333,7 +335,7 @@ class EcoMAX(PhysicalDevice):
     ) -> bool:
         """Update schedule parameters and dispatch the events."""
 
-        def _schedule_parameter_events() -> Generator[Coroutine]:
+        def _schedule_parameter_events() -> Generator[Coroutine[Any, Any, None]]:
             """Get dispatch calls for schedule parameter events."""
             for index, values in parameters:
                 description = SCHEDULE_PARAMETERS[index]

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/devices/mixer.py

@@ -7,7 +7,7 @@ from collections.abc import Coroutine, Generator
 import logging
 from typing import Any
 
-from pyplumio.devices import VirtualDevice
+from pyplumio.devices import LogicalDevice
 from pyplumio.helpers.event_manager import event_listener
 from pyplumio.parameters import ParameterValues
 from pyplumio.parameters.mixer import (
@@ -16,12 +16,12 @@ from pyplumio.parameters.mixer import (
     MixerSwitchDescription,
     get_mixer_parameter_types,
 )
-from pyplumio.structures.product_info import ATTR_PRODUCT, ProductInfo
+from pyplumio.structures.product_info import ATTR_PRODUCT
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class Mixer(VirtualDevice):
+class Mixer(LogicalDevice):
     """Represents a mixer."""
 
     __slots__ = ()
@@ -41,10 +41,10 @@ class Mixer(VirtualDevice):
     ) -> bool:
         """Update mixer parameters and dispatch the events."""
         _LOGGER.debug("Received mixer %i parameters", self.index)
-        product_info: ProductInfo = await self.parent.get(ATTR_PRODUCT)
+        product_info = await self.parent.get(ATTR_PRODUCT)
         parameter_types = get_mixer_parameter_types(product_info)
 
-        def _mixer_parameter_events() -> Generator[Coroutine]:
+        def _mixer_parameter_events() -> Generator[Coroutine[Any, Any, None]]:
             """Get dispatch calls for mixer parameter events."""
             for index, values in parameters:
                 try:

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/devices/thermostat.py

@@ -7,7 +7,7 @@ from collections.abc import Coroutine, Generator
 import logging
 from typing import Any
 
-from pyplumio.devices import VirtualDevice
+from pyplumio.devices import LogicalDevice
 from pyplumio.helpers.event_manager import event_listener
 from pyplumio.parameters import ParameterValues
 from pyplumio.parameters.thermostat import (
@@ -20,7 +20,7 @@ from pyplumio.parameters.thermostat import (
 _LOGGER = logging.getLogger()
 
 
-class Thermostat(VirtualDevice):
+class Thermostat(LogicalDevice):
     """Represents a thermostat."""
 
     __slots__ = ()
@@ -42,7 +42,7 @@ class Thermostat(VirtualDevice):
         _LOGGER.debug("Received thermostat %i parameters", self.index)
         parameter_types = get_thermostat_parameter_types()
 
-        def _thermostat_parameter_events() -> Generator[Coroutine]:
+        def _thermostat_parameter_events() -> Generator[Coroutine[Any, Any, None]]:
             """Get dispatch calls for thermostat parameter events."""
             for index, values in parameters:
                 description = parameter_types[index]

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/filters.py

@@ -69,7 +69,7 @@ DEFAULT_TOLERANCE: Final = 1e-6
 
 
 @overload
-def is_close(old: Parameter, new: Parameter, *, tolerance: None = None) -> bool: ...
+def is_close(old: Parameter, new: Parameter) -> bool: ...
 
 
 @overload
@@ -79,9 +79,7 @@ def is_close(
 
 
 @overload
-def is_close(
-    old: SupportsComparison, new: SupportsComparison, *, tolerance: None = None
-) -> bool: ...
+def is_close(old: SupportsComparison, new: SupportsComparison) -> bool: ...
 
 
 def is_close(
@@ -100,6 +98,9 @@ def is_close(
     return old.__eq__(new)
 
 
+_SubtractableT = TypeVar("_SubtractableT", list, SupportsSubtraction)
+
+
 @overload
 def diffence_between(old: list, new: list) -> list: ...
 
@@ -110,9 +111,7 @@ def diffence_between(
 ) -> SupportsSubtraction: ...
 
 
-def diffence_between(
-    old: SupportsSubtraction | list, new: SupportsSubtraction | list
-) -> SupportsSubtraction | list | None:
+def diffence_between(old: _SubtractableT, new: _SubtractableT) -> Any:
     """Return a difference between values."""
     if isinstance(old, list) and isinstance(new, list):
         return [x for x in new if x not in old]
@@ -120,7 +119,7 @@ def diffence_between(
     if isinstance(old, SupportsSubtraction) and isinstance(new, SupportsSubtraction):
         return new.__sub__(old)
 
-    return None
+    return NotImplemented
 
 
 _Numeric: TypeAlias = float | int | Decimal | Number
@@ -172,6 +171,11 @@ class Filter(ABC):
 
         return NotImplemented
 
+    @property
+    def __name__(self) -> str:
+        """Return a callback name."""
+        return self._callback.__name__
+
     @abstractmethod
     async def __call__(self, new_value: Any) -> Any:
         """Set a new value for the callback."""
@@ -536,7 +540,8 @@ class _Delta(ComparisonFilter):
         if self.is_undefined() or not is_close(self.value, new_value):
             old_value = self.value
             self.value = new_value
-            if (difference := diffence_between(old_value, new_value)) is not None:
+            difference = diffence_between(old_value, new_value)
+            if difference is not NotImplemented:
                 return await self._callback(difference)
 
 

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/frames/__init__.py

@@ -10,8 +10,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Final, TypeVar
 
 from pyplumio.const import DeviceType, FrameType
 from pyplumio.exceptions import UnknownFrameError
-from pyplumio.helpers.factory import create_instance
-from pyplumio.utils import ensure_dict, to_camelcase
+from pyplumio.utils import create_instance, ensure_dict, to_camelcase
 
 if TYPE_CHECKING:
     from pyplumio.structures import Structure
@@ -243,11 +242,29 @@ class Frame(ABC):
         """Decode a frame message."""
 
 
+def frame_handler(
+    frame_type: FrameType, structure: type[Structure] | None = None
+) -> Callable[[type[_FrameT]], type[_FrameT]]:
+    """Specify frame type for the frame class."""
+
+    def wrapper(cls: type[_FrameT]) -> type[_FrameT]:
+        """Wrap the frame class."""
+        setattr(cls, "frame_type", frame_type)
+        if structure and issubclass(cls, Response):
+            setattr(cls, "structures", (structure,))
+
+        return cls
+
+    return wrapper
+
+
 class Request(Frame):
     """Represents a request."""
 
     __slots__ = ()
 
+    response: ClassVar[type[Response]]
+
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
         return bytearray()
@@ -256,38 +273,47 @@ class Request(Frame):
         """Decode a frame message."""
         return {}
 
-    def response(self, **kwargs: Any) -> Response | None:
-        """Return a response frame."""
+    def create_response(self, **kwargs: Any) -> Response | None:
+        """Create response frame."""
+        if hasattr(self, "response"):
+            return self.response(recipient=self.sender, **kwargs)
+
         return None
 
+    def validate_response(self, response: Response) -> bool:
+        """Validate if response is valid for the request."""
+        if not hasattr(self, "response"):
+            raise NotImplementedError
 
-class Response(Frame):
-    """Represents a response."""
+        if isinstance(response, self.response):
+            return True
 
-    __slots__ = ()
+        return False
 
-    def create_message(self, data: dict[str, Any]) -> bytearray:
-        """Create a frame message."""
-        return bytearray()
 
-    def decode_message(self, message: bytearray) -> dict[str, Any]:
-        """Decode a frame message."""
-        return {}
+_RequestT = TypeVar("_RequestT", bound=Request)
 
 
-class Message(Response):
-    """Represents a message."""
+def expect_response(
+    response: type[Response],
+) -> Callable[[type[_RequestT]], type[_RequestT]]:
+    """Assign response to the request class."""
 
-    __slots__ = ()
+    def wrapper(cls: type[_RequestT]) -> type[_RequestT]:
+        """Wrap the request class."""
+        setattr(cls, "response", response)
+        return cls
 
+    return wrapper
 
-class Structured(Frame):
-    """Represents a frame that has known structure."""
+
+class Response(Frame):
+    """Represents a response."""
 
     __slots__ = ("_structures",)
 
     container: ClassVar[str]
-    structures: ClassVar[list[type[Structure]]]
+    structures: ClassVar[list[type[Structure]]] = []
 
     _structures: list[Structure]
 
@@ -302,9 +328,7 @@ class Structured(Frame):
         **kwargs: Any,
     ) -> None:
         """Initialize a new structured frame."""
-        if hasattr(self, "structures"):
-            self._structures = [structure(self) for structure in self.structures]
-
+        self._structures = [structure(self) for structure in self.structures]
         super().__init__(
             recipient, sender, econet_type, econet_version, message, data, **kwargs
         )
@@ -330,28 +354,18 @@ class Structured(Frame):
         return data
 
 
-def frame_handler(
-    frame_type: FrameType, structure: type[Structure] | None = None
-) -> Callable[[type[_FrameT]], type[_FrameT]]:
-    """Specify frame type for the frame class."""
-
-    def wrapper(cls: type[_FrameT]) -> type[_FrameT]:
-        """Wrap the frame class."""
-        setattr(cls, "frame_type", frame_type)
-        if structure and issubclass(cls, Structured):
-            setattr(cls, "structures", (structure,))
-
-        return cls
+class Message(Response):
+    """Represents a message."""
 
-    return wrapper
+    __slots__ = ()
 
 
-_StructuredT = TypeVar("_StructuredT", bound=Structured)
+_ResponseT = TypeVar("_ResponseT", bound=Response)
 
 
 def contains(
     *structures: type[Structure], container: str | None = None
-) -> Callable[[type[_StructuredT]], type[_StructuredT]]:
+) -> Callable[[type[_ResponseT]], type[_ResponseT]]:
     """Decorate frame class with structure.
 
     Indicate which structures need to be used for encoding/decoding
@@ -359,7 +373,7 @@ def contains(
     a single key.
     """
 
-    def wrapper(cls: type[_StructuredT]) -> type[_StructuredT]:
+    def wrapper(cls: type[_ResponseT]) -> type[_ResponseT]:
         """Wrap the frame class."""
         setattr(cls, "structures", structures)
         if container:
@@ -375,9 +389,9 @@ __all__ = [
     "Request",
     "Response",
     "Message",
-    "Structured",
     "bcc",
     "contains",
+    "expect_response",
     "frame_handler",
     "get_frame_handler",
     "is_known_frame_type",

{pyplumio-0.6.5 → pyplumio-0.6.7}/pyplumio/frames/messages.py

@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 from pyplumio.const import ATTR_SENSORS, FrameType
-from pyplumio.frames import Message, Structured, contains, frame_handler
+from pyplumio.frames import Message, contains, frame_handler
 from pyplumio.structures.frame_versions import FrameVersionsStructure
 from pyplumio.structures.regulator_data import RegulatorDataStructure
 from pyplumio.structures.sensor_data import SensorDataStructure
 
 
 @frame_handler(FrameType.MESSAGE_REGULATOR_DATA, structure=RegulatorDataStructure)
-class RegulatorDataMessage(Structured, Message):
+class RegulatorDataMessage(Message):
     """Represents a regulator data message."""
 
     __slots__ = ()
@@ -18,7 +18,7 @@ class RegulatorDataMessage(Structured, Message):
 
 @frame_handler(FrameType.MESSAGE_SENSOR_DATA)
 @contains(FrameVersionsStructure, SensorDataStructure, container=ATTR_SENSORS)
-class SensorDataMessage(Structured, Message):
+class SensorDataMessage(Message):
     """Represents a sensor data message."""
 
     __slots__ = ()