From 0ad20a631808fcc255a8739d0ea27bfe044f4ea0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 十一月 2024 17:07:31 +0800
Subject: [PATCH] 请求basic_agent换成requests库，保存消息是不再保存中间结果
---
app/api/report.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app/api/report.py b/app/api/report.py
index 22c9bf6..f8d32fa 100644
--- a/app/api/report.py
+++ b/app/api/report.py
@@ -10,7 +10,7 @@
from app.models.base_model import get_db
from app.models.user_model import UserModel
from app.service.bisheng import BishengService
-from app.service.token import get_bisheng_token
+from app.service.service_token import get_bisheng_token
router = APIRouter()
@@ -65,18 +65,21 @@
files = data.get("files", [])
steps = data.get("intermediate_steps", "")
msg = data.get("message", "")
+ category = data.get("category", "")
- if len(files) != 0 or (steps and last_message == "step") or msg or data["type"] == "close":
+ if len(files) != 0 or (msg and category != "answer") or data["type"] == "close":
if data["type"] == "close":
t = "close"
else:
t = "stream"
process_files(files, agent_id)
- result = {"step_message": steps, "message": msg, "type": t, "files": files}
+ result = {"message": msg, "type": t, "files": files}
await websocket.send_json(result)
- print(f"Forwarded to client, {chat_id}: {result}")
+ elif steps and last_message == "step":
+ result = {"step_message": steps, "type": "stream", "files": files}
+ await websocket.send_json(result)
- last_message = "step" if steps else "message"
+ last_message = "message" if msg else "step"
# 鍚姩涓や釜浠诲姟锛屽垎鍒鐞嗗鎴风鍜屾湇鍔＄鐨勬秷鎭�
tasks = [
@@ -90,7 +93,8 @@
task.cancel()
try:
await task
- except asyncio.CancelledError:
+ except asyncio.CancelledError as e:
+ print(f"asyncio CancelledError: {e}")
pass
except WebSocketDisconnect as e:
--
Gitblit v1.8.0