统一: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
+212 -22
View File
@@ -7,7 +7,7 @@ import json
import time
from pathlib import Path
from nao_quality_tools import QualityTools, QualityToolError, normalize_filters
from nao_quality_tools import QualityTools, QualityToolError, SourceCoverageUnavailable, normalize_filters
from nao_query_contract import canonical_filters
@@ -27,7 +27,7 @@ def _proofs(value):
if isinstance(p, dict) and isinstance(p.get('queryId'), str)}.values())
def native_model_view(result):
def native_model_view(result, *, compact=False, task=None):
"""The full signed response stays in evidence; omit transport duplication."""
def project(value):
if isinstance(value, list): return [project(item) for item in value]
@@ -59,6 +59,22 @@ def native_model_view(result):
if display:metadata[key]=display
if metadata:node['formalDisplay']=metadata
displays(view)
if formal:
def category_shares(node):
if isinstance(node,list):
for item in node:category_shares(item)
elif isinstance(node,dict):
categories=node.get('defects')
if isinstance(categories,list) and any(isinstance(item,dict) and 'rate' in item for item in categories):
# The official API's category rate uses listed category
# weights, which may not equal formal stage scrap weight.
# Name that denominator explicitly in the model view only.
node['categoryShareBasis']='sum_of_listed_category_weights'
for item in categories:
if isinstance(item,dict) and 'rate' in item:
item['shareOfListedCategoryWeight']=item.pop('rate')
for item in list(node.values()):category_shares(item)
category_shares(view)
if result.get('kind') == 'quality_changes' and isinstance(result.get('prioritySignals'),dict):
rows = {row.get('key'):row for row in result.get('rows',[]) if isinstance(row,dict)}
signals = {}
@@ -73,12 +89,97 @@ def native_model_view(result):
projected.append(project(item))
signals[name] = projected
view['prioritySignals'] = signals
if compact:
from dsh_model_input import compact_tool_result
return compact_tool_result(view, task=task)
return view
def prepare_step(arguments, task, state):
def _source_field_binding(source_catalog, stage, selected_fields, expected_release_id=None):
"""Resolve only exact, stage-compatible values from the current catalog."""
if not isinstance(source_catalog, dict) or not isinstance(source_catalog.get('sourceFields'), list):
raise QualityToolError('请先读取当前发布版本catalog;没有已签发的原表字段目录,不能选择source字段。')
if not isinstance(expected_release_id, str) or not expected_release_id.strip():
raise QualityToolError('当前原件调查缺少冻结releaseId;不能绑定source字段。')
if source_catalog.get('releaseId') != expected_release_id:
raise QualityToolError('原表字段目录不属于当前releaseId;未注册或读取任何原件。')
if not isinstance(stage, str) or stage not in ('black', 'bright'):
raise QualityToolError('原表字段选择需要明确的黑片或亮片阶段。')
if not isinstance(selected_fields, list) or not 1 <= len(selected_fields) <= 32:
raise QualityToolError('原表fields须是1到32个当前catalog授权字段。')
catalog_rows = source_catalog['sourceFields']
by_key = {}
for row in catalog_rows:
if not isinstance(row, dict):
raise QualityToolError('当前catalog原表字段目录结构无效;请重新读取catalog。')
key = row.get('key')
if not isinstance(key, str) or not key.strip() or key in by_key:
raise QualityToolError('当前catalog原表字段stable key缺失或重复;不能绑定source字段。')
by_key[key] = row
keys, columns = [], []
for raw in selected_fields:
if not isinstance(raw, str) or not raw.strip():
raise QualityToolError('原表fields只能使用当前catalog中的stable key、唯一label或唯一原列名。')
row = by_key.get(raw)
if row is None:
candidates = []
for candidate in catalog_rows:
stages = candidate.get('stages')
column_map = candidate.get('columns')
column = column_map.get(stage) if isinstance(column_map, dict) else None
if (isinstance(stages, list) and stage in stages and isinstance(column, str) and column.strip()
and raw in (candidate.get('label'), column)):
candidates.append(candidate)
if len(candidates) > 1:
raise QualityToolError('原表字段label/原列名在当前阶段不唯一;请使用catalog返回的stable key。')
row = candidates[0] if candidates else None
if row is None:
raise QualityToolError('原表字段不在当前releaseId的catalog授权目录;未注册或读取任何原件。')
stages = row.get('stages')
column_map = row.get('columns')
column = column_map.get(stage) if isinstance(column_map, dict) else None
if not isinstance(stages, list) or stage not in stages or not isinstance(column, str) or not column.strip():
raise QualityToolError('原表字段不支持所选阶段;未扩大阶段或字段范围。')
key = row['key']
if key in keys:
raise QualityToolError('原表fields含重复字段;请使用唯一的catalog字段列表。')
keys.append(key)
columns.append(column)
return keys, columns
def _current_source_catalog(state, release_id):
cache = state.get('cache') if isinstance(state, dict) else None
candidates = [value for key, value in (cache.items() if isinstance(cache, dict) else [])
if isinstance(key, str) and key.startswith('catalog-')
and isinstance(value, dict) and value.get('releaseId') == release_id
and isinstance(value.get('sourceFields'), list)]
if not candidates:
raise QualityToolError('请先读取当前releaseId的catalog;原表字段未由当前发布版本授权。')
signatures = {json.dumps(value['sourceFields'], ensure_ascii=False, sort_keys=True,
separators=(',', ':')) for value in candidates}
if len(signatures) != 1:
raise QualityToolError('当前releaseId的catalog原表字段目录不一致;请重新读取完整目录后再调查。')
return candidates[-1]
def prepare_step(arguments, task, state, *, source_catalog=None):
"""Make a proposal, never an authorization. The server resolves every scope."""
args = copy.deepcopy(arguments)
# Some providers encode object arguments as JSON strings. Decode only the
# declared period objects before comparing them with the authorized frame.
for key in ('period', 'comparisonPeriod'):
if isinstance(args.get(key), str):
try:
args[key] = json.loads(args[key])
except (ValueError, TypeError):
raise QualityToolError(key+'必须是期间对象,例如{year:2026,month:10}。', code='invalid_arguments') from None
if not isinstance(args[key], dict):
raise QualityToolError(key+'必须是期间对象。', code='invalid_arguments')
if 'groupBy' in args:
args['view'] = args.pop('groupBy')
mode = args.get('mode')
if mode == 'details':
# The native protocol records complete, pageable investigation responses;
@@ -86,6 +187,10 @@ def prepare_step(arguments, task, state):
args.update(mode='investigate', action='rows')
mode = 'investigate'
root = canonical_filters(task.get('filters') or {})
if isinstance(args.get('filters'), dict):
args['filters'] = {key: value for key, value in args['filters'].items()
if not (key in ('department','group','product','projectGroup')
and value in ('__ALL__','all','全部','全公司'))}
columns = root.pop('columnFilters', None)
supplied = canonical_filters(args.get('filters') or {})
supplied_columns = supplied.pop('columnFilters', columns)
@@ -109,8 +214,11 @@ def prepare_step(arguments, task, state):
if required is not None:
if key in args and args[key] != required:
from nao_period import normalize_period, expected_months
supplied_period = normalize_period(args[key])
required_period = normalize_period(required)
try:
supplied_period = normalize_period(args[key])
required_period = normalize_period(required)
except (ValueError, TypeError):
raise QualityToolError('期间格式无效;可省略period与comparisonPeriod以使用本轮已确认期间。', code='invalid_arguments') from None
if (not supplied_period or not required_period or supplied_period['year'] != required_period['year']
or expected_months(supplied_period) != expected_months(required_period)):
raise QualityToolError('调查期间必须沿用已确认任务。')
@@ -146,8 +254,12 @@ def prepare_step(arguments, task, state):
node = {'nodeId': 'explore', 'selector': selector, 'visualPreference': task.get('visualPreference', 'auto'),
'visualType': None, 'comparisonRequired': False}
if mode in ('query', 'compare'):
if args.get('view', 'overall') != 'overall':
raise QualityToolError('跨对象比较请使用changes批量排名;单个对象请用filters后compare/query。')
# Overall endpoints already return both stages; this argument is a
# redundant selector, not permission to change the root stage frame.
args.pop('stage', None)
view = args.get('view', 'overall')
if view not in ('overall','department','group','product') or mode == 'compare' and view != 'overall':
raise QualityToolError('query支持overall总体、department产业部、group业务分组、product产品批量汇总;compare只比较总体。')
if mode == 'compare':
args.pop('view', None)
node.update(purpose='trend' if mode == 'query' and task.get('trendRequired') else 'metrics',
@@ -155,12 +267,20 @@ def prepare_step(arguments, task, state):
comparisonRequired=mode == 'compare')
if not node['stages'] and node['fields'] != ['rate']:
node['stages'] = ['black', 'bright']
if mode == 'query' and view != 'overall':
batch_limit = 500 if view == 'product' or task.get('aggregateSelection') else 100
node.update(purpose='metrics', dimension=view, limit=batch_limit)
args['limit'] = batch_limit # Page size, not the requested Top-N display count.
elif mode == 'changes':
node.update(purpose='changes', dimension=args.get('dimension'),
fields=['rate', 'totalWeight', 'scrapWeight'], stages=[stage] if stage else [],
comparisonRequired=True, sort=args.get('sort', 'scrap_delta'), limit=min(args.get('limit', 5), 10))
comparisonRequired=True, sort=args.get('sort', 'scrap_delta'), limit=min(args.get('limit', 5), 100))
args['limit'] = node['limit']
elif mode in ('rank', 'defects'):
if mode == 'rank' and args.get('metric') not in ('totalWeight', 'scrapWeight'):
raise QualityToolError('rank缺少metric或值无效:投入/生产重量用totalWeight,报废重量用scrapWeight;请明确metric后重试,不能省略或猜测。')
if mode == 'rank' and args.get('limit', 10) > 100:
raise QualityToolError('原生排名单次最多100项。')
# A single exact product already fixes the object. With no defect
# field, the meaningful defect view is that product's defect breakdown.
if (mode == 'defects' and args.get('dimension') == 'product' and not args.get('defect')
@@ -171,17 +291,36 @@ def prepare_step(arguments, task, state):
from nao_quality_tools import _normalize_category
args['category'] = _normalize_category(stage, args['category'])
node.update(purpose='ranking' if mode == 'rank' else 'defects',
dimension=args.get('dimension', 'defect'), fields=[args.get('metric', 'totalWeight')] if mode == 'rank' else ['scrapWeight'],
dimension=args.get('dimension', 'defect'), fields=[args['metric']] if mode == 'rank' else ['scrapWeight'],
stages=[stage] if stage else [], limit=args.get('limit', 10),
comparisonRequired=mode == 'defects' and bool(args.get('comparisonPeriod')))
if mode == 'rank' and stage:
node['fields'] = list(dict.fromkeys([*node['fields'],
*[field for field in task.get('fields', []) if field in ('totalWeight', 'scrapWeight')]]))
args['limit'] = node['limit']
for key in ('category', 'defect'):
if key in args: node[key] = args[key]
if mode == 'defects': args.setdefault('dimension', 'defect')
if mode == 'defects':
args.setdefault('dimension', 'defect')
# A report-wide composition hint is not the type of every child
# chart. Fine source Top lists use their actual weight bars.
node['visualType'] = 'bar'
elif mode in ('investigate', 'details'):
purpose = 'records' if mode == 'details' or args.get('action') == 'rows' else 'source'
action = args.get('action', 'overview')
if action not in ('source', 'rows'):
raise QualityToolError('自主协议原件调查只支持action=source或rows;正式概览用query,字段目录从当前releaseId的catalog读取。')
if not task.get('fullDetails' if purpose == 'records' else 'verifySource'):
raise QualityToolError('原始记录或原件核验需要用户明确要求,普通原因分析不能自动读取。')
if args.get('category') is not None:
if purpose == 'source':
raise QualityToolError('action=source不支持category筛选;请在相同已确认范围内核验原件,并读取响应中的categoryReconciliation。未丢弃该类别条件或扩大授权。')
raise QualityToolError('action=rows不支持category筛选;请使用已确认筛选或授权的具体字段,不会静默丢弃类别条件。')
if args.get('sourceRevisionId') is not None:
raise QualityToolError('自主协议原件scope未签发sourceRevisionId;不能切换或补充原件版本。')
if args.get('fields'):
field_keys, _ = _source_field_binding(source_catalog, stage, args['fields'], state.get('releaseId'))
args['fields'] = field_keys
if purpose == 'records':
args.update(action='rows', recordFilter='all')
args.setdefault('offset', 0)
@@ -209,9 +348,10 @@ def prepare_step(arguments, task, state):
class NativeExplorationTools:
def __init__(self, *, delegated, evidence_dir, task, identity, state_path):
def __init__(self, *, delegated, evidence_dir, task, identity, state_path, directory=None):
self.delegated, self.evidence_dir, self.task = delegated, Path(evidence_dir), task
self.identity, self.state_path = identity, Path(state_path)
self.directory = copy.deepcopy(directory or {})
def observation_coverage(self, result):
snapshot = self.delegated.call('/api/analysis/protocol/queries', payload={}, method='POST')
@@ -249,23 +389,26 @@ class NativeExplorationTools:
if arguments.get('mode') == 'catalog':
key = 'catalog-' + hashlib.sha256(json.dumps(arguments, sort_keys=True).encode()).hexdigest()
if key in state['cache'] and not fresh:
state['noProgress'] += 1
state['halted'] = state['noProgress'] >= 3
return {**copy.deepcopy(state['cache'][key]), 'reusedEvidence': True}
result = QualityTools(api_factory=lambda: self.delegated,
evidence_dir=self.evidence_dir).quality_data(arguments)
evidence_dir=self.evidence_dir,
catalog_metadata_only=True).quality_data(arguments)
state['cache'][key] = copy.deepcopy(result)
state['noProgress'] = 0
return result
args, proposal = prepare_step(arguments, self.task, state)
needs_source_catalog = (arguments.get('mode') in ('investigate', 'details')
and bool(arguments.get('fields')))
source_catalog = _current_source_catalog(state, state['releaseId']) if needs_source_catalog else None
args, proposal = prepare_step(arguments, self.task, state, source_catalog=source_catalog)
QualityTools(api_factory=lambda: self.delegated,
evidence_dir=self.evidence_dir)._validate_arguments(args)
key = hashlib.sha256(json.dumps(args, sort_keys=True, ensure_ascii=False).encode()).hexdigest()
if key in state['cache'] and not fresh:
if state['cache'][key].get('status') == 'no_data':
return {**copy.deepcopy(state['cache'][key]), 'reusedEvidence':True}
state['noProgress'] += 1
state['halted'] = state['noProgress'] >= 3
return {**self.observation_coverage(copy.deepcopy(state['cache'][key])), 'reusedEvidence': True,
'investigationNotice': '复用本轮相同查询证据;请依据结果换调查方向或结束答复。'}
return self.active_result({**self.observation_coverage(copy.deepcopy(state['cache'][key])), 'reusedEvidence': True,
'investigationNotice': '复用本轮相同查询证据;请依据结果换调查方向或结束答复。'})
registrations = state.setdefault('registrations', {})
registered = registrations.get(proposal['requestKey'])
if registered is None:
@@ -273,8 +416,19 @@ class NativeExplorationTools:
registrations[proposal['requestKey']] = copy.deepcopy(registered)
scope = registered['scope']
child = registered['task']
if args.get('mode') == 'investigate' and args.get('fields'):
args['fields'] = copy.deepcopy((child.get('investigationFields') or {}).get(args.get('stage'), args['fields']))
selected_source_fields = proposal['node'].get('sourceFields')
if selected_source_fields:
selected_stage = args.get('stage')
expected_keys, expected_columns = _source_field_binding(
source_catalog, selected_stage, selected_source_fields.get(selected_stage),
state.get('releaseId'))
if selected_source_fields != {selected_stage: expected_keys}:
raise QualityToolError('待签发sourceFields与当前catalog不一致;原件范围未执行。')
if child.get('sourceFields') != selected_source_fields:
raise QualityToolError('服务端签发的sourceFields与请求不一致;原件范围未执行。')
if child.get('investigationFields') != {selected_stage: expected_columns}:
raise QualityToolError('服务端签发的原列映射与当前catalog不一致;原件范围未执行。')
args['fields'] = copy.deepcopy(expected_columns)
scoped = ScopedApi(self.delegated, registered['nodeId'], registered['scopeId'])
scoped.read_count = state['readCount']
tools = QualityTools(api_factory=lambda: scoped, evidence_dir=self.evidence_dir,
@@ -284,6 +438,7 @@ class NativeExplorationTools:
tools._bulk_changes = True
started = time.monotonic()
result = tools.quality_data(args)
result['status'] = 'success'
state['queryElapsedMs'] = state.get('queryElapsedMs', 0) + round((time.monotonic() - started) * 1000)
proof_ids = [p['queryId'] for p in _proofs(result)]
if not proof_ids:
@@ -298,7 +453,25 @@ class NativeExplorationTools:
state['halted'] = state['noProgress'] >= 3
if same_content:
result['investigationNotice'] = '已明确重查,但正式响应没有新增内容;请依据已有结果换调查方向或结束。'
return self.observation_coverage(result)
return self.active_result(self.observation_coverage(result))
except SourceCoverageUnavailable as error:
# A successful authorized read with no published rows is a
# business outcome. Never invent zero metrics or an MCP error.
raw = error.response or {}
if (not isinstance(raw.get('coverage',{}).get('sourceMonths'),list)
or not raw.get('protocolEvidence',{}).get('queryId')):
raise QualityToolError('查询缺少来源覆盖或执行凭据,不能判作暂无数据。',code='unavailable') from None
result = {'kind':'quality_no_data','status':'no_data','message':str(error),
'releaseId':state['releaseId'],'period':copy.deepcopy(error.period),
'filters':copy.deepcopy(args.get('filters',{})), 'view':args.get('view','overall'),
'summary':None,'rows':[], 'coverage':raw.get('coverage',{}),
'protocolEvidence':raw.get('protocolEvidence',{})}
from nao_quality_tools import _json_safe
result = _json_safe(result)
evidence_id, evidence_path = tools._write_evidence(result, args['mode'])
result.update(evidenceId=evidence_id,evidenceRef=tools._evidence_ref(evidence_id),evidencePath=evidence_path)
state['cache'][key] = copy.deepcopy(result)
return result
except Exception as error:
state['noProgress'] += 1
state['halted'] = state['noProgress'] >= 3
@@ -307,8 +480,25 @@ class NativeExplorationTools:
state.setdefault('errors', []).append({'type': type(error).__name__, 'message': safe})
state['errors'] = state['errors'][-12:]
if isinstance(error, RuntimeErrorSafe):
raise QualityToolError(safe) from None
code = ('forbidden' if error.http_status in (401,403) else
'invalid_arguments' if error.http_status in (400,409,422) else 'unavailable')
raise QualityToolError(safe, code=code) from None
raise
finally:
if scoped is not None: state['readCount'] = scoped.read_count
_atomic_json(self.state_path, state)
def active_result(self, result):
"""Only the model projection omits inactive organizations; proofs stay intact."""
directory_key = {'department':'departments','group':'groups'}.get(result.get('view'))
if not directory_key or not self.directory.get(directory_key):
return result
visible = copy.deepcopy(result)
allowed = set(self.directory[directory_key])
rows = visible.get('rows',[])
visible['rows'] = [row for row in rows if row.get('key',row.get('label')) in allowed]
visible['rowsReturned'] = len(visible['rows'])
visible['rowCount'] = len(visible['rows']) if not visible.get('rowsTruncated') else visible.get('rowCount')
visible['organizationCoverage'] = {'activeOnly':True,'omittedInactiveCount':len(rows)-len(visible['rows']),
'summaryBasis':'正式总体汇总保持原口径,分组仅展示有效组织,不根据可见分组重新计算总体指标。'}
return visible