oep-client-python 0.0.22__py3-none-any.whl → 0.0.23__py3-none-any.whl

oep_client/__init__.py

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

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

{oep_client_python-0.0.22.dist-info → oep_client_python-0.0.23.dist-info}/METADATA

@@ -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.dist-info → oep_client_python-0.0.23.dist-info}/RECORD

@@ -1,4 +1,4 @@
-oep_client/__init__.py,sha256=9qswvxq4JvJ5-5gCnma-BgwUbIsoKQiMEZRcvOZlhXY,164
+oep_client/__init__.py,sha256=pnKaZosmvKhvHN9-ow0t_ED6s5zr6kOzmNMKGNsgJKA,164
 oep_client/__main__.py,sha256=wN7KRc5IqmCPqDosKa9ArJAFmu281aUh1UMM2VvSLbY,17575
 oep_client/arm.py,sha256=JGrevyxH8W-ke33rCv1_zyfekDDZrUv2kJhNRGyKFCA,12708
 oep_client/capture.py,sha256=goD0of-bClOK88PHR0PpWZ_XJqOWhOL9UVtVU0k3NLA,31994
@@ -20,7 +20,7 @@ oep_client/frames.py,sha256=xjgjnXmXUqNJZ5m0h91r4Cy48WoVK1mEMW4gRg-mlMI,3991
 oep_client/hid_stream.py,sha256=99Dsm4Io1keukuETG_UNqjBGiVYZZeb__Pv4ytaKg9k,10695
 oep_client/host.py,sha256=3NiPV5rnruaC6PR48LOCEoMRpC6985PA8VpSnr7gB2A,20296
 oep_client/interfaces.py,sha256=8HXr9iGJASIwBpTHBrCK_0b6NfbclEjCbBCsc62euzg,5693
-oep_client/link.py,sha256=xgexRPqQY5tAH3FZsTgC83BEaTQEh2oG2BMRL0KtsYE,21738
+oep_client/link.py,sha256=U50zgp1IPVaUniINpERD6y13C_eO8uWQBLiBa6ONexU,22627
 oep_client/message.py,sha256=eQ-27lxN2Y9JadnUFpEmkEW2X7oucrKFFFs4_nnDClU,12322
 oep_client/names.py,sha256=ztCZFWs__aR-a5G14TnJP-Q4YfLhbyrzvOVOMJuG93k,3653
 oep_client/registry.py,sha256=W8xLB0HqKB0-YtHguwTrXLwtPRMjRNdOPfwkstp7pGo,15552
@@ -28,8 +28,8 @@ oep_client/riscv.py,sha256=vqd2aiLf2MaXcsGqh7Hsg51ng_OQi1DgI-vLZvHJ8VQ,29291
 oep_client/rp2350.py,sha256=7OMyj270k3AY1e3-ljicPwOjf9jOlokbT6QNkA0b0yY,4227
 oep_client/uiapduino.py,sha256=kDB8C9GvIPBw94PaCKMzVWNtoQDu_axrz_n_6zbYJGU,6082
 oep_client/usb_stream.py,sha256=_KQvWq906DnQ4EjW1to7d9ufh3pnGkkkbCzti6GYVCY,11131
-oep_client_python-0.0.22.dist-info/METADATA,sha256=L7dI737h-xkRTN8hgy4mlXlC9tGtQXy29U4KVBpO2-M,10290
-oep_client_python-0.0.22.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-oep_client_python-0.0.22.dist-info/entry_points.txt,sha256=h6_8QX89Ww1ogALEGG5g4kspT3IOV6O51lwKqf5BWco,49
-oep_client_python-0.0.22.dist-info/licenses/LICENSE,sha256=ntlalztb3L1OaNAxmQdHlubu5fVhjMc9oRZi3PeQhXg,1076
-oep_client_python-0.0.22.dist-info/RECORD,,
+oep_client_python-0.0.23.dist-info/METADATA,sha256=9dH6nKQlUcX2cVOl9bPGWGQOCfFRd18SrzBCIOS9tGA,10290
+oep_client_python-0.0.23.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+oep_client_python-0.0.23.dist-info/entry_points.txt,sha256=h6_8QX89Ww1ogALEGG5g4kspT3IOV6O51lwKqf5BWco,49
+oep_client_python-0.0.23.dist-info/licenses/LICENSE,sha256=ntlalztb3L1OaNAxmQdHlubu5fVhjMc9oRZi3PeQhXg,1076
+oep_client_python-0.0.23.dist-info/RECORD,,