mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-22 09:32:07 +00:00
合入 W3-c 评测执行:后台评测与无头作答、六种期望五种结论的评分、重评、结论裁判记评测账、统计(Wilson 区间、按角色用量)、对比与 A/B(McNemar)、目录贡献预设、预算与止损、清理;定时任务接题集目标,定时评测有退步 / 没有评完推全局渠道;定时页照实显示非工作流目标
This commit is contained in:
@@ -3914,7 +3914,24 @@ export const SCHEDULE_TEXT = {
|
||||
/** 启用开关遇到版本不符(409):服务端那句是写给表单保存的,开关用这句,原话放进详情 */
|
||||
toggleConflict: (name: string) => `「${name}」已在别处被修改,已重新载入最新状态,请确认后再切换`,
|
||||
|
||||
// ---- 目标(定时只有一套:目标可以是工作流、评测题集或数据源维护)
|
||||
targetKind: { workflow: '工作流', eval_suite: '评测题集', source_maintenance: '数据源维护' } as Record<
|
||||
import('../types').ScheduleTargetKind, string>,
|
||||
/** 目标已经不在了:名字是保存时记下的 */
|
||||
targetGone: (name: string) => `${name}(已不存在)`,
|
||||
view: '查看',
|
||||
viewLabel: (name: string) => `查看定时任务「${name}」`,
|
||||
/** 非工作流目标的设置是只读的:启用、暂停、立即运行、触发历史照常可用 */
|
||||
targetSettingsTitle: '设置',
|
||||
targetSettingsNote: (kind: string) => `这个定时任务的目标是${kind}:可以启用、暂停、立即运行和查看触发历史;名称、频率和目标在这里只能查看,不能修改`,
|
||||
targetField: '目标',
|
||||
graceField: '补发宽限',
|
||||
|
||||
// ---- 立即运行的结果
|
||||
/** 目标是评测题集:发起的是一次评测,没有运行可看 */
|
||||
evalStarted: '已发起一次评测',
|
||||
/** 触发历史里评测题集那一次:评测的编号 */
|
||||
evalFire: (short: string) => `评测 #${short}`,
|
||||
runStarted: '已发起运行',
|
||||
runSkipped: '上一次运行尚未结束,本次已按重叠策略跳过',
|
||||
runFailed: (reason: string | null) => (reason ? `未能发起运行:${reason}` : '未能发起运行'),
|
||||
@@ -5669,7 +5686,7 @@ export const NOTIFY_TEXT = {
|
||||
// 个人应用提交审核有了结果(发布了或退回了),通知提交人:只对个人渠道、全局渠道有意义(服务端 notify/service.notify_review)
|
||||
'review.done': '我提交审核的应用有结果',
|
||||
'source.changed': '数据源有变化要处理', 'ledger.recall': '口径升版,答案的数变了',
|
||||
'eval.regressed': '评测有退步', 'eval.failed': '评测失败',
|
||||
'eval.regressed': '定时评测有退步', 'eval.failed': '定时评测没有评完',
|
||||
'task.digest': '每天的待办汇总', 'key.expiring': '访问密钥快到期',
|
||||
} as Record<string, string>,
|
||||
/** 投递记录里才有的事件:改派、升级、催办按「待办打开」的订阅推,记录里照实写是哪一种(服务端 notify/service._AS) */
|
||||
|
||||
@@ -143,6 +143,9 @@ function FireRow({ fire: f, tz, now }: { fire: ScheduleFire; tz: string; now: nu
|
||||
{T.openRun}
|
||||
<ChevronRight size={11} aria-hidden />
|
||||
</Link>
|
||||
) : f.eval_run_id ? (
|
||||
// 目标是评测题集:这一次发起的是一次评测(评测页在后续版本),这里只写编号
|
||||
<span className="shrink-0 text-2xs text-dim" data-fire-eval={f.eval_run_id}>{T.evalFire(f.eval_run_id.slice(0, 6))}</span>
|
||||
) : <span className="shrink-0 text-2xs text-faint">{T.noRun}</span>}
|
||||
</div>
|
||||
{f.reason && (
|
||||
|
||||
@@ -8,7 +8,11 @@ import { SCHEDULE_TEXT as T } from '../../lib/terms'
|
||||
import { useOnReconnect } from '../../store/catalog'
|
||||
import type { Schedule, ScheduleFire } from '../../types'
|
||||
import { FireHistory } from './FireHistory'
|
||||
import { EnableSwitch, LastFire, NextRun, isUnsupported, rememberScheduleNames, removeSchedule, runNow, setEnabled } from './parts'
|
||||
import {
|
||||
EnableSwitch, LastFire, NextRun, isUnsupported, rememberScheduleNames, removeSchedule, runNow, setEnabled, targetKindOf,
|
||||
targetText,
|
||||
} from './parts'
|
||||
import { graceLabel } from './model'
|
||||
import { ScheduleEditor } from './ScheduleEditor'
|
||||
|
||||
const BACK = (
|
||||
@@ -234,7 +238,12 @@ export function ScheduleDetailPage({ id }: { id: string }) {
|
||||
<Tabs tabs={[{ key: 'settings', label: T.tabs.settings }, { key: 'history', label: T.tabs.history }]}
|
||||
active={tab} onChange={pickTab} label={T.title} idPrefix="schedule" />
|
||||
<div className="min-h-0 flex-1 overflow-y-auto">
|
||||
{settingsSeen && (
|
||||
{settingsSeen && targetKindOf(schedule) !== 'workflow' && (
|
||||
<div role="tabpanel" id="schedule-panel-settings" aria-labelledby="schedule-tab-settings" hidden={tab !== 'settings'}>
|
||||
<TargetSettings schedule={schedule} />
|
||||
</div>
|
||||
)}
|
||||
{settingsSeen && targetKindOf(schedule) === 'workflow' && (
|
||||
<div role="tabpanel" id="schedule-panel-settings" aria-labelledby="schedule-tab-settings" hidden={tab !== 'settings'}>
|
||||
<ScheduleEditor
|
||||
key={resetKey}
|
||||
@@ -261,3 +270,31 @@ export function ScheduleDetailPage({ id }: { id: string }) {
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 目标不是工作流的定时任务(评测题集、数据源维护)的设置:只读地列出名称、目标、频率、时区、补发宽限。工作流那张表单
|
||||
* (选工作流、运行类别、输入模板、Webhook)对它们不适用;页头的启用开关、立即运行、删除和触发历史照常可用
|
||||
*/
|
||||
function TargetSettings({ schedule }: { schedule: Schedule }) {
|
||||
const kind = targetKindOf(schedule)
|
||||
const rows: [string, string][] = [
|
||||
[T.name, schedule.name],
|
||||
[T.targetField, `${T.targetKind[kind]} · ${targetText(schedule)}`],
|
||||
[T.freq, schedule.description_text],
|
||||
[T.timezone, schedule.timezone],
|
||||
[T.graceField, graceLabel(schedule.misfire_grace_s)],
|
||||
]
|
||||
return (
|
||||
<div className="mx-auto max-w-3xl space-y-3 p-4" data-schedule-target-settings={kind}>
|
||||
<p className="text-xs text-dim">{T.targetSettingsNote(T.targetKind[kind])}</p>
|
||||
<dl className="grid grid-cols-[auto_1fr] gap-x-4 gap-y-2 rounded-lg border bg-panel p-3 text-xs">
|
||||
{rows.map(([label, value]) => (
|
||||
<div key={label} className="contents">
|
||||
<dt className="text-faint">{label}</dt>
|
||||
<dd className="min-w-0 break-words text-fg">{value}</dd>
|
||||
</div>
|
||||
))}
|
||||
</dl>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -8,7 +8,10 @@ import { SCHEDULE_TEXT as T } from '../../lib/terms'
|
||||
import type { Schedule } from '../../types'
|
||||
import { ClassChip } from '../runs/parts'
|
||||
import { ScheduleCreatePage, ScheduleDetailPage } from './ScheduleDetail'
|
||||
import { EnableSwitch, LastFire, NextRun, isUnsupported, rememberScheduleNames, removeSchedule, runNow, setEnabled } from './parts'
|
||||
import {
|
||||
EnableSwitch, LastFire, NextRun, isUnsupported, rememberScheduleNames, removeSchedule, runNow, setEnabled, targetKindOf,
|
||||
targetText,
|
||||
} from './parts'
|
||||
|
||||
/**
|
||||
* 定时任务:按设定的周期自动发起工作流运行。
|
||||
@@ -145,13 +148,17 @@ function ScheduleListPage() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 一行:名字(链到详情)、工作流和频率;下次运行、上次触发;右边启用开关、立即运行、编辑、删除。
|
||||
* 窄屏上右边的按钮整组折到下一行,不挤名字
|
||||
* 一行:名字(链到详情)、目标和频率;下次运行、上次触发;右边启用开关、立即运行、编辑、删除。
|
||||
* 窄屏上右边的按钮整组折到下一行,不挤名字。目标不是工作流的(评测题集、数据源维护)标出种类、不标运行类别,
|
||||
* 「编辑」写「查看」:这类定时的设置在这里只读
|
||||
*/
|
||||
function ScheduleRow({ s, now, busy, onToggle, onRun, onDelete }: {
|
||||
s: Schedule; now: number; busy?: 'toggle' | 'run' | 'delete'
|
||||
onToggle: (enabled: boolean) => void; onRun: () => void; onDelete: () => void
|
||||
}) {
|
||||
const kind = targetKindOf(s)
|
||||
const workflow = kind === 'workflow'
|
||||
const target = targetText(s)
|
||||
return (
|
||||
<li className="rounded-lg border bg-panel px-3 py-2.5" data-schedule-row={s.id} data-enabled={String(s.enabled)}>
|
||||
<div className="flex flex-wrap items-start gap-x-3 gap-y-2">
|
||||
@@ -161,11 +168,13 @@ function ScheduleRow({ s, now, busy, onToggle, onRun, onDelete }: {
|
||||
className="min-w-0 truncate text-sm font-medium text-fg hover:underline">
|
||||
{s.name}
|
||||
</Link>
|
||||
<ClassChip runClass={s.run_class} />
|
||||
{workflow
|
||||
? <ClassChip runClass={s.run_class} />
|
||||
: <span className="chip shrink-0" data-schedule-target-kind={kind}>{T.targetKind[kind]}</span>}
|
||||
{!s.enabled && <span className="chip shrink-0" data-schedule-paused="">{T.pausedChip}</span>}
|
||||
</div>
|
||||
<div className="mt-0.5 truncate text-xs text-dim" title={`${s.workflow_name} · ${s.description_text}`} data-schedule-desc="">
|
||||
{s.workflow_name}<span className="text-faint"> · </span>{s.description_text}
|
||||
<div className="mt-0.5 truncate text-xs text-dim" title={`${target} · ${s.description_text}`} data-schedule-desc="">
|
||||
{target}<span className="text-faint"> · </span>{s.description_text}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex shrink-0 items-center gap-1">
|
||||
@@ -174,9 +183,9 @@ function ScheduleRow({ s, now, busy, onToggle, onRun, onDelete }: {
|
||||
title={T.runNowLabel(s.name)} data-schedule-run="">
|
||||
{busy === 'run' ? <Spinner size={11} /> : <Play size={11} aria-hidden />} {T.runNow}
|
||||
</button>
|
||||
<Link to={`/schedules/${encodeURIComponent(s.id)}`} className="btn btn-sm btn-ghost" aria-label={T.editLabel(s.name)}
|
||||
data-schedule-edit="">
|
||||
{T.edit}
|
||||
<Link to={`/schedules/${encodeURIComponent(s.id)}`} className="btn btn-sm btn-ghost"
|
||||
aria-label={workflow ? T.editLabel(s.name) : T.viewLabel(s.name)} data-schedule-edit="">
|
||||
{workflow ? T.edit : T.view}
|
||||
</Link>
|
||||
<IconButton label={T.deleteLabel(s.name)} onClick={onDelete} disabled={!!busy} data-schedule-delete=""
|
||||
className="text-faint hover:bg-st-failed/10 hover:text-[var(--err)]" icon={<Trash2 size={12} />} />
|
||||
|
||||
@@ -97,7 +97,8 @@ export function FireStatusChip({ fire }: { fire: ScheduleFire }) {
|
||||
return (
|
||||
<span
|
||||
className="chip shrink-0"
|
||||
title={fire.reason || T.fireStatusHint[fire.status] || undefined}
|
||||
title={fire.reason || (fire.eval_run_id && fire.status === 'started' ? T.evalStarted : T.fireStatusHint[fire.status])
|
||||
|| undefined}
|
||||
data-fire-status-chip={fire.status}
|
||||
style={{
|
||||
color,
|
||||
@@ -180,6 +181,9 @@ export async function runNow(s: Schedule, navigate: (to: string) => void): Promi
|
||||
const runId = r.run_id ?? r.fire?.run_id ?? null
|
||||
if (runId) {
|
||||
toast.ok(T.runStarted, { action: { label: T.openRun, onClick: () => navigate(`/runs/${encodeURIComponent(runId)}`) } })
|
||||
} else if (r.fire?.status === 'started' && r.fire.eval_run_id) {
|
||||
// 目标是评测题集:发起的是一次评测,没有一次运行可看
|
||||
toast.ok(T.evalStarted)
|
||||
} else if (r.fire?.status === 'skipped_overlap' || r.fire?.status === 'skipped_misfire') {
|
||||
toast.warn(r.fire.status === 'skipped_overlap' ? T.runSkipped : T.fireStatus.skipped_misfire,
|
||||
r.fire.reason ? { detail: r.fire.reason } : undefined)
|
||||
@@ -210,6 +214,15 @@ export async function removeSchedule(s: Schedule): Promise<boolean> {
|
||||
}
|
||||
}
|
||||
|
||||
/** 定时任务的目标种类:老服务端不给的都是工作流 */
|
||||
export const targetKindOf = (s: Schedule) => s.target_kind ?? 'workflow'
|
||||
|
||||
/** 目标的名字(不在了标出来):工作流用 workflow_name,别的种类用 target_name */
|
||||
export function targetText(s: Schedule): string {
|
||||
const name = (targetKindOf(s) === 'workflow' ? s.workflow_name : s.target_name ?? s.workflow_name) || s.target_id || ''
|
||||
return s.target_exists === false ? T.targetGone(name) : name
|
||||
}
|
||||
|
||||
/** 老服务端没有定时任务接口:404 且没有机读码(有码的 404 是服务端自己说的「不存在」) */
|
||||
export const isUnsupported = (e: unknown) => e instanceof ApiError && e.status === 404 && !e.code
|
||||
&& /^not found$/i.test(String(e.detail ?? ''))
|
||||
|
||||
@@ -3830,6 +3830,11 @@ export type ScheduleEvent = 'finished' | 'failed' | 'awaiting_approval'
|
||||
export type ScheduleFireKind = 'scheduled' | 'manual' | 'misfire'
|
||||
/** 触发的结局:发起了运行、上一次还没结束而跳过、错过时间超出宽限而跳过、发起时被拒 */
|
||||
export type ScheduleFireStatus = 'started' | 'skipped_overlap' | 'skipped_misfire' | 'failed_to_start'
|
||||
/**
|
||||
* 定时的目标种类(next-round X4:定时只有一套):工作流、评测题集、数据源维护。非工作流目标没有工作流、输入模板、运行类别
|
||||
* 和 Webhook(backend/app/api/schedules.py)
|
||||
*/
|
||||
export type ScheduleTargetKind = 'workflow' | 'eval_suite' | 'source_maintenance'
|
||||
|
||||
/** 读出来的 Webhook 设置。完整地址服务端加密保存、不再返回,只露主机和末 4 位 */
|
||||
export interface ScheduleWebhook {
|
||||
@@ -3873,6 +3878,8 @@ export interface ScheduleFire {
|
||||
run_status: RunStatus | null
|
||||
/** 跳过、发起失败的原因(中文) */
|
||||
reason: string | null
|
||||
/** 目标是评测题集时这一次触发建的那次评测(没有 run_id);老服务端不给 */
|
||||
eval_run_id?: string | null
|
||||
notified: ScheduleFireNotice[]
|
||||
/**
|
||||
* 和同一定时任务上一次成功的运行的对比。运行没有成功结束、没有可比的、还没算、比不了、任何一边又在执行(不在终态)
|
||||
@@ -3885,6 +3892,13 @@ export interface ScheduleFire {
|
||||
export interface Schedule {
|
||||
id: string
|
||||
name: string
|
||||
/** 目标:种类、id、种类的叫法、目标现在的名字(不在了是保存时记下的)、还在不在。老服务端不给(都是工作流) */
|
||||
target_kind?: ScheduleTargetKind
|
||||
target_id?: string
|
||||
target_label?: string
|
||||
target_name?: string
|
||||
target_exists?: boolean
|
||||
/** 非工作流目标存空串 */
|
||||
workflow_id: string
|
||||
workflow_name: string
|
||||
/** 五段 cron:分 时 日 月 星期 */
|
||||
|
||||
Reference in New Issue
Block a user