完善口径管理、主动调查与后台任务,修复通用问题

- 完善口径编辑、只读试运行、统一质量验证与执行语义指纹
- 增加可执行指标约束、有预算的主动调查和过程评测
- 提取发布检查、证据读取与起草服务,支持任务停止、重试和检查点恢复
- 增加版本传递影响分析,修复并发覆盖、敏感值遮罩、异常评分及页面状态问题
- 修复 SQLite 复合查询追溯和 microVM 可选依赖缺失处理
- 纳入当前设计文档及部署配置调整

验证:相关主回归 3822 项通过,4 项跳过、8 项预期失败;补充回归通过。
前端构建、文案检查及 git diff --check 通过。
全量检查仍有环境权限、PostgreSQL 可选依赖和既有部署配置、SQLite 文件基线差异导致的未通过项。
This commit is contained in:
ThearchyHelios
2026-11-06 17:14:45 +08:00
parent 5f0b2359ac
commit 9d8b41430e
94 changed files with 9730 additions and 957 deletions
+3
View File
@@ -112,6 +112,9 @@ export const ledger = {
*/
version: (workflowId: string, version: number) =>
get<{ apps: { app_id: string; name: string; app_version: number }[]; effects: number; formal_runs: number
workflows?: { workflow_id: string; version: number; name: string; node_id: string; depth: number }[]
indirect_apps?: { app_id: string; name: string; app_version: number }[]
unreadable_workflows?: { workflow_id: string; version: number; name: string }[]
answers?: number; exports?: number; schedules?: number; recall?: VersionRecallCounts }>(
`/ledger/workflow-versions/${encodeURIComponent(workflowId)}/${version}`),
}
+2
View File
@@ -57,6 +57,8 @@ export const caliberLedger = {
/** 一份草稿的完整内容:payload 摊平在上层(metrics / entry_fields / dropped / open_questions / alignment / trial) */
draft: (draftId: string, opts?: RequestOptions) => get<CaliberDraft>(draftAt(draftId), opts),
/** 起草后自动发起的那次只读试运行:状态和每个指标的值,running 时轮询到终态 */
retryDraft: (draftId: string) => post<{ draft_id: string; status: string }>(`${draftAt(draftId)}/retry`, {}),
stopDraft: (draftId: string) => post<CaliberDraft>(`${draftAt(draftId)}/stop`, {}),
draftTrial: (draftId: string, opts?: RequestOptions) => get<DraftTrialOut>(`${draftAt(draftId)}/trial`, opts),
/**
* 按填好的入口字段再试运行一次(POST 同一个路径):参数按入口字段校验,缺必填回 422;
+257 -5
View File
@@ -1924,16 +1924,146 @@ function CaseList({ nodeId, mode, value, issues, onChange }: {
)
}
/** 指标类型:和 engine/schema.py 的 METRIC_KINDS 同一组;公式是缺省类型,不写进配置 */
const METRIC_KIND_OPTIONS = [
{ value: 'formula', label: '公式' },
{ value: 'external', label: '外部常量' },
{ value: 'rule', label: '规则' },
{ value: 'assessment', label: '评估' },
] as const
type MetricKind = (typeof METRIC_KIND_OPTIONS)[number]['value']
/** 列表字段写成一行「、」分隔;空值不显示 */
function listText(value: any): string {
return Array.isArray(value) ? value.filter((v) => typeof v === 'string' && v.trim()).join('、') : ''
}
/** 同义词一行拆成列表:顿号、逗号、换行都算分隔 */
function splitItems(text: string): string[] {
const seen = new Set<string>()
const out: string[] = []
for (const part of text.split(/[、,,\n]/)) {
const item = part.trim()
if (item && !seen.has(item)) { seen.add(item); out.push(item) }
}
return out
}
/** 多行文本拆成列表:每行一条,空行不要 */
function lineItems(text: string): string[] {
return text.split('\n').map((line) => line.trim()).filter(Boolean)
}
/** 数字框:没填就删键,不把空串写成 0 */
function numberText(value: any): string {
return typeof value === 'number' && Number.isFinite(value) ? String(value) : ''
}
function numberValue(text: string): number | undefined {
if (!text.trim()) return undefined
const value = Number(text)
return Number.isFinite(value) ? value : undefined
}
/**
* 指标定义卡:一条指标由「定义」和「计算」组成。
*
* 计算按类型分四种:公式用表达式;外部常量直接给值;规则与评估的结构字段用 JSON 编辑(形状见 engine/schema.py
* 的 metric_definition_issues)。定义是业务说法:名称、同义词、单位、小数位、定义说明、适用范围、负责人、生效日期、
* 不包含的情况。引用原文(citations)由文档起草逐字核对后留下,这里只读。
*
* 空值一律删键:schema 把空串当成写了值,会和「没写」分不开。
*/
function MetricList({ nodeId, value, issues, onChange }: {
nodeId: string; value: any[]; issues: FieldIssue[]; onChange: (v: any[]) => void
}) {
const uid = useId()
/** 换掉一条指标对象:调用方先拼好,空值在下面几个 set 里已经删掉 */
const replace = (i: number, next: any) =>
onChange(value.map((m, idx) => (idx === i ? next : m)))
const update = (i: number, patch: any) =>
onChange(value.map((m, idx) => (idx === i ? { ...m, ...patch } : m)))
/** 类型只改 kind:切回公式时把 kind 删掉;其余结构字段原样留着,切回来不丢东西 */
const setKind = (i: number, kind: MetricKind) => {
const metric = value[i] ?? {}
const next = { ...metric }
if (kind === 'formula') delete next.kind
else next.kind = kind
replace(i, next)
}
/** 外部常量:值、来源、截止日期、过期天数;空对象删掉 */
const setExternal = (i: number, key: string, raw: any) => {
const metric = value[i] ?? {}
const external = { ...(metric.external && typeof metric.external === 'object' ? metric.external : {}) }
if (raw === undefined || raw === '') delete external[key]
else external[key] = key === 'stale_after_days' ? Math.trunc(raw) : raw
const next = { ...metric }
if (Object.keys(external).length) next.external = external
else delete next.external
replace(i, next)
}
/** 定义说明:除了 citations 之外的几个键;定义对象空了就删掉 */
const setDefinition = (i: number, key: string, raw: any) => {
const metric = value[i] ?? {}
const definition = { ...(metric.definition && typeof metric.definition === 'object' ? metric.definition : {}) }
if (raw === undefined || raw === '' || (Array.isArray(raw) && raw.length === 0)) delete definition[key]
else definition[key] = raw
const next = { ...metric }
if (Object.keys(definition).length) next.definition = definition
else delete next.definition
replace(i, next)
}
/** 规则 / 评估:整个对象交给 JSON 编辑;清空就删键 */
const setNested = (i: number, key: string, raw: any) => {
const metric = value[i] ?? {}
const next = { ...metric }
if (raw === undefined || raw === null) delete next[key]
else next[key] = raw
replace(i, next)
}
const setList = (i: number, key: string, text: string) => {
const metric = value[i] ?? {}
const items = key === 'exclusions' ? lineItems(text) : splitItems(text)
const next = { ...metric }
if (items.length) next[key] = items
else delete next[key]
replace(i, next)
}
const setNumber = (i: number, key: string, text: string, integer = false) => {
const raw = numberValue(text)
const metric = value[i] ?? {}
const next = { ...metric }
if (raw === undefined) delete next[key]
else next[key] = integer ? Math.trunc(raw) : raw
replace(i, next)
}
return (
<div>
{value.map((m, i) => {
const own = issues.filter((x) => x.at?.index === i)
const at = (sub: string) => own.filter((x) => x.at?.sub === sub || x.at?.sub?.startsWith(`${sub}.`))
const kind = (METRIC_KIND_OPTIONS.some((o) => o.value === m.kind) ? m.kind : 'formula') as MetricKind
const definition: Record<string, any> = m.definition && typeof m.definition === 'object' ? m.definition : {}
const external: Record<string, any> = m.external && typeof m.external === 'object' ? m.external : {}
const citations = Array.isArray(definition.citations) ? definition.citations.length : 0
const exclusions = Array.isArray(definition.exclusions)
? definition.exclusions.filter((v: any) => typeof v === 'string' && v.trim()).join('\n') : ''
const rest = own.filter((x) => {
const base = x.at?.sub?.split('.')[0]
if (!base) return true
if (base === 'expression') return kind !== 'formula'
return !['kind', 'external', 'rule', 'assessment', 'definition', 'decimals', 'synonyms'].includes(base)
})
return (
<Row key={i} item={i} removeLabel={`删除指标 ${m.id || i + 1}`}
tone={own.some((x) => x.level === 'error') ? 'error' : own.length ? 'warning' : undefined}
@@ -1952,12 +2082,134 @@ function MetricList({ nodeId, value, issues, onChange }: {
onChange={(e) => update(i, { unit: e.target.value })} />
</Sub>
</div>
<Sub label="计算" htmlFor={`${uid}-${i}-expr`} syntax="expression" sub="expression">
<TemplateText id={`${uid}-${i}-expr`} multiline={false} syntax="expression" nodeId={nodeId}
className="text-xs" placeholder="round(vars.agg.amount / vars.agg.orders, 2)"
value={m.expression ?? ''} onChange={(v) => update(i, { expression: v })} />
<div className="flex gap-1.5">
<Sub label="类型" htmlFor={`${uid}-${i}-kind`} className="min-w-0 flex-1" sub="kind">
<select id={`${uid}-${i}-kind`} className="field" value={kind}
onChange={(e) => setKind(i, e.target.value as MetricKind)}>
{METRIC_KIND_OPTIONS.map((option) => (
<option key={option.value} value={option.value}>{option.label}</option>
))}
</select>
</Sub>
<Sub label="小数位" htmlFor={`${uid}-${i}-decimals`} className="w-16 shrink-0" sub="decimals">
<input id={`${uid}-${i}-decimals`} type="number" min={0} max={8} className="field tnum"
value={numberText(m.decimals)} placeholder="—"
onChange={(e) => setNumber(i, 'decimals', e.target.value, true)} />
</Sub>
</div>
{at('kind').map((x, k) => <IssueLine key={`kind:${k}`} issue={x} />)}
{at('decimals').map((x, k) => <IssueLine key={`decimals:${k}`} issue={x} />)}
{kind === 'formula' && (
<>
<Sub label="计算" htmlFor={`${uid}-${i}-expr`} syntax="expression" sub="expression">
<TemplateText id={`${uid}-${i}-expr`} multiline={false} syntax="expression" nodeId={nodeId}
className="text-xs" placeholder="round(vars.agg.amount / vars.agg.orders, 2)"
value={m.expression ?? ''} onChange={(v) => update(i, { expression: v })} />
</Sub>
{at('expression').map((x, k) => <IssueLine key={`expression:${k}`} issue={x} />)}
</>
)}
{kind === 'external' && (
<>
<p className="text-2xs leading-snug text-faint">外部常量不从查询计算,值由人填写。</p>
<div className="grid grid-cols-2 gap-1.5">
<Sub label="值" htmlFor={`${uid}-${i}-external-value`} sub="external.value">
<input id={`${uid}-${i}-external-value`} type="number" step="any" className="field tnum"
value={numberText(external.value)}
onChange={(e) => setExternal(i, 'value', numberValue(e.target.value))} />
</Sub>
<Sub label="来源" htmlFor={`${uid}-${i}-external-source`} sub="external.source">
<input id={`${uid}-${i}-external-source`} className="field" value={external.source ?? ''}
onChange={(e) => setExternal(i, 'source', e.target.value)} />
</Sub>
<Sub label="截止日期" htmlFor={`${uid}-${i}-external-as-of`} sub="external.as_of">
<input id={`${uid}-${i}-external-as-of`} className="field" placeholder="YYYY-MM-DD"
value={external.as_of ?? ''}
onChange={(e) => setExternal(i, 'as_of', e.target.value)} />
</Sub>
<Sub label="过期天数" htmlFor={`${uid}-${i}-external-days`} sub="external.stale_after_days">
<input id={`${uid}-${i}-external-days`} type="number" min={0} className="field tnum"
value={numberText(external.stale_after_days)}
onChange={(e) => setExternal(i, 'stale_after_days', numberValue(e.target.value))} />
</Sub>
</div>
{at('external').map((x, k) => <IssueLine key={`external:${k}`} issue={x} />)}
</>
)}
{kind === 'rule' && (
<>
<Sub label="规则结构(按 JSON 编辑)" htmlFor={`${uid}-${i}-rule`} sub="rule">
<JsonInput id={`${uid}-${i}-rule`} value={m.rule} rows={6}
onChange={(v) => setNested(i, 'rule', v)} />
</Sub>
<p className="text-2xs leading-snug text-faint">规则的输入、条件、成立与不成立时的取值都写在结构里。</p>
{at('rule').map((x, k) => <IssueLine key={`rule:${k}`} issue={x} />)}
</>
)}
{kind === 'assessment' && (
<>
<Sub label="评估结构(按 JSON 编辑)" htmlFor={`${uid}-${i}-assessment`} sub="assessment">
<JsonInput id={`${uid}-${i}-assessment`} value={m.assessment} rows={6}
onChange={(v) => setNested(i, 'assessment', v)} />
</Sub>
<p className="text-2xs leading-snug text-faint">评估按维度加权评分,再按分数落等级。</p>
{at('assessment').map((x, k) => <IssueLine key={`assessment:${k}`} issue={x} />)}
</>
)}
<details className="rounded border bg-panel px-2 py-1.5" data-metric-contract="">
<summary className="cursor-pointer text-2xs text-dim">计算约束</summary>
<Sub label="结果形状、粒度和取值约束" htmlFor={`${uid}-${i}-contract`} sub="contract">
<JsonInput id={`${uid}-${i}-contract`} value={m.contract} rows={5}
onChange={(v) => setNested(i, 'contract', v)} />
</Sub>
<p className="text-2xs leading-snug text-faint">
shape 选 scalar 时要求查询恰好一行;grain 指定唯一粒度列,non_null 指定非空列,minimum / maximum 限制取值。
ratio 可指定同一查询中的 numerator、denominator 列及 scale 换算倍率;subset 为 true 时检查分子不超过分母。
业务描述与 SQL 的一致性仍需审阅。
</p>
{at('contract').map((x, k) => <IssueLine key={`contract:${k}`} issue={x} />)}
</details>
<Sub label="同义词(逗号分隔)" htmlFor={`${uid}-${i}-synonyms`} sub="synonyms">
<input id={`${uid}-${i}-synonyms`} className="field" value={listText(m.synonyms)}
onChange={(e) => setList(i, 'synonyms', e.target.value)} />
</Sub>
{own.map((x, k) => <IssueLine key={k} issue={x} />)}
{at('synonyms').map((x, k) => <IssueLine key={`synonyms:${k}`} issue={x} />)}
<details className="rounded border bg-panel px-2 py-1.5" data-metric-definition="">
<summary className="cursor-pointer text-2xs text-dim">定义说明与出处</summary>
<div className="mt-1.5 space-y-1.5">
<Sub label="定义说明" htmlFor={`${uid}-${i}-def-text`} sub="definition.text">
<textarea id={`${uid}-${i}-def-text`} className="field text-xs" rows={3}
value={definition.text ?? ''}
onChange={(e) => setDefinition(i, 'text', e.target.value)} />
</Sub>
<div className="flex gap-1.5">
<Sub label="适用范围" htmlFor={`${uid}-${i}-def-scope`} className="min-w-0 flex-1" sub="definition.scope">
<input id={`${uid}-${i}-def-scope`} className="field" value={definition.scope ?? ''}
onChange={(e) => setDefinition(i, 'scope', e.target.value)} />
</Sub>
<Sub label="负责人" htmlFor={`${uid}-${i}-def-owner`} className="min-w-0 flex-1" sub="definition.owner">
<input id={`${uid}-${i}-def-owner`} className="field" value={definition.owner ?? ''}
onChange={(e) => setDefinition(i, 'owner', e.target.value)} />
</Sub>
</div>
<Sub label="生效日期" htmlFor={`${uid}-${i}-def-from`} sub="definition.effective_from">
<input id={`${uid}-${i}-def-from`} className="field" placeholder="YYYY-MM-DD"
value={definition.effective_from ?? ''}
onChange={(e) => setDefinition(i, 'effective_from', e.target.value)} />
</Sub>
<Sub label="不包含(每行一条)" htmlFor={`${uid}-${i}-def-exclusions`} sub="definition.exclusions">
<textarea id={`${uid}-${i}-def-exclusions`} className="field text-xs" rows={2}
value={exclusions} onChange={(e) => setDefinition(i, 'exclusions', lineItems(e.target.value))} />
</Sub>
{citations > 0 && (
<p className="text-2xs leading-snug text-faint">
引用原文 {citations} 条,起草时逐字核对过;这里只读。
</p>
)}
{at('definition').map((x, k) => <IssueLine key={`definition:${k}`} issue={x} />)}
</div>
</details>
{rest.map((x, k) => <IssueLine key={`rest:${k}`} issue={x} />)}
</Row>
)
})}
+10 -1
View File
@@ -257,6 +257,11 @@ export const NODE_DEFS: Record<NodeType, NodeDef> = {
key: 'approval', label: '审批策略', type: 'select', options: APPROVAL_OPTIONS,
help: '需要审批时运行将暂停,请在运行面板或记录页的审批卡上处理',
},
{
key: 'investigation', label: '异常调查策略', type: 'json', advanced: true,
placeholder: '{"enabled":true,"max_rounds":2,"minimum_depth":1,"min_coverage":0.8}',
help: '发现异常或追问原因时继续调查。可设置是否启用、追加调查轮数、最低下钻深度和解释覆盖程度。查询仍受运行预算约束。',
},
{
key: 'parallel_tools', label: '并行执行工具', type: 'switch', advanced: true,
help: '默认关闭:每轮只调用一个工具,根据结果决定下一步。开启后每轮可同时调用多个工具,速度更快,'
@@ -696,7 +701,11 @@ export const NODE_DEFS: Record<NodeType, NodeDef> = {
when: (c) => !c.caliber_from,
},
{ key: 'caliber_version', label: '口径版本', type: 'text', placeholder: 'v1', when: (c) => !c.caliber_from },
{ key: 'metrics', label: '指标定义', type: 'metricsList', when: (c) => !c.caliber_from },
{
key: 'metrics', label: '指标定义', type: 'metricsList', when: (c) => !c.caliber_from,
help: '一条指标由定义卡(名称、同义词、单位、小数位、定义说明、负责人、生效日期)和计算组成。'
+ '公式用表达式;外部常量直接给值;规则与评估按结构编辑。',
},
{
key: 'upgrade_policy', label: '上游发布新版本时', type: 'select', when: (c) => !!c.caliber_from,
options: [
+16 -1
View File
@@ -59,6 +59,16 @@ export function VersionUsageLine({ usage }: { usage: VersionUsage }) {
))}
</>
)}
{!!usage.workflows?.length && (
<span> · 依赖工作流:{usage.workflows.map((w, i) => (
<span key={`${w.workflow_id}:${w.version}:${w.node_id}:${i}`}>
{i > 0 && '、'}<Link className="hover:underline" to={`/studio/${w.workflow_id}`}>{w.name} v{w.version}</Link>
{w.depth > 1 ? '(间接)' : ''}
</span>
))}</span>
)}
{!!usage.indirect_apps?.length && <span> · 间接影响应用:{usage.indirect_apps.map((a) => a.name).join('、')}</span>}
{!!usage.unreadable_workflows?.length && <span> · 部分版本无法解析,影响范围尚未核对完整</span>}
<span className="text-faint"> · {T.effects(usage.effects)} · {T.formalRuns(usage.formal_runs)}</span>
{extra.length > 0 && <span className="text-faint" data-version-usage-ledger=""> · {extra.join(' · ')}</span>}
</span>
@@ -82,7 +92,12 @@ export async function retireVersion(workflowId: string, version: number, usage:
const ok = await confirmDialog({
title: T.retireTitle(version),
body: T.retireBody,
consequences: usage?.apps.length ? [T.retireAffected(usage.apps.map((a) => `${a.name} v${a.app_version}`))] : undefined,
consequences: [
...(usage?.apps.length ? [T.retireAffected(usage.apps.map((a) => `${a.name} v${a.app_version}`))] : []),
...(usage?.workflows?.length ? [`依赖此版本的工作流将无法继续正式运行:${usage.workflows.map((w) => `${w.name} v${w.version}`).join('、')}`] : []),
...(usage?.indirect_apps?.length ? [`间接影响应用:${usage.indirect_apps.map((a) => a.name).join('、')}`] : []),
...(usage?.unreadable_workflows?.length ? ['部分版本无法解析,当前影响范围可能不完整'] : []),
],
confirmLabel: T.retire,
danger: true,
})
+1 -1
View File
@@ -153,7 +153,7 @@ export const EVAL_TEXT = {
expectation: {
kind: {
scalar: '一个数', table: '多行', set: '名单', none: '没有数据', ask: '反问', text: '文字要点', contribution: '贡献',
verdict: '判定',
verdict: '判定', investigation: '调查过程',
} as Record<EvalExpectationKind, string>,
scalarCell: (column: string, row: number) => `「${column}」第 ${row + 1} 行`,
scalarWhere: (column: string, where: string) => `「${column}」(${where})`,
+34 -10
View File
@@ -225,20 +225,23 @@ export const LEDGER_UI = {
// ---- 从业务文档起草口径(/ledger/drafts;app/ledger/docdraft.py、docattach.py) ----
drafts: {
entry: '从业务文档起草',
entry: '新增口径',
title: '从业务文档起草口径',
subtitle: '文档整理成定义和取数,自动试运行一次;去画布审改后由人签字发布',
back: '返回口径目录',
refresh: '刷新',
/** 列表按状态筛:全部加起草中和六种落点;起草中会停留几分钟,单独筛出来看 */
/** 列表按阶段筛:全部、起草中、待审、已丢弃、失败。ready / questions_open / path_pending / attached 都归「待审」 */
filter: {
all: '全部',
drafting: '起草中',
ready: '待签字发布',
questions_open: '待确认问题',
path_pending: '待接数据路径',
attached: '已接上',
rejected: '已驳回',
review: '待审',
discarded: '已丢弃',
failed: '起草失败',
} as Record<string, string>,
stage: {
drafting: '起草中',
review: '待审',
discarded: '已丢弃',
failed: '起草失败',
} as Record<string, string>,
status: {
@@ -250,13 +253,16 @@ export const LEDGER_UI = {
rejected: '已驳回',
failed: '起草失败',
} as Record<string, string>,
filterLabel: '按状态筛',
/** 细状态里值得在阶段旁边多说一句的:没有图、接了运行 */
stageNote: (status: string) => status === 'path_pending' ? '还没有取数图'
: status === 'attached' ? '已接上一次运行' : '',
filterLabel: '按阶段筛',
summary: (metrics: number, questions: number) => `${formatNumber(metrics)} 个指标 · ${
questions ? `${formatNumber(questions)} 个未决问题` : '没有未决问题'}`,
loadFailed: '无法读取口径草稿',
empty: '还没有口径草稿',
emptyBody: '选一份业务文档,把里面的指标整理成定义和取数草稿',
emptyFiltered: '这个状态下没有草稿,换个状态看看',
emptyFiltered: '这个阶段没有草稿,换个阶段看看',
// ---- 发起:选文档、可选数据源和起草要求 ----
start: '起草一份新口径',
@@ -297,9 +303,16 @@ export const LEDGER_UI = {
trialNoMetrics: '这次试运行没有产出指标值',
trialUnavailable: '暂时无法读取试运行状态',
trialRun: '看这次运行',
/** 试运行读到的表:草稿页和口径目录共用,只读,不是正式出具 */
trialResult: '只读试运行结果,不是正式出具',
trialRows: (total: number) => `共 ${formatNumber(total)} 行`,
trialTruncated: (shown: number) => `只显示前 ${formatNumber(shown)} 行`,
trialNoRows: '这次试运行没有读到数据',
/** 必填入口字段没有值:状态停在 needs_input,不拿系统编的值去跑 */
trialNeedsInput: '等补入口字段',
trialNeedsInputHint: '填好入口字段再试运行',
trialStale: '需要重新试运行',
trialStaleHint: '口径已修改,之前的试运行结果不再代表当前定义。',
trialRunAction: '试运行',
trialRunStarting: '正在发起…',
@@ -308,6 +321,11 @@ export const LEDGER_UI = {
docTruncated: '文档太长,后面的段落没有参与起草',
catalogTruncated: '数据目录太大,只展开了文档点到的几张表',
blocks: (n: number) => `${formatNumber(n)} 个取数节点`,
/** 取数 SQL:草稿图里的模板,入口字段在运行时渲染;页面只读展示,不出现执行值 */
sqlTitle: '取数 SQL',
sqlHint: '取数模板,入口字段在运行时渲染',
/** 逐组取数:第几组、这条 SQL 出哪几个指标 */
sqlGroup: (n: number, metrics: number) => `第 ${formatNumber(n)} 组 · ${formatNumber(metrics)} 个指标`,
metricsCount: (n: number) => `指标(${formatNumber(n)} 条)`,
/** 指标卡默认收起:标题行看名字、单位、值和未决问题数,展开看定义、表达式和引用 */
metricSummaryHint: '展开看定义、表达式和引用原文',
@@ -359,10 +377,16 @@ export const LEDGER_UI = {
defaultValue: (value: string) => `缺省 ${value}`,
publish: '去画布审改并发布',
publishHint: '在画布上核对图、改完再发布;发布这一步由人签字',
/** 发布前检查:服务端从图和试跑状态算,只读、不拦人 */
checks: '发布前检查',
checksHint: '只读检查,不拦人;未通过的项照实列出',
checkOk: '通过',
checkFail: '待处理',
checksSummary: (passed: number, total: number) => `${formatNumber(passed)}/${formatNumber(total)} 项通过`,
workflowVersion: (version: number) => `工作流 v${version}`,
// ---- 接上一次运行(辅助入口) ----
attach: '接上一次运行',
attach: '已经有答案?接上一次运行',
attachHint: '已经有一次运行得出的答案,让它认这份定义:取数照抄那次运行执行过的查询,不重新生成;接上后产出可试运行的工作流版本,不发布',
runId: '运行 id',
runIdPlaceholder: '粘贴运行记录里的 id',
+1
View File
@@ -131,6 +131,7 @@ export function cellText(v: unknown): string {
/** 一个期望是从哪里取什么:「「gmv」第 1 行」「指标「gmv」」「按「地区」配对的多行」…… */
export function expectationText(e: EvalExpectation): string {
if (e.kind === 'investigation') return `${e.status === 'partial' ? '明确保留调查缺口' : '完成调查'}${e.minimum_depth != null ? `,至少下钻 ${e.minimum_depth} 层` : ''}${e.max_queries != null ? `,最多查询 ${e.max_queries} 次` : ''}`
const E = T.expectation
let text: string
switch (e.kind) {
+14 -4
View File
@@ -7,13 +7,14 @@
*/
import { useEffect, useMemo, useState } from 'react'
import { Link } from 'react-router-dom'
import { ChevronDown, FileText, Layers, Play, RefreshCw, Search } from 'lucide-react'
import { ChevronDown, Layers, Play, Plus, RefreshCw, Search } from 'lucide-react'
import clsx from 'clsx'
import { api } from '../../api/client'
import { SchemaForm } from '../../components/SchemaForm'
import { EmptyState, ErrorState, Notice, PageHeader, Skeleton, Spinner, toast } from '../../components/ui'
import { LEDGER_TEXT } from '../../lib/terms'
import { LEDGER_UI } from '../../lib/termsLedger'
import { TrialResult, TrialValidation } from './TrialResult'
import type { FormSchema } from '../../typesApp'
import type { CaliberDescriptor, CaliberTrialOut } from '../../typesLedger'
@@ -80,8 +81,9 @@ export function CaliberCatalog() {
<div className="flex h-full flex-col" data-caliber-catalog="">
<PageHeader icon={<Layers size={14} />} title="口径" subtitle="已发布口径的入口、指标、依赖与试运行"
actions={<>
<Link to="/ledger/drafts" className="btn btn-xs btn-ghost" data-caliber-drafts-link="">
<FileText size={12} aria-hidden /> {LEDGER_UI.drafts.entry}
<Link to="/ledger/drafts" className="btn btn-xs btn-primary" data-caliber-drafts-link=""
title="从业务文档起草;已经有答案的,在草稿里接一次运行">
<Plus size={12} aria-hidden /> {LEDGER_UI.drafts.entry}
</Link>
<button type="button" className="btn btn-xs btn-ghost" onClick={load} title="重新加载">
<RefreshCw size={12} aria-hidden /> 刷新
@@ -204,9 +206,17 @@ export function CaliberCatalog() {
<Notice tone={result.status === 'running' ? 'info' : 'err'}>
{result.status === 'running' ? '还在运行:' : '试运行没有成功:'}
{result.error || result.status}
{' '}<Link className="underline" to={`/runs/${result.run_id}`}>看运行</Link>
</Notice>
)}
{result.run_id && (
<div className="mt-1">
<Link className="text-2xs text-accent hover:underline" to={`/runs/${result.run_id}`}
data-caliber-trial-run="">
{LEDGER_UI.drafts.trialRun}
</Link>
</div>
)}
{result.status === 'succeeded' && <><TrialValidation report={result.validation} /><TrialResult queries={result.queries} /></>}
</div>
)}
</div>
+172 -46
View File
@@ -11,41 +11,48 @@
* (第 N 段),逐条的未决问题可以勾掉;被丢弃的条目单独列出原因;入口字段列出名字、类型、必填和缺省值;
* - 发布:主按钮去画布审改并发布。「接上一次运行」只是辅助入口:已经有答案时让它认这份定义。
*
* 页面不显示 SQL,取数到画布上看。状态由服务端算(还有问题 → questions_open,否则 ready;旧路径可能停在 path_pending),
* 页面只按状态画。
* 页面不显示执行值:取数 SQL 只作为模板只读展示,具体取数到画布上看。服务端把细状态折成四种阶段(起草中 / 待审 /
* 已丢弃 / 失败),页面按阶段筛、按阶段画;细状态放在标签的悬停提示里。
*/
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { Link } from 'react-router-dom'
import { ChevronLeft, FileText, PenLine, Play, RefreshCw, ScrollText } from 'lucide-react'
import { AlertTriangle, Check, ChevronLeft, FileText, PenLine, Play, RefreshCw, ScrollText } from 'lucide-react'
import clsx from 'clsx'
import { api } from '../../api/client'
import { EmptyState, ErrorState, Notice, PageHeader, Skeleton, Spinner, promptDialog, toast } from '../../components/ui'
import { formatDateTime, formatTime } from '../../lib/format'
import { LEDGER_UI } from '../../lib/termsLedger'
import { TrialResult, TrialValidation } from './TrialResult'
import type { DataSourceName, KbDocument, Run } from '../../types'
import type {
CaliberDraft, CaliberDraftStatus, CaliberDraftSummary, DraftAlignment, DraftCitation, DraftEntryField, DraftMetric,
DraftTrialMetric, DraftTrialOut,
CaliberDraft, CaliberDraftStage, CaliberDraftStatus, CaliberDraftSummary, DraftAlignment, DraftCitation, DraftEntryField,
DraftMetric, DraftTrialMetric, DraftTrialOut,
} from '../../typesLedger'
const D = LEDGER_UI.drafts
/** 列表的状态筛:全部加七种状态;起草中也会停留几分钟,可以单独筛出来看 */
type Filter = '' | CaliberDraftStatus
const FILTERS: Filter[] = ['', 'drafting', 'ready', 'questions_open', 'path_pending', 'attached', 'rejected', 'failed']
/** 列表按阶段筛:全部、起草中、待审、已丢弃、失败;细状态不再单独占筛选项 */
type Filter = '' | CaliberDraftStage
const FILTERS: Filter[] = ['', 'drafting', 'review', 'discarded', 'failed']
/** 细状态 → 界面阶段;旧服务端没有 stage 时按 status 推,页面不会因为少一个字段就空 */
const stageOf = (draft: CaliberDraftSummary | CaliberDraft): CaliberDraftStage =>
draft.stage ?? (draft.status === 'drafting' ? 'drafting' : draft.status === 'rejected' ? 'discarded'
: draft.status === 'failed' ? 'failed' : 'review')
/** 起草轮询:每两秒一次,多轮续跑要几分钟,最多等十分钟 */
const DRAFT_POLL_MS = 2_000
const DRAFT_POLL_LIMIT_MS = 15 * 60_000
/** 状态标签:起草中 / 待签字发布 / 待确认问题 / 待接数据路径 / 已接上 / 已驳回 / 起草失败 */
function StatusPill({ status }: { status: CaliberDraftStatus }) {
const color = status === 'ready' || status === 'attached' ? 'var(--ok)' : status === 'rejected' ? 'var(--text-faint)'
: status === 'drafting' ? 'var(--accent)' : status === 'failed' ? 'var(--err)' : 'var(--warn)'
/** 阶段标签:起草中 / 待审 / 已丢弃 / 起草失败;细状态放在 title 里,鼠标悬停能看到「待确认问题」这类差别 */
function StatusPill({ stage, status }: { stage: CaliberDraftStage; status?: CaliberDraftStatus }) {
const color = stage === 'review'
? (status === 'ready' || status === 'attached' ? 'var(--ok)' : 'var(--warn)')
: stage === 'drafting' ? 'var(--accent)' : stage === 'discarded' ? 'var(--text-faint)' : 'var(--err)'
return (
<span className="shrink-0 rounded border px-1.5 py-0.5 text-[10px]"
<span className="shrink-0 rounded border px-1.5 py-0.5 text-[10px]" title={status ? D.status[status] : undefined}
style={{ color, borderColor: `color-mix(in srgb, ${color} 40%, var(--border))` }}>
{D.status[status] ?? status}
{D.stage[stage] ?? stage}
</span>
)
}
@@ -207,6 +214,8 @@ export function CaliberDrafts() {
const [trialPollId, setTrialPollId] = useState<string | null>(null)
const [trialTimedOut, setTrialTimedOut] = useState(false)
const [trialError, setTrialError] = useState<unknown>(null)
const [jobError, setJobError] = useState<unknown>(null)
const [jobBusy, setJobBusy] = useState<string | null>(null)
/** 试运行的表单值:入口字段可改,必填没填满时按钮禁用;prefilled 记哪些是页面替人预填的 */
const [entryValues, setEntryValues] = useState<Record<string, string>>({})
@@ -270,6 +279,7 @@ export function CaliberDrafts() {
setTrialPollId(null)
setTrialTimedOut(false)
setTrialError(null)
setJobError(null)
try {
const draft = await api.caliberLedger.draft(id)
if (seq !== openSeq.current) return
@@ -322,7 +332,7 @@ export function CaliberDrafts() {
const run = detail?.trial?.run_id
if (!id || !run) return
let alive = true
setTrial((cur) => (cur?.run_id === run ? cur : {
setTrial((cur) => (cur?.run_id === run && detail?.trial?.status !== 'stale' ? cur : {
run_id: run, status: detail?.trial?.status ?? 'running', metrics: [], error: detail?.trial?.error ?? '',
}))
api.caliberLedger.draftTrial(id).then((out) => {
@@ -337,7 +347,7 @@ export function CaliberDrafts() {
setTrialPollId(null)
})
return () => { alive = false }
}, [detail?.id, detail?.trial?.run_id])
}, [detail?.id, detail?.version, detail?.trial?.run_id, detail?.trial?.status])
/** 试运行还在跑:每两秒取一次,超过一分钟就停;收尾时顺带刷新详情(状态可能已变成待签字发布) */
useEffect(() => {
@@ -378,7 +388,7 @@ export function CaliberDrafts() {
}, [detail, ensureChunks])
const shown = useMemo(
() => (drafts ?? []).filter((d) => !filter || d.status === filter),
() => (drafts ?? []).filter((d) => !filter || stageOf(d) === filter),
[drafts, filter],
)
@@ -528,6 +538,8 @@ export function CaliberDrafts() {
setTrial(out)
setTrialTimedOut(false)
if (out.status === 'running' && out.run_id) setTrialPollId(draft.id)
const fresh = await api.caliberLedger.draft(draft.id)
setDetail((cur) => cur?.id === fresh.id ? fresh : cur)
} catch (e) {
setTrialError(e)
} finally {
@@ -535,15 +547,36 @@ export function CaliberDrafts() {
}
}
const changeDraftJob = async (draft: CaliberDraft, action: 'retry' | 'stop') => {
const seq = openSeq.current
setJobBusy(draft.id)
setJobError(null)
try {
if (action === 'retry') await api.caliberLedger.retryDraft(draft.id)
else await api.caliberLedger.stopDraft(draft.id)
const fresh = await api.caliberLedger.draft(draft.id)
if (seq === openSeq.current) {
setDetail(fresh)
if (fresh.status === 'drafting') { setPollTimedOut(false); setPollingId(draft.id) }
else setPollingId(null)
}
await loadList()
} catch (error) {
if (seq === openSeq.current) setJobError(error)
} finally {
setJobBusy((id) => id === draft.id ? null : id)
}
}
/** 自动试运行:状态、每个指标的值(名字和值成对)、失败原因;没有试运行就整块不画 */
const renderTrial = (draft: CaliberDraft) => {
const status = trial?.status ?? draft.trial?.status
const status = draft.trial?.status === 'stale' ? 'stale' : trial?.status ?? draft.trial?.status
if (!status) return null
const rows = trial?.metrics ?? []
const color = status === 'succeeded' ? 'var(--ok)' : status === 'failed' ? 'var(--err)'
: status === 'needs_input' ? 'var(--warn)' : 'var(--accent)'
const color = status === 'succeeded' ? (trial?.validation?.status === 'pass' ? 'var(--ok)' : 'var(--warn)') : status === 'failed' ? 'var(--err)'
: status === 'needs_input' || status === 'stale' ? 'var(--warn)' : 'var(--accent)'
const label = status === 'succeeded' ? D.trialSucceeded : status === 'failed' ? D.trialFailed
: status === 'needs_input' ? D.trialNeedsInput : D.trialRunning
: status === 'needs_input' ? D.trialNeedsInput : status === 'stale' ? D.trialStale : D.trialRunning
const unitOf = (id: string) => (draft.metrics ?? []).find((m) => m.id === id)?.unit
return (
<div className="rounded-md border bg-elev px-3 py-2" data-draft-trial={status}>
@@ -573,28 +606,108 @@ export function CaliberDrafts() {
{D.trialNeedsInputHint}:{trial?.error || draft.trial?.error || ''}
</p>
)}
{status === 'succeeded' && (rows.length > 0 ? (
<ul className="mt-1 grid gap-x-4 gap-y-0.5 text-2xs sm:grid-cols-[1fr_auto]">
{rows.map((row) => {
const unit = unitOf(row.id)
return (
<li key={row.id} className="contents" data-draft-trial-metric={row.id}>
<span className="text-dim [overflow-wrap:anywhere]">{row.name || row.id}</span>
<span className="tnum text-right font-medium">
{row.rendered ?? (row.value == null ? '—' : String(row.value))}{unit ? ` ${unit}` : ''}
</span>
</li>
)
})}
</ul>
) : (
<p className="mt-1 text-2xs text-faint">{D.trialNoMetrics}</p>
))}
{status === 'stale' && <p className="mt-1 text-2xs text-dim">{D.trialStaleHint}</p>}
{status === 'succeeded' && (
<>
{rows.length > 0 ? (
<ul className="mt-1 grid gap-x-4 gap-y-0.5 text-2xs sm:grid-cols-[1fr_auto]">
{rows.map((row) => {
const unit = unitOf(row.id)
return (
<li key={row.id} className="contents" data-draft-trial-metric={row.id}>
<span className="text-dim [overflow-wrap:anywhere]">{row.name || row.id}</span>
<span className="tnum text-right font-medium">
{row.rendered ?? (row.value == null ? '—' : String(row.value))}{unit ? ` ${unit}` : ''}
</span>
</li>
)
})}
</ul>
) : (
<p className="mt-1 text-2xs text-faint">{D.trialNoMetrics}</p>
)}
<TrialValidation report={trial?.validation} />
<TrialResult queries={trial?.queries} />
</>
)}
{trialError != null && <div className="mt-1"><Notice tone="warn">{D.trialUnavailable}</Notice></div>}
</div>
)
}
/**
* 取数 SQL:草稿图里写好的模板,入口字段在运行时渲染;只读展示,不出现执行值。
* 默认折叠,SQL 可能为空(旧草稿、没写出取数),那时整块不画。
*/
const renderSql = (draft: CaliberDraft) => {
const groups = (draft.groups ?? []).filter((group) => (group.sql ?? '').trim())
const sql = (draft.sql ?? '').trim()
if (!groups.length && !sql) return null
const names = new Map((draft.metrics ?? []).filter((metric) => metric.id)
.map((metric) => [metric.id as string, metric.name]))
return (
<details className="rounded-md border bg-elev px-3 py-2" data-draft-sql="">
<summary className="cursor-pointer text-2xs font-semibold text-dim">{D.sqlTitle}</summary>
<p className="mt-0.5 text-2xs leading-relaxed text-faint">{D.sqlHint}</p>
{groups.length > 0 ? (
<div className="mt-1 space-y-2">
{groups.map((group, index) => (
<div key={`${index}:${group.sql}`} className="rounded bg-panel px-2 py-1.5"
data-draft-sql-group={index}>
<div className="flex flex-wrap items-baseline gap-x-2 gap-y-0.5 text-2xs">
<span className="font-medium text-dim">{D.sqlGroup(index + 1, group.metric_ids?.length ?? 0)}</span>
{!!group.metric_ids?.length && (
<span className="text-faint [overflow-wrap:anywhere]">
{(group.metric_ids ?? []).map((id) => names.get(id) ?? id).join('、')}
</span>
)}
</div>
<div className="mt-1 overflow-x-auto">
<code className="mono block whitespace-pre-wrap text-2xs leading-relaxed text-dim">{group.sql}</code>
</div>
</div>
))}
</div>
) : (
<div className="mt-1 overflow-x-auto rounded bg-panel px-2 py-1.5">
<code className="mono block whitespace-pre-wrap text-2xs leading-relaxed text-dim">{sql}</code>
</div>
)}
</details>
)
}
/** 发布前检查:服务端从图和试跑状态算,只读;未通过的不拦人,逐项写原因 */
const renderChecks = (draft: CaliberDraft) => {
const checks = draft.checks ?? []
if (!checks.length) return null
const passed = checks.filter((check) => check.ok).length
return (
<div className="rounded-md border bg-elev px-3 py-2" data-draft-checks="">
<div className="flex flex-wrap items-baseline gap-x-2 gap-y-0.5">
<h3 className="text-2xs font-semibold text-dim">{D.checks}</h3>
<span className={clsx('tnum text-2xs', passed === checks.length ? 'text-[var(--ok)]' : 'text-[var(--warn)]')}>
{D.checksSummary(passed, checks.length)}
</span>
</div>
<ul className="mt-1 space-y-1">
{checks.map((check) => (
<li key={check.key} className="flex items-start gap-1.5 text-2xs leading-relaxed" data-draft-check={check.key}>
{check.ok ? <Check size={11} className="mt-px shrink-0 text-[var(--ok)]" aria-hidden />
: <AlertTriangle size={11} className="mt-px shrink-0 text-[var(--warn)]" aria-hidden />}
<span className="min-w-0 flex-1">
<span className={check.ok ? 'text-dim' : 'text-[var(--warn)]'}>{check.label}</span>
{!check.ok && <span className="text-faint">({D.checkFail})</span>}
{check.detail && <p className="mt-0.5 text-2xs text-faint [overflow-wrap:anywhere]">{check.detail}</p>}
</span>
</li>
))}
</ul>
<p className="mt-1 text-2xs text-faint">{D.checksHint}</p>
</div>
)
}
/** 入口字段:发布后按这些字段收参数 */
const renderEntryFields = (draft: CaliberDraft) => {
const fields = draft.entry_fields
@@ -739,25 +852,28 @@ export function CaliberDrafts() {
}
const renderDetail = (draft: CaliberDraft) => {
const stage = stageOf(draft)
const drafting = draft.status === 'drafting'
const terminal = draft.status === 'attached' || draft.status === 'rejected'
const terminal = stage === 'discarded'
const stageNote = stage === 'review' ? D.stageNote(draft.status) : ''
const questions = draft.open_questions ?? []
const dropped = draft.dropped ?? []
const uncovered = draft.uncovered ?? []
const metrics = draft.metrics ?? []
const values = new Map((trial?.metrics ?? []).map((row) => [row.id, row]))
const values = new Map((draft.trial?.status === 'stale' ? [] : trial?.metrics ?? []).map((row) => [row.id, row]))
// 第一轮还没落库时服务端写的是空对象:没有轮次就不画,别显示「第 undefined 轮」
const progress = draft.progress && typeof draft.progress.round === 'number' ? draft.progress : null
return (
<div className="space-y-3 border-t px-3 py-3" data-draft-detail="">
<div className="flex flex-wrap items-center gap-x-2 gap-y-1 text-2xs text-faint">
<StatusPill status={draft.status} />
<StatusPill stage={stage} status={draft.status} />
{stageNote && <span>{stageNote}</span>}
{!!draft.documents?.length && <span>{D.documentsUsed(draft.documents.length)}</span>}
{typeof draft.blocks === 'number' && draft.blocks > 1 && <span>{D.blocks(draft.blocks)}</span>}
{draft.created_at && <span title={formatDateTime(draft.created_at)}>{formatTime(draft.created_at)}</span>}
{draft.created_by && <span>{D.createdBy(draft.created_by)}</span>}
{draft.model_id && <span title={draft.model_id}>{D.model(draft.model_id)}</span>}
{draft.workflow_id && draft.status !== 'rejected' && (
{draft.workflow_id && stage !== 'discarded' && (
<Link to={`/studio/${draft.workflow_id}`} className="text-accent hover:underline" data-draft-workflow="">
{D.openWorkflow}{draft.workflow_name ? `:${draft.workflow_name}` : ''}
{draft.version != null ? ` · ${D.workflowVersion(draft.version)}` : ''}
@@ -765,6 +881,13 @@ export function CaliberDrafts() {
)}
</div>
{(drafting || draft.job?.retryable || (draft.status === 'failed' && !draft.workflow_id)) && (
<div className="flex gap-2">
{drafting && <button className="btn btn-sm" disabled={jobBusy === draft.id} onClick={() => void changeDraftJob(draft, 'stop')}>停止起草</button>}
{!drafting && <button className="btn btn-sm" disabled={jobBusy === draft.id} onClick={() => void changeDraftJob(draft, 'retry')}>重试起草</button>}
</div>
)}
{jobError != null && <ErrorState error={jobError} compact />}
{draft.error && (
<Notice tone="err">
{drafting ? D.draftingFailed : D.loadFailed}:{draft.error}
@@ -799,6 +922,7 @@ export function CaliberDrafts() {
{renderTrial(draft)}
{renderEntryFields(draft)}
{renderSql(draft)}
<div>
<div className="mb-1 flex flex-wrap items-center justify-between gap-2">
@@ -854,7 +978,9 @@ export function CaliberDrafts() {
{draft.alignment && <AlignmentBlock alignment={draft.alignment} />}
{!drafting && !terminal && draft.workflow_id && (
{renderChecks(draft)}
{!drafting && stage === 'review' && draft.workflow_id && (
<div className="flex flex-wrap items-center gap-2" data-draft-publish="">
<Link to={`/studio/${draft.workflow_id}`} className="btn btn-primary btn-sm">
<PenLine size={12} aria-hidden /> {D.publish}
@@ -863,7 +989,7 @@ export function CaliberDrafts() {
</div>
)}
{!drafting && !terminal && (
{!drafting && stage === 'review' && draft.status !== 'attached' && (
<details className="rounded-md border bg-elev px-3 py-2" data-draft-attach="">
<summary className="cursor-pointer text-2xs font-semibold text-dim">{D.attach}</summary>
<p className="mt-0.5 text-2xs leading-relaxed text-faint">{D.attachHint}</p>
@@ -1004,7 +1130,7 @@ export function CaliberDrafts() {
aria-pressed={filter === f} onClick={() => setFilter(f)} data-draft-filter={f || 'all'}>
{f ? D.filter[f] : D.filter.all}
{drafts && <span className="tnum ml-1 text-[10px] opacity-70">
{f ? drafts.filter((d) => d.status === f).length : drafts.length}
{f ? drafts.filter((d) => stageOf(d) === f).length : drafts.length}
</span>}
</button>
))}
@@ -1036,7 +1162,7 @@ export function CaliberDrafts() {
<div className="min-w-0 flex-1">
<div className="flex flex-wrap items-baseline gap-x-2 gap-y-0.5">
<span className="text-sm font-medium [overflow-wrap:anywhere]">{draft.title}</span>
<StatusPill status={draft.status} />
<StatusPill stage={stageOf(draft)} status={draft.status} />
{draft.error && <span className="text-2xs text-[var(--err)]">{D.draftingFailed}</span>}
</div>
<div className="mt-0.5 text-2xs text-faint">
+95
View File
@@ -0,0 +1,95 @@
/**
* 只读试运行的结果表(草稿页和口径目录共用):一个取数节点一张表,列头 + 前几行 + 总行数。
*
* 试运行只是看数和定义对不对得上,不是正式出具,所以表上方写明这一点;页面最多画前二十行,再多只给总行数。
* 遮罩过的格子在服务端已经是「已遮罩」这样的字样,这里照原样显示,不再按列名猜。
* 旧服务端和旧草稿没有 queries,整块不画。
*/
import { LEDGER_UI } from '../../lib/termsLedger'
import type { DraftTrialQuery, QualityReport } from '../../typesLedger'
const D = LEDGER_UI.drafts
/** 每个查询最多画几行:再多给总行数,页面上不铺开整张表 */
const MAX_ROWS = 20
/** 格子转成文字:字符串照写,空值用破折号,对象转成 JSON 文本 */
function cellText(value: unknown): string {
if (value == null) return '—'
if (typeof value === 'string') return value
if (typeof value === 'number' || typeof value === 'boolean') return String(value)
const text = JSON.stringify(value)
return text ?? String(value)
}
export function TrialResult({ queries }: { queries?: DraftTrialQuery[] | null }) {
const list = (queries ?? []).filter((q) => q && ((q.columns?.length ?? 0) > 0 || (q.rows?.length ?? 0) > 0))
if (!list.length) return null
return (
<div className="mt-1.5 space-y-2" data-trial-result="">
<p className="text-2xs leading-relaxed text-faint">{D.trialResult}</p>
{list.map((q, i) => {
const columns = q.columns ?? []
const rows = q.rows ?? []
const shown = rows.slice(0, MAX_ROWS)
const truncated = !!q.truncated || rows.length > MAX_ROWS
return (
<div key={`${q.node_id}:${i}`} className="overflow-hidden rounded border" data-trial-query={q.node_id}>
<div className="flex flex-wrap items-baseline gap-x-2 border-b bg-elev px-2 py-1 text-2xs">
<span className="font-medium text-dim">{q.node_id}</span>
{q.tool && <span className="text-faint">{q.tool}</span>}
{q.source && <span className="text-faint">· {q.source}</span>}
<span className="tnum ml-auto text-faint">{q.source_truncated ? `已取回 ${q.total_rows} 行,查询结果已截断` : D.trialRows(q.total_rows)}</span>
</div>
<div className="overflow-x-auto">
<table className="w-full text-2xs">
<thead>
<tr className="border-b text-left text-faint">
{columns.map((column, j) => (
<th key={`${column}:${j}`} className="whitespace-nowrap px-2 py-1 font-normal">{column}</th>
))}
</tr>
</thead>
<tbody>
{shown.map((row, r) => (
<tr key={r} className="border-b last:border-0" data-trial-row={r}>
{columns.map((column, j) => (
<td key={`${column}:${j}`} className="mono max-w-[240px] truncate px-2 py-1 text-dim"
title={cellText(row[j])}>
{cellText(row[j])}
</td>
))}
</tr>
))}
</tbody>
</table>
</div>
{shown.length === 0 && <p className="px-2 py-1 text-2xs text-faint">{D.trialNoRows}</p>}
{truncated && <p className="border-t px-2 py-1 text-2xs text-faint">{D.trialTruncated(MAX_ROWS)}</p>}
</div>
)
})}
</div>
)
}
/** 执行完成后仍单独展示验证结论;旧结果没有报告时明确保留未知。 */
export function TrialValidation({ report }: { report?: QualityReport | null }) {
const status = report?.status ?? 'unknown'
const labels = { pass: '质量检查通过', fail: '质量检查未通过', unknown: '尚未完成质量验证' }
return (
<div className="mt-2 rounded border px-2 py-1 text-2xs" data-trial-validation={status}
style={{ color: status === 'pass' ? 'var(--ok)' : 'var(--warn)' }}>
<p>{labels[status]}</p>
{report?.checks?.length ? (
<ul className="mt-1 list-disc space-y-0.5 pl-4">
{report.checks.map((check, index) => (
<li key={`${check.code}:${check.metric_id ?? ''}:${index}`}>
{check.name ? `${check.name}:` : ''}{check.detail}
</li>
))}
</ul>
) : status === 'unknown' ? <p>这份结果缺少验证记录,请重新试运行。</p> : null}
</div>
)
}
+5 -1
View File
@@ -88,7 +88,7 @@ export interface EvalSuiteDetail extends EvalSuite {
// ---------------------------------------------------------------------------
export type EvalCaseKind = 'ask' | 'workflow'
export type EvalExpectationKind = 'scalar' | 'table' | 'set' | 'none' | 'ask' | 'text' | 'contribution' | 'verdict'
export type EvalExpectationKind = 'scalar' | 'table' | 'set' | 'none' | 'ask' | 'text' | 'contribution' | 'verdict' | 'investigation'
/** 分析期望用的分析方法(服务端 app/analysis/contract.OPS):贡献恒为 decompose,判定是另外四种 */
export type EvalAnalysisOp = 'decompose' | 'baseline' | 'trend' | 'differ' | 'comparable'
@@ -107,6 +107,10 @@ export type EvalJudgement = 'source' | 'dispersed' | 'flat' | 'mix' | 'rate' | '
* (贡献、判定)只写做哪种分析、参数,来源、方向、判定由平台的分析方法在期望 SQL 的结果上算
*/
export interface EvalExpectation {
minimum_depth?: number
max_queries?: number
status?: 'complete' | 'partial'
stop_reason?: string
id?: string
kind: EvalExpectationKind
required?: boolean
+93 -4
View File
@@ -392,6 +392,13 @@ export interface CaliberMetric {
format?: string
/** 公式(formula)、外部常量(external)、单元格条件规则(rule)、评估(assessment) */
kind?: string
grain?: string
time_field?: string
numerator?: string
denominator?: string
dimensions?: string[]
filters?: string[]
contract?: Record<string, unknown>
/** 定义卡:文字定义、范围、排除项、负责人、生效日期、引用 */
definition?: { text?: string; scope?: string; exclusions?: string[]; owner?: string; effective_from?: string; citations?: unknown[] }
params?: { name: string; type: string; default?: unknown; min?: number; max?: number }[]
@@ -404,6 +411,7 @@ export interface CaliberDescriptor {
version: number
level: string
graph_hash?: string | null
semantic_hash?: string | null
card: { node_id: string; title: string; caliber?: string | null; caliber_version?: string | null }
metrics: CaliberMetric[]
entry_schema: FormSchema
@@ -424,29 +432,54 @@ export interface CaliberDescriptor {
}
}
export interface ValidationCheck {
code: string
status: 'pass' | 'fail' | 'unknown'
detail: string
metric_id?: string
name?: string
}
export interface QualityReport {
status: 'pass' | 'fail' | 'unknown'
checks: ValidationCheck[]
}
export interface CaliberTrialMetric extends CaliberMetric {
quality?: QualityReport
masked?: boolean
value?: unknown
rendered?: string
}
/** POST /api/ledger/calibers/{wf}/{version}/{node}/trial:按固定版本试跑一次 */
export interface CaliberTrialOut {
validation?: QualityReport
run_id: string
status: string
output?: Record<string, unknown> | null
error?: string | null
metrics: CaliberTrialMetric[]
/** 这次试运行各取数节点读到的表;旧服务端没有 */
queries?: DraftTrialQuery[]
}
// ---------------------------------------------------------------- 从业务文档起草口径
/**
* 草稿的状态(app/ledger/docdraft.STATUSES):起草中 → 待确认问题 / 待接数据路径 / 待签字发布 → 已接上;
* 另有已驳回。ready 表示图已经生成、没有未决问题,可以试运行、可以签字发布;questions_open 也有图和数,
* 草稿的细状态(app/ledger/docdraft.STATUSES):起草中 → 待确认问题 / 待接数据路径 / 待签字发布 → 已接上;
* 另有已驳回。界面不再逐个画这些状态,按 CaliberDraftStage 折成四种阶段;细状态留在标签的悬停提示里。
* ready 表示图已经生成、没有未决问题,可以试运行、可以签字发布;questions_open 也有图和数,
* 只是还没清完问题,不阻断试运行。path_pending 是旧路径:图还没生成,取数只能来自一次真实运行。
*/
export type CaliberDraftStatus = 'drafting' | 'questions_open' | 'path_pending' | 'ready' | 'attached' | 'rejected' | 'failed'
/**
* 界面上的阶段(服务端 stage):起草中 / 待审 / 已丢弃 / 失败。ready、questions_open、path_pending、attached
* 都归「待审」;细状态仍照实给,需要说清楚时用 status。
*/
export type CaliberDraftStage = 'drafting' | 'review' | 'discarded' | 'failed'
/** 一条引用:逐字原文、原文所在段落(chunk)、段号、span 是原文里的 [start, end) */
export interface DraftCitation {
chunk: string
@@ -467,7 +500,7 @@ export interface DraftDefinition {
citations?: DraftCitation[]
}
/** 草稿里的一条指标:业务定义 + 取数表达式;SQL 在画布上看,这里不返回。 */
/** 草稿里的一条指标:业务定义 + 取数表达式;取数 SQL 在草稿图上(CaliberDraft.sql),这里不返回。 */
export interface DraftMetric {
id?: string
name: string
@@ -477,6 +510,7 @@ export interface DraftMetric {
decimals?: number
/** 指标表达式,形如 cell(nodes.fetch_1, 0, '列');一组取数时节点 id 是 fetch */
expression?: string
contract?: Record<string, unknown>
/** 粒度,如「日」「订单行」 */
grain?: string
/** 业务时间字段的业务叫法 */
@@ -501,28 +535,58 @@ export interface DraftEntryField {
/**
* 试运行的状态:还会缺必填入口字段(needs_input),这时不跑,等人填了再发起;needs_input 没有 run_id。
*/
export type DraftTrialStatus = 'running' | 'succeeded' | 'failed' | 'needs_input'
export type DraftTrialStatus = 'running' | 'succeeded' | 'failed' | 'needs_input' | 'stale'
/** 起草后自动发起的那次只读试运行(draft.payload.trial) */
export interface DraftTrial {
run_id: string
status: DraftTrialStatus
error?: string
version?: number
graph_hash?: string
execution_hash?: string
inputs_hash?: string
}
/** GET /api/ledger/drafts/{id}/trial 的一条:name 和 rendered 一一对应 */
export interface DraftTrialMetric {
quality?: QualityReport
masked?: boolean
id: string
name: string
value?: unknown
rendered?: string
}
/**
* 一次试运行里某个取数节点读到的一张表:列头、前几行、总行数;截断时只带回前若干行,
* 遮罩过的格子在 rows 里已经是「已遮罩」这样的字样,页面照原样显示。
*/
export interface DraftTrialQuery {
node_id: string
/** 这张表是查还是别的工具拿到的(旧服务端可能没有) */
tool?: string
/** 取数用的数据源 */
source?: string
columns: string[]
rows: unknown[][]
total_rows: number
/** 只带回了前若干行 */
truncated?: boolean
source_truncated?: boolean
preview_truncated?: boolean
/** 遮罩过的列名;格子本身已经是遮罩后的字样 */
masked?: string[]
}
/** GET /api/ledger/drafts/{id}/trial:这次自动试运行的状态和每个指标的值;POST 同一个路径按填好的入口字段再发起一次 */
export interface DraftTrialOut {
validation?: QualityReport
run_id: string
status: DraftTrialStatus
metrics: DraftTrialMetric[]
/** 这次试运行各取数节点读到的表;旧服务端和旧草稿没有 */
queries?: DraftTrialQuery[]
error?: string | null
}
@@ -551,6 +615,8 @@ export interface CaliberDraftSummary {
id: string
title: string
status: CaliberDraftStatus
/** 服务端算的界面阶段;旧服务端没有,页面按 status 推 */
stage?: CaliberDraftStage
metric_count: number
question_count: number
workflow_id: string | null
@@ -565,25 +631,48 @@ export interface DraftProgress {
uncovered: number
}
/** 发布前检查的一项:服务端从图和试跑状态算出来,只读,不拦人 */
export interface DraftCheck {
key: string
label: string
ok: boolean
detail?: string
}
/** 草稿图里一组取数:一条 SQL 出哪几个指标(metric_ids 对应 DraftMetric.id) */
export interface DraftGroup {
sql: string
entry_fields?: DraftEntryField[]
metric_ids?: string[]
}
/** GET /api/ledger/drafts/{id}:payload 摊平在上层(documents / metrics / dropped / open_questions / alignment) */
export interface CaliberDraft extends CaliberDraftSummary {
job?: { status: string; attempt: number; error?: string | null; retryable: boolean }
documents?: DraftDocument[]
metrics?: DraftMetric[]
/** 草稿图的入口字段 */
entry_fields?: DraftEntryField[]
/** 入口字段在各组里声明不一致的地方(必填取并集、类型取更宽),合并时记下的说明 */
entry_notes?: string[]
/** 草稿图里的取数 SQL 模板:入口字段在运行时渲染;页面只读展示,不出现执行值 */
sql?: string | null
dropped?: DraftDropped[]
open_questions?: string[]
/** 还没有起草出来的指标名称:续跑跑到轮数上限或没有新指标后剩下的,可以再起一份 */
uncovered?: string[]
/** 这张草稿图有几个取数节点(fetch_1、fetch_2…):多组指标共用一张口径卡 */
blocks?: number
/** 逐组取数:每条 SQL 出哪几个指标;旧草稿没有,页面回退到拼接的 sql 字段 */
groups?: DraftGroup[]
/** 多轮续跑的进度;旧草稿没有 */
progress?: DraftProgress
/** 模型回复被截断,指标是从完整片段里抢救出来的 */
salvaged?: boolean
alignment?: DraftAlignment
/** 发布前检查;旧草稿没有图时不给 */
checks?: DraftCheck[]
/** 起草后自动发起的那次只读试运行;旧草稿可能没有 */
trial?: DraftTrial | null
/** 草稿图对应的版本号 */