ys/GenericAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: _parse_openai_sse防御None值迭代(tool_calls/delta可能为null)

Browse Source
This commit is contained in:
Liang Jiaqing
2026-03-30 11:19:56 +08:00
parent 5459ebbb59
commit 7b704b5dbc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
llmcore.py
View File

@@ -200,10 +200,10 @@ def _parse_openai_sse(resp_lines, api_mode="chat_completions"):
try: evt = json.loads(data_str) try: evt = json.loads(data_str)
except: continue except: continue
ch = (evt.get("choices") or [{}])[0] ch = (evt.get("choices") or [{}])[0]
delta = ch.get("delta", {}) delta = ch.get("delta") or {}
if delta.get("content"): if delta.get("content"):
text = delta["content"]; content_text += text; yield text text = delta["content"]; content_text += text; yield text
for tc in delta.get("tool_calls", []): for tc in (delta.get("tool_calls") or []):
idx = tc.get("index", 0) idx = tc.get("index", 0)
if idx not in tc_buf: tc_buf[idx] = {"id": tc.get("id", ""), "name": "", "args": ""} if idx not in tc_buf: tc_buf[idx] = {"id": tc.get("id", ""), "name": "", "args": ""}
if tc.get("function", {}).get("name"): tc_buf[idx]["name"] = tc["function"]["name"] if tc.get("function", {}).get("name"): tc_buf[idx]["name"] = tc["function"]["name"]
@@ -521,8 +521,7 @@ class NativeOAISession:
_pat = next((p for p in ['[{"type":"tool_use"', '[{"type": "tool_use"'] if p in content), None) _pat = next((p for p in ['[{"type":"tool_use"', '[{"type": "tool_use"'] if p in content), None)
if _pat: if _pat:
try: try:
idx = content.index(_pat) idx = content.index(_pat); raw = json.loads(content[idx:])
raw = json.loads(content[idx:])
tool_calls = [MockToolCall(b["name"], b.get("input", {}), id=b.get("id", "")) for b in raw if b.get("type") == "tool_use"] tool_calls = [MockToolCall(b["name"], b.get("input", {}), id=b.get("id", "")) for b in raw if b.get("type") == "tool_use"]
content = content[:idx].strip() content = content[:idx].strip()
except: pass except: pass