优化:未分类连续维护与柏拉图预汇总,同步已发布修复
This commit is contained in:
+19
-12
@@ -16,7 +16,8 @@ def exploration_notices(scopes, coverage):
|
||||
child = scope.get('task') or {}
|
||||
stage = '/'.join({'black':'黑片','bright':'亮片'}.get(s,s) for s in child.get('stages',[]))
|
||||
kind = stage + purposes.get(scope.get('purpose'),'补充调查')
|
||||
grouped.setdefault(kind,[]).append(str(scope.get('label') or '当前范围'))
|
||||
label = str(scope.get('label') or '当前范围')
|
||||
grouped.setdefault(kind,[]).append('当前范围' if label == '基础范围' else label)
|
||||
return [kind+'尚未完整核实:'+'、'.join(dict.fromkeys(labels))+';未用于已核实结论。'
|
||||
for kind,labels in grouped.items()]
|
||||
|
||||
@@ -25,7 +26,7 @@ def run_native_exploration(*, request, task, authority, actor_root, delegated, c
|
||||
manager, state, cancel_event, emit, prior_evidence_files, phase_timings=None):
|
||||
from nao_quality_runtime import _atomic_json, _authenticate, _sse_request, _read_json
|
||||
from nao_agent_task import bind_task
|
||||
from nao_protocol_execution import _identity, _platform_visual_context
|
||||
from nao_protocol_execution import _identity, _platform_visual_context, query_evidence_bindings
|
||||
from nao_evidence_finalizer import evidence_summaries, synthesize_native
|
||||
from analysis_visual_evidence import protocol_visual_result
|
||||
from nao_runtime_policy import native_timeout
|
||||
@@ -119,6 +120,7 @@ def run_native_exploration(*, request, task, authority, actor_root, delegated, c
|
||||
release_id=request['releaseId'], base_context=context)
|
||||
timings['visuals'] = round((time.monotonic() - started) * 1000)
|
||||
context['_platformVisuals'] = _platform_visual_context(visuals)
|
||||
emit({'type': 'progress', 'message': '正在核对结论与图表…', 'executionMode': 'native_agent'})
|
||||
started = time.monotonic()
|
||||
final = synthesize_native(base_url=connection[0], api_key=connection[1], model=connection[2],
|
||||
question=request['question'], evidence=documents, cancel_event=cancel_event,
|
||||
@@ -127,16 +129,20 @@ def run_native_exploration(*, request, task, authority, actor_root, delegated, c
|
||||
_atomic_json(actor_root / 'private' / 'native-composition.json', {
|
||||
'turnId': request['turnId'], 'rawModelResponses': final.get('rawModelResponses', []),
|
||||
'compositionDiagnostics': final.get('compositionDiagnostics', {}),
|
||||
'bindingInput': final.get('_privateBindingInput'),
|
||||
'titleMetadata': {key: final.get(key) for key in
|
||||
('reportTitle', 'titleGeneratedByModel', 'titleValid', 'titleSource')},
|
||||
'readingSummary': final.get('readingSummary')})
|
||||
full_facts = final.get('fullEvidenceFacts', [])
|
||||
if full_facts:
|
||||
_atomic_json(actor_root / 'private' / 'native-full-evidence-facts.json', full_facts)
|
||||
missing.extend(final.get('missingEvidence', []))
|
||||
visual_warnings = list(visuals.get('missingEvidence', []))
|
||||
if task.get('visualPreference') == 'required':
|
||||
missing.extend(visuals.get('missingEvidence', []))
|
||||
missing.extend(visual_warnings)
|
||||
else:
|
||||
warnings.extend(str(item).replace('queryPlan共有', '共有').replace('结果为部分完成。', '已保留核实结果。')
|
||||
for item in visuals.get('missingEvidence', []))
|
||||
if visual_warnings and not summary_warnings:
|
||||
summary_warnings = ['部分重点图表未能完整展示;已保留核实文字和表格。']
|
||||
missing = list(dict.fromkeys(str(item) for item in missing if item))
|
||||
complete = bool(documents and final.get('evidenceSufficient') and not missing)
|
||||
used_refs = set(final.get('usedEvidenceRefs', []))
|
||||
@@ -145,16 +151,16 @@ def run_native_exploration(*, request, task, authority, actor_root, delegated, c
|
||||
if final.get('evidenceSufficient') and not cited_ids:
|
||||
missing.append('解释未关联当前执行的实际查询证明。')
|
||||
complete = False
|
||||
if warnings:
|
||||
def visible_warning(value):
|
||||
text = str(value)
|
||||
for scope in scopes:
|
||||
text = text.replace('节点'+str(scope.get('nodeId'))+'范围','范围')
|
||||
return text
|
||||
final['answer'] += '\n\n## 调查局限\n\n' + '\n'.join('- ' + visible_warning(item) for item in dict.fromkeys(warnings))
|
||||
if warnings or visual_warnings:
|
||||
_atomic_json(actor_root / 'private' / 'native-warning-diagnostics.json', {
|
||||
'turnId': request['turnId'], 'explorationWarnings': warnings,
|
||||
'visualWarnings': visual_warnings})
|
||||
if summary_warnings:
|
||||
if isinstance(final.get('readingSummary'), dict):
|
||||
final['readingSummary']['notices'] = list(dict.fromkeys([
|
||||
*final['readingSummary'].get('notices', []), *summary_warnings]))
|
||||
else:
|
||||
final['answer'] += '\n\n' + '\n'.join(dict.fromkeys(summary_warnings))
|
||||
if missing:
|
||||
final['answer'] += '\n\n尚未解决:' + ';'.join(missing)
|
||||
if isinstance(final.get('readingSummary'), dict):
|
||||
@@ -170,6 +176,7 @@ def run_native_exploration(*, request, task, authority, actor_root, delegated, c
|
||||
'conclusionProtocolQueryIds': cited_ids,
|
||||
'actualModel': model, 'phaseTimingsMs': timings,
|
||||
'protocolEvidence': receipts, 'queryEvidenceRefs': [doc['evidenceRef'] for doc in documents],
|
||||
'queryEvidenceBindings': query_evidence_bindings(documents, receipts),
|
||||
'toolCalls': accumulator.tool_calls, 'toolCount': len(accumulator.tool_calls),
|
||||
'timeline': accumulator.timeline, 'factsComplete': bool(documents and not missing),
|
||||
'evidenceCompletion': {'serverCoverageSufficient': not snapshot.get('rootGoalGaps'),
|
||||
|
||||
Reference in New Issue
Block a user