mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
fix(agent): normalize socks:// env proxies for httpx/anthropic
WSL2 / Clash-style setups often export ALL_PROXY=socks://127.0.0.1:PORT. httpx and the Anthropic SDK reject that alias and expect socks5://, so agent startup failed early with "Unknown scheme for proxy URL" before any provider request could proceed. Add shared normalize_proxy_url()/normalize_proxy_env_vars() helpers in utils.py and route all proxy entry points through them: - run_agent._get_proxy_from_env - agent.auxiliary_client._validate_proxy_env_urls - agent.anthropic_adapter.build_anthropic_client - gateway.platforms.base.resolve_proxy_url Regression coverage: - run_agent proxy env resolution - auxiliary proxy env normalization - gateway proxy URL resolution Verified with: PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 /home/nonlinear/.hermes/hermes-agent/venv/bin/pytest -o addopts='' -p pytest_asyncio.plugin tests/run_agent/test_create_openai_client_proxy_env.py tests/agent/test_proxy_and_url_validation.py tests/gateway/test_proxy_mode.py 39 passed.
This commit is contained in:
parent
bd342f30a2
commit
155b619867
8 changed files with 73 additions and 7 deletions
34
utils.py
34
utils.py
|
|
@ -197,6 +197,39 @@ def env_bool(key: str, default: bool = False) -> bool:
|
|||
return is_truthy_value(os.getenv(key, ""), default=default)
|
||||
|
||||
|
||||
# ─── Proxy Helpers ────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
_PROXY_ENV_KEYS = (
|
||||
"HTTPS_PROXY", "HTTP_PROXY", "ALL_PROXY",
|
||||
"https_proxy", "http_proxy", "all_proxy",
|
||||
)
|
||||
|
||||
|
||||
def normalize_proxy_url(proxy_url: str | None) -> str | None:
|
||||
"""Normalize proxy URLs for httpx/aiohttp compatibility.
|
||||
|
||||
WSL/Clash-style environments often export SOCKS proxies as
|
||||
``socks://127.0.0.1:PORT``. httpx rejects that alias and expects the
|
||||
explicit ``socks5://`` scheme instead.
|
||||
"""
|
||||
candidate = str(proxy_url or "").strip()
|
||||
if not candidate:
|
||||
return None
|
||||
if candidate.lower().startswith("socks://"):
|
||||
return f"socks5://{candidate[len('socks://'):]}"
|
||||
return candidate
|
||||
|
||||
|
||||
def normalize_proxy_env_vars() -> None:
|
||||
"""Rewrite supported proxy env vars to canonical URL forms in-place."""
|
||||
for key in _PROXY_ENV_KEYS:
|
||||
value = os.getenv(key, "")
|
||||
normalized = normalize_proxy_url(value)
|
||||
if normalized and normalized != value:
|
||||
os.environ[key] = normalized
|
||||
|
||||
|
||||
# ─── URL Parsing Helpers ──────────────────────────────────────────────────────
|
||||
|
||||
|
||||
|
|
@ -236,4 +269,3 @@ def base_url_host_matches(base_url: str, domain: str) -> bool:
|
|||
if not domain:
|
||||
return False
|
||||
return hostname == domain or hostname.endswith("." + domain)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue