oep-client-python 0.0.22__tar.gz → 0.0.23__tar.gz

{oep_client_python-0.0.22 → oep_client_python-0.0.23}/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.0.23
+- (EN) `link.open_host("tcp://…")` waits 15 s for a reply and does not send a request again by itself (`resend=False`): behind ch32rv's broker, the broker retries towards the probe, and a second copy from the client only raced it (V003 jig, 2026-10-01). `open_host(..., timeout=, resend=)` set both explicitly; serial and USB keep 3 s and one resend.
+- (JA) `link.open_host("tcp://…")` は応答を 15 秒待ち、自分では送り直さない（`resend=False`）。ch32rv のブローカーの後ろでは、ブローカーが probe に送り直すので、client からの 2 通目は競合するだけだった（V003 ジグ、2026-10-01）。`open_host(..., timeout=, resend=)` で明示できる。シリアルと USB は 3 秒と 1 回の送り直しのまま。
+
 ## 0.0.22
 - (EN) Breaking: the wire follows oep-spec's zero-base rewrite of 2026-10-01 (docs/v1-zero-base-proposal.ja.md §3 / §7; registry synced). Every answer that ended in data or a list now carries its length and may be followed by TLVs: read answers `start flags len data [TLV]` (console, fixture UART; capture `len` u32), gpio read `n n×level`, dmi `done status nvals values`, arm-adi transfer `done status ack nvals values`, run `status stopped dpc elapsed_us nvals values` (stopped 2 = the hart could not be halted: `RunResult.not_halted`), data frames `position len data [TLV]`, events `kind fixed-part [TLV]`. TLVs have a long form (`tag 0xFF len(u16) value` for 255 bytes and more; `message.tlv` / `split_tlvs`, the long form with a short value is `message.BadTlv`). confirm answers the probe's `boot_id`; subscribe's `max_delay_ms` is u32; `rejected unsupported` is always `tag [TLV]` (0x00 = a fixed-part value: `Unsupported.tag` None, `.tlvs`).
 - (JA) 破壊的変更: wire を oep-spec の 2026-10-01 のゼロベース見直し（docs/v1-zero-base-proposal.ja.md §3 / §7。registry を写し直した）に揃えた。データや並びで終わっていた応答はすべて長さを持ち、後ろに TLV を置ける: read の応答 `start flags len data [TLV]`（console、fixture UART。capture の `len` は u32）、gpio read `n n×level`、dmi `done status nvals values`、arm-adi transfer `done status ack nvals values`、run `status stopped dpc elapsed_us nvals values`（stopped 2 = hart を止められなかった: `RunResult.not_halted`）、データフレーム `position len data [TLV]`、出来事 `kind 固定部 [TLV]`。TLV に長い形（255 byte 以上は `tag 0xFF len(u16) value`。`message.tlv` / `split_tlvs`、短い値の長い形は `message.BadTlv`）。confirm は probe の `boot_id` を返す。subscribe の `max_delay_ms` は u32。`rejected unsupported` は常に `tag [TLV]`（0x00 = 固定部の値: `Unsupported.tag` は None、`.tlvs`）。

{oep_client_python-0.0.22 → oep_client_python-0.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.22
+Version: 0.0.23
 Summary: Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a fake probe
 Project-URL: Homepage, https://github.com/Open-Embedded-Probe/oep-client-python
 Project-URL: Repository, https://github.com/Open-Embedded-Probe/oep-client-python

{oep_client_python-0.0.22 → oep_client_python-0.0.23}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.22"
+version = "0.0.23"
 description = "Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a fake probe"
 readme = "README.md"
 license = "MIT"

{oep_client_python-0.0.22 → oep_client_python-0.0.23}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.22"
+__version__ = "0.0.23"

{oep_client_python-0.0.22 → oep_client_python-0.0.23}/src/oep_client/link.py

@@ -122,6 +122,7 @@ class SerialLink:
         self.stream = stream
         self.framing = framing
         self.timeout = timeout
+        self.resend = True                         # a lost reply: the request once more with the same corr (core §5.2)
         self.retries = 0
         self.corrupt = 0
         self.stale = 0                             # replies that answered another request
@@ -284,7 +285,7 @@ class SerialLink:
                 if isinstance(e, cobs.CorruptFrame):
                     self.corrupt += 1
                 self._recover()
-                if attempt or (message[0] & m.ROLE_SESSION and self.ended_blind):
+                if attempt or not self.resend or (message[0] & m.ROLE_SESSION and self.ended_blind):
                     raise
                 # sent once more with the same corr, state-changing ones too: the probe keeps the lock holder's recent
                 # results and answers a repeat from them instead of running it twice (v1-open-proposals §4). A result
@@ -303,7 +304,7 @@ class SerialLink:
         try:
             return self._exchange_once(messages, max_inflight, window_bytes, replies)
         except (cobs.CorruptFrame, TimeoutError, FramingLost):
-            if self.ended_blind:
+            if self.ended_blind or not self.resend:
                 raise
             self.retries += 1
             rest = messages[len(replies):]
@@ -433,19 +434,29 @@ def _open_usb_stream(kind: str, vid: int, pid: int, serial: str | None):
         return UsbBulkStream.open(vid, pid, serial)
 
 
-def open_host(target: str, timeout: float = 3.0):
+TCP_TIMEOUT = 15.0   # behind a broker: outlast its own 3 s retry towards the probe, and never send again ourselves
+
+
+def open_host(target: str, timeout: float | None = None, resend: bool | None = None):
     """A Host on `target`, with the link's pipelining bound to the probe's limits (core confirm): Host.pipeline and
     everything built on it (flash, capture reads) then keep several requests in flight.
 
     target: a serial port path (COM3 on Windows); tcp://HOST:PORT for a local broker (length frames); usb[:VID:PID[:SERIAL]]
     (hex) for the probe's USB device, vendor bulk then HID (oep-core §3.3); usb:UNIT_ID for the OEP probe whose USB
-    serial is that unit id, whatever its VID:PID."""
+    serial is that unit id, whatever its VID:PID.
+
+    timeout: seconds to wait for a reply (default 3; TCP 15). resend: send a request once more with the same corr when
+    its reply was lost (default on; off for TCP, where a broker retries towards the probe itself and a second copy from
+    here would only race it - a lost reply is then raised to the caller)."""
     from . import host
     if target.startswith("tcp://"):
         addr, _, port = target[len("tcp://"):].rpartition(":")
-        lk = SerialLink.on_stream(TcpStream(addr or "127.0.0.1", int(port)), "length", timeout)
+        lk = SerialLink.on_stream(TcpStream(addr or "127.0.0.1", int(port)), "length",
+                                  TCP_TIMEOUT if timeout is None else timeout)
+        lk.resend = False if resend is None else resend
         lk.transport = "tcp"
     elif target == "usb" or target.startswith("usb:"):
+        timeout = 3.0 if timeout is None else timeout
         parts = target.split(":")[1:]
         if len(parts) == 1:                                   # usb:UNIT_ID (any length: a VID comes with its PID)
             vid, pid = find_usb(parts[0])
@@ -454,8 +465,10 @@ def open_host(target: str, timeout: float = 3.0):
         pid = int(parts[1], 16) if len(parts) > 1 else USB_PID
         return open_usb_host(vid, pid, parts[2] if len(parts) > 2 else None, timeout)
     else:
-        lk = SerialLink(target, timeout)
+        lk = SerialLink(target, 3.0 if timeout is None else timeout)
         lk.transport = "serial"
+    if resend is not None:
+        lk.resend = resend
     hst = host.Host(lk.send)
     lk.attach_host(hst)
     return hst