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
99 lines
3.7 KiB
Python
99 lines
3.7 KiB
Python
"""Regression guard: auxiliary OpenAI clients must use env-only proxy policy.
|
|
|
|
On macOS, httpx with default ``trust_env=True`` reads system proxy settings
|
|
via ``urllib.request.getproxies()`` but not the macOS proxy exception list.
|
|
Auxiliary clients (vision, title generation, etc.) must mirror the main
|
|
agent: explicit ``HTTPS_PROXY`` / ``NO_PROXY`` env vars only, via a custom
|
|
keepalive transport that suppresses automatic system-proxy detection.
|
|
"""
|
|
from unittest.mock import patch
|
|
|
|
import httpx
|
|
|
|
from agent.auxiliary_client import _create_openai_client, _openai_http_client_kwargs
|
|
from agent.process_bootstrap import _get_proxy_for_base_url
|
|
|
|
|
|
def _pool_types(http_client) -> list:
|
|
return [
|
|
type(mount._pool).__name__
|
|
for mount in http_client._mounts.values()
|
|
if mount is not None and hasattr(mount, "_pool")
|
|
]
|
|
|
|
|
|
@patch("agent.auxiliary_client.OpenAI")
|
|
def test_create_openai_client_routes_via_env_proxy(mock_openai, 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://127.0.0.1:7897")
|
|
|
|
_create_openai_client(
|
|
api_key="test-key",
|
|
base_url="https://litellm.internal.example.com/v1",
|
|
)
|
|
|
|
http_client = mock_openai.call_args.kwargs.get("http_client")
|
|
assert isinstance(http_client, httpx.Client)
|
|
assert "HTTPProxy" in _pool_types(http_client)
|
|
http_client.close()
|
|
|
|
|
|
@patch("agent.auxiliary_client.OpenAI")
|
|
def test_create_openai_client_no_proxy_when_env_unset(mock_openai, 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)
|
|
|
|
_create_openai_client(
|
|
api_key="test-key",
|
|
base_url="https://litellm.internal.example.com/v1",
|
|
)
|
|
|
|
http_client = mock_openai.call_args.kwargs.get("http_client")
|
|
assert isinstance(http_client, httpx.Client)
|
|
assert "HTTPProxy" not in _pool_types(http_client)
|
|
http_client.close()
|
|
|
|
|
|
@patch("agent.auxiliary_client.OpenAI")
|
|
def test_create_openai_client_ignores_macos_system_proxy(mock_openai, monkeypatch):
|
|
"""System proxy from getproxies() must not apply when env vars are unset."""
|
|
for key in ("HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
|
"https_proxy", "http_proxy", "all_proxy", "NO_PROXY", "no_proxy"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
with patch(
|
|
"urllib.request.getproxies",
|
|
return_value={"http": "http://127.0.0.1:7897", "https": "http://127.0.0.1:7897"},
|
|
):
|
|
_create_openai_client(
|
|
api_key="test-key",
|
|
base_url="https://litellm.internal.example.com/v1",
|
|
)
|
|
|
|
http_client = mock_openai.call_args.kwargs.get("http_client")
|
|
assert isinstance(http_client, httpx.Client)
|
|
assert "HTTPProxy" not in _pool_types(http_client)
|
|
http_client.close()
|
|
|
|
|
|
def test_get_proxy_for_base_url_respects_no_proxy(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://127.0.0.1:7897")
|
|
monkeypatch.setenv("NO_PROXY", "internal.example.com")
|
|
|
|
assert _get_proxy_for_base_url("https://litellm.internal.example.com/v1") is None
|
|
assert _get_proxy_for_base_url("https://api.openai.com/v1") == "http://127.0.0.1:7897"
|
|
|
|
|
|
def test_openai_http_client_kwargs_async_mode():
|
|
kwargs = _openai_http_client_kwargs(
|
|
"https://litellm.internal.example.com/v1",
|
|
async_mode=True,
|
|
)
|
|
assert isinstance(kwargs["http_client"], httpx.AsyncClient)
|