PyPlumIO 0.5.17__tar.gz → 0.5.18__tar.gz

{pyplumio-0.5.17 → pyplumio-0.5.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.17
+Version: 0.5.18
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -25,12 +25,12 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.2.6; extra == "test"
-Requires-Dist: coverage==7.5.0; extra == "test"
-Requires-Dist: mypy==1.9.0; extra == "test"
+Requires-Dist: coverage==7.5.1; extra == "test"
+Requires-Dist: mypy==1.10.0; extra == "test"
 Requires-Dist: pyserial-asyncio-fast==0.11; extra == "test"
 Requires-Dist: pytest==8.2.0; extra == "test"
 Requires-Dist: pytest-asyncio==0.23.6; extra == "test"
-Requires-Dist: ruff==0.4.2; extra == "test"
+Requires-Dist: ruff==0.4.3; extra == "test"
 Requires-Dist: tox==4.15.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20240311; extra == "test"
 Provides-Extra: docs

{pyplumio-0.5.17 → pyplumio-0.5.18}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.17
+Version: 0.5.18
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -25,12 +25,12 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.2.6; extra == "test"
-Requires-Dist: coverage==7.5.0; extra == "test"
-Requires-Dist: mypy==1.9.0; extra == "test"
+Requires-Dist: coverage==7.5.1; extra == "test"
+Requires-Dist: mypy==1.10.0; extra == "test"
 Requires-Dist: pyserial-asyncio-fast==0.11; extra == "test"
 Requires-Dist: pytest==8.2.0; extra == "test"
 Requires-Dist: pytest-asyncio==0.23.6; extra == "test"
-Requires-Dist: ruff==0.4.2; extra == "test"
+Requires-Dist: ruff==0.4.3; extra == "test"
 Requires-Dist: tox==4.15.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20240311; extra == "test"
 Provides-Extra: docs

{pyplumio-0.5.17 → pyplumio-0.5.18}/PyPlumIO.egg-info/requires.txt

@@ -12,11 +12,11 @@ readthedocs-sphinx-search==0.3.2
 
 [test]
 codespell==2.2.6
-coverage==7.5.0
-mypy==1.9.0
+coverage==7.5.1
+mypy==1.10.0
 pyserial-asyncio-fast==0.11
 pytest==8.2.0
 pytest-asyncio==0.23.6
-ruff==0.4.2
+ruff==0.4.3
 tox==4.15.0
 types-pyserial==3.5.0.20240311

{pyplumio-0.5.17 → pyplumio-0.5.18}/docs/source/schedules.rst

@@ -55,7 +55,7 @@ switches back to daytime mode from 07:00 to 00:00.
     heating_schedule = schedules["heating"]
     heating_schedule.monday.set_off(start="00:00", end="07:00")
     heating_schedule.monday.set_on(start="07:00", end="00:00")
-    heating_schedule.commit()
+    await heating_schedule.commit()
 
 For clarity sake, you might want to use ``STATE_NIGHT`` and
 ``STATE_DAY`` constants from ``pyplumio.helpers.schedule`` module.
@@ -99,7 +99,7 @@ Schedule object:
         weekday.set_off("07:00", "00:00")
 
     # Commit changes to the device.
-    heating_schedule.commit()
+    await heating_schedule.commit()
 
 Schedule Examples
 -----------------
@@ -131,7 +131,7 @@ Schedule Examples
             # There will be no nighttime mode on sunday.
             heating_schedule.sunday.set_state(STATE_DAY)
             
-            heating_schedule.commit()
+            await heating_schedule.commit()
 
 
     asyncio.run(main())

{pyplumio-0.5.17 → pyplumio-0.5.18}/pyplumio/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.17'
-__version_tuple__ = version_tuple = (0, 5, 17)
+__version__ = version = '0.5.18'
+__version_tuple__ = version_tuple = (0, 5, 18)

{pyplumio-0.5.17 → pyplumio-0.5.18}/pyplumio/helpers/factory.py

@@ -2,21 +2,26 @@
 from __future__ import annotations
 
 import asyncio
-from importlib import import_module
+import importlib
 import logging
+from types import ModuleType
 from typing import Any
 
 _LOGGER = logging.getLogger(__name__)
 
 
+async def _load_module(module_name: str) -> ModuleType:
+    """Load a module by name."""
+    return await asyncio.get_running_loop().run_in_executor(
+        None, importlib.import_module, f".{module_name}", "pyplumio"
+    )
+
+
 async def create_instance(class_path: str, **kwargs: Any) -> Any:
     """Return a class instance from the class path."""
-    loop = asyncio.get_running_loop()
     module_name, class_name = class_path.rsplit(".", 1)
     try:
-        module = await loop.run_in_executor(
-            None, import_module, "." + module_name, "pyplumio"
-        )
+        module = await _load_module(module_name)
         return getattr(module, class_name)(**kwargs)
     except Exception:
         _LOGGER.error("Failed to load module (%s)", class_path)

{pyplumio-0.5.17 → pyplumio-0.5.18}/pyplumio/helpers/schedule.py

@@ -9,7 +9,7 @@ from typing import Final, Literal
 
 from pyplumio.const import STATE_OFF, STATE_ON
 from pyplumio.devices import AddressableDevice
-from pyplumio.frames.requests import SetScheduleRequest
+from pyplumio.helpers.factory import create_instance
 from pyplumio.structures.schedules import collect_schedule_data
 
 TIME_FORMAT: Final = "%H:%M"
@@ -158,11 +158,11 @@ class Schedule(Iterable):
             self.saturday,
         ).__iter__()
 
-    def commit(self) -> None:
+    async def commit(self) -> None:
         """Commit a weekly schedule to the device."""
