统一:DSH 智能分析、Top100 与图表静默恢复
接入 DSH 专用运行时和对话界面,保留模型原始回答,支持会话分页、连续追问与显式报告。 补齐组合筛选、各维度 Top100、分组查询到排名图的转换,图表故障静默省略并基于保存数据自动恢复。 优化报告风格、图表顺序和表格换行,更新接入说明及构建输入。 验证:独立目录前后端构建通过;118 项 Java、102 项前端、102 项图表、14 项 DSH 应用和 13 项组合筛选检查通过。 仅提交相关源码、锁定依赖与测试;不包含凭据、会话、业务数据或本地产物。
This commit is contained in:
@@ -3,60 +3,121 @@ import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import ts from 'typescript';
|
||||
import React from 'react';
|
||||
import {renderToStaticMarkup} from 'react-dom/server';
|
||||
import {analysisStreamStatus,analysisIsRunning,acceptAnalysisEvent,settledAnalysisTurn} from '../src/analysisConversationState.ts';
|
||||
const source=fs.readFileSync(new URL('../src/ManagementPages.tsx',import.meta.url),'utf8');
|
||||
const compile=code=>ts.transpileModule(code,{fileName:'status.tsx',compilerOptions:{target:ts.ScriptTarget.ES2022,jsx:ts.JsxEmit.React}}).outputText;
|
||||
const tick=()=>new Promise(resolve=>setImmediate(resolve));
|
||||
const deferred=()=>{let resolve;const promise=new Promise(r=>resolve=r);return{promise,resolve};};
|
||||
const isObjectRecord=v=>!!v&&typeof v==='object'&&!Array.isArray(v);
|
||||
const finalStatuses=new Set(['COMPLETED','PARTIAL','FAILED','CANCELLED','NEEDS_CLARIFICATION']);
|
||||
function fixture(){
|
||||
let lastTurn={id:'t1',question:'q',status:'QUEUED',createdAt:'2026-11-02T01:00:00Z'},onEvent,reads=0;
|
||||
const stream=deferred(),firstRead=deferred(),secondRead=deferred();
|
||||
const env={mounted:{current:true},streamController:{current:null},subscriptionGeneration:{current:0},sessionId:'s1',eventCursors:{current:{}},ANALYSIS_FINAL_STATUSES:finalStatuses,
|
||||
setLastTurn:next=>lastTurn=typeof next==='function'?next(lastTurn):next,writeAnalysisLocation(){},setActiveTurnId(){},setBusy(){},setRetryQuestion(){},setTurns(){},setError(){},loadSessions:async()=>{},onUnauthorized:()=>false,apiMessage:e=>e.message,
|
||||
isObjectRecord,analysisStreamStatus,analysisIsRunning,acceptAnalysisEvent,settledAnalysisTurn,collectionItems:value=>value.items||[],modelThinkingEntries:()=>[],mergeModelThinking:()=>[]};
|
||||
const api={analysisTurnEvents:async(_id,options)=>{onEvent=options.onEvent;return stream.promise;},analysisSessionTurns:()=>{reads++;return reads===1?firstRead.promise:secondRead.promise;}};
|
||||
const code=source.slice(source.indexOf(' const followTurn = async'),source.indexOf('\n useEffect(() => {\n if (!active || restoreStarted.current)'));
|
||||
const follow=new Function('api',...Object.keys(env),compile(code+'\nreturn followTurn;'))(api,...Object.values(env));
|
||||
const work=follow('t1','q','s1');
|
||||
return{get:()=>lastTurn,reads:()=>reads,switchTurn(){env.subscriptionGeneration.current++;lastTurn={id:'other',status:'RUNNING'};},emit(event,data){onEvent({id:String(Math.random()),event,data});},firstRead,secondRead,async close(){env.streamController.current?.abort();stream.resolve();await work;}};
|
||||
import { renderToStaticMarkup } from 'react-dom/server';
|
||||
import { analysisStreamStatus, analysisIsRunning } from '../src/analysisConversationState.ts';
|
||||
import { sanitizeAnalysisDisplayText } from '../src/analysisDisplayText.ts';
|
||||
import { createAnalysisSessionClient } from '../src/agent/sessionClient.ts';
|
||||
|
||||
const CREATED_AT = '2026-11-02T01:00:00Z';
|
||||
const STARTED_AT = '2026-11-02T01:00:05Z';
|
||||
const initialTurn = { id: 't1', question: '质量查询', status: 'QUEUED', createdAt: CREATED_AT, eventCursor: '10' };
|
||||
const page = (id, turn, activeTurnId = turn.id) => ({ id, activeTurnId, turns: [turn] });
|
||||
|
||||
function fixture(t) {
|
||||
const connections = [];
|
||||
const pages = { s1: page('s1', initialTurn), s2: page('s2', { id: 'other', status: 'RUNNING' }) };
|
||||
let auxiliaryReads = 0;
|
||||
const unexpectedRead = async () => { auxiliaryReads++; throw new Error('Unexpected auxiliary read'); };
|
||||
const client = createAnalysisSessionClient({
|
||||
userId: 'status-fixture',
|
||||
transport: {
|
||||
analysisSessions: async () => ({ items: [] }),
|
||||
analysisSessionPage: unexpectedRead,
|
||||
analysisTurn: unexpectedRead,
|
||||
analysisTurnEvents: unexpectedRead,
|
||||
analysisSessionTurns: unexpectedRead,
|
||||
analysisSessionFollow: (id, { signal, onEvent }) => new Promise(resolve => {
|
||||
connections.push({ id, signal, emit: onEvent, close: resolve });
|
||||
signal.addEventListener('abort', resolve, { once: true });
|
||||
onEvent({ event: 'snapshot', data: pages[id] });
|
||||
}),
|
||||
},
|
||||
});
|
||||
t.after(client.dispose);
|
||||
return { client, connections, pages, auxiliaryReads: () => auxiliaryReads };
|
||||
}
|
||||
test('tool step events keep the whole turn running and terminal status does not regress',()=>{
|
||||
assert.equal(analysisStreamStatus('RUNNING','tool_started',undefined),'RUNNING');
|
||||
assert.equal(analysisStreamStatus('RUNNING','tool_completed','completed'),'RUNNING');
|
||||
assert.equal(analysisStreamStatus('RUNNING','completed','COMPLETED'),'COMPLETED');
|
||||
assert.equal(analysisStreamStatus('COMPLETED','progress','RUNNING'),'COMPLETED');
|
||||
});
|
||||
test('actual event subscriber keeps status live and fills the server clock without re-entering',async()=>{
|
||||
const ui=fixture();assert.equal(ui.reads(),1);
|
||||
ui.emit('progress',{status:'RUNNING'});
|
||||
ui.firstRead.resolve({items:[{id:'t1',createdAt:'2026-11-02T01:00:00Z',startedAt:''}]});await tick();
|
||||
assert.equal(ui.reads(),2,'a running event during an initial queued timing read schedules one non-overlapping follow-up');
|
||||
ui.secondRead.resolve({items:[{id:'t1',startedAt:'2026-11-02T01:00:05Z'}]});await tick();
|
||||
ui.emit('tool_started',{step:{status:'running'}});
|
||||
assert.equal(ui.get().status,'RUNNING');assert.equal(ui.get().startedAt,'2026-11-02T01:00:05Z');
|
||||
ui.emit('tool_completed',{step:{status:'completed'}});assert.equal(ui.get().status,'RUNNING');
|
||||
assert.equal(ui.reads(),2);await ui.close();
|
||||
});
|
||||
test('late timing metadata cannot update a different selected turn',async()=>{
|
||||
const ui=fixture();ui.switchTurn();await ui.close();ui.firstRead.resolve({items:[{id:'t1',startedAt:'2026-11-02T01:00:05Z'}]});await tick();
|
||||
assert.equal(ui.get().startedAt,undefined);
|
||||
});
|
||||
test('metadata renders a waiting clock immediately and a spinning running clock after server start',()=>{
|
||||
const code=source.slice(source.indexOf('function AnalysisTurnMetadata('),source.indexOf('\nfunction isObjectRecord('));
|
||||
const Metadata=new Function('React','useState','useEffect','analysisIsRunning','isObjectRecord','LoadingOutlined',compile(code+'\nreturn AnalysisTurnMetadata;'))(React,initial=>[initial,()=>{}],()=>{},analysisIsRunning,isObjectRecord,props=>React.createElement('i',props));
|
||||
const now=Date.now();
|
||||
const waiting=renderToStaticMarkup(React.createElement(Metadata,{turn:{_uiSubmittedAt:new Date(now-30000).toISOString()},status:'SUBMITTING',compact:true}));
|
||||
assert.match(waiting,/提交中/);assert.match(waiting,/已等待 30秒/);
|
||||
const running=renderToStaticMarkup(React.createElement(Metadata,{turn:{startedAt:new Date(now-10000).toISOString()},status:'RUNNING',compact:true}));
|
||||
assert.match(running,/已运行 10秒/);assert.match(running,/analysis-runtime-spinner/);
|
||||
|
||||
const currentTurn = client => client.getSnapshot().turns.at(-1);
|
||||
const tick = () => new Promise(resolve => setImmediate(resolve));
|
||||
|
||||
test('tool status is independent of the turn status and terminal status stays settled', () => {
|
||||
assert.equal(analysisStreamStatus('RUNNING', 'tool_started', undefined), 'RUNNING');
|
||||
assert.equal(analysisStreamStatus('RUNNING', 'tool_completed', 'completed'), 'RUNNING');
|
||||
assert.equal(analysisStreamStatus('RUNNING', 'completed', 'COMPLETED'), 'COMPLETED');
|
||||
assert.equal(analysisStreamStatus('COMPLETED', 'progress', 'RUNNING'), 'COMPLETED');
|
||||
});
|
||||
|
||||
test('partial remains a backend state without an extra partial label in conversation metadata',()=>{
|
||||
const code=source.slice(source.indexOf('function AnalysisTurnMetadata('),source.indexOf('\nfunction isObjectRecord('));
|
||||
const Metadata=new Function('React','useState','useEffect','analysisIsRunning','isObjectRecord','LoadingOutlined',compile(code+'\nreturn AnalysisTurnMetadata;'))(React,initial=>[initial,()=>{}],()=>{},analysisIsRunning,isObjectRecord,()=>null);
|
||||
const html=renderToStaticMarkup(React.createElement(Metadata,{turn:{durationMs:6000},status:'PARTIAL',compact:true}));
|
||||
assert.doesNotMatch(html,/部分完成/);assert.match(html,/运行时长 6秒/);
|
||||
test('the follow connection supplies the server start time without an auxiliary read', async t => {
|
||||
const { client, connections, auxiliaryReads } = fixture(t);
|
||||
assert.equal(await client.openSession('s1'), true);
|
||||
assert.equal(currentTurn(client).status, 'QUEUED');
|
||||
assert.equal(currentTurn(client).createdAt, CREATED_AT);
|
||||
assert.equal(currentTurn(client).startedAt, undefined);
|
||||
const { emit } = connections[0];
|
||||
emit({ id: '11', event: 'progress', data: { turnId: 't1', status: 'RUNNING', startedAt: STARTED_AT } });
|
||||
emit({ id: '12', event: 'tool_started', data: { turnId: 't1', step: { status: 'running' } } });
|
||||
emit({ id: '13', event: 'tool_completed', data: { turnId: 't1', status: 'completed' } });
|
||||
assert.equal(currentTurn(client).status, 'RUNNING');
|
||||
assert.equal(currentTurn(client).startedAt, STARTED_AT);
|
||||
assert.equal(client.getSnapshot().busy, true);
|
||||
assert.equal(auxiliaryReads(), 0);
|
||||
assert.equal(connections.length, 1);
|
||||
});
|
||||
|
||||
test('late server clock events from an aborted connection cannot update the newly selected turn', async t => {
|
||||
const { client, connections } = fixture(t);
|
||||
await client.openSession('s1');
|
||||
await client.openSession('s2');
|
||||
assert.equal(connections[0].signal.aborted, true);
|
||||
connections[0].emit({ id: '11', event: 'progress', data: { turnId: 't1', status: 'RUNNING', startedAt: STARTED_AT } });
|
||||
assert.equal(currentTurn(client).id, 'other');
|
||||
assert.equal(currentTurn(client).startedAt, undefined);
|
||||
});
|
||||
|
||||
test('the terminal event settles immediately and the replacement snapshot supplies the saved duration', async t => {
|
||||
const { client, connections, pages, auxiliaryReads } = fixture(t);
|
||||
await client.openSession('s1');
|
||||
const { emit, close } = connections[0];
|
||||
emit({ id: '11', event: 'completed', data: { turnId: 't1', status: 'COMPLETED', result: { answer: '已核验答复' } } });
|
||||
assert.equal(currentTurn(client).status, 'COMPLETED');
|
||||
assert.equal(currentTurn(client).answer, '已核验答复');
|
||||
assert.equal(client.getSnapshot().busy, false);
|
||||
pages.s1 = page('s1', { ...initialTurn, status: 'COMPLETED', eventCursor: '11', durationMs: 6000, result: { answer: '已核验答复' } }, '');
|
||||
close();
|
||||
await tick();
|
||||
assert.equal(connections.length, 2);
|
||||
assert.equal(currentTurn(client).durationMs, 6000);
|
||||
assert.equal(auxiliaryReads(), 0);
|
||||
});
|
||||
|
||||
const source = fs.readFileSync(new URL('../src/agent/AgentConversation.tsx', import.meta.url), 'utf8');
|
||||
const statusSource = source.slice(source.indexOf('function RunStatus('), source.indexOf('\nfunction ExecutionEvents('));
|
||||
const statusJavaScript = ts.transpileModule(`${statusSource}\nreturn RunStatus;`, {
|
||||
fileName: 'status.tsx', compilerOptions: { target: ts.ScriptTarget.ES2022, jsx: ts.JsxEmit.React },
|
||||
}).outputText;
|
||||
const fixedClock = class extends Date { static now() { return Date.parse('2026-11-02T01:00:15Z'); } };
|
||||
const record = value => value && typeof value === 'object' && !Array.isArray(value) ? value : {};
|
||||
const string = value => typeof value === 'string' ? value : '';
|
||||
const LoadingOutlined = () => React.createElement('i', { className: 'test-loading-icon' });
|
||||
const RunStatus = new Function('React', 'useState', 'useEffect', 'analysisIsRunning', 'sanitizeAnalysisDisplayText',
|
||||
'record', 'string', 'LoadingOutlined', 'Date', statusJavaScript)(React, React.useState, React.useEffect,
|
||||
analysisIsRunning, sanitizeAnalysisDisplayText, record, string, LoadingOutlined, fixedClock);
|
||||
const renderStatus = turn => renderToStaticMarkup(React.createElement(RunStatus, { turn }));
|
||||
|
||||
test('run status renders a submission clock and prefers the actual server start time while running', () => {
|
||||
const waiting = renderStatus({ _uiSubmittedAt: '2026-11-02T00:59:45Z', status: 'SUBMITTING' });
|
||||
assert.match(waiting, /提交中/);
|
||||
assert.match(waiting, /<time>30 秒<\/time>/);
|
||||
const running = renderStatus({ createdAt: CREATED_AT, startedAt: STARTED_AT, status: 'RUNNING' });
|
||||
assert.match(running, /分析中/);
|
||||
assert.match(running, /agent-run-status is-running/);
|
||||
assert.match(running, /test-loading-icon/);
|
||||
assert.match(running, /<time>10 秒<\/time>/);
|
||||
});
|
||||
|
||||
test('a partial result renders its status once and shows the saved duration', () => {
|
||||
const html = renderStatus({ durationMs: 6000, status: 'PARTIAL' });
|
||||
assert.equal(html.match(/部分完成/g)?.length, 1);
|
||||
assert.match(html, /<time>6 秒<\/time>/);
|
||||
assert.doesNotMatch(html, /is-running|test-loading-icon/);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user