guke
03129e059f
背景 admin 比价记录页 / 概览 / 大盘此前把「未找到店、未找到菜、门店打烊、单点不配送、平台不支持、未满起送」统统显示/统计为失败——根因是 #209 把这些业务结局归一化成记录级 status='failed' 落库。但它们其实是比价流程正常跑完、只是外部原因导致结果缺失;与「系统技术故障」混为一谈后,管理员排查时无法区分「是我们系统的锅」还是「目标平台本来就没这家店/这些菜」。 方案 admin 后台改用技术完成率口径:流程跑完(非 running)且非纯技术故障 → 记为成功,有外部缺失的前端标绿「成功」+ ⚠(hover 看具体原因);只有真正的技术故障 failed 才是失败。 口径收敛到新模块 app/admin/repositories/comparison_outcome.py,被列表下发 / 概览 / 大盘 / 状态筛选共同消费(单一真相源)。 原始业务结局取自 raw_payload.record_status(3 级 coalesce 兜底,兼容历史残留;Python 派生与 SQL 判定 bit 一致)。 仅 admin,不碰 C 端 / #209 落库 / 奖励逻辑——admin 关心「系统跑没跑成」,C 端关心「省没省到钱」,刻意分层。 口径映射 原始 record_status | admin 状态 | hover 提示 -- | -- | -- success | 🟢 成功 | — below_minimum | 🟢 成功 ⚠ | 未满起送 store_closed | 🟢 成功 ⚠ | 门店打烊 store_not_found | 🟢 成功 ⚠ | 未找到店 items_not_found | 🟢 成功 ⚠ | 未找到菜 no_delivery | 🟢 成功 ⚠ | 单点不配送 unsupported | 🟢 成功 ⚠ | 平台·场景不支持 failed(纯技术故障) | 🔴 失败 | — cancelled / running | ⚪ 中途退出 / 🔵 进行中 | — 改动清单 新增 comparison_outcome.py:derive_admin_outcome(列表 Python 派生) + admin_success_sql(聚合/筛选 SQL 判定)。 列表/详情 下发 admin_status + outcome_hint(瞬态挂载,零额外查询)。 概览 comparison_records_summary:success / completed / 耗时分位改 admin 口径。 大盘 dashboard_overview:比价成功率改 admin 口径(顺带补齐 #209 未同步大盘的 below_minimum)。 状态筛选 _comparison_status_condition:筛「成功」含 6 类、筛「失败」仅纯技术故障;清理 #209 遗留死常量。 文档 补 admin 口径说明。 --------- Co-authored-by: guke <guke@autohome.com.cn> Reviewed-on: #217
108 lines
4.7 KiB
Python
108 lines
4.7 KiB
Python
"""admin 比价记录 debug 页 schema(独立于 C 端 app/schemas/compare_record:admin 看任意用户、
|
|
无 debug_trace 权限闸、展示全量 debug 字段)。phone/nickname 由 queries 瞬态挂在 ORM 实例上。"""
|
|
from __future__ import annotations
|
|
|
|
from datetime import datetime
|
|
|
|
from pydantic import BaseModel, ConfigDict
|
|
|
|
|
|
class AdminComparisonListItem(BaseModel):
|
|
"""列表项:概要 + debug 维度概览(不含大字段 raw_payload/llm_calls/明细数组)。"""
|
|
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
# 软鉴权/匿名下帧0 建行时 user_id 可能暂缺(见 models.comparison 注释);admin 全看含孤儿行,故可空。
|
|
user_id: int | None = None
|
|
phone: str | None = None # join User 瞬态(非 DB 列)
|
|
nickname: str | None = None # join User 瞬态
|
|
business_type: str
|
|
trace_id: str
|
|
# admin 是 debug 工具,无条件下发 trace_url(不看 user.debug_trace_enabled)
|
|
trace_url: str | None = None
|
|
status: str # success / failed / cancelled / running;旧细分值由前端兼容映射
|
|
# admin 展示口径(见 repositories/comparison_outcome):成功含「跑完但外部缺失」,
|
|
# 纯技术故障才 failed;outcome_hint 非空=有缺失,前端标感叹号。
|
|
admin_status: str = "success"
|
|
outcome_hint: str | None = None
|
|
information: str | None = None
|
|
store_name: str | None = None
|
|
product_names: str | None = None # 下单商品名派生串(顿号分隔;「商品」列展示 + 商品搜索)
|
|
source_platform_name: str | None = None
|
|
best_platform_name: str | None = None
|
|
source_price_cents: int | None = None
|
|
best_price_cents: int | None = None
|
|
saved_amount_cents: int | None = None
|
|
ordered: bool = False
|
|
# debug 概览
|
|
total_ms: int | None = None
|
|
step_count: int | None = None
|
|
llm_call_count: int | None = None
|
|
retry_count: int | None = None
|
|
input_tokens: int | None = None # Σ usage.prompt_tokens(server 派生)
|
|
output_tokens: int | None = None # Σ usage.completion_tokens(server 派生)
|
|
# 本次比价 LLM 总成本(元,按当时价冻结);旧记录/未回填为 None → 前端「成本」列回退估算。见 services/llm_cost.py。
|
|
llm_cost_yuan: float | None = None
|
|
device_model: str | None = None
|
|
device_model_name: str | None = None
|
|
rom_vendor: str | None = None
|
|
rom_name: str | None = None
|
|
rom_version: int | None = None
|
|
android_version: str | None = None
|
|
app_version: str | None = None
|
|
ad_revenue_yuan: float = 0.0 # 本次比价看的信息流广告预估收益(元),queries 瞬态挂 ORM 实例上
|
|
created_at: datetime
|
|
|
|
|
|
class AdminComparisonSummary(BaseModel):
|
|
"""比价记录页概览；主耗时指标仅统计 status=success。"""
|
|
|
|
started: int
|
|
completed: int
|
|
success: int
|
|
success_rate: float | None = None
|
|
avg_token_cost: float | None = None
|
|
lower_price_rate: float | None = None
|
|
avg_duration_ms: int | None = None
|
|
p5_duration_ms: int | None = None
|
|
p50_duration_ms: int | None = None
|
|
p95_duration_ms: int | None = None
|
|
p99_duration_ms: int | None = None
|
|
cancelled: int
|
|
cancelled_rate: float | None = None
|
|
cancelled_p5_ms: int | None = None
|
|
cancelled_p50_ms: int | None = None
|
|
cancelled_p95_ms: int | None = None
|
|
|
|
|
|
class AdminComparisonDetail(AdminComparisonListItem):
|
|
"""详情:概要 + 全量明细(逐平台对比 / LLM 每次调用 / 原始 payload)。"""
|
|
|
|
source_platform_id: str | None = None
|
|
source_package: str | None = None
|
|
best_platform_id: str | None = None
|
|
best_deeplink: str | None = None
|
|
is_source_best: bool | None = None
|
|
total_dish_count: int | None = None
|
|
skipped_dish_count: int | None = None
|
|
device_id: str | None = None
|
|
items: list = []
|
|
platforms: list = [] # pricebot 渲染就绪的逐平台卡片模型(status=ok/业务失败细分)
|
|
comparison_results: list = [] # 逐平台对比(价格/rank/coupon/打烊...)
|
|
skipped_dish_names: list = []
|
|
# 全量环境
|
|
device_manufacturer: str | None = None
|
|
android_sdk: int | None = None
|
|
app_version_code: int | None = None
|
|
source_app_version: str | None = None
|
|
longitude: float | None = None
|
|
latitude: float | None = None
|
|
# 每次 LLM 调用明细 [{scene,model,input_messages,output,usage,latency_ms,error}]
|
|
llm_calls: list | None = None
|
|
# 原始上报全量;「卡在哪一步」从 raw_payload.platform_results[*].status 读
|
|
# (store_not_found/items_not_found/below_minimum/unsupported = 卡在 找店/加菜/起送/读价)。
|
|
raw_payload: dict | None = None
|
|
# 算成本所用单价快照 {mode, prices:{model:{...}}}(llm_cost_yuan 继承自列表项)。见 services/llm_cost.py。
|
|
llm_price_snapshot: dict | None = None
|