统一:DSH 智能分析、Top100 与图表静默恢复

接入 DSH 专用运行时和对话界面,保留模型原始回答,支持会话分页、连续追问与显式报告。
补齐组合筛选、各维度 Top100、分组查询到排名图的转换,图表故障静默省略并基于保存数据自动恢复。
优化报告风格、图表顺序和表格换行,更新接入说明及构建输入。

验证:独立目录前后端构建通过;118 项 Java、102 项前端、102 项图表、14 项 DSH 应用和 13 项组合筛选检查通过。
仅提交相关源码、锁定依赖与测试;不包含凭据、会话、业务数据或本地产物。
This commit is contained in:
2026-11-12 11:57:41 +08:00
parent cc8832c8e5
commit f1a2fbd494
166 changed files with 26281 additions and 2248 deletions
+315 -1
View File
@@ -1,5 +1,6 @@
"""Native tool loop boundaries, using actual tool adapters and captured-like APIs."""
import copy
import json
import sys
import tempfile
import unittest
@@ -10,7 +11,7 @@ from pathlib import Path
sys.path[:0] = [str(Path(__file__).resolve().parents[1] / 'scripts'), str(Path(__file__).parent)]
from nao_native_exploration import prepare_step, NativeExplorationTools, _proofs, native_model_view
from nao_agent_task import normalize_task, plan_task
from nao_quality_tools import QualityToolError
from nao_quality_tools import QualityToolError, tool_definition
from test_nao_protocol_execution import BoundApi, identity
from test_nao_quality_tools import RELEASE
from test_nao_agent_task import task_value
@@ -59,6 +60,80 @@ class Delegated(BoundApi):
class NativeExplorationTests(unittest.TestCase):
def state(self): return {'releaseId': RELEASE, 'scopes': []}
def test_report_rank_is_available_without_a_preplanned_rank_dimension(self):
task=root();task.update(dimensions=['defect'],comparisonPeriod=None,
question='生成2026年1—10月总体质量分析报告,重点说明总体表现、月度变化和主要报废结构。')
schema=tool_definition(native_protocol=True,task=task,release_id=RELEASE)['inputSchema']
self.assertIn('rank',schema['properties']['mode']['enum'])
self.assertNotIn('investigate',schema['properties']['mode']['enum'])
def test_captured_rank_calls_explain_missing_metric_before_proposing_any_scope(self):
for dimension in ('department','product'):
with self.subTest(dimension=dimension), self.assertRaisesRegex(QualityToolError,'缺少metric'):
prepare_step({'mode':'rank','stage':'black','dimension':dimension,'limit':10},root(),self.state())
def test_public_rank_trace_retains_the_actual_metric_without_credentials(self):
from nao_quality_runtime import public_tool_call
call=public_tool_call('mcp_call',{'tool':'quality_data','arguments':{
'mode':'rank','metric':'totalWeight','stage':'black','dimension':'product','token':'private'}})
self.assertEqual(call['input']['metric'],'totalWeight')
self.assertEqual(call['label'],'查询重量排名')
self.assertNotIn('token',call['input'])
def test_batch_overview_uses_one_bound_scope_and_overall_alias_cannot_widen_parent(self):
task=root();task['filters']={'department':'A'}
args,proposal=prepare_step({'mode':'query','view':'group','filters':{'department':'__ALL__'}},task,self.state())
self.assertEqual(args['filters'],{'department':'A'})
self.assertEqual(args['period'],task['period'])
self.assertEqual(args['limit'],100)
self.assertEqual(proposal['node']['purpose'],'metrics')
self.assertEqual(proposal['node']['dimension'],'group')
self.assertEqual(proposal['node']['selector'],{'kind':'base'})
def test_inactive_rows_are_omitted_from_model_projection_without_recalculating_summary(self):
tools=NativeExplorationTools(delegated=None,evidence_dir=Path('/unused'),task=root(),identity={},
state_path=Path('/unused/state'),directory={'departments':['有效产业部']})
raw={'view':'department','summary':{'compositeRate':.95},'rows':[{'key':'有效产业部'},
{'key':'欧洲磁钢'},{'key':'美洲产业部'}],'rowCount':3,'rowsTruncated':False}
view=tools.active_result(raw)
self.assertEqual(view['rows'],[{'key':'有效产业部'}])
self.assertEqual(view['summary'],raw['summary'])
self.assertEqual(len(raw['rows']),3)
def test_no_published_rows_are_cached_as_no_data_with_original_proof(self):
from nao_quality_tools import SourceCoverageUnavailable
with tempfile.TemporaryDirectory() as folder:
p=Path(folder);api=Delegated()
tools=NativeExplorationTools(delegated=api,evidence_dir=p/'evidence',task=root(),
identity={**identity(),'releaseId':RELEASE},state_path=p/'state.json')
raw={'coverage':{'sourceMonths':[]},'protocolEvidence':{**identity(),'queryId':'empty-query'}}
with patch('nao_quality_tools.QualityTools.quality_data',side_effect=SourceCoverageUnavailable(root()['period'],raw)) as query:
first=tools.quality_data({'mode':'query'})
second=tools.quality_data({'mode':'query'})
self.assertEqual(query.call_count,1)
self.assertEqual(first['status'],'no_data')
self.assertIsNone(first['summary'])
self.assertEqual(first['protocolEvidence'],raw['protocolEvidence'])
self.assertTrue(second['reusedEvidence'])
@staticmethod
def source_task():
value = root()
value.update(kind='analysis', fields=[], dimensions=[], dimensionStages={}, stages=['black'],
period={'year': 2026, 'month': 9}, comparisonPeriod=None,
comparisonRequired=False, trendRequired=False, verifySource=True,
fullDetails=False)
return value
@staticmethod
def source_catalog():
return {'releaseId': RELEASE, 'sourceFields': [
{'key': 'src_responsibility_detail', 'label': '责废细项重量', 'stages': ['black'],
'columns': {'black': '原表责废细项重量', 'bright': None}},
{'key': 'src_black_total', 'label': '黑片报废合计', 'stages': ['black'],
'columns': {'black': '原表黑片报废合计', 'bright': None}},
]}
def test_model_view_removes_only_transport_and_identical_signal_duplicates(self):
row={'key':'甲','label':'甲','rank':1,'current':{'rate':0,'scrapWeight':None},
'comparison':{'rate':None,'scrapWeight':0}}
@@ -85,6 +160,15 @@ class NativeExplorationTests(unittest.TestCase):
changed=native_model_view(source)
self.assertIn('rateDrop',changed['prioritySignals']['scale'][0])
self.assertIsNone(changed['prioritySignals']['scale'][0]['rateDrop'])
def test_official_category_share_names_its_actual_denominator_without_mutating_signed_values(self):
source={'kind':'quality_metrics','summary':{'bright':{'rate':.98,'scrapWeight':100,
'defects':[{'name':'加工废','weight':30,'rate':.6},{'name':'镀废','weight':20,'rate':.4}]}}}
original=copy.deepcopy(source);view=native_model_view(source)['summary']['bright']
self.assertEqual(view['rate'],.98)
self.assertEqual(view['defects'][0]['shareOfListedCategoryWeight'],.6)
self.assertNotIn('rate',view['defects'][0])
self.assertEqual(view['categoryShareBasis'],'sum_of_listed_category_weights')
self.assertEqual(source,original)
def test_explicit_cause_cannot_silently_become_a_static_recipe(self):
from nao_native_planning import explicit_investigation
self.assertTrue(explicit_investigation('为什么下降?请自行深挖'))
@@ -292,6 +376,178 @@ class NativeExplorationTests(unittest.TestCase):
self.assertEqual(args['limit'], 100)
self.assertEqual(proposal['node']['purpose'], 'source')
def test_native_source_fields_map_only_exact_current_catalog_keys_labels_and_columns(self):
task = self.source_task()
catalog = self.source_catalog()
args, proposal = prepare_step({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'fields': ['责废细项重量']}, task, self.state(), source_catalog=catalog)
self.assertEqual(args['fields'], ['src_responsibility_detail'])
self.assertEqual(proposal['node']['sourceFields'], {'black': ['src_responsibility_detail']})
args, proposal = prepare_step({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'fields': ['src_black_total']}, task, self.state(), source_catalog=catalog)
self.assertEqual(args['fields'], ['src_black_total'])
self.assertEqual(proposal['node']['sourceFields'], {'black': ['src_black_total']})
duplicate_label = copy.deepcopy(catalog)
duplicate_label['sourceFields'].append({'key': 'src_duplicate', 'label': '责废细项重量',
'stages': ['black'], 'columns': {'black': '另一原列', 'bright': None}})
for bad_catalog, bad_field, error in (
(catalog, '未经授权的字段', '不在当前releaseId'),
(catalog, 'src_bright_only', '不在当前releaseId'),
(duplicate_label, '责废细项重量', '不唯一')):
with self.subTest(field=bad_field), self.assertRaisesRegex(QualityToolError, error):
prepare_step({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'fields': [bad_field]}, task, self.state(), source_catalog=bad_catalog)
stale = {**catalog, 'releaseId': 'older-release'}
with self.assertRaisesRegex(QualityToolError, '不属于当前releaseId'):
prepare_step({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'fields': ['src_responsibility_detail']}, task, self.state(), source_catalog=stale)
def test_source_scope_rejects_unsupported_actions_and_category_without_registering(self):
task = self.source_task()
for action in ('overview', 'fields'):
with self.subTest(action=action), self.assertRaisesRegex(QualityToolError, '只支持action=source或rows'):
prepare_step({'mode': 'investigate', 'action': action, 'stage': 'black'}, task, self.state())
with self.assertRaisesRegex(QualityToolError, '不支持category筛选.*categoryReconciliation'):
prepare_step({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'category': '责废'}, task, self.state())
with self.assertRaisesRegex(QualityToolError, '未签发sourceRevisionId'):
prepare_step({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'sourceRevisionId': 'revision-2'}, task, self.state())
# Category filtering remains a supported defect query and is not silently stripped.
_, proposal = prepare_step({'mode': 'defects', 'stage': 'black', 'dimension': 'defect',
'category': '责废'}, root(), self.state())
self.assertEqual(proposal['node']['category'], '责废')
with tempfile.TemporaryDirectory() as folder:
path = Path(folder); api = Delegated()
tools = NativeExplorationTools(delegated=api, evidence_dir=path/'evidence', task=task,
identity={**identity(), 'releaseId': RELEASE}, state_path=path/'state.json')
with self.assertRaisesRegex(QualityToolError, 'categoryReconciliation'):
tools.quality_data({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'category': '责废'})
self.assertEqual(api.steps, [])
def test_dsh_schema_uses_only_protocol_supported_investigation_actions(self):
legacy = tool_definition()
native = tool_definition(native_protocol=True)
self.assertEqual(legacy['inputSchema']['properties']['action']['enum'],
['overview', 'rows', 'fields', 'source'])
self.assertEqual(native['inputSchema']['properties']['action']['enum'], ['source', 'rows'])
self.assertIn('正式指标概览使用query', native['description'])
self.assertIn('字段目录使用catalog', native['description'])
self.assertIn('categoryReconciliation', native['inputSchema']['properties']['category']['description'])
query_rule = next(rule for rule in native['inputSchema']['allOf']
if rule.get('if', {}).get('properties', {}).get('mode', {}).get('const') == 'query')
query_forbidden = [clause['not']['required'][0] for clause in query_rule['then']['allOf']]
self.assertIn('stage', query_forbidden)
self.assertIn('category', query_forbidden)
native_raw_scope = next(rule for rule in native['inputSchema']['allOf']
if rule.get('if', {}).get('properties', {}).get('action', {}).get('enum') == ['source', 'rows'])
self.assertEqual([clause['not']['required'][0] for clause in native_raw_scope['then']['allOf']],
['category', 'sourceRevisionId'])
def test_source_query_signs_catalog_stable_key_and_sends_only_signed_original_column(self):
source_fields = [{'key': 'src_responsibility_detail', 'label': '责废细项重量',
'stages': ['black'], 'columns': {'black': '原表责废细项重量', 'bright': None}}]
fine_catalog = {'kind': 'fine_defect_catalog', 'grain': 'source_defect_weight',
'fields': [{'stage': 'black', 'key': '责废尺寸重量', 'label': '责废尺寸重量',
'category': '责废', 'available': True}],
'categories': [{'stage': 'black', 'category': '责废', 'available': True}]}
class SourceApi(Delegated):
def __init__(self):
super().__init__()
self.registered = []
self.source_payloads = []
self.registered_scopes = []
def call(self, path, payload=None, method=None, *, node_id=None, scope_id=None):
if path == '/api/analysis/model-authorization':
self.authorization_calls += 1
return {}
if path == '/api/releases':
return {'currentReleaseId': RELEASE, 'items': [
{'id': RELEASE, 'name': 'Published', 'status': 'PUBLISHED'}]}
if path == '/api/options':
return {'years': [2026], 'departments': [], 'groups': [], 'products': [], 'projectGroups': []}
if path == '/api/analysis/tools/catalog':
return {'kind': 'analysis_catalog', 'visibleWeightFields': [], 'visibleDefectFields': [],
'dimensions': [], 'topDimensions': [], 'grouping': ['overall'], 'limitations': [],
'sourceFields': copy.deepcopy(source_fields), 'fineDefects': copy.deepcopy(fine_catalog)}
if path == '/api/analysis/protocol/exploration/steps':
self.registered.append(copy.deepcopy(payload))
node = payload['node']
task = NativeExplorationTests.source_task()
task['stages'] = copy.deepcopy(node['stages'])
selected = node.get('sourceFields')
if selected:
task['sourceFields'] = copy.deepcopy(selected)
task['investigationFields'] = {
stage: [next(row['columns'][stage] for row in source_fields if row['key'] == key)
for key in keys]
for stage, keys in selected.items()}
registered = {'nodeId': node['nodeId'], 'scopeId': 'scope-' + node['nodeId'],
'task': task, 'scope': {'nodeId': node['nodeId'], 'scopeId': 'scope-' + node['nodeId'],
'purpose': node['purpose'], 'task': task}}
self.registered_scopes.append(registered)
return copy.deepcopy(registered)
if path == '/api/analysis/investigate':
self.source_payloads.append(copy.deepcopy(payload))
period = {key: payload[key] for key in ('year', 'month', 'quarter', 'monthStart', 'monthEnd')
if key in payload}
context = {**period, 'releaseId': RELEASE, 'stage': payload['stage'], 'category': None,
'sourceRevisionId': None, 'includeUnassigned': False,
'department': payload.get('department'), 'group': payload.get('group'),
'product': payload.get('product'), 'projectGroup': payload.get('projectGroup'),
'extraFilters': payload.get('extraFilters', {}), 'columnFilters': payload.get('columnFilters', []),
'exclusions': payload.get('exclusions', {})}
proof = {**identity(), 'queryId': 'source-query', 'responseHash': 'a' * 64,
'nodeId': node_id, 'scopeId': scope_id}
return {'kind': 'quality_investigation', 'action': 'source', 'releaseId': RELEASE,
'context': context, 'totalRows': 1, 'aggregateComplete': True,
'categories': [{'category': '责废', 'categoryReconciliation': {'status': 'INCOMPLETE'}}],
'lineage': [], 'selectedFields': copy.deepcopy(payload.get('fields')),
'sourceVerification': {'expectedRows': 1, 'complete': True, 'verifiedRows': 1,
'missingRows': 0, 'mismatchRows': 0, 'allSelectedValuesMatchStored': True},
'protocolEvidence': proof}
if path == '/api/analysis/protocol/queries':
return {'scopeCoverage': [{'nodeId': row['nodeId'], 'scopeId': row['scopeId'],
'complete': True, 'missingEvidence': []} for row in self.registered_scopes], 'rootGoalGaps': []}
return super().call(path, payload, method, node_id=node_id, scope_id=scope_id)
with tempfile.TemporaryDirectory() as folder:
path = Path(folder)
api = SourceApi()
tools = NativeExplorationTools(delegated=api, evidence_dir=path/'evidence', task=self.source_task(),
identity={**identity(), 'releaseId': RELEASE}, state_path=path/'state.json')
tools.quality_data({'mode': 'catalog'})
result = tools.quality_data({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'fields': ['责废细项重量']})
self.assertEqual(len(api.registered), 1)
signed_node = api.registered[0]['node']
self.assertEqual(signed_node['sourceFields'], {'black': ['src_responsibility_detail']})
self.assertEqual(api.source_payloads[0]['fields'], ['原表责废细项重量'])
self.assertNotIn('category', api.source_payloads[0])
self.assertEqual(result['action'], 'source')
self.assertEqual(result['category'], None)
self.assertEqual(_proofs(result)[0]['nodeId'], signed_node['nodeId'])
def test_native_source_fields_require_catalog_from_current_release_before_registration(self):
class NoCatalog(Delegated):
pass
with tempfile.TemporaryDirectory() as folder:
path = Path(folder); api = NoCatalog()
tools = NativeExplorationTools(delegated=api, evidence_dir=path/'evidence', task=self.source_task(),
identity={**identity(), 'releaseId': RELEASE}, state_path=path/'state.json')
with self.assertRaisesRegex(QualityToolError, '当前releaseId的catalog'):
tools.quality_data({'mode': 'investigate', 'action': 'source', 'stage': 'black',
'fields': ['src_responsibility_detail']})
self.assertEqual(api.steps, [])
def test_multilevel_child_inherits_verified_parent(self):
state = self.state(); state['scopes'] = [{'filters': {'group': '甲'}, 'queryIds': ['q1']}]
_, step = prepare_step({'mode': 'defects', 'stage': 'black', 'filters': {'group': '甲', 'product': '乙'}}, root(), state)
@@ -314,6 +570,64 @@ class NativeExplorationTests(unittest.TestCase):
tools.quality_data({'mode': 'compare', 'dimension': 'product'})
self.assertEqual(api.steps, [])
def test_catalog_reads_only_authorized_metadata_and_formal_reads_still_register_scope(self):
fine_catalog = {
'kind': 'fine_defect_catalog', 'grain': 'source_defect_weight',
'fields': [
{'stage': 'black', 'key': '责废尺寸重量', 'label': '责废尺寸重量',
'category': '责废', 'sourceField': '责废尺寸重量',
'grain': 'source_defect_weight', 'available': True},
{'stage': 'bright', 'key': '镀废重量', 'label': '镀废重量',
'category': '镀废', 'sourceField': '镀废重量',
'grain': 'source_defect_weight', 'available': True},
],
'categories': [
{'stage': 'black', 'category': '责废', 'available': True},
{'stage': 'bright', 'category': '镀废', 'available': True},
],
}
class CatalogApi(Delegated):
def call(self, path, payload=None, method=None, *, node_id=None, scope_id=None):
result = super().call(path, payload, method, node_id=node_id, scope_id=scope_id)
if path == '/api/analysis/tools/catalog':
result = {**result, 'fineDefects': copy.deepcopy(fine_catalog)}
return result
with tempfile.TemporaryDirectory() as folder:
p = Path(folder); api = CatalogApi()
tools = NativeExplorationTools(delegated=api, evidence_dir=p/'evidence', task=root(),
identity={**identity(), 'releaseId': RELEASE}, state_path=p/'state.json')
catalog = tools.quality_data({'mode': 'catalog'})
self.assertEqual(catalog['periods']['availableMonthsInLatestYear'], [])
self.assertEqual(catalog['periods']['availableMonthsSource'], 'not_scanned')
self.assertEqual(catalog['fineDefects']['endpoint'], 'GET /api/analysis/tools/catalog')
self.assertEqual(catalog['fineDefects']['fields'], fine_catalog['fields'])
self.assertEqual(catalog['fineDefects']['scanned'], False)
self.assertNotIn('protocolEvidence', catalog)
narrowed = tools.quality_data({'mode': 'catalog', 'stage': 'black'})
self.assertEqual([item['stage'] for item in narrowed['fineDefects']['fields']], ['black'])
self.assertEqual([item['stage'] for item in narrowed['fineDefects']['categories']], ['black'])
paths = [call[1].split('?', 1)[0] for call in api.calls]
self.assertTrue(set(paths) <= {
'/api/analysis/model-authorization', '/api/releases', '/api/analysis/tools/catalog', '/api/options'
}, paths)
self.assertNotIn('/api/metrics', paths)
self.assertNotIn('/api/analysis/defects', paths)
for _ in range(3):
duplicate = tools.quality_data({'mode': 'catalog'})
self.assertTrue(duplicate['reusedEvidence'])
state = json.loads((p/'state.json').read_text())
self.assertEqual(state['noProgress'], 0)
self.assertFalse(state.get('halted', False))
tools.quality_data({'mode': 'compare'})
self.assertEqual(len(api.steps), 1)
self.assertTrue(any(path.startswith('/api/metrics') for _, path, _ in api.calls))
def test_actual_compare_preserves_both_proofs_and_duplicate_reads_are_cached(self):
with tempfile.TemporaryDirectory() as folder:
api = Delegated(); p = Path(folder)