fix: harden wiki delivery and leaderboard performance
This commit is contained in:
1 parent
0c5e2e8cb0
commit
9f29ecae9e
28 files changed
+616
-68
No files matched your search
@@ -637,10 +637,16 @@ def _non_scheduled_run_filter():
|
||||
|
||||
|
||||
def _non_scheduled_tool_filter():
|
||||
return or_(
|
||||
ToolCallMetricRow.run_id.is_(None),
|
||||
RunRow.run_id.is_(None),
|
||||
_non_scheduled_run_filter(),
|
||||
"""Exclude legacy scheduled runs without joining runs into the metric scan."""
|
||||
|
||||
return ~(
|
||||
select(1)
|
||||
.select_from(RunRow)
|
||||
.where(
|
||||
RunRow.run_id == ToolCallMetricRow.run_id,
|
||||
RunRow.first_human_message.like("【定时任务触发】%"),
|
||||
)
|
||||
.exists()
|
||||
)
|
||||
|
||||
|
||||
@@ -667,8 +673,15 @@ def _admin_user_ids_stmt():
|
||||
return select(UserRow.id).where(UserRow.system_role == "admin")
|
||||
|
||||
|
||||
def _scheduled_run_ids_stmt():
|
||||
return select(ScheduledTaskRunRow.agent_run_id).where(ScheduledTaskRunRow.agent_run_id.is_not(None))
|
||||
def _not_scheduled_run_id_filter(run_id_column):
|
||||
"""Use a NULL-safe, index-friendly anti-semi join instead of NOT IN."""
|
||||
|
||||
return ~(
|
||||
select(1)
|
||||
.select_from(ScheduledTaskRunRow)
|
||||
.where(ScheduledTaskRunRow.agent_run_id == run_id_column)
|
||||
.exists()
|
||||
)
|
||||
|
||||
|
||||
def _apply_user_scope(stmt, column, *, exclude_user_ids: set[str], include_admins: bool):
|
||||
@@ -692,7 +705,7 @@ def _apply_run_scope(
|
||||
if not include_failed:
|
||||
stmt = stmt.where(RunRow.status != "error")
|
||||
if not include_scheduled:
|
||||
stmt = stmt.where(or_(run_id_column.is_(None), run_id_column.not_in(_scheduled_run_ids_stmt())))
|
||||
stmt = stmt.where(_not_scheduled_run_id_filter(run_id_column))
|
||||
stmt = stmt.where(_non_scheduled_run_filter())
|
||||
return stmt
|
||||
|
||||
@@ -706,8 +719,8 @@ def _apply_tool_scope(
|
||||
):
|
||||
stmt = _apply_user_scope(stmt, ToolCallMetricRow.user_id, exclude_user_ids=exclude_user_ids, include_admins=include_admins)
|
||||
if not include_scheduled:
|
||||
stmt = stmt.where(or_(ToolCallMetricRow.run_id.is_(None), ToolCallMetricRow.run_id.not_in(_scheduled_run_ids_stmt())))
|
||||
stmt = stmt.outerjoin(RunRow, RunRow.run_id == ToolCallMetricRow.run_id).where(_non_scheduled_tool_filter())
|
||||
stmt = stmt.where(_not_scheduled_run_id_filter(ToolCallMetricRow.run_id))
|
||||
stmt = stmt.where(_non_scheduled_tool_filter())
|
||||
return stmt
|
||||
|
||||
|
||||
@@ -985,7 +998,7 @@ async def _query_model_rankings(
|
||||
if not include_failed:
|
||||
stmt = stmt.where(LlmCallMetricRow.status != "error")
|
||||
if not include_scheduled:
|
||||
stmt = stmt.where(or_(LlmCallMetricRow.run_id.is_(None), LlmCallMetricRow.run_id.not_in(_scheduled_run_ids_stmt())))
|
||||
stmt = stmt.where(_not_scheduled_run_id_filter(LlmCallMetricRow.run_id))
|
||||
rows = (await _execute_leaderboard_query(session, "model_rankings", stmt)).all()
|
||||
return [
|
||||
AdminLeaderboardDimension(
|
||||
@@ -1080,8 +1093,8 @@ async def _query_overview(
|
||||
if not include_failed:
|
||||
run_where.append(RunRow.status != "error")
|
||||
if not include_scheduled:
|
||||
run_where.append(or_(RunRow.run_id.is_(None), RunRow.run_id.not_in(_scheduled_run_ids_stmt())))
|
||||
tool_where.append(or_(ToolCallMetricRow.run_id.is_(None), ToolCallMetricRow.run_id.not_in(_scheduled_run_ids_stmt())))
|
||||
run_where.append(_not_scheduled_run_id_filter(RunRow.run_id))
|
||||
tool_where.append(_not_scheduled_run_id_filter(ToolCallMetricRow.run_id))
|
||||
tool_where.append(_non_scheduled_tool_filter())
|
||||
|
||||
total_users_stmt = select(func.count(UserRow.id))
|
||||
@@ -1104,7 +1117,6 @@ async def _query_overview(
|
||||
func.count(ToolCallMetricRow.id),
|
||||
func.sum(case((func.nullif(ToolCallMetricRow.skill_name, "").is_not(None), 1), else_=0)),
|
||||
)
|
||||
.outerjoin(RunRow, RunRow.run_id == ToolCallMetricRow.run_id)
|
||||
.where(*tool_where)
|
||||
)
|
||||
tool_row = (await _execute_leaderboard_query(session, "overview.tool_summary", tool_summary_stmt)).one()
|
||||
|
||||
Reference in new issue
Block a user