aioebus 0.2.2__tar.gz → 0.3.0__tar.gz

{aioebus-0.2.2 → aioebus-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioebus
-Version: 0.2.2
+Version: 0.3.0
 Summary: Standalone async eBUS library (decode-first). No ebusd daemon required.
 Author-email: dneprojects <dne.projects.1@gmail.com>
 License-Expression: Apache-2.0

{aioebus-0.2.2 → aioebus-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioebus"
-version = "0.2.2"
+version = "0.3.0"
 description = "Standalone async eBUS library (decode-first). No ebusd daemon required."
 readme = "README.md"
 requires-python = ">=3.11"

{aioebus-0.2.2 → aioebus-0.3.0}/src/aioebus/__init__.py

@@ -20,7 +20,7 @@ from .active import (
 )
 from .codecs import Codec, decode, encode, make_codec
 from .conditions import ConditionContext, context_from_scan, evaluate, evaluate_all
-from .engine import EbusEngine, value_key
+from .engine import EbusEngine, EngineStats, value_key
 from .frame import Telegram, crc8, escape, parse_telegram, unescape
 from .messages import FieldDef, MessageDef, parse_csv
 from .passive import MessageRegistry, decode_raw
@@ -34,6 +34,7 @@ __all__ = [
     "Codec",
     "ConditionContext",
     "EbusEngine",
+    "EngineStats",
     "EnhDecoder",
     "FieldDef",
     "MessageDef",
@@ -64,4 +65,4 @@ __all__ = [
     "unescape",
     "value_key",
 ]
-__version__ = "0.2.2"
+__version__ = "0.3.0"

{aioebus-0.2.2 → aioebus-0.3.0}/src/aioebus/engine.py

@@ -40,6 +40,19 @@ class _Active:
     driver: _CommandDriver | None = None
 
 
+@dataclass
+class EngineStats:
+    """Live counters for the adapter link, meant to be surfaced as the adapter's
+    own diagnostic entities (connection, bus activity, poll success)."""
+
+    connected: bool = False  # the stream is up and bytes are arriving
+    telegrams: int = 0  # telegrams decoded off the bus passively (free)
+    polls_ok: int = 0  # scheduled polls that got an answer
+    polls_failed: int = 0  # scheduled polls that stayed unanswered (backed off)
+    writes: int = 0  # active writes performed
+    last_telegram: float | None = None  # monotonic time of the last bus telegram
+
+
 class EbusEngine:
     """Drive one eBUS adapter connection: passive decode + interleaved actives."""
 
@@ -68,6 +81,7 @@ class EbusEngine:
         self._active: _Active | None = None
         self._queue: deque[_Active] = deque()
         self.cache: dict[tuple[str, str, str], object] = {}
+        self.stats = EngineStats()
         self._stop = False
 
     # -- public API ---------------------------------------------------------
@@ -81,11 +95,14 @@ class EbusEngine:
                 break
             if not chunk:
                 break
+            self.stats.connected = True
             for code, data in self._dec.feed(chunk):
                 await self._on_event(code, data)
+        self.stats.connected = False
 
     def stop(self) -> None:
         self._stop = True
+        self.stats.connected = False
 
     def attach(self, send: Callable[[bytes], Awaitable[None]],
                recv: Callable[[], Awaitable[bytes]]) -> None:
@@ -97,6 +114,7 @@ class EbusEngine:
         self._buf.clear()
         self._active = None
         self._stop = False
+        self.stats.connected = False
 
     async def read(self, msg: MessageDef, timeout: float = 4.0) -> dict:
         """Actively read a message as soon as the bus is idle; return its values."""
@@ -154,6 +172,8 @@ class EbusEngine:
             return
         if not tg.crc_ok:
             return
+        self.stats.telegrams += 1
+        self.stats.last_telegram = time.monotonic()
         decoded = self.registry.decode(tg)
         if decoded is not None:
             self._store(*decoded)
@@ -193,6 +213,10 @@ class EbusEngine:
         if drv.error is None:
             if isinstance(drv, ReadDriver) and act.msg is not None:
                 self._store(act.msg, act.msg.decode_labeled(slave=drv.result))
+                if act.future is None:  # a scheduled poll, not an explicit read
+                    self.stats.polls_ok += 1
+            elif isinstance(drv, WriteDriver):
+                self.stats.writes += 1
             if act.future is not None and not act.future.done():
                 act.future.set_result(drv.result)
             return
@@ -219,3 +243,4 @@ class EbusEngine:
             # the same dead register, starving the rest; the backoff then fades a
             # persistently unanswered register out of the rotation entirely.
             self.scheduler.mark_failure(act.msg, time.monotonic())
+            self.stats.polls_failed += 1

{aioebus-0.2.2 → aioebus-0.3.0}/src/aioebus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioebus
-Version: 0.2.2
+Version: 0.3.0
 Summary: Standalone async eBUS library (decode-first). No ebusd daemon required.
 Author-email: dneprojects <dne.projects.1@gmail.com>
 License-Expression: Apache-2.0

{aioebus-0.2.2 → aioebus-0.3.0}/tests/test_engine.py

@@ -112,6 +112,40 @@ class _ArbLossAdapter:
         return bytes(out)
 
 
+def test_stats_track_connection_and_bus_activity():
+    """A decoded bus telegram counts as activity and marks the link connected;
+    an unanswered poll is counted as a failed poll."""
+    async def inner():
+        link = _Link()
+        eng = EbusEngine(link.send, link.recv, REG)
+        assert eng.stats.connected is False
+        task = asyncio.create_task(eng.run())
+        link.inject(encode_received_frame(bytes.fromhex("3138b509030d1800740003910100bb00")))
+        await asyncio.sleep(0.05)
+        assert eng.stats.connected is True
+        assert eng.stats.telegrams == 1
+        assert eng.stats.last_telegram is not None
+        eng.stop()
+        link.inject(b"")
+        await asyncio.wait_for(task, 1)
+        assert eng.stats.connected is False
+
+        msg = BY["Statenumber"]
+        sched = PollScheduler([msg], base_interval=10.0)
+        eng2 = EbusEngine(link.send, link.recv, REG, scheduler=sched)
+
+        class _FailedDriver:
+            error = "timeout waiting for slave"
+
+        act = _Active(lambda: _FailedDriver(), msg, None)  # future None -> a poll
+        act.driver = _FailedDriver()
+        eng2._active = act
+        await eng2._finish_active()
+        assert eng2.stats.polls_failed == 1
+
+    asyncio.run(inner())
+
+
 def test_arbitration_loss_captures_winner_passively():
     """When our poll loses arbitration, the telegram that won is decoded
     passively (seeded with the winner's address) instead of being discarded."""