fix: add debug() before every yield, fix indentation
This commit is contained in:
parent
0080ad1f57
commit
11684317a8
@ -199,7 +199,9 @@ if action == 'send_message':
|
|||||||
ctx = await _load_ctx(sor, uid)
|
ctx = await _load_ctx(sor, uid)
|
||||||
model = await _sel_model(sor, user_model_id)
|
model = await _sel_model(sor, user_model_id)
|
||||||
if not model:
|
if not model:
|
||||||
yield json.dumps({"type":"widget","widget":_w_card("❌ 错误",_w_text("无可用LLM"),"error")},ensure_ascii=False)+chr(10)
|
d = json.dumps({"type":"widget","widget":_w_card("❌ 错误",_w_text("无可用LLM"),"error")},ensure_ascii=False)+chr(10)
|
||||||
|
debug(f"AGENT_STREAM yield error: {d[:80]}")
|
||||||
|
yield d
|
||||||
return
|
return
|
||||||
|
|
||||||
repos_str = ', '.join([r['n'] for r in ctx['repos']]) or '无'
|
repos_str = ', '.join([r['n'] for r in ctx['repos']]) or '无'
|
||||||
@ -223,17 +225,23 @@ if action == 'send_message':
|
|||||||
if act.get('action') == 'tool_call':
|
if act.get('action') == 'tool_call':
|
||||||
tool = act.get('tool','')
|
tool = act.get('tool','')
|
||||||
label = _tool_labels.get(tool,tool)
|
label = _tool_labels.get(tool,tool)
|
||||||
yield json.dumps({"type":"widget","widget":_w_progress(f"🔄 {label}")},ensure_ascii=False)+chr(10)
|
d = json.dumps({"type":"widget","widget":_w_progress(f"🔄 {label}")},ensure_ascii=False)+chr(10)
|
||||||
|
debug(f"AGENT_STREAM yield: {d[:80]}")
|
||||||
|
yield d
|
||||||
result = await _exec_tool(sor, tool, act.get('params',{}), ctx, uid, org_id)
|
result = await _exec_tool(sor, tool, act.get('params',{}), ctx, uid, org_id)
|
||||||
ok = result.startswith("OK:")
|
ok = result.startswith("OK:")
|
||||||
yield json.dumps({"type":"widget","widget":_w_card(f"{'✅' if ok else '❌'} {label}",_w_text(result),"success" if ok else "error")},ensure_ascii=False)+chr(10)
|
d = json.dumps({"type":"widget","widget":_w_card(f"{'✅' if ok else '❌'} {label}",_w_text(result),"success" if ok else "error")},ensure_ascii=False)+chr(10)
|
||||||
|
debug(f"AGENT_STREAM yield: {d[:80]}")
|
||||||
|
yield d
|
||||||
msgs.append({"role":"assistant","content":raw})
|
msgs.append({"role":"assistant","content":raw})
|
||||||
msgs.append({"role":"user","content":f"工具 {tool} 结果:\n{result}"})
|
msgs.append({"role":"user","content":f"工具 {tool} 结果:\n{result}"})
|
||||||
continue
|
continue
|
||||||
agent_reply = raw; break
|
agent_reply = raw; break
|
||||||
|
|
||||||
if not agent_reply: agent_reply = "处理超时,请简化需求。"
|
if not agent_reply: agent_reply = "处理超时,请简化需求。"
|
||||||
yield json.dumps({"type":"widget","widget":_w_card("🤖 驾驶舱 Agent",_w_text(agent_reply),"reply")},ensure_ascii=False)+chr(10)
|
d = json.dumps({"type":"widget","widget":_w_card("🤖 驾驶舱 Agent",_w_text(agent_reply),"reply")},ensure_ascii=False)+chr(10)
|
||||||
|
debug(f"AGENT_STREAM yield final: {d[:80]}")
|
||||||
|
yield d
|
||||||
|
|
||||||
await sor.C('pipeline_conversations',{'id':getID(),'role':'agent','content':agent_reply,'msg_type':'text','org_id':org_id,'created_by':'system'})
|
await sor.C('pipeline_conversations',{'id':getID(),'role':'agent','content':agent_reply,'msg_type':'text','org_id':org_id,'created_by':'system'})
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user