Skip to content

fix(web): catch aiohttp.ClientError in SearchWeb to prevent unhandled crash #1586

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
ascl1u wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(web): catch aiohttp.ClientError in SearchWeb to prevent unhandled crash #1586

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd8d882
catch network error
ascl1u Mar 25, 2026
0eb7b78
Merge branch 'main' of https://github.com/ascl1u/kimi-cli into fix/ca…
ascl1u Mar 25, 2026
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
86 changes: 48 additions & 38 deletions src/kimi_cli/tools/web/search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import override

import aiohttp
from kosong.tooling import CallableTool2, ToolReturnValue
from pydantic import BaseModel, Field, ValidationError

Expand Down Expand Up @@ -65,44 +66,53 @@ async def __call__(self, params: Params) -> ToolReturnValue:
tool_call = get_current_tool_call_or_none()
assert tool_call is not None, "Tool call is expected to be set"

async with (
new_client_session() as session,
session.post(
self._base_url,
headers={
"User-Agent": USER_AGENT,
"Authorization": f"Bearer {api_key}",
"X-Msh-Tool-Call-Id": tool_call.id,
**self._runtime.oauth.common_headers(),
**self._custom_headers,
},
json={
"text_query": params.query,
"limit": params.limit,
"enable_page_crawling": params.include_content,
"timeout_seconds": 30,
},
) as response,
):
if response.status != 200:
return builder.error(
(
f"Failed to search. Status: {response.status}. "
"This may indicates that the search service is currently unavailable."
),
brief="Failed to search",
)

try:
results = Response(**await response.json()).search_results
except ValidationError as e:
return builder.error(
(
f"Failed to parse search results. Error: {e}. "
"This may indicates that the search service is currently unavailable."
),
brief="Failed to parse search results",
)
try:
async with (
new_client_session() as session,
session.post(
self._base_url,
headers={
"User-Agent": USER_AGENT,
"Authorization": f"Bearer {api_key}",
"X-Msh-Tool-Call-Id": tool_call.id,
**self._runtime.oauth.common_headers(),
**self._custom_headers,
},
json={
"text_query": params.query,
"limit": params.limit,
"enable_page_crawling": params.include_content,
"timeout_seconds": 30,
},
) as response,
):
if response.status != 200:
return builder.error(
(
f"Failed to search. Status: {response.status}. "
"This may indicate that the search service is currently unavailable."
),
brief="Failed to search",
)

try:
results = Response(**await response.json()).search_results
except ValidationError as e:
return builder.error(
(
f"Failed to parse search results. Error: {e}. "
"This may indicate that the search service is currently unavailable."
),
brief="Failed to parse search results",
)
except aiohttp.ClientError as e:
return builder.error(
(
f"Failed to search due to network error: {e}. "
"This may indicate the search service is unreachable."
),
brief="Network error",
)

for i, result in enumerate(results):
if i > 0:
Expand Down
Loading