PyPlumIO 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

pyplumio/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.6.0'
-__version_tuple__ = version_tuple = (0, 6, 0)
+__version__ = version = '0.6.1'
+__version_tuple__ = version_tuple = (0, 6, 1)
 
 __commit_id__ = commit_id = None

pyplumio/connection.py

@@ -116,42 +116,6 @@ class Connection(ABC, TaskManager):
 
         yield await self.protocol.get(name, timeout=timeout)
 
-    @property
-    def get(self):  # type: ignore[no-untyped-def]
-        """Access the remote device.
-
-        Raise NotImplementedError when using protocol
-        different from AsyncProtocol.
-        """
-        if isinstance(self.protocol, AsyncProtocol):
-            return self.protocol.get
-
-        raise NotImplementedError
-
-    @property
-    def get_nowait(self):  # type: ignore[no-untyped-def]
-        """Access the remote device without waiting.
-
-        Raise NotImplementedError when using protocol
-        different from AsyncProtocol.
-        """
-        if isinstance(self.protocol, AsyncProtocol):
-            return self.protocol.get_nowait
-
-        raise NotImplementedError
-
-    @property
-    def wait_for(self):  # type: ignore[no-untyped-def]
-        """Wait for the remote device to become available.
-
-        Raise NotImplementedError when using protocol
-        different from AsyncProtocol.
-        """
-        if isinstance(self.protocol, AsyncProtocol):
-            return self.protocol.wait_for
-
-        raise NotImplementedError
-
     @property
     def protocol(self) -> Protocol:
         """Return the protocol object."""

pyplumio/protocol.py

@@ -145,25 +145,29 @@ class Statistics:
     connection_losses: int = 0
 
     #: List of statistics for connected devices
-    devices: list[DeviceStatistics] = field(default_factory=list)
+    devices: set[DeviceStatistics] = field(default_factory=set)
 
-    def update_transfer_statistics(
-        self, sent: Frame | None = None, received: Frame | None = None
-    ) -> None:
-        """Update transfer statistics."""
-        if sent:
-            self.sent_bytes += sent.length
-            self.sent_frames += 1
+    def update_sent(self, frame: Frame) -> None:
+        """Update sent frames statistics."""
+        self.sent_bytes += frame.length
+        self.sent_frames += 1
 
-        if received:
-            self.received_bytes += received.length
-            self.received_frames += 1
+    def update_received(self, frame: Frame) -> None:
+        """Update received frames statistics."""
+        self.received_bytes += frame.length
+        self.received_frames += 1
 
-    def track_connection_loss(self) -> None:
-        """Increase connection loss counter and store the datetime."""
+    def update_connection_lost(self) -> None:
+        """Update connection lost counter."""
         self.connection_losses += 1
         self.connection_loss_at = datetime.now()
 
+    def update_devices(self, device: PhysicalDevice) -> None:
+        """Update connected devices."""
+        device_statistics = DeviceStatistics(address=device.address)
+        device.subscribe(ATTR_REGDATA, device_statistics.update_last_seen)
+        self.devices.add(device_statistics)
+
     def reset_transfer_statistics(self) -> None:
         """Reset transfer statistics."""
         self.sent_bytes = 0
@@ -173,18 +177,22 @@ class Statistics:
         self.failed_frames = 0
 
 
-@dataclass(slots=True)
+@dataclass(slots=True, kw_only=True)
 class DeviceStatistics:
     """Represents a device statistics."""
 
-    #: Device name
-    name: str
+    #: Device address
+    address: int
 
     #: Datetime object representing connection time
-    connected_since: datetime | Literal["never"] = NEVER
+    connected_since: datetime = field(default_factory=datetime.now)
 
     #: Datetime object representing time when device was last seen
-    last_seen: datetime | Literal["never"] = NEVER
+    last_seen: datetime = field(default_factory=datetime.now)
+
+    def __hash__(self) -> int:
+        """Return a hash of the statistics based on unique address."""
+        return self.address
 
     async def update_last_seen(self, _: Any) -> None:
         """Update last seen property."""
