oep-client-python 0.0.1__tar.gz → 0.0.2__tar.gz

{oep_client_python-0.0.1 → oep_client_python-0.0.2}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 0.0.2
+- (EN) Breaking: the modules move from `oep_client.v1.*` to `oep_client.*` (`from oep_client import link`, `python -m oep_client`, `python -m oep_client.fake_serve`). The protocol revision stays in the registry and confirm.
+- (JA) 破壊的変更: モジュールを `oep_client.v1.*` から `oep_client.*` に移した（`from oep_client import link`、`python -m oep_client`、`python -m oep_client.fake_serve`）。プロトコルの revision は registry と confirm が持つ。
+- (EN) `fake_serve --uart-plan` puts the first fixture UART's RX / TX plan in at boot (as a saved config), and `--uart-rx TEXT` feeds its RX every `--every` ms once configured.
+- (JA) `fake_serve --uart-plan` で最初の fixture UART の RX / TX の plan を起動時に入れる（保存した設定として）。`--uart-rx TEXT` で、configure の後、その RX に `--every` ms ごとに文字を入れる。
+
 ## 0.0.1
 - (EN) First beta on PyPI (`pip install oep-client-python`, imported as `oep_client`). OEP v1 host: serial ports always COBS with the probe's raw bytes skipped as noise and opened exclusively (TIOCEXCL), USB vendor bulk / HID and TCP (a broker) with length frames, all under one `Host` (`link.open_host(target)`); the session rules (owner, resend with the same corr, `core.take` for the lock); the standard interfaces; `Host.on_capture` for run recorders; a fake probe (`oep_client.v1.endpoint`) and `python -m oep_client.v1.fake_serve` (pty / TCP) as the working spec for other hosts' tests.
 - (JA) PyPI での最初のβ版（`pip install oep-client-python`、import は `oep_client`）。OEP v1 の host: シリアルの口は常に COBS（probe の生のバイトは雑音として捨てる、排他で開く TIOCEXCL）、USB の vendor bulk / HID と TCP（ブローカー）は長さつきのフレームで、どれも同じ `Host`（`link.open_host(target)`）。セッションの規則（owner、同じ corr での送り直し、ロックの取り方 `core.take`）、標準インターフェース、記録の受け口 `Host.on_capture`。ほかの host の試験のための「動く spec」として、偽の probe（`oep_client.v1.endpoint`）と `python -m oep_client.v1.fake_serve`（pty / TCP）。

