From c795d4b39ce86ad9b502044d96df9392c0c7dca7 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 25 十一月 2024 17:39:56 +0800
Subject: [PATCH] ragflow和bisheng的会话时间统一
---
app/api/chat.py | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 4359eab..9f2ea44 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -297,7 +297,7 @@
conversation_id = ""
receive_message = await websocket.receive_json()
print(f"Received from client {chat_id}: {receive_message}")
- upload_file_id = receive_message.get('upload_file_id', [])
+ upload_file_id = receive_message.get('upload_file_id', "")
question = receive_message.get('message', "")
if not question and not image_url:
await websocket.send_json({"message": "Invalid request", "type": "error"})
@@ -313,30 +313,53 @@
conversation_id = session.conversation_id
except Exception as e:
logger.error(e)
- complete_response = ""
- async for rag_response in dify_service.chat(token, chat_id, question, upload_file_id, conversation_id):
+ # complete_response = ""
+ answer_str = ""
+ async for rag_response in dify_service.chat(token, current_user.id, question, upload_file_id, conversation_id):
+ # 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: # 淇℃伅杩囨护
- 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", "")
+
+ result = {"message": answer_str, "type": "message"}
+ 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)
+ elif data.get("event") == "message_file":
+ url = data.get("url", "")
+ result = {"message": url, "type": "image"}
+ else:
+ continue
await websocket.send_json(result)
complete_response = ""
except json.JSONDecodeError as e:
@@ -346,12 +369,7 @@
result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
await websocket.send_json(result)
print(f"Error process message of ragflow: {e2}")
- try:
- dialog_chat_history = await ragflow_service.get_session_history(token, chat_id, 1)
- await update_session_history(db, dialog_chat_history, current_user.id)
- except Exception as e:
- logger.error(e)
- logger.error("-----------------淇濆瓨ragflow鐨勫巻鍙蹭細璇濆紓甯�-----------------")
+
# 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
--
Gitblit v1.8.0