@@ -241,10 +249,10 @@ class AsyncProtocol(Protocol, EventManager[PhysicalDevice]):
             self.frame_producer(self._queues, reader=self.reader, writer=self.writer),
             name="frame_producer_task",
         )
-        for consumer in range(self.consumers_count):
+        for consumer_id in range(self.consumers_count):
             self.create_task(
                 self.frame_consumer(self._queues.read),
-                name=f"frame_consumer_task ({consumer})",
+                name=f"frame_consumer_task ({consumer_id})",
             )
 
         for device in self.data.values():
@@ -277,30 +285,39 @@ class AsyncProtocol(Protocol, EventManager[PhysicalDevice]):
             await self._connection_close()
             await asyncio.gather(*(device.shutdown() for device in self.data.values()))
 
+    async def _write_from_queue(
+        self, writer: FrameWriter, queue: asyncio.Queue[Frame]
+    ) -> None:
+        """Send frame from the queue to the remote device."""
+        frame = await queue.get()
+        await writer.write(frame)
+        queue.task_done()
+        self.statistics.update_sent(frame)
+
+    async def _read_into_queue(
+        self, reader: FrameReader, queue: asyncio.Queue[Frame]
+    ) -> None:
+        """Read frame from the remote device into the queue."""
+        if frame := await reader.read():
+            queue.put_nowait(frame)
+            self.statistics.update_received(frame)
+
     async def frame_producer(
         self, queues: Queues, reader: FrameReader, writer: FrameWriter
     ) -> None:
         """Handle frame reads and writes."""
-        statistics = self.statistics
         await self.connected.wait()
         while self.connected.is_set():
             try:
-                request = None
                 if not queues.write.empty():
-                    request = await queues.write.get()
-                    await writer.write(request)
-                    queues.write.task_done()
-
-                if response := await reader.read():
-                    queues.read.put_nowait(response)
-
-                statistics.update_transfer_statistics(request, response)
+                    await self._write_from_queue(writer, queues.write)
 
+                await self._read_into_queue(reader, queues.read)
             except ProtocolError as e:
-                statistics.failed_frames += 1
+                self.statistics.failed_frames += 1
                 _LOGGER.debug("Can't process received frame: %s", e)
             except (OSError, asyncio.TimeoutError):
-                statistics.track_connection_loss()
+                self.statistics.update_connection_lost()
                 self.create_task(self.connection_lost())
                 break
             except Exception:
@@ -327,14 +344,7 @@ class AsyncProtocol(Protocol, EventManager[PhysicalDevice]):
                 device.dispatch_nowait(ATTR_CONNECTED, True)
                 device.dispatch_nowait(ATTR_SETUP, True)
                 await self.dispatch(name, device)
-                self.statistics.devices.append(
-                    device_statistics := DeviceStatistics(
-                        name=name,
-                        connected_since=datetime.now(),
-                        last_seen=datetime.now(),
-                    )
-                )
-                device.subscribe(ATTR_REGDATA, device_statistics.update_last_seen)
+                self.statistics.update_devices(device)
 
         return self.data[name]
 

