perf(account-check): 优化账号检测首屏加载
This commit is contained in:
@@ -54,6 +54,7 @@ from ..schemas import (
|
||||
DouyuConfigUpdate,
|
||||
DouyuExchangeResultImageOut,
|
||||
DouyuGoodsOut,
|
||||
DouyuSupplyTargetConfigOut,
|
||||
DouyuSupplyTargetOut,
|
||||
DouyuSupplyTargetUpdate,
|
||||
DouyuSupplyTargetUpsert,
|
||||
@@ -64,7 +65,10 @@ from ..schemas import (
|
||||
DouyuXpdGoodsOut,
|
||||
)
|
||||
from ..services.account_binding import bind_payload
|
||||
from ..services.account_observability import account_platform_status
|
||||
from ..services.account_observability import (
|
||||
account_platform_status,
|
||||
account_platform_trends,
|
||||
)
|
||||
from ..services.account_protection_service import (
|
||||
evaluate_protection_targets,
|
||||
update_protection_group,
|
||||
@@ -739,11 +743,21 @@ def task_types(current: User = Depends(require_permission("douyu:task"))):
|
||||
|
||||
@router.get("/account-platform-status")
|
||||
def get_account_platform_status(
|
||||
include_trends: bool = Query(True),
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(require_permission("douyu:task")),
|
||||
):
|
||||
"""账号同步、CK 周期、商品覆盖和供给缺口的统一观测快照。"""
|
||||
return account_platform_status(db)
|
||||
return account_platform_status(db, include_trends=include_trends)
|
||||
|
||||
|
||||
@router.get("/account-platform-trends")
|
||||
def get_account_platform_trends(
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(require_permission("douyu:task")),
|
||||
):
|
||||
"""延迟加载账号平台 7 天趋势,避免阻塞账号检测首屏。"""
|
||||
return account_platform_trends(db)
|
||||
|
||||
|
||||
@router.put(
|
||||
@@ -1071,6 +1085,46 @@ def list_supply_targets(
|
||||
]
|
||||
|
||||
|
||||
@router.get(
|
||||
"/supply-targets/config",
|
||||
response_model=list[DouyuSupplyTargetConfigOut],
|
||||
)
|
||||
def list_supply_target_configs(
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(require_permission("douyu:config")),
|
||||
):
|
||||
"""只返回供给目标配置,库存由 account-platform-status 统一提供。"""
|
||||
rows = (
|
||||
db.query(AccountSupplyTarget)
|
||||
.order_by(
|
||||
AccountSupplyTarget.enabled.desc(),
|
||||
AccountSupplyTarget.scope.asc(),
|
||||
AccountSupplyTarget.value_class.asc(),
|
||||
AccountSupplyTarget.commodity_id.asc(),
|
||||
AccountSupplyTarget.id.asc(),
|
||||
)
|
||||
.all()
|
||||
)
|
||||
return [
|
||||
DouyuSupplyTargetConfigOut(
|
||||
id=int(row.id),
|
||||
target_id=int(row.id),
|
||||
platform=row.platform,
|
||||
scope=row.scope,
|
||||
commodity_id=row.commodity_id,
|
||||
value_class=row.value_class,
|
||||
target_covered=int(row.target_covered or 0),
|
||||
target_available=int(row.target_available or 0),
|
||||
target_allocatable=int(row.target_allocatable or 0),
|
||||
safety_buffer=int(row.safety_buffer or 0),
|
||||
enabled=bool(row.enabled),
|
||||
updated_by=row.updated_by,
|
||||
updated_at=row.updated_at,
|
||||
)
|
||||
for row in rows
|
||||
]
|
||||
|
||||
|
||||
@router.post("/supply-targets", response_model=DouyuSupplyTargetOut)
|
||||
def create_supply_target(
|
||||
req: DouyuSupplyTargetUpsert,
|
||||
|
||||
@@ -1630,6 +1630,22 @@ class DouyuSupplyTargetOut(BaseModel):
|
||||
updated_at: datetime | None = None
|
||||
|
||||
|
||||
class DouyuSupplyTargetConfigOut(BaseModel):
|
||||
id: int
|
||||
target_id: int
|
||||
platform: str
|
||||
scope: str
|
||||
commodity_id: str
|
||||
value_class: str
|
||||
target_covered: int
|
||||
target_available: int
|
||||
target_allocatable: int
|
||||
safety_buffer: int
|
||||
enabled: bool
|
||||
updated_by: int | None = None
|
||||
updated_at: datetime | None = None
|
||||
|
||||
|
||||
class DouyuAccountProtectionTargetUpdate(BaseModel):
|
||||
enabled: bool = True
|
||||
target_count: int = Field(0, ge=0, le=100_000)
|
||||
|
||||
@@ -193,10 +193,79 @@ def _platform_trends(db: Session, moment: datetime) -> dict[str, Any]:
|
||||
}
|
||||
|
||||
|
||||
def _trend_alerts(trends: dict[str, Any]) -> list[dict[str, Any]]:
|
||||
alerts: list[dict[str, Any]] = []
|
||||
query_sample = sum(
|
||||
int(row["success"]) + int(row["failed"]) for row in trends["query"]
|
||||
)
|
||||
query_success = sum(int(row["success"]) for row in trends["query"])
|
||||
query_rate = _rate(query_success, query_sample)
|
||||
if query_sample >= 20 and query_rate < 80:
|
||||
alerts.append(
|
||||
{
|
||||
"code": "query_success_rate_low",
|
||||
"severity": "critical" if query_rate < 50 else "warning",
|
||||
"count": query_sample,
|
||||
"message": (
|
||||
f"近 {TREND_DAYS} 天查询成功率 {query_rate:.1f}%"
|
||||
f"({query_sample} 次已完成查询)"
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
login_sample = sum(
|
||||
int(row["success"]) + int(row["failed"]) for row in trends["login"]
|
||||
)
|
||||
login_success = sum(int(row["success"]) for row in trends["login"])
|
||||
login_rate = _rate(login_success, login_sample)
|
||||
if login_sample >= 10 and login_rate < 60:
|
||||
alerts.append(
|
||||
{
|
||||
"code": "login_success_rate_low",
|
||||
"severity": "critical" if login_rate < 40 else "warning",
|
||||
"count": login_sample,
|
||||
"message": (
|
||||
f"近 {TREND_DAYS} 天登录成功率 {login_rate:.1f}%"
|
||||
f"({login_sample} 次已完成尝试)"
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
relogin_ok = sum(int(row["relogin_ok"]) for row in trends["lifecycle"])
|
||||
relogin_failed = sum(int(row["relogin_failed"]) for row in trends["lifecycle"])
|
||||
if relogin_failed >= 5 and relogin_failed > relogin_ok:
|
||||
alerts.append(
|
||||
{
|
||||
"code": "relogin_failure_trend_high",
|
||||
"severity": "warning",
|
||||
"count": relogin_failed,
|
||||
"message": (
|
||||
f"近 {TREND_DAYS} 天重登失败 {relogin_failed} 次,"
|
||||
f"成功 {relogin_ok} 次"
|
||||
),
|
||||
}
|
||||
)
|
||||
return alerts
|
||||
|
||||
|
||||
def account_platform_trends(
|
||||
db: Session,
|
||||
*,
|
||||
now: datetime | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""返回可延迟加载的趋势和趋势告警,避免阻塞账号检测首屏。"""
|
||||
trends = _platform_trends(db, now or datetime.now(UTC))
|
||||
return {
|
||||
"trends": trends,
|
||||
"alerts": _trend_alerts(trends),
|
||||
}
|
||||
|
||||
|
||||
def account_platform_status(
|
||||
db: Session,
|
||||
*,
|
||||
now: datetime | None = None,
|
||||
include_trends: bool = True,
|
||||
) -> dict[str, Any]:
|
||||
moment = now or datetime.now(UTC)
|
||||
in_24h = moment + timedelta(hours=24)
|
||||
@@ -349,9 +418,8 @@ def account_platform_status(
|
||||
)
|
||||
if not item.needs_replenishment:
|
||||
continue
|
||||
critical = (
|
||||
(item.target_available > 0 and item.available <= 0)
|
||||
or (item.target_allocatable > 0 and item.allocatable <= 0)
|
||||
critical = (item.target_available > 0 and item.available <= 0) or (
|
||||
item.target_allocatable > 0 and item.allocatable <= 0
|
||||
)
|
||||
alerts.append(
|
||||
{
|
||||
@@ -440,61 +508,9 @@ def account_platform_status(
|
||||
}
|
||||
)
|
||||
|
||||
trends = _platform_trends(db, moment)
|
||||
query_sample = sum(
|
||||
int(row["success"]) + int(row["failed"])
|
||||
for row in trends["query"]
|
||||
)
|
||||
query_success = sum(int(row["success"]) for row in trends["query"])
|
||||
query_rate = _rate(query_success, query_sample)
|
||||
if query_sample >= 20 and query_rate < 80:
|
||||
alerts.append(
|
||||
{
|
||||
"code": "query_success_rate_low",
|
||||
"severity": "critical" if query_rate < 50 else "warning",
|
||||
"count": query_sample,
|
||||
"message": (
|
||||
f"近 {TREND_DAYS} 天查询成功率 {query_rate:.1f}%"
|
||||
f"({query_sample} 次已完成查询)"
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
login_sample = sum(
|
||||
int(row["success"]) + int(row["failed"])
|
||||
for row in trends["login"]
|
||||
)
|
||||
login_success = sum(int(row["success"]) for row in trends["login"])
|
||||
login_rate = _rate(login_success, login_sample)
|
||||
if login_sample >= 10 and login_rate < 60:
|
||||
alerts.append(
|
||||
{
|
||||
"code": "login_success_rate_low",
|
||||
"severity": "critical" if login_rate < 40 else "warning",
|
||||
"count": login_sample,
|
||||
"message": (
|
||||
f"近 {TREND_DAYS} 天登录成功率 {login_rate:.1f}%"
|
||||
f"({login_sample} 次已完成尝试)"
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
relogin_ok = sum(int(row["relogin_ok"]) for row in trends["lifecycle"])
|
||||
relogin_failed = sum(
|
||||
int(row["relogin_failed"]) for row in trends["lifecycle"]
|
||||
)
|
||||
if relogin_failed >= 5 and relogin_failed > relogin_ok:
|
||||
alerts.append(
|
||||
{
|
||||
"code": "relogin_failure_trend_high",
|
||||
"severity": "warning",
|
||||
"count": relogin_failed,
|
||||
"message": (
|
||||
f"近 {TREND_DAYS} 天重登失败 {relogin_failed} 次,"
|
||||
f"成功 {relogin_ok} 次"
|
||||
),
|
||||
}
|
||||
)
|
||||
trends = _platform_trends(db, moment) if include_trends else None
|
||||
if trends is not None:
|
||||
alerts.extend(_trend_alerts(trends))
|
||||
|
||||
return {
|
||||
"checked_at": moment,
|
||||
@@ -523,4 +539,4 @@ def account_platform_status(
|
||||
}
|
||||
|
||||
|
||||
__all__ = ["account_platform_status"]
|
||||
__all__ = ["account_platform_status", "account_platform_trends"]
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
from datetime import UTC, datetime
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import and_, case, func, or_
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from ..models import (
|
||||
@@ -97,9 +98,7 @@ def normalize_group_config(
|
||||
MIN_PROBE_INTERVAL_MINUTES,
|
||||
MAX_PROBE_INTERVAL_MINUTES,
|
||||
),
|
||||
"auto_relogin": bool(
|
||||
value.get("auto_relogin", definition["auto_relogin"])
|
||||
),
|
||||
"auto_relogin": bool(value.get("auto_relogin", definition["auto_relogin"])),
|
||||
}
|
||||
|
||||
|
||||
@@ -124,9 +123,7 @@ def _presale_account_ids(db: Session) -> set[int]:
|
||||
.filter(
|
||||
PlatformFulfillmentTask.sale_mode == "presale",
|
||||
PlatformFulfillmentTask.account_id.isnot(None),
|
||||
PlatformFulfillmentTask.execution_status.notin_(
|
||||
("completed", "cancelled")
|
||||
),
|
||||
PlatformFulfillmentTask.execution_status.notin_(("completed", "cancelled")),
|
||||
)
|
||||
.distinct()
|
||||
.all()
|
||||
@@ -246,59 +243,109 @@ def evaluate_protection_targets(
|
||||
) -> list[dict[str, Any]]:
|
||||
moment = now or datetime.now(UTC)
|
||||
snapshot = load_protection_snapshot(db, job_config=job_config)
|
||||
all_ids = {
|
||||
account_id
|
||||
for ids in snapshot.group_account_ids.values()
|
||||
for account_id in ids
|
||||
}
|
||||
accounts = (
|
||||
db.query(Account).filter(Account.id.in_(all_ids)).all() if all_ids else []
|
||||
)
|
||||
account_map = {int(account.id): account for account in accounts}
|
||||
|
||||
rows: list[dict[str, Any]] = []
|
||||
for key, group in snapshot.groups.items():
|
||||
account_ids = snapshot.group_account_ids.get(key, frozenset())
|
||||
group_accounts = [
|
||||
account_map[account_id]
|
||||
for account_id in account_ids
|
||||
if account_id in account_map
|
||||
]
|
||||
probe_cutoff = moment - timedelta(minutes=int(group["probe_interval_minutes"]))
|
||||
if account_ids:
|
||||
# 只做数据库条件聚合,不加载 Account ORM。完整账号行包含加密密码、
|
||||
# 邮箱/Cookie 和大型 JSON 快照,2174 行实测可占 2 秒以上。
|
||||
totals = (
|
||||
db.query(
|
||||
func.count(Account.id),
|
||||
func.coalesce(
|
||||
func.sum(
|
||||
case((Account.ck_check_status == "valid", 1), else_=0)
|
||||
),
|
||||
0,
|
||||
),
|
||||
func.coalesce(
|
||||
func.sum(
|
||||
case((Account.ck_check_status == "invalid", 1), else_=0)
|
||||
),
|
||||
0,
|
||||
),
|
||||
func.coalesce(
|
||||
func.sum(
|
||||
case((Account.ck_check_status == "error", 1), else_=0)
|
||||
),
|
||||
0,
|
||||
),
|
||||
func.coalesce(
|
||||
func.sum(
|
||||
case(
|
||||
(
|
||||
func.coalesce(Account.ck_check_status, "").notin_(
|
||||
("valid", "invalid", "error")
|
||||
),
|
||||
1,
|
||||
),
|
||||
else_=0,
|
||||
)
|
||||
),
|
||||
0,
|
||||
),
|
||||
func.coalesce(
|
||||
func.sum(
|
||||
case(
|
||||
(
|
||||
or_(
|
||||
Account.cookie.is_(None),
|
||||
func.length(Account.cookie) == 0,
|
||||
),
|
||||
1,
|
||||
),
|
||||
else_=0,
|
||||
)
|
||||
),
|
||||
0,
|
||||
),
|
||||
func.coalesce(
|
||||
func.sum(
|
||||
case(
|
||||
(
|
||||
or_(
|
||||
Account.ck_checked_at.is_(None),
|
||||
and_(
|
||||
Account.ck_checked_at.isnot(None),
|
||||
Account.ck_checked_at < probe_cutoff,
|
||||
),
|
||||
),
|
||||
1,
|
||||
),
|
||||
else_=0,
|
||||
)
|
||||
),
|
||||
0,
|
||||
),
|
||||
)
|
||||
.filter(Account.id.in_(account_ids))
|
||||
.one()
|
||||
)
|
||||
(
|
||||
bound_count,
|
||||
ck_valid,
|
||||
ck_invalid,
|
||||
ck_error,
|
||||
ck_unchecked,
|
||||
without_cookie,
|
||||
probe_due_count,
|
||||
) = (int(value or 0) for value in totals)
|
||||
else:
|
||||
bound_count = ck_valid = ck_invalid = ck_error = 0
|
||||
ck_unchecked = without_cookie = probe_due_count = 0
|
||||
|
||||
status_counts = {
|
||||
"ck_valid": 0,
|
||||
"ck_invalid": 0,
|
||||
"ck_error": 0,
|
||||
"ck_unchecked": 0,
|
||||
"without_cookie": 0,
|
||||
"ck_valid": ck_valid,
|
||||
"ck_invalid": ck_invalid,
|
||||
"ck_error": ck_error,
|
||||
"ck_unchecked": ck_unchecked,
|
||||
"without_cookie": without_cookie,
|
||||
}
|
||||
for account in group_accounts:
|
||||
status = str(account.ck_check_status or "")
|
||||
if status == "valid":
|
||||
status_counts["ck_valid"] += 1
|
||||
elif status == "invalid":
|
||||
status_counts["ck_invalid"] += 1
|
||||
elif status == "error":
|
||||
status_counts["ck_error"] += 1
|
||||
else:
|
||||
status_counts["ck_unchecked"] += 1
|
||||
if not account.cookie:
|
||||
status_counts["without_cookie"] += 1
|
||||
|
||||
target = int(group["target_count"])
|
||||
shortage = max(target - status_counts["ck_valid"], 0)
|
||||
probe_seconds = int(group["probe_interval_minutes"]) * 60
|
||||
due_at = moment.timestamp() - probe_seconds
|
||||
due_count = sum(
|
||||
1
|
||||
for account in group_accounts
|
||||
if account.ck_checked_at is None
|
||||
or (
|
||||
account.ck_checked_at.replace(tzinfo=UTC)
|
||||
if account.ck_checked_at.tzinfo is None
|
||||
else account.ck_checked_at
|
||||
).timestamp()
|
||||
<= due_at
|
||||
)
|
||||
needs_attention = bool(
|
||||
group["enabled"]
|
||||
and (
|
||||
@@ -317,10 +364,10 @@ def evaluate_protection_targets(
|
||||
"target_count": target,
|
||||
"probe_interval_minutes": int(group["probe_interval_minutes"]),
|
||||
"auto_relogin": bool(group["auto_relogin"]),
|
||||
"bound_count": len(group_accounts),
|
||||
"bound_count": bound_count,
|
||||
**status_counts,
|
||||
"target_shortage": shortage,
|
||||
"probe_due_count": due_count,
|
||||
"probe_due_count": probe_due_count,
|
||||
"needs_attention": needs_attention,
|
||||
}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user