-        self.device.queue.put_nowait(
-            SetScheduleRequest(
-                recipient=self.device.address,
-                data=collect_schedule_data(self.name, self.device),
-            )
+        request = await create_instance(
+            "frames.requests.SetScheduleRequest",
+            recipient=self.device.address,
+            data=collect_schedule_data(self.name, self.device),
         )
+        await self.device.queue.put(request)

{pyplumio-0.5.17 → pyplumio-0.5.18}/pyplumio/protocol.py

@@ -233,9 +233,10 @@ class AsyncProtocol(Protocol, EventManager):
     async def get_device_entry(self, device_type: DeviceType) -> AddressableDevice:
         """Set up device entry."""
         handler, name = get_device_handler_and_name(device_type)
-        return self.data.setdefault(
-            name, await self._create_device_entry(name, handler)
-        )
+        if name not in self.data:
+            self.data[name] = await self._create_device_entry(name, handler)
+
+        return self.data[name]
 
     async def _create_device_entry(self, name: str, handler: str) -> AddressableDevice:
         """Create device entry."""

{pyplumio-0.5.17 → pyplumio-0.5.18}/pyplumio/structures/ecomax_parameters.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from collections.abc import Generator
 from dataclasses import dataclass
-from typing import Any, Final
+from typing import Any, Final, cast
 
 from pyplumio.const import (
     ATTR_INDEX,
@@ -47,37 +47,27 @@ class EcomaxParameter(Parameter):
     async def create_request(self) -> Request:
         """Create a request to change the parameter."""
         if self.description.name == ATTR_ECOMAX_CONTROL:
-            request: Request = await create_instance(
-                "frames.requests.EcomaxControlRequest",
-                recipient=self.device.address,
-                data={
-                    ATTR_VALUE: self.values.value,
-                },
-            )
-
+            cls = "frames.requests.EcomaxControlRequest"
+            data = {ATTR_VALUE: self.values.value}
         elif self.description.name == ATTR_THERMOSTAT_PROFILE:
-            request = await create_instance(
-                "frames.requests.SetThermostatParameterRequest",
-                recipient=self.device.address,
-                data={
-                    ATTR_INDEX: self._index,
-                    ATTR_VALUE: self.values.value,
-                    ATTR_OFFSET: 0,
-                    ATTR_SIZE: 1,
-                },
-            )
-
+            cls = "frames.requests.SetThermostatParameterRequest"
+            data = {
+                ATTR_INDEX: self._index,
+                ATTR_VALUE: self.values.value,
+                ATTR_OFFSET: 0,
+                ATTR_SIZE: 1,
+            }
         else:
-            request = await create_instance(
-                "frames.requests.SetEcomaxParameterRequest",
-                recipient=self.device.address,
-                data={
-                    ATTR_INDEX: self._index,
-                    ATTR_VALUE: self.values.value,
-                },
-            )
-
-        return request
+            cls = "frames.requests.SetEcomaxParameterRequest"
+            data = {
+                ATTR_INDEX: self._index,
+                ATTR_VALUE: self.values.value,
+            }
+
+        return cast(
+            Request,
+            await create_instance(cls, recipient=self.device.address, data=data),
+        )
 
     async def set(self, value: ParameterValueType, retries: int = 5) -> bool:
         """Set a parameter value."""

{pyplumio-0.5.17 → pyplumio-0.5.18}/pyproject.toml

@@ -33,12 +33,12 @@ dynamic = ["version"]
 [project.optional-dependencies]
 test = [
     "codespell==2.2.6",
-    "coverage==7.5.0",
-    "mypy==1.9.0",
+    "coverage==7.5.1",
+    "mypy==1.10.0",
     "pyserial-asyncio-fast==0.11",
     "pytest==8.2.0",
     "pytest-asyncio==0.23.6",
-    "ruff==0.4.2",
+    "ruff==0.4.3",
     "tox==4.15.0",
     "types-pyserial==3.5.0.20240311"
 ]

{pyplumio-0.5.17 → pyplumio-0.5.18}/requirements_test.txt

@@ -1,11 +1,11 @@
 codespell==2.2.6
-coverage==7.5.0
-mypy==1.9.0
+coverage==7.5.1
+mypy==1.10.0
 pre-commit==3.7.0
 pyserial-asyncio-fast==0.11
 pytest==8.2.0
 pytest-asyncio==0.23.6
-ruff==0.4.2
+ruff==0.4.3
 tomli==2.0.1
 tox==4.15.0
 types-pyserial==3.5.0.20240311

{pyplumio-0.5.17 → pyplumio-0.5.18}/tests/helpers/test_schedule.py

@@ -100,8 +100,8 @@ def test_schedule(schedule: Schedule) -> None:
     assert next(schedule_iter)[0]
 
 
-@patch("pyplumio.helpers.schedule.SetScheduleRequest")
-def test_schedule_commit(mock_set_schedule_request, schedule: Schedule) -> None:
+@patch("pyplumio.helpers.schedule.create_instance")
+async def test_schedule_commit(mock_create_instance, schedule: Schedule) -> None:
     """Test committing a schedule."""
     schedule.device = Mock(spec=Device)
     schedule.device.address = DeviceType.ECOMAX
@@ -112,8 +112,9 @@ def test_schedule_commit(mock_set_schedule_request, schedule: Schedule) -> None:
     }
     schedule.device.queue = Mock(spec=asyncio.Queue)
 
-    schedule.commit()
-    mock_set_schedule_request.assert_called_once_with(
+    await schedule.commit()
+    mock_create_instance.assert_awaited_once_with(
+        "frames.requests.SetScheduleRequest",
         recipient=DeviceType.ECOMAX,
         data={
             ATTR_TYPE: "test",