b4fbd6fe9f
Deploy Site / deploy-vercel (push) Has been skipped
Deploy Site / deploy-docs (push) Has been skipped
Build Skills Index / build-index (push) Has been skipped
CI / Deny unrelated histories (push) Has been skipped
CI / Detect affected areas (push) Successful in 27m35s
CI / OSV scan (push) Failing after 4s
CI / Build&Test Docker image (push) Successful in 9s
CI / Supply-chain scan (push) Has been skipped
CI / Lint Docker scripts (push) Failing after 5m13s
CI / Check contributors (push) Failing after 12m8s
CI / Docs Site (push) Failing after 12m8s
CI / TypeScript (push) Failing after 12m8s
CI / Python lints (push) Failing after 12m9s
CI / Python tests (push) Failing after 12m9s
CI / Check uv.lock (push) Failing after 23m22s
CI / CI timing report (push) Has been cancelled
Build Skills Index / trigger-deploy (push) Has been cancelled
CI / All required checks pass (push) Has been cancelled
235 lines
9.3 KiB
Python
235 lines
9.3 KiB
Python
"""Regression guard: _create_openai_client must honor HTTP(S)_PROXY env vars.
|
|
|
|
The keepalive client now uses ``httpx.Limits(keepalive_expiry=20.0)``
|
|
instead of a custom ``httpx.HTTPTransport(socket_options=...)`` to
|
|
prevent CLOSE-WAIT accumulation. This avoids breaking streaming for
|
|
providers behind reverse proxies (#54049, #12952) while still reaping
|
|
idle connections before a proxy's timeout drops them.
|
|
|
|
This test pins that the constructed ``httpx.Client`` mounts an
|
|
``HTTPProxy`` pool when a proxy env var is set, and that no
|
|
custom socket-options transport is used (default httpx transport).
|
|
"""
|
|
from unittest.mock import patch
|
|
|
|
import httpx
|
|
|
|
from run_agent import AIAgent, _get_proxy_from_env, _get_proxy_for_base_url
|
|
|
|
|
|
def _make_agent():
|
|
return AIAgent(
|
|
api_key="test-key",
|
|
base_url="https://chatgpt.com/backend-api/codex",
|
|
provider="openai-codex",
|
|
model="gpt-5.4",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
|
|
def _extract_http_client(client_kwargs: dict):
|
|
"""_create_openai_client calls ``OpenAI(**client_kwargs)``; grab the injected client."""
|
|
return client_kwargs.get("http_client")
|
|
|
|
|
|
def test_get_proxy_from_env_prefers_https_then_http_then_all(monkeypatch):
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
assert _get_proxy_from_env() is None
|
|
|
|
monkeypatch.setenv("ALL_PROXY", "http://all:1")
|
|
assert _get_proxy_from_env() == "http://all:1"
|
|
|
|
monkeypatch.setenv("HTTP_PROXY", "http://http:2")
|
|
assert _get_proxy_from_env() == "http://http:2"
|
|
|
|
monkeypatch.setenv("HTTPS_PROXY", "http://https:3")
|
|
assert _get_proxy_from_env() == "http://https:3"
|
|
|
|
|
|
def test_get_proxy_from_env_ignores_blank_values(monkeypatch):
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
monkeypatch.setenv("HTTPS_PROXY", " ")
|
|
monkeypatch.setenv("HTTP_PROXY", "http://real-proxy:8080")
|
|
assert _get_proxy_from_env() == "http://real-proxy:8080"
|
|
|
|
|
|
def test_get_proxy_from_env_normalizes_socks_alias(monkeypatch):
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
monkeypatch.setenv("ALL_PROXY", "socks://127.0.0.1:1080/")
|
|
assert _get_proxy_from_env() == "socks5://127.0.0.1:1080/"
|
|
|
|
|
|
@patch("run_agent.OpenAI")
|
|
def test_create_openai_client_routes_via_proxy_when_env_set(mock_openai, monkeypatch):
|
|
"""With HTTPS_PROXY set, the custom httpx.Client must mount an HTTPProxy pool.
|
|
|
|
This is the WSL2 + Clash / corporate-egress case. Before the fix, the custom
|
|
transport suppressed httpx's env-proxy auto-detection, so requests bypassed
|
|
the proxy entirely.
|
|
"""
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
monkeypatch.setenv("HTTPS_PROXY", "http://127.0.0.1:7897")
|
|
|
|
agent = _make_agent()
|
|
kwargs = {
|
|
"api_key": "test-key",
|
|
"base_url": "https://chatgpt.com/backend-api/codex",
|
|
}
|
|
agent._create_openai_client(kwargs, reason="test", shared=False)
|
|
|
|
forwarded = mock_openai.call_args.kwargs
|
|
http_client = _extract_http_client(forwarded)
|
|
assert isinstance(http_client, httpx.Client), (
|
|
"Expected _create_openai_client to inject a keepalive-enabled "
|
|
"httpx.Client; got %r" % (http_client,)
|
|
)
|
|
# Verify a proxy mount exists. httpx Client(proxy=...) rewrites _mounts so
|
|
# the proxied pool (HTTPProxy) sits alongside the base transport.
|
|
proxied_pools = [
|
|
type(mount._pool).__name__
|
|
for mount in http_client._mounts.values()
|
|
if mount is not None and hasattr(mount, "_pool")
|
|
]
|
|
assert "HTTPProxy" in proxied_pools, (
|
|
"Expected httpx.Client to route through HTTPProxy when HTTPS_PROXY is "
|
|
"set; found pools: %r" % (proxied_pools,)
|
|
)
|
|
http_client.close()
|
|
|
|
|
|
@patch("run_agent.OpenAI")
|
|
def test_create_openai_client_no_proxy_when_env_unset(mock_openai, monkeypatch):
|
|
"""Without proxy env vars, no HTTPProxy mount should exist and
|
|
no custom socket-options transport should be installed."""
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
agent = _make_agent()
|
|
kwargs = {
|
|
"api_key": "test-key",
|
|
"base_url": "https://chatgpt.com/backend-api/codex",
|
|
}
|
|
agent._create_openai_client(kwargs, reason="test", shared=False)
|
|
|
|
forwarded = mock_openai.call_args.kwargs
|
|
http_client = _extract_http_client(forwarded)
|
|
assert isinstance(http_client, httpx.Client)
|
|
pool_types = [
|
|
type(mount._pool).__name__
|
|
for mount in http_client._mounts.values()
|
|
if mount is not None and hasattr(mount, "_pool")
|
|
]
|
|
assert "HTTPProxy" not in pool_types, (
|
|
"No proxy env set but httpx.Client still mounted HTTPProxy; "
|
|
"pools were %r" % (pool_types,)
|
|
)
|
|
http_client.close()
|
|
|
|
|
|
@patch("run_agent.OpenAI")
|
|
def test_create_openai_client_uses_plain_httpx_client_for_copilot(mock_openai, monkeypatch):
|
|
"""All providers now use a standard httpx.Client (no custom socket-options
|
|
transport) so Copilot Claude chat-completions works without a host bypass."""
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
agent = _make_agent()
|
|
kwargs = {
|
|
"api_key": "test-key",
|
|
"base_url": "https://api.githubcopilot.com",
|
|
}
|
|
agent._create_openai_client(kwargs, reason="test", shared=False)
|
|
|
|
forwarded = mock_openai.call_args.kwargs
|
|
http_client = _extract_http_client(forwarded)
|
|
assert isinstance(http_client, httpx.Client)
|
|
assert getattr(http_client._transport._pool, "_socket_options", None) is None
|
|
http_client.close()
|
|
|
|
|
|
def test_get_proxy_for_base_url_returns_none_when_host_bypassed(monkeypatch):
|
|
"""NO_PROXY must suppress the proxy for matching base_urls.
|
|
|
|
Regression for #14966: users running a local inference endpoint
|
|
(Ollama, LM Studio, llama.cpp) with a global HTTPS_PROXY would see
|
|
the keepalive client route loopback traffic through the proxy, which
|
|
typically answers 502 for local hosts. NO_PROXY should opt those
|
|
hosts out via stdlib ``urllib.request.proxy_bypass_environment``.
|
|
"""
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy",
|
|
"NO_PROXY", "no_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
monkeypatch.setenv("HTTPS_PROXY", "http://127.0.0.1:7897")
|
|
monkeypatch.setenv("NO_PROXY", "localhost,127.0.0.1,192.168.0.0/16")
|
|
|
|
# Local endpoint — must bypass the proxy.
|
|
assert _get_proxy_for_base_url("http://127.0.0.1:11434/v1") is None
|
|
assert _get_proxy_for_base_url("http://localhost:1234/v1") is None
|
|
|
|
# Non-local endpoint — proxy still applies.
|
|
assert _get_proxy_for_base_url("https://api.openai.com/v1") == "http://127.0.0.1:7897"
|
|
|
|
|
|
def test_get_proxy_for_base_url_returns_proxy_when_no_proxy_unset(monkeypatch):
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy",
|
|
"NO_PROXY", "no_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
monkeypatch.setenv("HTTPS_PROXY", "http://corp:8080")
|
|
assert _get_proxy_for_base_url("http://127.0.0.1:11434/v1") == "http://corp:8080"
|
|
|
|
|
|
def test_get_proxy_for_base_url_returns_none_when_proxy_unset(monkeypatch):
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy",
|
|
"NO_PROXY", "no_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
monkeypatch.setenv("NO_PROXY", "localhost,127.0.0.1")
|
|
assert _get_proxy_for_base_url("http://127.0.0.1:11434/v1") is None
|
|
assert _get_proxy_for_base_url("https://api.openai.com/v1") is None
|
|
|
|
|
|
@patch("run_agent.OpenAI")
|
|
def test_create_openai_client_bypasses_proxy_for_no_proxy_host(mock_openai, monkeypatch):
|
|
"""E2E: with HTTPS_PROXY + NO_PROXY=localhost, a local base_url gets a
|
|
keepalive client with NO HTTPProxy mount."""
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy",
|
|
"NO_PROXY", "no_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
monkeypatch.setenv("HTTPS_PROXY", "http://127.0.0.1:7897")
|
|
monkeypatch.setenv("NO_PROXY", "localhost,127.0.0.1")
|
|
|
|
agent = _make_agent()
|
|
kwargs = {
|
|
"api_key": "***",
|
|
"base_url": "http://127.0.0.1:11434/v1",
|
|
}
|
|
agent._create_openai_client(kwargs, reason="test", shared=False)
|
|
|
|
forwarded = mock_openai.call_args.kwargs
|
|
http_client = _extract_http_client(forwarded)
|
|
assert isinstance(http_client, httpx.Client)
|
|
pool_types = [
|
|
type(mount._pool).__name__
|
|
for mount in http_client._mounts.values()
|
|
if mount is not None and hasattr(mount, "_pool")
|
|
]
|
|
assert "HTTPProxy" not in pool_types, (
|
|
"NO_PROXY host must not route through HTTPProxy; pools were %r" % (pool_types,)
|
|
)
|
|
http_client.close()
|