liuwei_x_x/abot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "完善后台任务中心历史摘要视图"

Browse Source 
This reverts commit 1db8681636.
This commit is contained in:
Liu
2026-05-01 12:45:40 +08:00
parent 024624126e
commit 17264f91e6
8 changed files with 7 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
utils/plugin_schedule_manager.py
View File

@@ -209,47 +209,6 @@ class PluginScheduleManager:
return False
return latest_log_at < (expected_at - timedelta(seconds=self._compensation_tolerance_seconds))
@staticmethod
def _build_schedule_health_status(
*,
enabled: bool,
running: bool,
last_status: str,
latest_success_at,
latest_failure_summary: str,
) -> str:
"""根据调度任务运行态和历史态生成后台健康标签。"""
if not enabled:
return "disabled"
if running:
return "running"
# 只有“最近一次执行仍是失败”时才把健康态打成 failed，
# 避免历史上曾失败过、但后面已经恢复成功的任务一直显示异常。
if str(last_status or "").strip().lower() == "failed":
return "failed"
if latest_success_at or str(last_status or "").strip().lower() == "success":
return "healthy"
if str(latest_failure_summary or "").strip():
return "degraded"
return "idle"
@staticmethod
def _build_schedule_health_message(*, health_status: str, latest_success_at, latest_failure_summary: str) -> str:
"""生成调度任务列表里展示的简短健康说明。"""
if health_status == "disabled":
return "任务已停用"
if health_status == "running":
return "任务正在执行中"
if health_status in ("failed", "degraded"):
return str(latest_failure_summary or "最近存在失败记录").strip()
if health_status == "healthy":
if isinstance(latest_success_at, datetime):
return f"最近成功于 {latest_success_at.strftime('%Y-%m-%d %H:%M:%S')}"
if latest_success_at:
return f"最近成功于 {latest_success_at}"
return "任务近期执行正常"
return "暂无执行记录"
async def _run_one_schedule(self, schedule_row: Dict[str, Any]) -> Dict[str, Any]:
schedule_id = int(schedule_row["id"])
action_key = schedule_row.get("action_key")
@@ -338,7 +297,6 @@ class PluginScheduleManager:
# 日志兜底：进程重启后内存态 last_run_at 会丢失，任务页需要从数据库最新日志恢复显示。
schedule_ids = [int(row.get("id")) for row in db_rows if row.get("id") is not None]
latest_log_by_schedule = self.db.get_latest_logs_map(schedule_ids)
history_summary_by_schedule = self.db.get_schedule_history_summary_map(schedule_ids)
data = []
for row in db_rows:
@@ -346,7 +304,6 @@ class PluginScheduleManager:
key = f"plugin_schedule:{schedule_id}"
runtime = runtime_by_key.get(key, {})
latest_log = latest_log_by_schedule.get(schedule_id) or {}
history_summary = history_summary_by_schedule.get(schedule_id) or {}
merged = dict(row)
merged["runtime_job_id"] = runtime.get("id")
merged["running"] = runtime.get("running", False)
@@ -362,24 +319,6 @@ class PluginScheduleManager:
merged["run_count"] = runtime.get("run_count", 0)
merged["success_count"] = runtime.get("success_count", 0)
merged["fail_count"] = runtime.get("fail_count", 0)
merged["latest_success_at"] = history_summary.get("latest_success_at")
merged["latest_failed_at"] = history_summary.get("latest_failed_at")
merged["latest_failure_summary"] = str(history_summary.get("latest_failure_summary") or "").strip()
merged["history_success_count"] = int(history_summary.get("history_success_count", 0) or 0)
merged["history_fail_count"] = int(history_summary.get("history_fail_count", 0) or 0)
merged["history_total_count"] = int(history_summary.get("history_total_count", 0) or 0)
merged["health_status"] = self._build_schedule_health_status(
enabled=bool(row.get("enabled", 0)),
running=bool(runtime.get("running", False)),
last_status=str(merged.get("last_status") or ""),
latest_success_at=history_summary.get("latest_success_at"),
latest_failure_summary=str(history_summary.get("latest_failure_summary") or ""),
)
merged["health_message"] = self._build_schedule_health_message(
health_status=merged["health_status"],
latest_success_at=history_summary.get("latest_success_at"),
latest_failure_summary=str(history_summary.get("latest_failure_summary") or ""),
)
data.append(merged)
return data