接入 DSH 专用运行时和对话界面,保留模型原始回答,支持会话分页、连续追问与显式报告。 补齐组合筛选、各维度 Top100、分组查询到排名图的转换,图表故障静默省略并基于保存数据自动恢复。 优化报告风格、图表顺序和表格换行,更新接入说明及构建输入。 验证:独立目录前后端构建通过;118 项 Java、102 项前端、102 项图表、14 项 DSH 应用和 13 项组合筛选检查通过。 仅提交相关源码、锁定依赖与测试;不包含凭据、会话、业务数据或本地产物。
126 lines
6.7 KiB
Python
126 lines
6.7 KiB
Python
"""Engine pinning, provider tool boundaries and shared formal completion."""
|
|
import io
|
|
import json
|
|
import sys
|
|
import tempfile
|
|
import types
|
|
import unittest
|
|
from pathlib import Path
|
|
from unittest.mock import Mock, patch
|
|
|
|
ROOT = Path(__file__).resolve().parents[1]
|
|
sys.path[:0] = [str(ROOT/'scripts'), str(ROOT/'verification')]
|
|
from quality_analysis_runtime import engine_for_request, run_turn
|
|
from nao_agent_contract import apply_platform_tools
|
|
import test_native_run as native_fixture
|
|
|
|
|
|
class EngineSelectionTests(unittest.TestCase):
|
|
def setUp(self):
|
|
self.directory = tempfile.TemporaryDirectory()
|
|
self.addCleanup(self.directory.cleanup)
|
|
self.settings = Path(self.directory.name)/'model.json'
|
|
|
|
def test_old_config_defaults_to_nao_and_new_config_can_select_dsh(self):
|
|
self.assertEqual(engine_for_request({}, settings_file=self.settings), 'NAO')
|
|
self.settings.write_text(json.dumps({'runtimeEngine':'DSH'}))
|
|
self.assertEqual(engine_for_request({}, settings_file=self.settings), 'DSH')
|
|
|
|
def test_queued_engine_survives_later_config_change(self):
|
|
self.settings.write_text(json.dumps({'runtimeEngine':'NAO'}))
|
|
self.assertEqual(engine_for_request({'runtimeEngine':'DSH'}, settings_file=self.settings), 'DSH')
|
|
self.assertEqual(engine_for_request({'context':{'_runtimeEngine':'DSH'}}, settings_file=self.settings), 'DSH')
|
|
|
|
def test_conflicting_or_arbitrary_engine_is_not_an_executable(self):
|
|
for request in ({'runtimeEngine':'DSH','context':{'_runtimeEngine':'NAO'}},
|
|
{'runtimeEngine':'dsh'}, {'runtimeEngine':'/bin/sh'},
|
|
{'runtimeEngine':True}):
|
|
with self.subTest(request=request), self.assertRaises(ValueError):
|
|
engine_for_request(request, settings_file=self.settings)
|
|
|
|
def test_symlinked_settings_are_rejected(self):
|
|
target = self.settings.with_name('target.json'); target.write_text('{}')
|
|
self.settings.symlink_to(target)
|
|
with self.assertRaises(ValueError):engine_for_request({}, settings_file=self.settings)
|
|
|
|
def test_route_keeps_platform_protocol_and_never_silently_falls_back(self):
|
|
request = {'runtimeEngine':'DSH','question':'fixture'}
|
|
with patch('nao_quality_runtime.run_turn', side_effect=RuntimeError('DSH unavailable')) as platform:
|
|
with self.assertRaises(RuntimeError):run_turn(request, stdout=io.StringIO(), stdin=io.StringIO())
|
|
self.assertEqual(platform.call_count,1)
|
|
self.assertEqual(platform.call_args.kwargs['runtime_engine'],'DSH')
|
|
|
|
def test_dsh_provider_cannot_see_shell_fs_story_or_nao_tools(self):
|
|
names=['mcp__quality__quality_data','bash','read','mcp_call','story',
|
|
'mcp__other__quality_data','mcp__quality__write','working_directory']
|
|
payload={'tools':[{'type':'function','function':{'name':name}} for name in names],
|
|
'tool_choice':{'type':'function','function':{'name':'bash'}}}
|
|
value=apply_platform_tools(payload, native_agent=True, runtime_engine='DSH')
|
|
self.assertEqual([x['function']['name'] for x in value['tools']],['mcp__quality__quality_data'])
|
|
self.assertNotIn('tool_choice',value)
|
|
|
|
|
|
class DshFormalCompletionTests(unittest.TestCase):
|
|
# Reuse the established signed-evidence fixture, not the NAO implementation.
|
|
setUp = native_fixture.NativeRunTests.setUp
|
|
invoke = native_fixture.NativeRunTests.invoke
|
|
native = native_fixture.NativeRunTests.native
|
|
|
|
def configure_dsh(self):
|
|
self.request['runtimeEngine']='DSH'
|
|
self.dsh=Mock(side_effect=self.native)
|
|
module=types.ModuleType('dsh_agent_runtime'); module.run_dsh_agent=self.dsh
|
|
self.enterContext(patch.dict(sys.modules,{'dsh_agent_runtime':module}))
|
|
self.synthesis.side_effect=None
|
|
self.synthesis.return_value={'answer':'正式证据支持的答复。','evidenceSufficient':True,
|
|
'finishReason':'stop','missingEvidence':[],'titleRequired':False}
|
|
self.exploration=self.enterContext(patch('nao_native_exploration.NativeExplorationTools'))
|
|
|
|
def test_dsh_never_starts_nao_and_keeps_java_proof_and_visual_completion(self):
|
|
self.configure_dsh(); result=self.invoke()
|
|
self.manager.ensure_instance.assert_not_called(); self.auth.assert_not_called()
|
|
self.sse.assert_not_called(); self.dsh.assert_called_once()
|
|
self.assertEqual(result['engine'],'DSH')
|
|
self.assertEqual(result['status'],'COMPLETED')
|
|
self.assertEqual(result['answerQuality']['narrativeFactBinding'],'verified_composition')
|
|
self.assertEqual(result['conclusionProtocolQueryIds'],['query-current','query-compare','query-group'])
|
|
self.assertEqual(result['answer'],'正式证据支持的答复。')
|
|
self.assertEqual(self.exploration.call_args.kwargs['identity']['releaseId'],self.request['releaseId'])
|
|
|
|
def test_loop_stop_does_not_publish_a_rejected_narrative_as_completed(self):
|
|
self.configure_dsh()
|
|
self.synthesis.return_value={'answer':'保留已核实数据,部分结论待核查。',
|
|
'evidenceSufficient':False,'finishReason':'stop','missingEvidence':['正文与明细不一致']}
|
|
result=self.invoke()
|
|
self.assertEqual(result['status'],'PARTIAL')
|
|
self.assertFalse(result['answerQuality']['narrativeComplete'])
|
|
self.assertIn('正文与明细不一致',result['answerQuality']['missingEvidence'])
|
|
|
|
def test_cancel_during_loop_has_no_composition_or_late_public_evidence(self):
|
|
self.configure_dsh(); self.cancel_during_native=True
|
|
result=self.invoke()
|
|
self.assertEqual(result['status'],'CANCELLED')
|
|
self.synthesis.assert_not_called()
|
|
self.assertEqual(result['answer'],''); self.assertEqual(result['queryEvidenceRefs'],[])
|
|
|
|
def test_synthesis_failure_preserves_partial_state_without_publishing_draft(self):
|
|
from nao_evidence_finalizer import FinalizationUnavailable
|
|
self.configure_dsh(); self.synthesis.side_effect=FinalizationUnavailable('fixture')
|
|
result=self.invoke()
|
|
self.assertEqual(result['status'],'PARTIAL')
|
|
self.assertEqual(result['answerQuality']['narrativeFactBinding'],'rejected')
|
|
self.assertNotEqual(result['answer'],self.accumulator.answer)
|
|
|
|
def test_no_signed_evidence_cannot_publish_an_unchecked_dsh_draft(self):
|
|
self.configure_dsh(); self.documents=[]
|
|
self.accumulator.answer='TOP5全部属于缺角,合格率99%。'
|
|
result=self.invoke()
|
|
self.assertEqual(result['status'],'PARTIAL')
|
|
self.assertEqual(result['answerQuality']['narrativeFactBinding'],'rejected')
|
|
self.assertNotIn('99%',result['answer'])
|
|
self.assertNotIn('全部属于缺角',result['answer'])
|
|
self.synthesis.assert_not_called()
|
|
|
|
|
|
if __name__=='__main__':unittest.main()
|