修复:智能分析空回答与工具结束条件冲突

统一自主分析工具范围与执行前校验,严格核验正常结束、最终正文和图表恢复状态,并显示空回答及恢复失败原因。

包含两次已上线修复及回归测试,保留已有回答与业务数据。

验证:1101 项 Python、469 项前端、97 项后端测试通过;前后端构建和真实模型、页面验收通过。
This commit is contained in:
2026-11-03 08:56:49 +08:00
parent 7ffb5cdb9c
commit 52d92c95d8
20 changed files with 387 additions and 37 deletions
+69
View File
@@ -216,6 +216,53 @@ class RuntimeStreamTests(unittest.TestCase):
truncated.feed({"type": "finish", "finishReason": "length"})
self.assertEqual(truncated.status(), ("PARTIAL", "length"))
def test_tool_errors_are_read_from_envelopes_not_business_data_cells(self):
for flag in ('mcpValidationError','mcpAuthRequired'):
stream=runtime.ConversationAccumulator()
stream.feed({'type':'tool-input-available','toolName':'mcp_call','toolCallId':'q'})
stream.feed({'type':'tool-output-available','toolCallId':'q','output':{flag:True,'server':'quality'}})
stream.feed({'type':'text-delta','id':'final','delta':'尚未查到数据。'})
stream.feed({'type':'finish','finishReason':'stop'})
self.assertEqual(stream.tool_calls[0]['status'],'failed')
self.assertEqual(stream.status(),('PARTIAL','mcp_error'))
payload={'kind':'quality_records','rows':[{'error':'缺角','isError':True}], 'note':'{"error":"原始单元格内容"}'}
stream=runtime.ConversationAccumulator()
stream.feed({'type':'tool-input-available','toolName':'mcp_call','toolCallId':'q'})
stream.feed({'type':'tool-output-available','toolCallId':'q','output':{'content':[{'type':'text','text':json.dumps(payload)}]}})
stream.feed({'type':'text-delta','id':'final','delta':'已查询并保留原始字段。'})
stream.feed({'type':'finish','finishReason':'stop'})
self.assertEqual(stream.tool_calls[0]['status'],'completed')
self.assertEqual(stream.status(),('COMPLETED','stop'))
def test_transport_done_is_not_a_normal_model_finish(self):
stream = runtime.ConversationAccumulator()
stream.feed({'type': 'text-delta', 'id': 'progress', 'delta': '先查一下。'})
stream.feed({'type': 'tool-input-available', 'toolName': 'mcp_call', 'toolCallId': 'q'})
stream.feed({'type': 'tool-output-available', 'toolCallId': 'q', 'output': {}})
stream.feed({'type': 'finish', 'finishReason': 'tool-calls'})
stream.feed({'type': '[DONE]'})
self.assertNotEqual(stream.status()[0], 'COMPLETED')
self.assertEqual(stream.answer, '先查一下。')
def test_progress_before_a_tool_or_unsettled_tool_cannot_count_as_final_answer(self):
for settled in (False, True):
stream = runtime.ConversationAccumulator()
stream.feed({'type': 'text-delta', 'id': 'progress', 'delta': '正在查询。'})
stream.feed({'type': 'tool-input-available', 'toolName': 'mcp_call', 'toolCallId': 'q'})
if settled:stream.feed({'type': 'tool-output-available', 'toolCallId': 'q', 'output': {}})
stream.feed({'type': 'finish', 'finishReason': 'stop'})
self.assertNotEqual(stream.status()[0], 'COMPLETED')
stream.feed({'type': 'text-delta', 'id': 'final', 'delta': '已核实的最终回答。'})
self.assertEqual(stream.status()[0], 'COMPLETED' if settled else 'PARTIAL')
def test_only_the_terminal_finish_and_successful_stop_control_can_complete(self):
for reasons, stopped in ((['stop', 'tool-calls'], None), (['stop'], False)):
stream = runtime.ConversationAccumulator()
stream.feed({'type': 'text-delta', 'id': 'answer', 'delta': '保留原文'})
for reason in reasons:stream.feed({'type': 'finish', 'finishReason': reason})
stream.feed({'type': '[DONE]'})
self.assertNotEqual(stream.status(stop_succeeded=stopped)[0], 'COMPLETED')
def test_native_stop_controller_stops_before_closing_stream_on_cancel(self):
calls = []
response = FakeResponse()
@@ -306,6 +353,28 @@ class RuntimeStreamTests(unittest.TestCase):
self.assertEqual(result[2], "transport_or_stream_error")
native_stop.assert_called_once_with(unittest.mock.ANY, "http://127.0.0.1:10000", "existing-native-id")
def test_an_already_finished_native_reply_cannot_be_cancelled_by_stale_no_progress_state(self):
controls=[];ready=[];controller=runtime.NativeStopController
def capture(*args):
value=controller(*args);controls.append(value);return value
class Response:
def __enter__(self):return self
def __exit__(self,*_):pass
def close(self):pass
def __iter__(self):
yield b'data: {"type":"text-delta","id":"final","delta":"final reply"}\n'
yield b'data: {"type":"finish","finishReason":"stop"}\n'
ready.append(controls[0].completion_ready())
yield b'data: [DONE]\n'
with tempfile.TemporaryDirectory() as temp:
root=Path(temp)/str(uuid.uuid4());root.mkdir();actor=root.name;sid=str(uuid.uuid4())
runtime._atomic_json(root/'private/native-exploration-state.json',{'executionId':'e','halted':True})
client=unittest.mock.Mock();client.open.return_value=Response()
with patch.object(runtime,'NativeStopController',side_effect=capture),patch('nao_agent_task.task_from_context',return_value={'executionMode':'native_agent','freshQuery':True}):
result=runtime._sse_request(client=client,base_url='http://native.invalid',model='fixture',question='q',release_id=str(uuid.uuid4()),
context={'_nativeExecutionId':'e'},chat_id='chat',session_state=runtime.SessionState(root,actor),session_id=sid,actor_root=root,emit=lambda _:None,timeout=5)
self.assertEqual(ready,[False]);self.assertEqual(result[1],'COMPLETED')
def test_story_export_uses_last_successful_call_and_matching_markdown(self):
class StoryClient:
def __init__(self):