更新: 109 个文件 - 2026-03-18 10:55:52

scripts/intel/http_client.py

@@ -4,14 +4,12 @@ import time
 from typing import Any, Dict
 
 import requests
-from requests.adapters import HTTPAdapter
-from urllib3.util.retry import Retry
 
 from intel.config import DEFAULT_HEALTH_POLICY, DEFAULT_REQUEST_POLICY
 
 
 DEFAULT_TIMEOUT = 30
-DEFAULT_USER_AGENT = "websafe-intel"
+DEFAULT_USER_AGENT = "python-requests/2.31.0"
 
 
 def _request_policy(source: Dict[str, Any] | None = None) -> Dict[str, Any]:
@@ -23,21 +21,8 @@ def _health_policy(source: Dict[str, Any] | None = None) -> Dict[str, Any]:
 
 
 def build_session(source: Dict[str, Any] | None = None) -> requests.Session:
-    health_policy = _health_policy(source)
     session = requests.Session()
-    retry = Retry(
-        total=int(health_policy.get("retries") or 3),
-        connect=int(health_policy.get("retries") or 3),
-        read=int(health_policy.get("retries") or 3),
-        status=int(health_policy.get("retries") or 3),
-        backoff_factor=float(health_policy.get("backoff_seconds") or 0.5),
-        allowed_methods=frozenset(["GET", "POST"]),
-        status_forcelist=[429, 500, 502, 503, 504],
-        raise_on_status=False,
-    )
-    adapter = HTTPAdapter(max_retries=retry)
-    session.mount("https://", adapter)
-    session.mount("http://", adapter)
+    session.trust_env = True
     request_policy = _request_policy(source)
     headers = {"User-Agent": request_policy.get("user_agent") or DEFAULT_USER_AGENT}
     if request_policy.get("accept"):
@@ -63,8 +48,6 @@ def request(
         headers["User-Agent"] = request_policy.get("user_agent") or DEFAULT_USER_AGENT
     if request_policy.get("accept") and "Accept" not in headers:
         headers["Accept"] = request_policy["accept"]
-    if request_policy.get("http_version") == "1.1" and "Connection" not in headers:
-        headers["Connection"] = "close"
     timeout_value = timeout if timeout != DEFAULT_TIMEOUT else int(request_policy.get("timeout_seconds") or DEFAULT_TIMEOUT)
     allow_redirects = kwargs.pop("allow_redirects", bool(request_policy.get("follow_redirects", True)))
     verify = kwargs.pop("verify", bool(request_policy.get("verify_tls", True)))