Merge pull request #255 from plugwise/clear-cache

Improve enery-logs reset process, enable use of a button in plugwise_usb beta

Author: bouwew

.gitignore

@@ -9,6 +9,7 @@ __pycache__
 .idea
 tests/__pycache__
 .coverage
+.python-version
 .vscode
 venv
 .venv

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
-## Ongoing
+## v0.44.4
 
+- PR [#255](https://github.com/plugwise/python-plugwise-usb/pull/255): Improve enery-logs reset process, enable use of a button in Plugwise_usb beta
 - PR [#261](https://github.com/plugwise/python-plugwise-usb/pull/261): Sense: bugfix parsing of humidity value as an unsigned int
 - PR #263 Maintenance chores and re-instatement of ruff, deprecate pre-commit cloud runs (just leveraging renovate)
 - PR #264 Maintenance chores Rework Github Actions workflow

plugwise_usb/__init__.py

@@ -14,7 +14,6 @@
 
 from .api import NodeEvent, PlugwiseNode, StickEvent
 from .connection import StickController
-from .constants import DEFAULT_CONS_INTERVAL, NO_PRODUCTION_INTERVAL
 from .exceptions import MessageError, NodeError, StickError, SubscriptionError
 from .network import StickNetwork
 
@@ -177,22 +176,6 @@ def port(self, port: str) -> None:
 
         self._port = port
 
-    async def energy_reset_request(self, mac: str) -> bool:
-        """Send an energy-reset request to a Node."""
-        _LOGGER.debug("Resetting energy logs for %s", mac)
-        try:
-            await self._network.energy_reset_request(mac)
-        except (MessageError, NodeError) as exc:
-            raise NodeError(f"{exc}") from exc
-
-        # Follow up by an energy-intervals (re)set
-        if result := await self.set_energy_intervals(
-            mac, DEFAULT_CONS_INTERVAL, NO_PRODUCTION_INTERVAL
-        ):
-            return result
-
-        return False
-
     async def set_energy_intervals(
         self, mac: str, cons_interval: int, prod_interval: int
     ) -> bool:

plugwise_usb/api.py

@@ -41,6 +41,7 @@ class NodeFeature(str, Enum):
 
     AVAILABLE = "available"
     BATTERY = "battery"
+    CIRCLE = "circle"
     CIRCLEPLUS = "circleplus"
     ENERGY = "energy"
     HUMIDITY = "humidity"
@@ -78,13 +79,14 @@ class NodeType(Enum):
 PUSHING_FEATURES = (
     NodeFeature.AVAILABLE,
     NodeFeature.BATTERY,
+    NodeFeature.CIRCLE,
+    NodeFeature.CIRCLEPLUS,
     NodeFeature.HUMIDITY,
     NodeFeature.MOTION,
     NodeFeature.MOTION_CONFIG,
     NodeFeature.TEMPERATURE,
     NodeFeature.SENSE,
     NodeFeature.SWITCH,
-    NodeFeature.CIRCLEPLUS,
 )
 
 

plugwise_usb/network/__init__.py

@@ -6,7 +6,7 @@
 
 from asyncio import Task, create_task, gather, sleep
 from collections.abc import Callable, Coroutine
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta
 import logging
 from typing import Any
 
@@ -15,11 +15,7 @@
 from ..constants import ENERGY_NODE_TYPES, UTF8
 from ..exceptions import CacheError, MessageError, NodeError, StickError, StickTimeout
 from ..helpers.util import validate_mac
-from ..messages.requests import (
-    CircleClockSetRequest,
-    CircleMeasureIntervalRequest,
-    NodePingRequest,
-)
+from ..messages.requests import CircleMeasureIntervalRequest, NodePingRequest
 from ..messages.responses import (
     NODE_AWAKE_RESPONSE_ID,
     NODE_JOIN_ID,
@@ -524,25 +520,6 @@ async def stop(self) -> None:
 
     # endregion
 
-    async def energy_reset_request(self, mac: str) -> None:
-        """Send an energy-reset to a Node."""
-        self._validate_energy_node(mac)
-        node_protocols = self._nodes[mac].node_protocols
-        request = CircleClockSetRequest(
-            self._controller.send,
-            bytes(mac, UTF8),
-            datetime.now(tz=UTC),
-            node_protocols.max,
-            True,
-        )
-        if (response := await request.send()) is None:
-            raise NodeError(f"Energy-reset for {mac} failed")
-
-        if response.ack_id != NodeResponseType.CLOCK_ACCEPTED:
-            raise MessageError(
-                f"Unexpected NodeResponseType {response.ack_id!r} received as response to CircleClockSetRequest"
-            )
-
     async def set_energy_intervals(
         self, mac: str, consumption: int, production: int
     ) -> None: