python-agent-harness 1.5.4.8__tar.gz → 1.5.4.9__tar.gz

{python_agent_harness-1.5.4.8/python_agent_harness.egg-info → python_agent_harness-1.5.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-agent-harness
-Version: 1.5.4.8
+Version: 1.5.4.9
 Summary: A lightweight, hackable mini-OpenCode written in Python.
 Author: huming
 License-Expression: MIT

{python_agent_harness-1.5.4.8 → python_agent_harness-1.5.4.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-agent-harness"
-version = "1.5.4.8"
+version = "1.5.4.9"
 description = "A lightweight, hackable mini-OpenCode written in Python."
 readme = "README.md"
 requires-python = ">=3.11"

{python_agent_harness-1.5.4.8 → python_agent_harness-1.5.4.9}/python_agent_harness/__init__.py

@@ -5,7 +5,7 @@ from .mcp.manager import MCPManager
 from .models import AgentMode, Message, ToolCall, ToolSpec
 from .session import Session
 
-__version__ = "1.5.4.8"
+__version__ = "1.5.4.9"
 
 __all__ = [
     "Session",

{python_agent_harness-1.5.4.8 → python_agent_harness-1.5.4.9}/python_agent_harness/client.py

@@ -12,6 +12,7 @@ import json
 import os
 import random
 import socket as _socket
+import sys
 import threading
 import time
 import uuid
@@ -822,6 +823,47 @@ def _default_api_key() -> str | None:
     return os.environ.get("OPENAI_API_KEY") or os.environ.get("DEEPSEEK_API_KEY") or None
 
 
+def _extract_socket(conn: object) -> _socket.socket | None:
+    """Best-effort extraction of the raw socket from an httpcore connection.
+
+    For direct (non-proxy) connections the socket lives at
+    ``conn._connection._network_stream``.  Proxy connections are wrapped
+    (ForwardHTTPConnection/TunnelHTTPConnection -> HTTPConnection ->
+    HTTP11Connection), so we unwrap up to 4 levels looking for the
+    ``_network_stream`` attribute that owns the raw socket.
+    """
+    try:
+        obj: object = conn
+        stream = None
+        for _ in range(4):
+            stream = getattr(obj, "_network_stream", None)
+            if stream is not None:
+                break
+            obj = getattr(obj, "_connection", None)
+            if obj is None:
+                break
+        return stream.get_extra_info("socket") if stream is not None else None
+    except Exception:  # noqa: BLE001 - best effort
+        return None
+
+
+def _shutdown_and_close(sock: _socket.socket) -> None:
+    """Shutdown then close a socket to wake blocked reads.
+
+    On macOS the socket is in non-blocking mode (httpcore calls
+    settimeout for the read timeout), so a blocked recv parks in
+    select(); closing the fd before that select has processed the
+    shutdown wakeup can lose the wakeup and leave the read parked
+    forever.  Give the woken thread a moment to observe the EOF first.
+    """
+    with contextlib.suppress(OSError):
+        sock.shutdown(_socket.SHUT_RDWR)
+    if sys.platform == "darwin":
+        time.sleep(0.05)
+    with contextlib.suppress(OSError):
+        sock.close()
+
+
 def _abort_inflight_sockets(client: httpx.Client) -> None:
     """Wake any blocked stream reads on every live pool socket.
 
@@ -849,21 +891,31 @@ def _abort_inflight_sockets(client: httpx.Client) -> None:
     ``contextlib.suppress`` right after this call, so a double-close is
     harmless.  Every step is best-effort; any failure is ignored.
     """
-    pool = getattr(getattr(client, "_transport", None), "_pool", None)
-    for conn in getattr(pool, "_connections", None) or ():
-        try:
-            stream = getattr(getattr(conn, "_connection", None), "_network_stream", None)
-            sock = stream.get_extra_info("socket") if stream is not None else None
-        except Exception:  # noqa: BLE001 - best effort
-            sock = None
-        if sock is not None:
-            # shutdown first (wakes the recv on Linux without touching
-            # the fd), then close the fd (the reliable wake on
-            # macOS/BSD, where shutdown alone may not).
-            with contextlib.suppress(OSError):
-                sock.shutdown(_socket.SHUT_RDWR)
-            with contextlib.suppress(OSError):
-                sock.close()
+    pools: list[object] = []
+    base_pool = getattr(getattr(client, "_transport", None), "_pool", None)
+    if base_pool is not None:
+        pools.append(base_pool)
+
+    if sys.platform == "darwin":
+        # macOS only: with proxy env vars (HTTP_PROXY/HTTPS_PROXY) set,
+        # httpx routes requests through proxy transports registered in
+        # client._mounts (pools are httpcore.HTTPProxy), leaving the
+        # base transport pool above empty.  On Linux this never happens
+        # in CI and the code path above is sufficient, so this extra
+        # walk is deliberately restricted to macOS.
+        mounts = getattr(client, "_mounts", None)
+        if isinstance(mounts, dict):
+            for transport in mounts.values():
+                if transport is not None:
+                    pool = getattr(transport, "_pool", None)
+                    if pool is not None:
+                        pools.append(pool)
+
+    for pool in pools:
+        for conn in getattr(pool, "_connections", None) or ():
+            sock = _extract_socket(conn)
+            if sock is not None:
+                _shutdown_and_close(sock)
 
 
 def _iter_sse(lines: Iterator[str]) -> Iterator[str]:

{python_agent_harness-1.5.4.8 → python_agent_harness-1.5.4.9/python_agent_harness.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-agent-harness
-Version: 1.5.4.8
+Version: 1.5.4.9
 Summary: A lightweight, hackable mini-OpenCode written in Python.
 Author: huming
 License-Expression: MIT

{python_agent_harness-1.5.4.8 → python_agent_harness-1.5.4.9}/tests/test_client.py

@@ -816,6 +816,7 @@ class TestAbortInflightSockets(unittest.TestCase):
 
     def _fake_client_with_stream(self, stream):
         conn = mock.Mock()
+        conn._network_stream = None
         conn._connection._network_stream = stream
         client = mock.Mock()
         client._transport._pool._connections = [conn]