{pyplumio-0.6.0.dist-info → pyplumio-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.6.0
+Version: 0.6.1
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -25,16 +25,16 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.10.6; extra == "test"
+Requires-Dist: coverage==7.10.7; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
-Requires-Dist: mypy==1.18.1; extra == "test"
+Requires-Dist: mypy==1.18.2; 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.1.0; extra == "test"
-Requires-Dist: ruff==0.13.0; extra == "test"
+Requires-Dist: pytest-asyncio==1.2.0; extra == "test"
+Requires-Dist: ruff==0.13.2; extra == "test"
 Requires-Dist: tox==4.30.2; extra == "test"
-Requires-Dist: types-pyserial==3.5.0.20250822; extra == "test"
+Requires-Dist: types-pyserial==3.5.0.20250919; extra == "test"
 Provides-Extra: docs
 Requires-Dist: sphinx==8.1.3; extra == "docs"
 Requires-Dist: sphinx_rtd_theme==3.0.2; extra == "docs"
@@ -79,7 +79,6 @@ through network by using RS-485 to Ethernet/WiFi converter.
 - [Callbacks](https://pyplumio.denpa.pro/callbacks.html)
 - [Mixers/Thermostats](https://pyplumio.denpa.pro/mixers_thermostats.html)
 - [Schedules](https://pyplumio.denpa.pro/schedules.html)
-- [Statistics](https://pyplumio.denpa.pro/statistics.html)
 - [Protocol](https://pyplumio.denpa.pro/protocol.html)
   - [Frame Structure](https://pyplumio.denpa.pro/protocol.html#frame-structure)
   - [Requests and Responses](https://pyplumio.denpa.pro/protocol.html#requests-and-responses)

{pyplumio-0.6.0.dist-info → pyplumio-0.6.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pyplumio/__init__.py,sha256=DQg-ZTAxLYuNKyqsGrcO0QrVAMw9aPA69Bv2mZ7ubXQ,3314
 pyplumio/__main__.py,sha256=3IwHHSq-iay5FaeMc95klobe-xv82yydSKcBE7BFZ6M,500
-pyplumio/_version.py,sha256=MAYWefOLb6kbIRub18WSzK6ggSjz1LNLy9aDRlX9Ea4,704
-pyplumio/connection.py,sha256=9Gzg6FXMU-HjspsDnm9XH8ZPBO29AZ6dKS2-eg8P8Z0,7686
+pyplumio/_version.py,sha256=7vNQiXfKffK0nbqts6Xy6-E1b1YOm4EGigvgaHr83o4,704
+pyplumio/connection.py,sha256=4JoutupQSvAO8WXFFuwddpJJODzna5oq-cHJRI4kgZ8,6625
 pyplumio/const.py,sha256=oYwXB3N6bvFLc6411icbABbBkSoQcj5BGuyD-NaKYp8,5629
 pyplumio/data_types.py,sha256=BTDxwErRo_odvFT5DNfIniNh8ZfyjRKEDaJmoEJqdEg,9426
 pyplumio/exceptions.py,sha256=_B_0EgxDxd2XyYv3WpZM733q0cML5m6J-f55QOvYRpI,996
 pyplumio/filters.py,sha256=sBEnr0i_1XMbIwIEA24npbpe5yevSRneynlsqJMyfko,15642
-pyplumio/protocol.py,sha256=jGx5b8y_1jbdFbjL_ZbUjpDvgBYhn5JUBsVsf_De6Ls,11614
+pyplumio/protocol.py,sha256=u0MqTFwbKv-kJeokXPgF2pNTVcFUExkH9MWIcY8ak7c,12083
 pyplumio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyplumio/stream.py,sha256=zFMKZ_GxsSGcaBTJigVM1CK3uGjlEJXgcvKqus8MDzk,7740
 pyplumio/utils.py,sha256=SV47Y6QC_KL-gPmk6KQgx7ArExzNHGKuaddGAHjT9rs,1839
@@ -56,8 +56,8 @@ pyplumio/structures/statuses.py,sha256=1h-EUw1UtuS44E19cNOSavUgZeAxsLgX3iS0eVC8p
 pyplumio/structures/temperatures.py,sha256=2VD3P_vwp9PEBkOn2-WhifOR8w-UYNq35aAxle0z2Vg,2831
 pyplumio/structures/thermostat_parameters.py,sha256=st3x3HkjQm3hqBrn_fpvPDQu8fuc-Sx33ONB19ViQak,3007
 pyplumio/structures/thermostat_sensors.py,sha256=rO9jTZWGQpThtJqVdbbv8sYMYHxJi4MfwZQza69L2zw,3399
-pyplumio-0.6.0.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
-pyplumio-0.6.0.dist-info/METADATA,sha256=fyZvRedY6toO1OuENZe4ytYtPA0EFJqYb7CJy-Tswlo,5579
-pyplumio-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyplumio-0.6.0.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
-pyplumio-0.6.0.dist-info/RECORD,,
+pyplumio-0.6.1.dist-info/licenses/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
+pyplumio-0.6.1.dist-info/METADATA,sha256=kIPXgPoGlOwVLdy5Va7UJjGg4yBorcNv9IJeof7ABfM,5520
+pyplumio-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyplumio-0.6.1.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
+pyplumio-0.6.1.dist-info/RECORD,,