Resolve merge conflicts

offline-backend-20260512/backend/app/gateway/routers/admin_users.py

@@ -25,7 +25,7 @@ from datetime import datetime, timedelta
 from fastapi import APIRouter, Depends, HTTPException, Query, Request
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel, Field
-from sqlalchemy import and_, case, desc, func, or_, select
+from sqlalchemy import and_, case, desc, func, not_, or_, select
 from langchain_core.messages import HumanMessage, SystemMessage
 
 from app.gateway.deps import (
@@ -355,6 +355,22 @@ def _run_time_filter(since: datetime, until: datetime):
     return and_(RunRow.created_at >= since, RunRow.created_at <= until)
 
 
+def _non_scheduled_run_filter():
+    """Exclude scheduler-generated runs that predate scheduled_task_runs links."""
+    return or_(
+        RunRow.first_human_message.is_(None),
+        not_(RunRow.first_human_message.like("【定时任务触发】%")),
+    )
+
+
+def _non_scheduled_tool_filter():
+    return or_(
+        ToolCallMetricRow.run_id.is_(None),
+        RunRow.run_id.is_(None),
+        _non_scheduled_run_filter(),
+    )
+
+
 def _tool_time_filter(since: datetime, until: datetime):
     return and_(ToolCallMetricRow.created_at >= since, ToolCallMetricRow.created_at <= until)
 
@@ -404,6 +420,7 @@ def _apply_run_scope(
         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(_non_scheduled_run_filter())
     return stmt
 
 
@@ -417,6 +434,7 @@ 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())
     return stmt
 
 
@@ -910,6 +928,7 @@ async def _query_overview(
     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())))
+        tool_where.append(_non_scheduled_tool_filter())
 
     total_users_stmt = select(func.count(UserRow.id))
     total_users_stmt = _apply_user_scope(total_users_stmt, UserRow.id, exclude_user_ids=exclude_user_ids, include_admins=include_admins)
@@ -928,7 +947,9 @@ async def _query_overview(
         select(
             func.count(ToolCallMetricRow.id),
             func.sum(case((func.nullif(ToolCallMetricRow.skill_name, "").is_not(None), 1), else_=0)),
-        ).where(*tool_where)
+        )
+        .outerjoin(RunRow, RunRow.run_id == ToolCallMetricRow.run_id)
+        .where(*tool_where)
     )).one()
 
     return AdminLeaderboardOverview(

offline-backend-20260512/config.yaml

@@ -147,18 +147,7 @@ title:
 # - keep:压缩后保留多少最近的上下文(同样支持 tokens / messages / fraction)。
 # - trim_tokens_to_summarize:喂给摘要模型的消息最多裁到多少 token。
 # - model_name:生成摘要用的模型(留空则用主对话模型)。
-summarization:
-  enabled: true
-  # model_name: deepseek-chat
-  trigger:
-    - type: tokens
-      value: 60000
-    - type: messages
-      value: 80
-  keep:
-    type: messages
-    value: 20
-  trim_tokens_to_summarize: 4000
+
 skills:
   path: /app/skills
   security_scan:
@@ -187,10 +176,7 @@ auth_login:
     ca_cert_path: ""   # 可选:PEM 格式 CA 包路径,设置后优先生效并启用校验
 # 日志系统入口(仅管理员可见):右下角「设置」菜单中会多出一个「日志系统」入口,
 # 点击后在新标签页打开下面的 url。enabled 关掉则不显示该入口。
-log_system:
-  enabled: true
-  url: "https://your-log-system.example.com"
-  label: "日志系统"
+
 database:
   backend: mysql
   mysql_url: $MYSQL_DATABASE_URL
@@ -269,4 +255,22 @@ memory:
     scan_content: true             # 注入/外渗模式扫描
     block_invisible_unicode: true
     # streaming_scrubber:预留字段,代码尚未实现 —— 待版本支持后取消注释。
-    # streaming_scrubber: true       # SSE 流前清洗 <memory-context>
+    # streaming_scrubber: true       # SSE 流前清洗 <memory-context>
+
+log_system:
+  enabled: true
+  url: "https://your-log-system.example.com"
+  label: "日志系统"
+
+summarization:
+  enabled: true
+  # model_name: deepseek-chat
+  trigger:
+    - type: tokens
+      value: 60000
+    - type: messages
+      value: 80
+  keep:
+    type: messages
+    value: 20
+  trim_tokens_to_summarize: 4000