{oep_client_python-0.0.1 → oep_client_python-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.1
+Version: 0.0.2
 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
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 # OEP Python client
 
 Open Embedded Probe の host 側。v1（oep-spec の `docs/oep-core.ja.md` と `docs/oep-if-*.ja.md`、固める候補の形）を話す。番号は oep-spec の
-`generated/oep-v1/oep_v1_registry.py` をそのまま写した `oep_client.v1.registry` から取る。破壊的変更を前提とする
+`generated/oep-v1/oep_v1_registry.py` をそのまま写した `oep_client.registry` から取る。破壊的変更を前提とする
 実験段階で、互換 API は約束しない。OEP を初めて読む人は oep-spec の `docs/review-guide.ja.md`（どこに何が書いてあるか）から。
 
 target の知識は host にある、という OEP の分担に従う。probe は線と DMI / DP・AP の転送しか知らず、CH32 の flash
@@ -34,14 +34,14 @@ pip install oep-client-python     # PyPI (import oep_client); a checkout: pip in
 uv run pytest                                                            # in a checkout
 ```
 
-`import oep_client.v1` だけで使える（`sys.path` に `src/` を足す使い方は不要になった）。番号の表は `tools/sync_registry.sh` で
+`import oep_client` だけで使える（`sys.path` に `src/` を足す使い方は不要になった）。番号の表は `tools/sync_registry.sh` で
 oep-spec から写す。PyPI の `oep-client` は別のプロジェクトなので、配布名は `oep-client-python`。
 
 リリースは GitHub Actions の Release（workflow_dispatch、version = X.Y.Z か X.Y.ZbN）: `tools/prepare_release.py` が
 pyproject.toml と `oep_client.__version__` を書き換え、CHANGELOG.md の Unreleased をその版にし、試験と build の後に commit と tag、
 GitHub Release、PyPI（Trusted Publishing）へ出す。変更は CHANGELOG.md の Unreleased に (EN) / (JA) で書き足しておく。
 
-## モジュール（`oep_client.v1`）
+## モジュール（`oep_client`）
 
 | モジュール | 中身 |
 |---|---|
@@ -66,7 +66,7 @@ GitHub Release、PyPI（Trusted Publishing）へ出す。変更は CHANGELOG.md
 ## 使い方の例
 
 ```python
-from oep_client.v1 import core, link, riscv, ch32_flash
+from oep_client import core, link, riscv, ch32_flash
 
 hst = link.open_host("/run/board-identify/by-id/esp32-series-30eda0e31108")   # pipelining つき
 # a serial port (always COBS), "tcp://127.0.0.1:PORT" (a broker), "usb" / "usb:303a:0002[:SERIAL]" (vendor, then HID)
@@ -81,7 +81,7 @@ wire.detach(conn)
 hst.end()
 ```
 
-能力の一覧は `uv run python -m oep_client.v1 dump --port <probe>`（`--fake p4-x035` でハードウェアなし）。
+能力の一覧は `uv run python -m oep_client dump --port <probe>`（`--fake p4-x035` でハードウェアなし）。
 実機での一通りの確認は ArduinoCore-CH32 の `tests/manual/oep_smoke/`（`oep_smoke.py`、`oep_probe_checks.py`）。
 
 ## 偽の probe（動く spec）
@@ -94,7 +94,7 @@ hst.end()
 外のプログラムの試験には `fake_serve` を子プロセスで使う:
 
 ```sh
-uv run python -m oep_client.v1.fake_serve --pty --profile p4-bench --slot x035 --bind last-reset \
+uv run python -m oep_client.fake_serve --pty --profile p4-bench --slot x035 --bind last-reset \
     --console 'uptime %d\r\n' --every 100
 # 最初の行: PTY /dev/pts/N（--tcp 0 なら PORT n）。stdin を閉じると終わる
 ```

{oep_client_python-0.0.1 → oep_client_python-0.0.2}/README.ja.md

@@ -1,7 +1,7 @@
 # OEP Python client
 
 Open Embedded Probe の host 側。v1（oep-spec の `docs/oep-core.ja.md` と `docs/oep-if-*.ja.md`、固める候補の形）を話す。番号は oep-spec の
-`generated/oep-v1/oep_v1_registry.py` をそのまま写した `oep_client.v1.registry` から取る。破壊的変更を前提とする
+`generated/oep-v1/oep_v1_registry.py` をそのまま写した `oep_client.registry` から取る。破壊的変更を前提とする
 実験段階で、互換 API は約束しない。OEP を初めて読む人は oep-spec の `docs/review-guide.ja.md`（どこに何が書いてあるか）から。
 
 target の知識は host にある、という OEP の分担に従う。probe は線と DMI / DP・AP の転送しか知らず、CH32 の flash
@@ -12,14 +12,14 @@ pip install oep-client-python     # PyPI (import oep_client); a checkout: pip in
 uv run pytest                                                            # in a checkout
 ```
 
-`import oep_client.v1` だけで使える（`sys.path` に `src/` を足す使い方は不要になった）。番号の表は `tools/sync_registry.sh` で
+`import oep_client` だけで使える（`sys.path` に `src/` を足す使い方は不要になった）。番号の表は `tools/sync_registry.sh` で
 oep-spec から写す。PyPI の `oep-client` は別のプロジェクトなので、配布名は `oep-client-python`。
 
 リリースは GitHub Actions の Release（workflow_dispatch、version = X.Y.Z か X.Y.ZbN）: `tools/prepare_release.py` が
 pyproject.toml と `oep_client.__version__` を書き換え、CHANGELOG.md の Unreleased をその版にし、試験と build の後に commit と tag、
 GitHub Release、PyPI（Trusted Publishing）へ出す。変更は CHANGELOG.md の Unreleased に (EN) / (JA) で書き足しておく。
 
-## モジュール（`oep_client.v1`）
+## モジュール（`oep_client`）
 
 | モジュール | 中身 |
 |---|---|
@@ -44,7 +44,7 @@ GitHub Release、PyPI（Trusted Publishing）へ出す。変更は CHANGELOG.md
 ## 使い方の例
 
 ```python
-from oep_client.v1 import core, link, riscv, ch32_flash
+from oep_client import core, link, riscv, ch32_flash
 
 hst = link.open_host("/run/board-identify/by-id/esp32-series-30eda0e31108")   # pipelining つき
 # a serial port (always COBS), "tcp://127.0.0.1:PORT" (a broker), "usb" / "usb:303a:0002[:SERIAL]" (vendor, then HID)
@@ -59,7 +59,7 @@ wire.detach(conn)
 hst.end()
 ```
 
-能力の一覧は `uv run python -m oep_client.v1 dump --port <probe>`（`--fake p4-x035` でハードウェアなし）。
+能力の一覧は `uv run python -m oep_client dump --port <probe>`（`--fake p4-x035` でハードウェアなし）。
 実機での一通りの確認は ArduinoCore-CH32 の `tests/manual/oep_smoke/`（`oep_smoke.py`、`oep_probe_checks.py`）。
 
 ## 偽の probe（動く spec）
@@ -72,7 +72,7 @@ hst.end()
 外のプログラムの試験には `fake_serve` を子プロセスで使う:
 
 ```sh
-uv run python -m oep_client.v1.fake_serve --pty --profile p4-bench --slot x035 --bind last-reset \
+uv run python -m oep_client.fake_serve --pty --profile p4-bench --slot x035 --bind last-reset \
     --console 'uptime %d\r\n' --every 100
 # 最初の行: PTY /dev/pts/N（--tcp 0 なら PORT n）。stdin を閉じると終わる
 ```

{oep_client_python-0.0.1 → oep_client_python-0.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.1"
+version = "0.0.2"
 description = "Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a fake probe"
 readme = "README.ja.md"
 license = "MIT"
@@ -25,7 +25,7 @@ usb-async = ["libusb1>=3"]   # queued asynchronous IN transfers: streaming near
 hid = ["hidapi>=0.14"]      # the vendor HID way in through the OS HID driver (Windows without WinUSB, Linux hidraw)
 
 [project.scripts]
-oep = "oep_client.v1.__main__:main"
+oep = "oep_client.__main__:main"
 
 [project.urls]
 Homepage = "https://github.com/Open-Embedded-Probe/oep-client-python"

oep_client_python-0.0.2/src/oep_client/__init__.py

@@ -0,0 +1,5 @@
+"""Open Embedded Probe (OEP) host client. `oep_client` speaks the v1 protocol (oep-spec docs/oep-core.ja.md)."""
+
+__all__ = ["__version__"]
+
+__version__ = "0.0.2"

{oep_client_python-0.0.1/src/oep_client/v1 → oep_client_python-0.0.2/src/oep_client}/__main__.py

@@ -1,9 +1,9 @@
 """Draft OEP capability discovery by name, on an in-process fake or a v1 draft probe.
 
-  uv run python -m oep_client.v1 dump --port /run/board-identify/by-id/<probe>
-  uv run python -m oep_client.v1 dump --fake p4-x035
-  uv run python -m oep_client.v1 dump --fake esp32-v003 --prefix oep.fixture
-  uv run python -m oep_client.v1 dump --fake p4-x035 --prefix oep.target --json
+  uv run python -m oep_client dump --port /run/board-identify/by-id/<probe>
+  uv run python -m oep_client dump --fake p4-x035
+  uv run python -m oep_client dump --fake esp32-v003 --prefix oep.fixture
+  uv run python -m oep_client dump --fake p4-x035 --prefix oep.target --json
 """
 
 from __future__ import annotations

{oep_client_python-0.0.1/src/oep_client/v1 → oep_client_python-0.0.2/src/oep_client}/fake_serve.py

@@ -1,6 +1,6 @@
 """Serve a fake probe (`endpoint.Endpoint`) on a pty or a TCP port, for other programs' tests.
 
-    python -m oep_client.v1.fake_serve [--pty | --tcp PORT] [options]
+    python -m oep_client.fake_serve [--pty | --tcp PORT] [options]
 
 --pty (the default) opens a pseudo terminal that is the probe's serial port (oep-core §3.4): COBS frames
 0x00 <COBS> 0x00 and the raw bytes of the port's bind on one line. The host opens the printed path itself (and
@@ -25,6 +25,9 @@ Options:
   --bind MODE           bind the serial port to every --slot: last-reset, manual or mixed
   --target-id HEX       the target_id every target's attach reports (wch_dmi_7f)
   --absent N            the N-th pin pair of the first wire has no target (repeatable)
+  --uart-plan           the first oep.fixture.uart gets its RX / TX plan at boot, as if saved (the jig's "DUT TX" /
+                        "DUT RX" labels when the profile has them, else the first free channels); configure then works
+  --uart-rx TEXT        what arrives on that UART's RX every --every ms once it is configured (%d = a counter)
   --run-hook SPEC       what riscv-dm run does on every target: SPEC is module:function or path/file.py:function,
                         called as function(target, pc, regs) -> (stopped, dpc, elapsed_us). `target` is the
                         endpoint.FakeTarget (mem = word address -> value, regs = regno -> value, halted, dpc), so a
@@ -45,7 +48,7 @@ import sys
 import time
 import tty
 
-from . import endpoint, fake, fake_serial, registry as reg
+from . import catalog, endpoint, fake, fake_serial, registry as reg
 
 _ITEM = reg.PROBE_CONFIG.tlv["item"]
 _MODES = reg.PROBE_CONFIG.enum["bind_mode"]
@@ -82,11 +85,40 @@ def build(a: argparse.Namespace) -> endpoint.Endpoint:
                            for n in range(len(a.slot)))
         value = struct.pack("<BBBB", a.port_index, _MODES[a.bind.replace("-", "_")], 0, len(a.slot)) + streams
         items.append(bytes([_ITEM["bind"], len(value)]) + value)
+    if a.uart_plan:
+        fn = uart_fn(ep)
+        rx, tx = _uart_channels(ep, fn)
+        for role, ch in ((1, rx), (2, tx)):
+            items.append(bytes([_ITEM["plan"], 5]) + struct.pack("<HBH", fn, role, ch))
     if items:
         ep.load_config(items, saved=True)
     return ep
 
 
+def uart_fn(ep: endpoint.Endpoint) -> int:
+    fn = ep.fns.get("oep.fixture.uart")
+    if fn is None:
+        raise SystemExit("this profile offers no oep.fixture.uart")
+    return fn
+
+
+def _uart_channels(ep: endpoint.Endpoint, fn: int) -> tuple[int, int]:
+    """RX, TX for the UART's plan: the jig's DUT TX (probe RX) / DUT RX (probe TX) labels, else the first two free."""
+    labels = {name: ch for ch, name in ep.static_labels.items()}
+    if "DUT TX" in labels and "DUT RX" in labels:
+        return labels["DUT TX"], labels["DUT RX"]
+    allowed = []
+    for t in ep.static[fn]:
+        if t[0] == catalog.ROLE_CHANNELS and t[2] == 1:
+            base = struct.unpack_from("<H", t, 3)[0]
+            allowed = catalog.bitmap_to_channels(base, t[5:2 + t[1]])
+    taken = {p for s in ep.slots.values() for p in s.pair} | {a[2] for a in ep.plan}
+    free = [ch for ch in allowed if ch not in taken]
+    if len(free) < 2:
+        raise SystemExit("no two free channels for the UART's plan")
+    return free[0], free[1]
+
+
 def _load_hook(spec: str):
     where, _, name = spec.rpartition(":")
     if not where or not name:
@@ -118,20 +150,28 @@ def _filter(a: argparse.Namespace):
     return answer
 
 
+def _text(fmt: str, count: int) -> bytes:
+    text = fmt.replace("%d", str(count)) if "%d" in fmt else fmt
+    return text.encode().decode("unicode_escape").encode("latin-1")
+
+
 class Console:
-    def __init__(self, ep: endpoint.Endpoint, fmt: str | None, every_ms: int):
-        self.ep, self.fmt, self.every = ep, fmt, every_ms
+    """Every `every_ms`: the targets write `fmt` to their consoles, and `uart_rx` arrives on the UART's RX (fn
+    `uart`) while it runs (configured)."""
+
+    def __init__(self, ep: endpoint.Endpoint, fmt: str | None, every_ms: int, uart_rx: str | None = None,
+                 uart: int | None = None):
+        self.ep, self.fmt, self.every, self.uart_rx, self.uart = ep, fmt, every_ms, uart_rx, uart
         self.next_ms, self.count = 0, 0
 
     def tick(self) -> None:
-        if not self.fmt or self.ep.now() < self.next_ms:
+        if not (self.fmt or self.uart_rx) or self.ep.now() < self.next_ms:
             return
         self.next_ms = self.ep.now() + self.every
-        for i, tg in enumerate(self.ep.targets.values()):
-            text = self.fmt.replace("{t}", str(i))
-            if "%d" in text:
-                text = text.replace("%d", str(self.count))
-            self.ep.target_says(text.encode().decode("unicode_escape").encode("latin-1"), tg)
+        for i, tg in enumerate(self.ep.targets.values()) if self.fmt else ():
+            self.ep.target_says(_text(self.fmt.replace("{t}", str(i)), self.count), tg)
+        if self.uart_rx and self.uart in self.ep.uarts:
+            self.ep.uart_rx(self.uart, _text(self.uart_rx, self.count))
         self.count += 1
 
 
@@ -257,7 +297,7 @@ def _serve_conn(a, ep, console, conn, watch_stdin) -> bool:
 
 
 def main(argv: list[str] | None = None) -> None:
-    ap = argparse.ArgumentParser(prog="python -m oep_client.v1.fake_serve", description=__doc__.split("\n\n")[0])
+    ap = argparse.ArgumentParser(prog="python -m oep_client.fake_serve", description=__doc__.split("\n\n")[0])
     where = ap.add_mutually_exclusive_group()
     where.add_argument("--pty", action="store_true")
     where.add_argument("--tcp", type=int, metavar="PORT")
@@ -273,6 +313,8 @@ def main(argv: list[str] | None = None) -> None:
     ap.add_argument("--bind", choices=["last-reset", "manual", "mixed"])
     ap.add_argument("--target-id")
     ap.add_argument("--absent", type=int, action="append", default=[])
+    ap.add_argument("--uart-plan", action="store_true")
+    ap.add_argument("--uart-rx")
     ap.add_argument("--run-hook")
     ap.add_argument("--once", action="store_true")
     a = ap.parse_args(argv)
@@ -285,7 +327,7 @@ def main(argv: list[str] | None = None) -> None:
         probe_ep = endpoint.Endpoint(profile(), lambda: 0)
         a.port_index = min(probe_ep.serial_ports) if probe_ep.serial_ports else 0
     ep = build(a)
-    console = Console(ep, a.console, _ms(a.every))
+    console = Console(ep, a.console, _ms(a.every), a.uart_rx, uart_fn(ep) if a.uart_rx else None)
     try:
         if a.tcp is None:
             serve_pty(a, ep, console)

oep_client_python-0.0.1/tests/test_v1_capabilities.py → oep_client_python-0.0.2/tests/test_capabilities.py

@@ -4,7 +4,7 @@ import json
 
 import pytest
 
-from oep_client.v1 import catalog, dump, fake, names
+from oep_client import catalog, dump, fake, names
 
 
 # ---- names ---------------------------------------------------------------

oep_client_python-0.0.1/tests/test_v1_capture.py → oep_client_python-0.0.2/tests/test_capture.py

@@ -1,9 +1,9 @@
-"""oep_client.v1.capture: the configure answer and the §3.0 logic layout (oep-spec logic-capture.ja.md)."""
+"""oep_client.capture: the configure answer and the §3.0 logic layout (oep-spec logic-capture.ja.md)."""
 
 import struct
 from fractions import Fraction
 
-from oep_client.v1 import capture as c
+from oep_client import capture as c
 
 
 def answer(*items):
@@ -92,7 +92,7 @@ def test_stream_does_not_count_the_fns_events_as_lost():
 
 def test_read_spans_frames_without_the_header_leaking_into_the_data():
     """read() splits a long read into frame-sized ones; each answer is position(u64) flags(u8) data."""
-    from test_v1_target_parts import ScriptedHost, ok
+    from test_target_parts import ScriptedHost, ok
     stream = bytes(range(256)) * 12                                   # 3072 bytes: more than one 1024-byte frame
     def read(p):
         pos, n = struct.unpack("<QI", p[:12])

oep_client_python-0.0.1/tests/test_v1_cobs.py → oep_client_python-0.0.2/tests/test_cobs.py

@@ -4,7 +4,7 @@ import random
 
 import pytest
 
-from oep_client.v1 import cobs
+from oep_client import cobs
 
 
 def test_crc_check_value():

oep_client_python-0.0.1/tests/test_v1_esp32_targets.py → oep_client_python-0.0.2/tests/test_esp32_targets.py

@@ -2,8 +2,8 @@
 
 import struct
 
-from oep_client.v1 import decode, esp32_targets as et, message as m
-from test_v1_target_parts import ScriptedHost, ok
+from oep_client import decode, esp32_targets as et, message as m
+from test_target_parts import ScriptedHost, ok
 
 I2C, SPI = 11, 12
 

oep_client_python-0.0.1/tests/test_v1_fake_spec.py → oep_client_python-0.0.2/tests/test_fake_spec.py

@@ -11,7 +11,7 @@ import time
 
 import pytest
 
-from oep_client.v1 import cobs, endpoint, fake, fake_serial, message as m, registry as reg
+from oep_client import cobs, endpoint, fake, fake_serial, message as m, registry as reg
 
 CFG = reg.PROBE_CONFIG
 ITEM, ATTACH, MODE, KIND = CFG.tlv["item"], CFG.enum["slot_attach"], CFG.enum["bind_mode"], CFG.enum["bind_stream"]
@@ -289,7 +289,7 @@ def test_last_reset_follows_the_target_the_host_reset():
 
 @pytest.mark.skipif(sys.platform != "linux", reason="pty and TIOCEXCL as on Linux")
 def test_fake_serve_pty_speaks_cobs_with_console_bytes_and_honours_tiocexcl():
-    proc = subprocess.Popen([sys.executable, "-m", "oep_client.v1.fake_serve", "--pty", "--profile", "p4-bench",
+    proc = subprocess.Popen([sys.executable, "-m", "oep_client.fake_serve", "--pty", "--profile", "p4-bench",
                              "--slot", "x035", "--bind", "last-reset", "--console", "tick %d\\n", "--every", "20"],
                             stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True)
     try:
@@ -320,11 +320,12 @@ def test_fake_serve_pty_speaks_cobs_with_console_bytes_and_honours_tiocexcl():
 
 
 def test_fake_serve_run_hook_from_a_file(tmp_path):
-    from oep_client.v1 import fake_serve
+    from oep_client import fake_serve
     hook = tmp_path / "loader.py"
     hook.write_text("def run(target, pc, regs):\n    target.mem[0x100] = regs.get(0x100A, 0)\n    return True, pc + 4, 7\n")
     a = fake_serve.main.__globals__["argparse"].Namespace(
-        profile="p4-x035", target_id=None, absent=[], slot=[], bind=None, port_index=0, run_hook=f"{hook}:run")
+        profile="p4-x035", target_id=None, absent=[], slot=[], bind=None, port_index=0, run_hook=f"{hook}:run",
+        uart_plan=False)
     ep = fake_serve.build(a)
     assert ep.target.run_hook(0x2000, {0x100A: 5}) == (True, 0x2004, 7) and ep.target.mem[0x100] == 5
 
@@ -344,3 +345,28 @@ def test_a_closed_console_stays_readable_until_the_same_place_opens_again():
     a2 = attach(p[0])
     h.ok(3, 0x01, struct.pack("<HB", a2, 2))                         # the same place again: the old one goes
     assert h.raw(3, 0x02, struct.pack("<HBQH", sa, 1, 0, 16), session=False).detail == m.UNAVAILABLE
+
+
+def test_fake_serve_uart_plan_and_rx():
+    import time
+    from oep_client import fixture, link
+    proc = subprocess.Popen([sys.executable, "-m", "oep_client.fake_serve", "--tcp", "0", "--framing", "length",
+                             "--profile", "esp32-v003", "--uart-plan", "--uart-rx", "rx %d\\n", "--every", "10"],
+                            stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True)
+    try:
+        port = proc.stdout.readline().split()[1]
+        hst = link.open_host(f"tcp://127.0.0.1:{port}", timeout=1.0)
+        hst.open(3000)
+        uart = fixture.FixtureUartIO(hst)
+        assert uart.configure(115200) > 0                            # the saved plan: configure works
+        assert uart.configure(9600) > 0                              # and again, while it runs
+        got, deadline = b"", time.monotonic() + 2
+        while b"\n" not in got and time.monotonic() < deadline:
+            got += uart.read()
+        assert got.startswith(b"rx ")                                # the RX side, from the configure on
+        uart.write(b"to the DUT")                                    # out on TX
+        hst.end()
+        hst.link.close()
+    finally:
+        proc.stdin.close()
+        proc.wait(timeout=5)

oep_client_python-0.0.1/tests/test_v1_flash_console.py → oep_client_python-0.0.2/tests/test_flash_console.py

@@ -6,8 +6,8 @@ import struct
 
 import pytest
 
-from oep_client.v1 import ch32_flash as cf, console, fixture, host as h, message as m, riscv, uiapduino
-from test_v1_target_parts import FNS, ScriptedHost, ok
+from oep_client import ch32_flash as cf, console, fixture, host as h, message as m, riscv, uiapduino
+from test_target_parts import FNS, ScriptedHost, ok
 
 WIRE, DM, GPIO = FNS["oep.wire.rvswd"], FNS["oep.target.riscv-dm"], FNS["oep.fixture.gpio"]
 CONSOLE, UART = 6, 7

oep_client_python-0.0.1/tests/test_v1_hid_stream.py → oep_client_python-0.0.2/tests/test_hid_stream.py

@@ -6,7 +6,7 @@ import time
 
 import pytest
 
-from oep_client.v1 import hid_stream, link
+from oep_client import hid_stream, link
 
 
 def espusbdevice_vendor_descriptor(size: int) -> bytes:

oep_client_python-0.0.1/tests/test_v1_interfaces.py → oep_client_python-0.0.2/tests/test_interfaces.py

@@ -7,7 +7,7 @@ import struct
 
 import pytest
 
-from oep_client.v1 import capture, console, core, endpoint, fake, fixture, host, message as m, riscv
+from oep_client import capture, console, core, endpoint, fake, fixture, host, message as m, riscv
 
 WIRE, DM, CONSOLE, GPIO, UART = 1, 2, 3, 4, 5          # p4_x035
 
@@ -259,7 +259,7 @@ def test_uart_configure_format_and_reads_that_do_not_consume(bench):
 
 
 def test_capture_critical_tag_it_cannot_honour_is_unsupported():
-    from test_v1_target_parts import ScriptedHost
+    from test_target_parts import ScriptedHost
 
     def configure(p):
         for tag, _ in m.split_tlvs(p):
@@ -351,7 +351,7 @@ def test_a_plan_replaces_only_the_fns_it_names_and_release_takes_a_list(bench):
 
 
 def test_ch32_resume_asks_again_while_dpc_has_not_moved(dm):
-    from oep_client.v1 import ch32_flash
+    from oep_client import ch32_flash
     ep, hst, d = dm
     assert d.read_register(d.DPC) == ep.target.dpc
     ep.target.resume_misses = 2                                    # two requests that do not take, then it goes

oep_client_python-0.0.1/tests/test_v1_link_host.py → oep_client_python-0.0.2/tests/test_link_host.py

@@ -5,7 +5,7 @@ import struct
 
 import pytest
 
-from oep_client.v1 import catalog, core, frames, host as h, link, message as m
+from oep_client import catalog, core, frames, host as h, link, message as m
 
 
 class Stream:

oep_client_python-0.0.1/tests/test_v1_link_serial.py → oep_client_python-0.0.2/tests/test_link_serial.py

@@ -9,7 +9,7 @@ import sys
 
 import pytest
 
-from oep_client.v1 import capture, cobs, core, host as h, link, message as m
+from oep_client import capture, cobs, core, host as h, link, message as m
 
 
 class Scripted:
@@ -67,7 +67,7 @@ def test_a_missing_answer_goes_once_more_with_the_same_corr():
 
 
 def serve(*args):
-    proc = subprocess.Popen([sys.executable, "-m", "oep_client.v1.fake_serve", *args],
+    proc = subprocess.Popen([sys.executable, "-m", "oep_client.fake_serve", *args],
                             stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True)
     return proc, proc.stdout.readline().split()
 

oep_client_python-0.0.1/tests/test_v1_session.py → oep_client_python-0.0.2/tests/test_session.py

@@ -4,7 +4,7 @@ import struct
 
 import pytest
 
-from oep_client.v1 import endpoint, fake, host, message as m
+from oep_client import endpoint, fake, host, message as m
 
 TOY = 7          # a fn the fake does not simulate (esp32_v003: the i2c-target) has the stand-in operations
 
@@ -53,7 +53,7 @@ def test_a_48_byte_name_fits_a_64_byte_frame():
     assert len(name) == 48
     probe = fake.FakeProbe("tiny", 64, [fake.Offered(0, 0, "oep.core"), fake.Offered(1, 1, name)])
     ep = endpoint.Endpoint(probe, Clock())
-    from oep_client.v1 import catalog
+    from oep_client import catalog
     result = ep.handle(m.Request(1, 0, m.OP_LIST, catalog.pack_list_request(name, True, 0)).pack())
     assert len(result) == 63 and catalog.unpack_list_result(result[5:])[1][0].name == name   # oep-v1 frame budget (v1-core-wire-delta §6)
 
@@ -228,7 +228,7 @@ def test_the_host_skips_tlvs_it_does_not_know_after_every_result(bench):
     assert opened.lease_ms == 1000 and not opened.resumed
     write(a, 9)
     assert read(a) == 9 and a.lock_state() == (True, 1000)
-    from oep_client.v1 import riscv
+    from oep_client import riscv
     wire = riscv.Wire(a, "oep.wire.swio")
     conn, _ = wire.attach()
     riscv.RiscvDm(a, conn).halt()

oep_client_python-0.0.1/tests/test_v1_target_parts.py → oep_client_python-0.0.2/tests/test_target_parts.py

@@ -5,7 +5,7 @@ import struct
 
 import pytest
 
-from oep_client.v1 import arm, host as h, message as m, target
+from oep_client import arm, host as h, message as m, target
 
 FNS = {"oep.wire.rvswd": 1, "oep.target.riscv-dm": 2, "oep.fixture.gpio": 3, "oep.wire.swd": 4,
        "oep.target.arm-adi": 5}
@@ -302,7 +302,7 @@ def test_cortexm_call_returns_r0_and_clears_maskints():
 
 
 def test_rp2350_flash_program_runs_the_sdk_sequence_and_verifies():
-    from oep_client.v1 import rp2350
+    from oep_client import rp2350
     fake = FakeCortexM()
     core = arm.CortexM(fake, bkpt_at=rp2350.BKPT_AT, stack_top=rp2350.STACK_TOP)
     core.halt()

oep_client_python-0.0.1/src/oep_client/__init__.py

@@ -1,5 +0,0 @@
-"""Open Embedded Probe (OEP) host client. `oep_client.v1` speaks the v1 protocol (oep-spec docs/oep-core.ja.md)."""
-
-__all__ = ["__version__"]
-
-__version__ = "0.0.1"

oep_client_python-0.0.1/src/oep_client/v1/__init__.py

@@ -1 +0,0 @@
-"""Draft: capability discovery by name (oep-spec capability-*.ja.md). No hardware yet."""