修复:智能分析空回答与工具结束条件冲突
统一自主分析工具范围与执行前校验,严格核验正常结束、最终正文和图表恢复状态,并显示空回答及恢复失败原因。 包含两次已上线修复及回归测试,保留已有回答与业务数据。 验证:1101 项 Python、469 项前端、97 项后端测试通过;前后端构建和真实模型、页面验收通过。
This commit is contained in:
+50
-13
@@ -21,6 +21,10 @@ class _NoRedirect(HTTPRedirectHandler):
|
||||
return None
|
||||
|
||||
|
||||
class ToolPolicyError(ValueError):
|
||||
pass
|
||||
|
||||
|
||||
class ModelGate:
|
||||
"""A stable per-session endpoint backed only by this turn's live delegation."""
|
||||
|
||||
@@ -41,7 +45,9 @@ class ModelGate:
|
||||
self._thinking = dict(thinking_options) if thinking_options is not None else None
|
||||
self._on_thinking = on_thinking
|
||||
self._native_turn_marker = native_turn_marker
|
||||
self.native_agent = False
|
||||
self.rejected_stale_requests = 0
|
||||
self.rejected_tool_calls = 0
|
||||
self._request_number = 0
|
||||
self._request_prefix = secrets.token_hex(4)
|
||||
self.request_audit = []
|
||||
@@ -92,9 +98,10 @@ class ModelGate:
|
||||
for message in messages)):
|
||||
with gate._audit_lock: gate.rejected_stale_requests += 1
|
||||
self.failure(403, '模型请求不属于当前轮次'); return
|
||||
decoded = gate.apply_thinking(decoded)
|
||||
from nao_agent_contract import apply_platform_tools
|
||||
decoded = apply_platform_tools(decoded)
|
||||
decoded = apply_platform_tools(decoded, native_agent=gate.native_agent)
|
||||
decoded = gate.apply_thinking(decoded)
|
||||
offered_tools = {tool['function']['name'] for tool in decoded.get('tools', [])}
|
||||
payload = json.dumps(decoded,ensure_ascii=False).encode()
|
||||
except (ValueError, OSError):
|
||||
self.failure(400, '模型请求格式无效'); return
|
||||
@@ -141,9 +148,10 @@ class ModelGate:
|
||||
thinking('start')
|
||||
# SSE termination is a transport concern even when no thinking
|
||||
# callback is installed (for example, native stream forwarding).
|
||||
observer = ProviderStream(lambda text:thinking('delta',text=text)) if gate._on_thinking or is_sse else None
|
||||
observer = ProviderStream(lambda text:thinking('delta',text=text))
|
||||
raw_json = bytearray()
|
||||
if not bridge:
|
||||
pending_wire = bytearray()
|
||||
if is_sse and not bridge:
|
||||
self.send_response(response.status)
|
||||
self.send_header('Content-Type', response.headers.get('Content-Type', 'application/json'))
|
||||
self.send_header('Cache-Control', 'no-store')
|
||||
@@ -161,21 +169,29 @@ class ModelGate:
|
||||
if time.monotonic() - checked_at >= 1:
|
||||
gate._check()
|
||||
checked_at = time.monotonic()
|
||||
if observer:
|
||||
if is_sse:observer.feed(chunk)
|
||||
else:raw_json.extend(chunk)
|
||||
if not bridge:
|
||||
self.wfile.write(chunk)
|
||||
self.wfile.flush()
|
||||
if is_sse:
|
||||
observer.feed(chunk)
|
||||
gate.check_returned_tools(observer, offered_tools)
|
||||
if not bridge:
|
||||
# A partial SSE line cannot be checked yet. Hold
|
||||
# it until its complete event has passed policy.
|
||||
pending_wire.extend(chunk)
|
||||
end=pending_wire.rfind(b'\n')+1
|
||||
if end:
|
||||
self.wfile.write(pending_wire[:end]);self.wfile.flush()
|
||||
del pending_wire[:end]
|
||||
else:raw_json.extend(chunk)
|
||||
# A provider may keep the HTTP connection alive with heartbeats
|
||||
# after its explicit terminal event. Do not wait for EOF, but
|
||||
# keep reading past finish_reason so the usage tail is preserved.
|
||||
if is_sse and observer.done:
|
||||
break
|
||||
gate._check()
|
||||
if observer:
|
||||
if is_sse:observer.finish()
|
||||
else:observer.document(json.loads(raw_json))
|
||||
if is_sse:observer.finish()
|
||||
else:observer.document(json.loads(raw_json))
|
||||
gate.check_returned_tools(observer, offered_tools, final=True)
|
||||
if is_sse and not bridge and pending_wire:
|
||||
self.wfile.write(pending_wire);self.wfile.flush()
|
||||
result = observer.completion() if bridge or is_sse else None
|
||||
stops = [row['finish_reason'] for row in observer.choices.values()] if observer else []
|
||||
thinking('end',finishReason='length' if 'length' in stops else (stops[-1] if stops else ''),interrupted=bool(observer and not stops))
|
||||
@@ -188,6 +204,15 @@ class ModelGate:
|
||||
self.send_response(200);self.send_header('Content-Type','application/json')
|
||||
self.send_header('Cache-Control','no-store');self.send_header('Content-Length',str(len(encoded)))
|
||||
self.end_headers();headers_sent=True;self.wfile.write(encoded);self.wfile.flush()
|
||||
elif not is_sse:
|
||||
self.send_response(response.status);self.send_header('Content-Type','application/json')
|
||||
self.send_header('Cache-Control','no-store');self.send_header('Content-Length',str(len(raw_json)))
|
||||
self.end_headers();headers_sent=True;self.wfile.write(raw_json);self.wfile.flush()
|
||||
except ToolPolicyError:
|
||||
if not headers_sent:self.failure(502,'模型返回了当前任务未开放的工具调用')
|
||||
else:
|
||||
with contextlib.suppress(OSError):
|
||||
self.wfile.write(b'data: {"error":{"message":"Tool call is unavailable for this task"}}\n\n');self.wfile.flush()
|
||||
except HTTPError as error:
|
||||
if not headers_sent:
|
||||
self.failure(error.code if 400 <= error.code <= 599 else 502, '模型接口暂不可用')
|
||||
@@ -230,6 +255,8 @@ class ModelGate:
|
||||
else:payload['reasoning_effort']=effort
|
||||
with self._audit_lock:
|
||||
if len(self.request_audit)<200:self.request_audit.append({'enabled':enabled,'effort':effort,
|
||||
'tools':[tool['function']['name'] for tool in payload.get('tools',[])],
|
||||
'nativeAgent':self.native_agent,
|
||||
'protocol':protocol,'stream':payload.get('stream',False),
|
||||
'maxCompletionTokens':payload.get('max_completion_tokens',payload.get('max_tokens')),
|
||||
'thinkingType':(payload.get('thinking') or {}).get('type'),
|
||||
@@ -237,6 +264,16 @@ class ModelGate:
|
||||
'reasoningEffort':payload.get('reasoning_effort',(payload.get('chat_template_kwargs') or {}).get('reasoning_effort'))})
|
||||
return payload
|
||||
|
||||
def check_returned_tools(self, observer, offered, *, final=False):
|
||||
for choice, tools in observer.tools.items():
|
||||
finished=final or bool(observer.choices.get(choice,{}).get('finish_reason')) or observer.done
|
||||
for tool in tools.values():
|
||||
name=tool.get('function',{}).get('name','')
|
||||
valid=(name in offered) if finished else (not name or any(allowed.startswith(name) for allowed in offered))
|
||||
if not valid:
|
||||
with self._audit_lock:self.rejected_tool_calls+=1
|
||||
raise ToolPolicyError('Unadvertised tool call')
|
||||
|
||||
def _check(self) -> None:
|
||||
if self._closed.is_set():
|
||||
raise PermissionError('模型授权已关闭')
|
||||
|
||||
Reference in New Issue
Block a user