Apply priority to response messages too

Author: brefra

plugwise_usb/messages/__init__.py

@@ -2,15 +2,25 @@
 
 from __future__ import annotations
 
+from enum import Enum
 from typing import Any
 
 from ..constants import MESSAGE_FOOTER, MESSAGE_HEADER, UTF8
 from ..helpers.util import crc_fun
 
+class Priority(int, Enum):
+    """Message priority levels for USB-stick message requests."""
+
+    CANCEL = 0
+    HIGH = 1
+    MEDIUM = 2
+    LOW = 3
 
 class PlugwiseMessage:
     """Plugwise message base class."""
 
+    priority: Priority = Priority.MEDIUM
+
     def __init__(self, identifier: bytes) -> None:
         """Initialize a plugwise message."""
         self._identifier = identifier
@@ -59,3 +69,35 @@ def serialize(self) -> bytes:
     def calculate_checksum(data: bytes) -> bytes:
         """Calculate crc checksum."""
         return bytes("%04X" % crc_fun(data), UTF8)
+
+    def __gt__(self, other: PlugwiseMessage) -> bool:
+        """Greater than."""
+        if self.priority.value == other.priority.value:
+            return self.timestamp > other.timestamp
+        if self.priority.value < other.priority.value:
+            return True
+        return False
+
+    def __lt__(self, other: PlugwiseMessage) -> bool:
+        """Less than."""
+        if self.priority.value == other.priority.value:
+            return self.timestamp < other.timestamp
+        if self.priority.value > other.priority.value:
+            return True
+        return False
+
+    def __ge__(self, other: PlugwiseMessage) -> bool:
+        """Greater than or equal."""
+        if self.priority.value == other.priority.value:
+            return self.timestamp >= other.timestamp
+        if self.priority.value < other.priority.value:
+            return True
+        return False
+
+    def __le__(self, other: PlugwiseMessage) -> bool:
+        """Less than or equal."""
+        if self.priority.value == other.priority.value:
+            return self.timestamp <= other.timestamp
+        if self.priority.value > other.priority.value:
+            return True
+        return False

plugwise_usb/messages/requests.py

@@ -5,7 +5,6 @@
 from collections.abc import Callable
 from copy import copy
 from datetime import UTC, datetime
-from enum import Enum
 import logging
 
 from ..constants import (
@@ -19,7 +18,7 @@
 )
 from ..exceptions import MessageError, NodeError, NodeTimeout, StickError, StickTimeout
 from ..messages.responses import PlugwiseResponse, StickResponse, StickResponseType
-from . import PlugwiseMessage
+from . import PlugwiseMessage, Priority
 from .properties import (
     DateTime,
     Int,
@@ -34,20 +33,10 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-class Priority(int, Enum):
-    """Message priority levels for USB-stick message requests."""
-
-    CANCEL = 0
-    HIGH = 1
-    MEDIUM = 2
-    LOW = 3
-
-
 class PlugwiseRequest(PlugwiseMessage):
     """Base class for request messages to be send from by USB-Stick."""
 
     arguments: list = []
-    priority: Priority = Priority.MEDIUM
 
     def __init__(
         self,
@@ -260,38 +249,6 @@ def add_send_attempt(self):
         """Increase the number of retries."""
         self._send_counter += 1
 
-    def __gt__(self, other: PlugwiseRequest) -> bool:
-        """Greater than."""
-        if self.priority.value == other.priority.value:
-            return self.timestamp > other.timestamp
-        if self.priority.value < other.priority.value:
-            return True
-        return False
-
-    def __lt__(self, other: PlugwiseRequest) -> bool:
-        """Less than."""
-        if self.priority.value == other.priority.value:
-            return self.timestamp < other.timestamp
-        if self.priority.value > other.priority.value:
-            return True
-        return False
-
-    def __ge__(self, other: PlugwiseRequest) -> bool:
-        """Greater than or equal."""
-        if self.priority.value == other.priority.value:
-            return self.timestamp >= other.timestamp
-        if self.priority.value < other.priority.value:
-            return True
-        return False
-
-    def __le__(self, other: PlugwiseRequest) -> bool:
-        """Less than or equal."""
-        if self.priority.value == other.priority.value:
-            return self.timestamp <= other.timestamp
-        if self.priority.value > other.priority.value:
-            return True
-        return False
-
 
 class StickNetworkInfoRequest(PlugwiseRequest):
     """Request network information.

plugwise_usb/messages/responses.py

@@ -8,7 +8,7 @@
 from ..api import NodeType
 from ..constants import MESSAGE_FOOTER, MESSAGE_HEADER, UTF8
 from ..exceptions import MessageError
-from . import PlugwiseMessage
+from . import PlugwiseMessage, Priority
 from .properties import (
     BaseType,
     DateTime,
@@ -227,6 +227,7 @@ class StickResponse(PlugwiseResponse):
     def __init__(self) -> None:
         """Initialize StickResponse message object."""
         super().__init__(b"0000", decode_ack=True, decode_mac=False)
+        self.priority = Priority.HIGH
 
     def __repr__(self) -> str:
         """Convert request into writable str."""
@@ -787,6 +788,7 @@ def __init__(self) -> None:
         super().__init__(NODE_AWAKE_RESPONSE_ID)
         self._awake_type = Int(0, 2, False)
         self._params += [self._awake_type]
+        self.priority = Priority.HIGH
 
     @property
     def awake_type(self) -> NodeAwakeResponseType:
@@ -863,6 +865,7 @@ def __init__(self) -> None:
         super().__init__(b"0100")
         self._node_ack_type = BaseType(0, length=4)
         self._params += [self._node_ack_type]
+        self.priority = Priority.HIGH
 
     @property
     def node_ack_type(self) -> NodeAckResponseType: