mirror of
https://github.com/langgenius/dify.git
synced 2026-03-07 08:35:58 +08:00
2020669cb0
Updated the BaseRequest class to conditionally include the timeout parameter when making requests with httpx. This change preserves the library's default timeout behavior by only passing the timeout argument when it is explicitly set, enhancing request management and flexibility.
82 lines
2.8 KiB
Python
82 lines
2.8 KiB
Python
import logging
|
|
import os
|
|
from collections.abc import Mapping
|
|
from typing import Any
|
|
|
|
import httpx
|
|
|
|
from core.helper.trace_id_helper import generate_traceparent_header
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class BaseRequest:
|
|
proxies: Mapping[str, str] | None = {
|
|
"http": "",
|
|
"https": "",
|
|
}
|
|
base_url = ""
|
|
secret_key = ""
|
|
secret_key_header = ""
|
|
|
|
@classmethod
|
|
def _build_mounts(cls) -> dict[str, httpx.BaseTransport] | None:
|
|
if not cls.proxies:
|
|
return None
|
|
|
|
mounts: dict[str, httpx.BaseTransport] = {}
|
|
for scheme, value in cls.proxies.items():
|
|
if not value:
|
|
continue
|
|
key = f"{scheme}://" if not scheme.endswith("://") else scheme
|
|
mounts[key] = httpx.HTTPTransport(proxy=value)
|
|
return mounts or None
|
|
|
|
@classmethod
|
|
def send_request(
|
|
cls,
|
|
method: str,
|
|
endpoint: str,
|
|
json: Any | None = None,
|
|
params: Mapping[str, Any] | None = None,
|
|
*,
|
|
timeout: float | httpx.Timeout | None = None,
|
|
raise_for_status: bool = False,
|
|
) -> Any:
|
|
headers = {"Content-Type": "application/json", cls.secret_key_header: cls.secret_key}
|
|
url = f"{cls.base_url}{endpoint}"
|
|
mounts = cls._build_mounts()
|
|
|
|
try:
|
|
# ensure traceparent even when OTEL is disabled
|
|
traceparent = generate_traceparent_header()
|
|
if traceparent:
|
|
headers["traceparent"] = traceparent
|
|
except Exception:
|
|
logger.debug("Failed to generate traceparent header", exc_info=True)
|
|
|
|
with httpx.Client(mounts=mounts) as client:
|
|
# IMPORTANT:
|
|
# - In httpx, passing timeout=None disables timeouts (infinite) and overrides the library default.
|
|
# - To preserve httpx's default timeout behavior for existing call sites, only pass the kwarg when set.
|
|
request_kwargs: dict[str, Any] = {"json": json, "params": params, "headers": headers}
|
|
if timeout is not None:
|
|
request_kwargs["timeout"] = timeout
|
|
|
|
response = client.request(method, url, **request_kwargs)
|
|
if raise_for_status:
|
|
response.raise_for_status()
|
|
return response.json()
|
|
|
|
|
|
class EnterpriseRequest(BaseRequest):
|
|
base_url = os.environ.get("ENTERPRISE_API_URL", "ENTERPRISE_API_URL")
|
|
secret_key = os.environ.get("ENTERPRISE_API_SECRET_KEY", "ENTERPRISE_API_SECRET_KEY")
|
|
secret_key_header = "Enterprise-Api-Secret-Key"
|
|
|
|
|
|
class EnterprisePluginManagerRequest(BaseRequest):
|
|
base_url = os.environ.get("ENTERPRISE_PLUGIN_MANAGER_API_URL", "ENTERPRISE_PLUGIN_MANAGER_API_URL")
|
|
secret_key = os.environ.get("ENTERPRISE_PLUGIN_MANAGER_API_SECRET_KEY", "ENTERPRISE_PLUGIN_MANAGER_API_SECRET_KEY")
|
|
secret_key_header = "Plugin-Manager-Inner-Api-Secret-Key"
|