Skip to content

fix(agent-scan): honor provider-configured timeout_ms for HTTP targets #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boy-hack wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(agent-scan): honor provider-configured timeout_ms for HTTP targets #617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions agent-scan/agent_scan/core/agent_adapter/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,10 @@ def _call_standard_provider(

# Make request
response_path = provider_conf.get("response_path")
result = self._make_http_request(url, "POST", headers, body, response_path)
result = self._make_http_request(
url, "POST", headers, body, response_path,
timeout_seconds=self._get_timeout_seconds(config)
)

# Add metadata and cost
if result.success and result.provider_response:
Expand Down Expand Up @@ -500,7 +503,10 @@ def _call_http_provider(self, provider: ProviderOptions, prompt: str) -> Provide

body = self._render_prompt_body(config.body, prompt)

return self._make_http_request(url, method, headers, body, config.transform_response)
return self._make_http_request(
url, method, headers, body, config.transform_response,
timeout_seconds=self._get_timeout_seconds(config)
)

def _render_prompt_body(self, body_template: Any, prompt: str) -> Any:
"""Render a provider request body by replacing prompt placeholders."""
Expand Down Expand Up @@ -813,7 +819,10 @@ def _call_dify_provider(self, provider: ProviderOptions, prompt: str) -> Provide
"Content-Type": "application/json"
}

result = self._make_http_request(url, "POST", headers, body, "answer")
result = self._make_http_request(
url, "POST", headers, body, "answer",
timeout_seconds=self._get_timeout_seconds(config)
)

if result.success and result.provider_response:
result.provider_response.metadata = result.provider_response.metadata or {}
Expand Down Expand Up @@ -901,7 +910,10 @@ def _call_coze_provider(self, provider: ProviderOptions, prompt: str) -> Provide
"Content-Type": "application/json"
}

result = self._make_http_request(url, "POST", headers, body)
result = self._make_http_request(
url, "POST", headers, body,
timeout_seconds=self._get_timeout_seconds(config)
)

if result.success and result.provider_response:
raw = result.provider_response.raw
Expand Down Expand Up @@ -945,13 +957,23 @@ def _make_http_request(
method: str,
headers: Dict[str, str],
body: Any,
transform_response: Optional[str] = None
transform_response: Optional[str] = None,
timeout_seconds: Optional[float] = None
) -> ProviderTestResult:
"""Make HTTP request and return standardized result."""
"""Make HTTP request and return standardized result.

Args:
timeout_seconds: Per-request timeout in seconds. When omitted,
falls back to the adapter-level default (``self.timeout``).
Callers that have a ``ProviderConfig`` should pass
``self._get_timeout_seconds(config)`` so that a user-configured
``timeout_ms`` is honored (see issue #613).
"""
effective_timeout = timeout_seconds if timeout_seconds is not None else self.timeout
start_time = time.time()

try:
with httpx.Client(timeout=self.timeout) as client:
with httpx.Client(timeout=effective_timeout) as client:
response = client.request(
method=method,
url=url,
Expand Down Expand Up @@ -1016,7 +1038,7 @@ def _make_http_request(
except httpx.TimeoutException:
return ProviderTestResult(
success=False,
message=f"⏱️ Request timed out after {self.timeout} seconds",
message=f"⏱️ Request timed out after {effective_timeout} seconds",
provider_response=ProviderResponseInfo(error="Timeout", metadata={"url": url})
)
except httpx.ConnectError as e:
Expand Down