From 28f41fceef54144cf87eaedd18d09a5a8b9cd5e1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 27 十一月 2024 09:40:58 +0800
Subject: [PATCH] dify 多次对话问题
---
app/api/report.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/api/report.py b/app/api/report.py
index 232c4b0..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,16 +65,19 @@
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 = "message" if msg else "step"
@@ -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