rtpbench 0.4.0__tar.gz → 0.4.1__tar.gz

{rtpbench-0.4.0 → rtpbench-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rtpbench
-Version: 0.4.0
+Version: 0.4.1
 Summary: Wire-level latency and conformance tests for voice agents over SIP/RTP
 Author-email: Juanjo Aroztegi <juanjo@aroztegi.com>
 License-Expression: Apache-2.0

{rtpbench-0.4.0 → rtpbench-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rtpbench"
-version = "0.4.0"
+version = "0.4.1"
 description = "Wire-level latency and conformance tests for voice agents over SIP/RTP"
 readme = "README.md"
 license = "Apache-2.0"

{rtpbench-0.4.0 → rtpbench-0.4.1}/src/rtpbench/bench.py

@@ -518,9 +518,10 @@ def _host(cmd: str) -> str:
 
 
 def _commit() -> str:
-    """Counted from a release (results' wave tags would otherwise name the commit); installed,
-    the release itself: there is no checkout to describe."""
-    if ROOT == PACKAGE:
+    """Counted from a release (results' wave tags would otherwise name the commit); without a
+    checkout to describe (installed, or the action's copy of a commit, which has no .git), the
+    version it declares: the image tag names the code."""
+    if not (ROOT / ".git").exists():  # not `git describe`: it would find any repository above
         from importlib.metadata import version
 
         return f"v{version('rtpbench')}"

{rtpbench-0.4.0 → rtpbench-0.4.1}/src/rtpbench/cases.py

@@ -366,6 +366,8 @@ def _hold(dial: Dial, seed: int, offers: list[tuple[str, str | None]]) -> dict[s
         if s.remote_bye:
             break
         m.muted = direction == "inactive"
+        if m.muted:  # the sender builds each packet a tick ahead: let the last one out first
+            s.wait(lambda: s.remote_bye, 2 * rtp.PTIME_NS / 1e9)
         s.reinvite(direction, conn=conn)
         s.wait(lambda: s.remote_bye, HOLD_S)
     s.hangup()

{rtpbench-0.4.0 → rtpbench-0.4.1}/src/rtpbench/realtime.py

@@ -124,9 +124,24 @@ class Lines:
 # --- WebSocket (RFC 6455, server side: text frames out, masked frames in) ---
 
 
-async def _handshake(reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> str:
+async def _handshake(reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> str | None:
+    """The request line once the WebSocket is open, or None for a plain HTTP request."""
     head = (await reader.readuntil(b"\r\n\r\n")).decode(errors="replace").split("\r\n")
     headers = {k.strip().lower(): v.strip() for k, _, v in (h.partition(":") for h in head[1:])}
+    if "sec-websocket-key" not in headers:
+        # Some agents check their key against the model list before they connect.
+        method, _, rest = head[0].partition(" ")
+        path = rest.partition(" ")[0]
+        found = method == "GET" and path.split("?")[0].rstrip("/").endswith("/models")
+        body = b'{"object": "list", "data": []}' if found else b""
+        status = "200 OK" if found else "404 Not Found"
+        writer.write(
+            f"HTTP/1.1 {status}\r\nContent-Type: application/json\r\n"
+            f"Content-Length: {len(body)}\r\nConnection: close\r\n\r\n".encode()
+            + body
+        )
+        await writer.drain()
+        return None
     key = headers["sec-websocket-key"].encode()
     accept = base64.b64encode(hashlib.sha1(key + _GUID).digest()).decode()
     writer.write(
@@ -532,7 +547,9 @@ def serve(out: Path, port: int = PORT, ready: Path | None = None) -> None:
     async def connection(reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
         try:
             request = await _handshake(reader, writer)
-        except asyncio.IncompleteReadError, KeyError, ConnectionError:
+        except asyncio.IncompleteReadError, ConnectionError:
+            request = None
+        if request is None:
             writer.close()
             return
         s = Session(writer, lines, log, steps)

{rtpbench-0.4.0 → rtpbench-0.4.1}/targets/aivc/compose.yaml

@@ -13,12 +13,12 @@ services:
     command: sleep infinity
 
   opensips:
-    image: opensips/opensips:3.6@sha256:81a7fa3c7bdbceaadb7cb869ff7ac3f34efb2d95cd7fecb3b689d7b6b1eb0672
+    image: opensips/opensips:4.0@sha256:e1d8151b96c00d52c9bd8f102ebc9e7c90fc4e44fe8df117b56009bebbeff7a0
     network_mode: service:target
     depends_on: [target]
     volumes: ["./targets/aivc/opensips.cfg:/etc/opensips/opensips.cfg:ro"]
     healthcheck:
-      test: opensips-cli -x mi sr_get_status core | grep -q running
+      test: opensips-cli -x mi status_report:get core | grep -q running
       interval: 1s
       retries: 20
 
@@ -54,7 +54,7 @@ services:
         - -c
         - >-
           import json, socket; s = socket.socket(2, 2); s.settimeout(1);
-          s.sendto(json.dumps({"jsonrpc": "2.0", "id": 1, "method": "subscribers_list",
+          s.sendto(json.dumps({"jsonrpc": "2.0", "id": 1, "method": "evi:subscribers",
           "params": ["E_UA_SESSION"]}).encode(), ("127.0.0.1", 8080));
           assert json.loads(s.recv(65535))["result"]["Event"]["Subscribers"]
       interval: 1s

{rtpbench-0.4.0 → rtpbench-0.4.1}/tests/test_images.py

@@ -122,3 +122,10 @@ def test_a_target_built_from_a_checkout_is_tagged_by_its_commit_and_files(
     assert tag() != clean
     with pytest.raises(ValueError, match="not a git checkout"):
         bench.checkout(tmp_path)
+
+
+def test_a_copy_without_git_records_its_version_as_the_commit(root: Path) -> None:
+    from importlib.metadata import version
+
+    assert not (root / ".git").exists()  # as the action unpacks a commit
+    assert bench._commit() == f"v{version('rtpbench')}"

{rtpbench-0.4.0 → rtpbench-0.4.1}/tests/test_realtime.py

@@ -82,6 +82,22 @@ def test_a_port_in_use_is_one_line_naming_the_option(tmp_path: Path) -> None:
     assert "\n" not in str(e.value)
 
 
+def test_a_model_list_request_gets_an_empty_list(engine: tuple[int, Path]) -> None:
+    port, _ = engine
+
+    async def get(path: str) -> bytes:
+        reader, writer = await asyncio.open_connection("127.0.0.1", port)
+        writer.write(f"GET {path} HTTP/1.1\r\nHost: x\r\nAuthorization: Bearer x\r\n\r\n".encode())
+        reply = await reader.read()
+        writer.close()
+        return reply
+
+    head, _, body = asyncio.run(get("/v1/models")).partition(b"\r\n\r\n")
+    assert head.startswith(b"HTTP/1.1 200")
+    assert json.loads(body) == {"object": "list", "data": []}
+    assert asyncio.run(get("/v1/realtime")).startswith(b"HTTP/1.1 404")
+
+
 def test_lines_are_told_apart_and_answered() -> None:
     lines = realtime.Lines()
     for name in ("transfer", "prompt-03", "turn-05", "interrupt-01"):