From e6fec761eb9d9623eba3f428ddf3939a4dc6e742 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 21 Jan 2025 18:06:39 +0100 Subject: [PATCH 1/8] Remove Protocol typing --- plugwise_usb/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugwise_usb/api.py b/plugwise_usb/api.py index 3aa54ab96..93eda01d5 100644 --- a/plugwise_usb/api.py +++ b/plugwise_usb/api.py @@ -5,7 +5,7 @@ from datetime import datetime from enum import Enum, auto import logging -from typing import Any, Protocol +from typing import Any _LOGGER = logging.getLogger(__name__) @@ -227,7 +227,7 @@ class EnergyStatistics: week_production_reset: datetime | None = None -class PlugwiseNode(Protocol): +class PlugwiseNode: """Protocol definition of a Plugwise device node.""" def __init__( From f6967fd6b804c9d41b41488b027475b64876309b Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 21 Jan 2025 18:52:58 +0100 Subject: [PATCH 2/8] Fix CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc2295cd7..deb700187 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## v0.40.0 (a22) - - Correcting messageflow to HA +- Correcting messageflow to HA ## v0.40.0 (a4) From d051f5008d58b97b8a0c5374dc6ac5041da0d47f Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Fri, 31 Jan 2025 18:52:06 +0100 Subject: [PATCH 3/8] Set to v0.40.0a23 test-version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d1b6c2c94..ed8328976 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise_usb" -version = "v0.40.0a22" +version = "v0.40.0a23" license = {file = "LICENSE"} description = "Plugwise USB (Stick) module for Python 3." readme = "README.md" From 46f065b55b3fe0bb35498680f8282325ff143171 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 2 Feb 2025 13:51:03 +0100 Subject: [PATCH 4/8] Try alternative solution --- plugwise_usb/api.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/plugwise_usb/api.py b/plugwise_usb/api.py index 93eda01d5..4cb81e252 100644 --- a/plugwise_usb/api.py +++ b/plugwise_usb/api.py @@ -5,7 +5,7 @@ from datetime import datetime from enum import Enum, auto import logging -from typing import Any +from typing import Any, Protocol _LOGGER = logging.getLogger(__name__) @@ -227,17 +227,9 @@ class EnergyStatistics: week_production_reset: datetime | None = None -class PlugwiseNode: +class PlugwiseNode(Protocol): """Protocol definition of a Plugwise device node.""" - def __init__( - self, - mac: str, - address: int, - loaded_callback: Callable[[NodeEvent, str], Awaitable[None]], - ) -> None: - """Initialize plugwise node object.""" - # region Generic node properties @property def features(self) -> tuple[NodeFeature, ...]: From b2636bc04c72017d68fb268393cb779403784491 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 2 Feb 2025 13:51:28 +0100 Subject: [PATCH 5/8] Set to a25 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ed8328976..bd170ae6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise_usb" -version = "v0.40.0a23" +version = "v0.40.0a25" license = {file = "LICENSE"} description = "Plugwise USB (Stick) module for Python 3." readme = "README.md" From ad978a11f15a6ea626176f84d2fd0bb4cca753b4 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 2 Feb 2025 13:57:36 +0100 Subject: [PATCH 6/8] Remove unused imports --- plugwise_usb/api.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugwise_usb/api.py b/plugwise_usb/api.py index 4cb81e252..bbbfdaa6c 100644 --- a/plugwise_usb/api.py +++ b/plugwise_usb/api.py @@ -1,6 +1,5 @@ """Plugwise USB-Stick API.""" -from collections.abc import Awaitable, Callable from dataclasses import dataclass from datetime import datetime from enum import Enum, auto From 4aca1cb1af334ff5ee1e2ba2a33dbb3afbde3219 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 2 Feb 2025 12:19:30 +0100 Subject: [PATCH 7/8] Set receiver-logger to info --- plugwise_usb/connection/receiver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise_usb/connection/receiver.py b/plugwise_usb/connection/receiver.py index 917537afb..950bc70f3 100644 --- a/plugwise_usb/connection/receiver.py +++ b/plugwise_usb/connection/receiver.py @@ -468,7 +468,7 @@ async def _notify_node_response_subscribers( self._node_subscription_lock.release() if len(notify_tasks) > 0: - _LOGGER.debug("Received %s %s", node_response, node_response.seq_id) + _LOGGER.info("Received %s %s", node_response, node_response.seq_id) if node_response.seq_id not in BROADCAST_IDS: self._last_processed_messages.append(node_response.seq_id) # Limit tracking to only the last appended request (FIFO) From cac9c9f09d2efb81f9f61a8e058ee74fb0cd264a Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 2 Feb 2025 14:35:31 +0100 Subject: [PATCH 8/8] Set to a26 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bd170ae6d..7b32870c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise_usb" -version = "v0.40.0a25" +version = "v0.40.0a26" license = {file = "LICENSE"} description = "Plugwise USB (Stick) module for Python 3." readme = "README.md"