Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions wren-ai-service/src/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class Settings(BaseSettings):
so we set it to 1_000_000, which is a large number
""",
)
max_ask_timeout: int = Field(default=300, description="Maximum timeout for the ask query in seconds.")

# user guide config
is_oss: bool = Field(default=True)
Expand Down
1 change: 1 addition & 0 deletions wren-ai-service/src/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ def create_service_container(
max_histories=settings.max_histories,
enable_column_pruning=settings.enable_column_pruning,
max_sql_correction_retries=settings.max_sql_correction_retries,
max_ask_timeout=settings.max_ask_timeout,
**query_cache,
),
chart_service=services.ChartService(
Expand Down
22 changes: 22 additions & 0 deletions wren-ai-service/src/web/v1/services/ask.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class AskRequest(BaseRequest):
enable_column_pruning: bool = False
use_dry_plan: bool = False
allow_dry_plan_fallback: bool = True
timeout: float = Field(default=30.0, description="Timeout for the ask query in seconds.")


class AskResponse(BaseModel):
Expand Down Expand Up @@ -144,6 +145,7 @@ def __init__(
enable_column_pruning: bool = False,
max_sql_correction_retries: int = 3,
max_histories: int = 5,
max_ask_timeout: int = 300,
maxsize: int = 1_000_000,
ttl: int = 120,
):
Expand All @@ -160,6 +162,7 @@ def __init__(
self._enable_column_pruning = enable_column_pruning
self._max_histories = max_histories
self._max_sql_correction_retries = max_sql_correction_retries
self._max_ask_timeout = max_ask_timeout

def _is_stopped(self, query_id: str, container: dict):
if (
Expand All @@ -175,6 +178,25 @@ async def ask(
self,
ask_request: AskRequest,
**kwargs,
):
timeout = min(ask_request.timeout, self._max_ask_timeout)
try:
await asyncio.wait_for(self._ask(ask_request, **kwargs), timeout=timeout)
except asyncio.TimeoutError:
logger.warning(f"ask pipeline - TIMEOUT: {ask_request.query_id}")
self._ask_results[ask_request.query_id] = AskResultResponse(
status="failed",
error=AskError(
code="OTHERS",
message="Query timed out",
),
trace_id=kwargs.get("trace_id"),
)

async def _ask(
self,
ask_request: AskRequest,
**kwargs,
):
trace_id = kwargs.get("trace_id")
results = {
Expand Down