From 8804c88450e4a1b6c8ab2ce1b433d073c4a9624d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 25 十一月 2024 14:58:36 +0800
Subject: [PATCH] dify test
---
app/api/chat.py | 41 ++++++++++++++++++++++++++++-------------
app/service/difyService.py | 2 +-
2 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 2a511e1..6279b64 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -313,35 +313,50 @@
conversation_id = session.conversation_id
except Exception as e:
logger.error(e)
- complete_response = ""
+ # complete_response = ""
+ answer_str = ""
async for rag_response in dify_service.chat(token, current_user.id, question, upload_file_id, conversation_id):
- logger.error("=============================================")
- logger.error(rag_response)
+ print("=============================================")
+ print(rag_response)
try:
if rag_response[:5] == "data:":
# 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
- text = rag_response[5:].strip()
+ complete_response = rag_response[5:].strip()
else:
# 鍚﹀垯锛屼繚鎸佸師鏍�
- text = rag_response
- complete_response += text
+ complete_response = rag_response
+ # complete_response += text
try:
data = json.loads(complete_response)
+ complete_response = ""
# data = json_data.get("data")
- if "answer" not in data or not isinstance(data["answer"], dict): # 淇℃伅杩囨护
- logger.error("闈炴硶鏁版嵁--------------------")
- logger.error(data)
- continue
- else: # 姝ｅ父杈撳嚭
- answer = data.get("answer", "")
+ if data.get("event") == "agent_message":# "event": "message_end"
+ if "answer" not in data or not data["answer"]: # 淇℃伅杩囨护
+ logger.error("闈炴硶鏁版嵁--------------------")
+ logger.error(data)
- result = {"message": answer, "type": "message"}
+ continue
+ else: # 姝ｅ父杈撳嚭
+ answer = data.get("answer", "")
+ if isinstance(answer, str):
+ answer_str += answer
+
+ elif isinstance(answer, dict):
+ logger.error("鏈煡鏁版嵁浣擄細0---------------------------------")
+ logger.error(answer)
+ answer_str += answer.get("action_input", "")
+ continue
+
+ elif data.get("event") == "message_end":
+ result = {"message": answer_str, "type": "close"}
try:
SessionService(db).update_session(chat_id,
message={"role": "assistant", "content": data, "conversation_id": data.get("conversation_id")})
except Exception as e:
logger.error("淇濆瓨dify鐨勪細璇濆紓甯革紒")
logger.error(e)
+ else:
+ continue
await websocket.send_json(result)
complete_response = ""
except json.JSONDecodeError as e:
diff --git a/app/service/difyService.py b/app/service/difyService.py
index 4543842..d3b4b20 100644
--- a/app/service/difyService.py
+++ b/app/service/difyService.py
@@ -81,7 +81,7 @@
"inputs": {},
"query": message,
"response_mode": "streaming",
- "conversation_id": conversation_id,
+ "conversation_id": "",
"user": str(user_id),
"files": files
}
--
Gitblit v1.8.0