mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-19 12:51:59 +00:00
运行对比页对齐服务端的实际输出:变化百分比按百分数写,归因、遮罩、差异说明照服务端给的显示
对照运行对比后端的实现核过一遍字段的写法: - delta_pct 服务端已经乘过 100(12.5 是 +12.5%),占比 share 仍是小数(0.4 是 40%),两处分开格式化;原先把 delta_pct 也当小数,会写成「+1250.0%」 - 维度归因服务端只给前 10 项、另有几项写在 note 里,照写;归不了因(查询结果截断、度量列遮罩、快照读不出来)时 给空的 rows 和一句说明,只写说明、不画空表;万一多给了仍只列 10 项并写明另有几项 - 约定之外服务端顺带给的几项按可选字段用上:输入的 masked(两边写「已遮罩」,不标变了)、查询的 differences (结构变了差在哪,列在并排的 SQL 上面)和 problem(快照读不出来、与哈希不一致)、模板配置项的 labels(按节点 类型翻好的叫法,键名放进悬停提示;没给或对不上时照写键名) - 找默认基准时的 404 分两种:本次这条运行不存在(机读码 run_not_found)写「运行记录不存在」,其余写「未找到 可作为基准的运行」 - check-compare 的夹具照服务端的写法改,补上述几种情形;菜单入口另查「问到基准之后才跳」(先跳到只带本次的地址、 再让对比页去找,原先查不出来);check-all 登记实测耗时
This commit is contained in:
@@ -2841,6 +2841,8 @@ export const RUN_COMPARE_TEXT = {
|
||||
reasons: '变化说明',
|
||||
inputs: '输入对比',
|
||||
inputsNone: '口径卡没有记录这个指标的输入',
|
||||
/** 取自设置了遮罩的列:两边的值都不显示 */
|
||||
masked: '已遮罩',
|
||||
colInput: '输入',
|
||||
attribution: '维度归因',
|
||||
attrBy: (measure: string) => `按「${measure}」的变化,从大到小`,
|
||||
|
||||
@@ -5,7 +5,7 @@ import { NONE } from '../../../lib/format'
|
||||
import { RUN_COMPARE_TEXT as T } from '../../../lib/terms'
|
||||
import type { RunCompareAttribution, RunCompareDecomposition, RunCompareMetric } from '../../../types'
|
||||
import { Block, ClassChip } from './parts'
|
||||
import { metricKey, percent, sameValue, signedNumber, valueText } from './model'
|
||||
import { changeText, metricKey, sameValue, shareText, signedNumber, valueText } from './model'
|
||||
|
||||
/** 维度归因列前几项:后端按变化从大到小排好,多的只写还有几项 */
|
||||
const ATTR_TOP = 10
|
||||
@@ -103,7 +103,7 @@ export function Metrics({ metrics, filter, onClearFilter }: {
|
||||
function MetricRows({ m, k, detailId, open, onToggle }: {
|
||||
m: RunCompareMetric; k: string; detailId: string; open: boolean; onToggle: () => void
|
||||
}) {
|
||||
const pct = m.delta_pct != null && m.delta_pct !== 0 ? percent(m.delta_pct, true) : null
|
||||
const pct = m.delta_pct != null && m.delta_pct !== 0 ? changeText(m.delta_pct) : null
|
||||
return (
|
||||
<Fragment>
|
||||
<tr className={clsx('border-b align-top last:border-0', open && 'bg-hover')} data-compare-metric={k} data-class={m.classification}>
|
||||
@@ -235,14 +235,17 @@ function Inputs({ m }: { m: RunCompareMetric }) {
|
||||
</thead>
|
||||
<tbody>
|
||||
{m.inputs.map((inp) => {
|
||||
const changed = !sameValue(inp.base, inp.target)
|
||||
// 遮罩列:两边的值服务端都不给,写「已遮罩」,也不说变没变
|
||||
const changed = !inp.masked && !sameValue(inp.base, inp.target)
|
||||
const shown = (v: unknown) => (inp.masked ? T.masked : valueText(v))
|
||||
return (
|
||||
<tr key={inp.path} className="border-b last:border-0" data-compare-input={inp.path} data-changed={changed ? '' : undefined}>
|
||||
<tr key={inp.path} className="border-b last:border-0" data-compare-input={inp.path} data-changed={changed ? '' : undefined}
|
||||
data-masked={inp.masked ? '' : undefined}>
|
||||
<th scope="row" className="mono py-1 pr-2 text-left font-normal text-dim [overflow-wrap:anywhere]">{inp.path}</th>
|
||||
<td className="tnum px-2 py-1 text-right text-dim [overflow-wrap:anywhere]">{valueText(inp.base)}</td>
|
||||
<td className="tnum px-2 py-1 text-right text-dim [overflow-wrap:anywhere]">{shown(inp.base)}</td>
|
||||
<td className={clsx('tnum py-1 pl-2 text-right [overflow-wrap:anywhere]', changed ? 'font-medium text-fg' : 'text-dim')}>
|
||||
{changed && <span className="mr-1 inline-block h-1.5 w-1.5 rounded-full align-middle" style={{ background: DATA_COLOR }} aria-hidden />}
|
||||
{valueText(inp.target)}
|
||||
{shown(inp.target)}
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
@@ -257,7 +260,8 @@ function Inputs({ m }: { m: RunCompareMetric }) {
|
||||
|
||||
/**
|
||||
* 维度归因:按键对齐两边查询结果的行,列前 10 项的键、两边的值、变化和占比。占比只在度量列之和等于指标的输入时才有,
|
||||
* 没有时那一栏写「—」,下面照服务端的说明写原因(没给说明时写一句通用的)
|
||||
* 没有时那一栏写「—」,下面照服务端的说明写原因(没给说明时写一句通用的)。归不了因的(查询结果截断、度量列遮罩、
|
||||
* 快照读不出来)服务端给空的 rows 和一句说明:不画空表,只写这句话
|
||||
*/
|
||||
function Attribution({ a }: { a: RunCompareAttribution | null }) {
|
||||
if (!a) {
|
||||
@@ -270,14 +274,14 @@ function Attribution({ a }: { a: RunCompareAttribution | null }) {
|
||||
}
|
||||
const rows = a.rows.slice(0, ATTR_TOP)
|
||||
const more = a.rows.length - rows.length
|
||||
const note = a.note || (a.rows.some((r) => r.share == null) ? T.attrNoShare : null)
|
||||
const note = a.note || (!rows.length ? T.attrNone : a.rows.some((r) => r.share == null) ? T.attrNoShare : null)
|
||||
return (
|
||||
<div data-compare-attr="">
|
||||
<h3 className="mb-1 flex flex-wrap items-baseline gap-x-2 text-2xs">
|
||||
<span className="font-medium text-faint">{T.attribution}</span>
|
||||
<span className="text-faint [overflow-wrap:anywhere]">{T.attrBy(a.measure)}{more > 0 ? ` · ${T.attrTop(ATTR_TOP)}` : ''}</span>
|
||||
</h3>
|
||||
<div className="overflow-x-auto">
|
||||
{!!rows.length && <div className="overflow-x-auto">
|
||||
<table className="w-full border-collapse text-2xs">
|
||||
<thead>
|
||||
<tr className="border-b text-left text-faint">
|
||||
@@ -298,16 +302,18 @@ function Attribution({ a }: { a: RunCompareAttribution | null }) {
|
||||
<td className="tnum px-2 py-1 text-right text-dim">{valueText(r.target)}</td>
|
||||
<td className="tnum px-2 py-1 text-right text-fg">{signedNumber(r.delta)}</td>
|
||||
<td className="tnum py-1 pl-2 text-right text-dim" data-compare-share="" title={r.share == null ? note ?? undefined : undefined}>
|
||||
{r.share == null ? NONE : percent(r.share)}
|
||||
{r.share == null ? NONE : shareText(r.share)}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>}
|
||||
<div className="mt-1 space-y-0.5 text-2xs text-faint">
|
||||
{more > 0 && <p data-compare-attr-more="">{T.attrMore(more)}</p>}
|
||||
{a.total_delta != null && <p className="tnum" data-compare-attr-total="">{T.attrTotal(signedNumber(a.total_delta))}</p>}
|
||||
{!!rows.length && a.total_delta != null && (
|
||||
<p className="tnum" data-compare-attr-total="">{T.attrTotal(signedNumber(a.total_delta))}</p>
|
||||
)}
|
||||
{note && <p className="leading-relaxed text-dim [overflow-wrap:anywhere]" data-compare-attr-note="">{note}</p>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -20,8 +20,9 @@ const MARK = {
|
||||
} as const
|
||||
|
||||
/**
|
||||
* 查询区:每条查询的结构状态和行数。只参数变的列出变化的字面量;结构变的并排两条 SQL(窄屏上下排),逐词标出各自独有的
|
||||
* 部分;新增、移除的只有一边。相同、只参数变的 SQL 默认收着,点开再看
|
||||
* 查询区:每条查询的结构状态和行数。只参数变的列出变化的字面量;结构变的先写服务端说的差在哪(有的话),再并排两条
|
||||
* SQL(窄屏上下排),逐词标出各自独有的部分;新增、移除的只有一边。相同、只参数变的 SQL 默认收着,点开再看。
|
||||
* 快照读不出来、与哈希不一致的,照服务端的说明写在这一条上
|
||||
*/
|
||||
export function Queries({ queries }: { queries: RunCompareQuery[] }) {
|
||||
const id = useId()
|
||||
@@ -64,6 +65,16 @@ function QueryItem({ q, k, nth }: { q: RunCompareQuery; k: string; nth: number |
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
{q.problem && (
|
||||
<p className="mt-1 text-2xs leading-relaxed [overflow-wrap:anywhere]" style={{ color: 'var(--warn)' }} data-compare-query-problem="">
|
||||
{q.problem}
|
||||
</p>
|
||||
)}
|
||||
{q.structure === 'changed' && !!q.differences?.length && (
|
||||
<ul className="mt-1.5 list-disc space-y-0.5 pl-4 text-2xs leading-relaxed text-dim [overflow-wrap:anywhere]" data-compare-differences="">
|
||||
{q.differences.map((d, i) => <li key={i}>{d}</li>)}
|
||||
</ul>
|
||||
)}
|
||||
{q.structure === 'params_only' && !!q.literals.length && (
|
||||
<div className="mt-1.5">
|
||||
<div className="mb-0.5 text-2xs text-faint">{T.literals}</div>
|
||||
|
||||
@@ -6,8 +6,9 @@ import { Block } from './parts'
|
||||
const CHANGE_COLOR: Record<string, string> = { added: 'var(--accent)', removed: 'var(--text-dim)', config: 'var(--warn)' }
|
||||
|
||||
/**
|
||||
* 模板区:两次运行各用的版本,执行图变了的话列出变化的节点(新增、移除、配置变更)和改了的配置项。配置项写的是节点
|
||||
* 配置里的键:同一个键在不同类型的节点里叫法不同,接口又不给节点类型,照原样写比猜一个中文名可靠
|
||||
* 模板区:两次运行各用的版本,执行图变了的话列出变化的节点(新增、移除、配置变更)和改了的配置项。配置项的叫法用
|
||||
* 服务端按节点类型翻好的 labels(同一个键在不同类型的节点里叫法不同,界面没有节点类型猜不准);没给、或者和键对不上
|
||||
* 时照写键名,宁可露键名也不编一个界面上没有的名字。键名放在悬停提示里
|
||||
*/
|
||||
export function TemplateSection({ template }: { template: RunCompareTemplate }) {
|
||||
const id = useId()
|
||||
@@ -35,9 +36,14 @@ export function TemplateSection({ template }: { template: RunCompareTemplate })
|
||||
{!!n.keys.length && (
|
||||
<span className="flex min-w-0 flex-wrap items-center gap-1 text-2xs text-faint">
|
||||
<span>{T.keys}</span>
|
||||
{n.keys.map((k) => (
|
||||
<code key={k} className="mono rounded bg-bg px-1 text-dim [overflow-wrap:anywhere]" data-compare-key="">{k}</code>
|
||||
))}
|
||||
{n.keys.map((k, i) => {
|
||||
const label = n.labels?.length === n.keys.length ? n.labels[i] : undefined
|
||||
return label && label !== k ? (
|
||||
<span key={k} className="rounded bg-bg px-1 text-dim [overflow-wrap:anywhere]" title={k} data-compare-key={k}>{label}</span>
|
||||
) : (
|
||||
<code key={k} className="mono rounded bg-bg px-1 text-dim [overflow-wrap:anywhere]" data-compare-key={k}>{k}</code>
|
||||
)
|
||||
})}
|
||||
</span>
|
||||
)}
|
||||
</li>
|
||||
|
||||
@@ -65,16 +65,21 @@ export function signedNumber(v: number | null | undefined): string {
|
||||
return `${v > 0 ? '+' : '-'}${plainNumber(Math.abs(v))}`
|
||||
}
|
||||
|
||||
/**
|
||||
* 小数写成百分比(一位小数)。signed 时带正负号:变化比例 0.125 →「+12.5%」;占比 0.4 →「40.0%」。
|
||||
* 不是零、却小到一位小数写不出来的写「<0.1%」,不写成看着像没变的「0.0%」
|
||||
*/
|
||||
export function percent(v: number | null | undefined, signed = false): string {
|
||||
/** 百分数(已经乘过 100)写成一位小数;不是零、却小到一位小数写不出来的写「<0.1%」,不写成看着像没变的「0.0%」 */
|
||||
function pct(abs: number, sign: string): string {
|
||||
return abs !== 0 && abs < 0.05 ? `${sign}<0.1%` : `${sign}${abs.toFixed(1)}%`
|
||||
}
|
||||
|
||||
/** 变化百分比:服务端给的 delta_pct 已经乘过 100(12.5 是涨了 12.5%),带正负号:「+12.5%」「-3.0%」 */
|
||||
export function changeText(v: number | null | undefined): string {
|
||||
if (!isNum(v)) return NONE
|
||||
const pct = Math.abs(v) * 100
|
||||
const sign = signed && v !== 0 ? (v > 0 ? '+' : '-') : v < 0 ? '-' : ''
|
||||
if (v !== 0 && pct < 0.05) return `${sign}<0.1%`
|
||||
return `${sign}${pct.toFixed(1)}%`
|
||||
return pct(Math.abs(v), v > 0 ? '+' : v < 0 ? '-' : '')
|
||||
}
|
||||
|
||||
/** 归因的占比:服务端给的是小数(0.4 是 40%)。和总变化反向的一项占比是负的:「-5.0%」 */
|
||||
export function shareText(v: number | null | undefined): string {
|
||||
if (!isNum(v)) return NONE
|
||||
return pct(Math.abs(v) * 100, v < 0 ? '-' : '')
|
||||
}
|
||||
|
||||
/** 两个值算不算一样(输入对比里标「变了」用):数按值比,别的按 JSON 比 */
|
||||
@@ -108,9 +113,14 @@ export function queryNumbers(queries: RunCompareQuery[]): Map<string, number | n
|
||||
*/
|
||||
export type CompareErrorKind = '409' | '422' | '404' | 'no-base' | 'other'
|
||||
|
||||
/** 服务端「运行记录不存在」的机读码(api/evidence.py 的 RUN_NOT_FOUND,运行对比的接口沿用) */
|
||||
const RUN_NOT_FOUND = 'run_not_found'
|
||||
|
||||
export function compareErrorKind(e: unknown, finding: boolean): CompareErrorKind {
|
||||
if (!(e instanceof ApiError) || e.kind !== 'http') return 'other'
|
||||
if (finding) return e.status === 404 ? 'no-base' : 'other'
|
||||
// 找基准时的 404 有两种:本次这条运行就不存在(机读码 run_not_found),和找不到可比的上一次
|
||||
if (finding && e.status === 404) return e.code === RUN_NOT_FOUND ? '404' : 'no-base'
|
||||
if (finding) return 'other'
|
||||
if (e.status === 409) return '409'
|
||||
if (e.status === 422) return '422'
|
||||
if (e.status === 404) return '404'
|
||||
|
||||
@@ -3211,6 +3211,8 @@ export interface RunCompareTemplateNode {
|
||||
change: 'added' | 'removed' | 'config' | (string & {})
|
||||
/** 改了的配置项(节点配置里的键) */
|
||||
keys: string[]
|
||||
/** 约定之外、服务端顺带给的:各配置项在界面上的叫法,和 keys 一一对应。没给(或对不上)时照写键名 */
|
||||
labels?: string[]
|
||||
}
|
||||
|
||||
export interface RunCompareTemplate {
|
||||
@@ -3237,6 +3239,8 @@ export interface RunCompareInput {
|
||||
path: string
|
||||
base: unknown
|
||||
target: unknown
|
||||
/** 约定之外、服务端顺带给的:取自设置了遮罩的列,两边的值都不给 */
|
||||
masked?: boolean
|
||||
}
|
||||
|
||||
export interface RunCompareAttributionRow {
|
||||
@@ -3272,7 +3276,7 @@ export interface RunCompareMetric {
|
||||
delta: number | null
|
||||
/** 带正负号;比率、百分数写「个百分点」。没变化、不是数时可能为 null */
|
||||
delta_rendered: string | null
|
||||
/** 相对基准的变化比例(小数,0.125 是 +12.5%);基准为 0、缺值时为 null */
|
||||
/** 相对基准变化了百分之几(已乘 100,保留两位:12.5 是 +12.5%,和占比的小数写法不同);基准为 0、缺值时为 null */
|
||||
delta_pct: number | null
|
||||
classification: RunCompareClass | (string & {})
|
||||
reasons: string[]
|
||||
@@ -3300,6 +3304,10 @@ export interface RunCompareQuery {
|
||||
target_rows: number | null
|
||||
base_truncated: boolean | null
|
||||
target_truncated: boolean | null
|
||||
/** 约定之外、服务端顺带给的:结构变了时差在哪,一处一句中文(按对结果的影响从大到小) */
|
||||
differences?: string[]
|
||||
/** 约定之外、服务端顺带给的:快照读不出来、与哈希不一致时的一句说明 */
|
||||
problem?: string
|
||||
}
|
||||
|
||||
/** GET /runs/{id}/compare?base=。任一未封存或封存核对不一致 409;不是同一工作流、是同一次运行 422 */
|
||||
|
||||
Reference in New Issue
Block a user