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 | 137 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 127 insertions(+), 10 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index e4a439d..9f2ea44 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -14,6 +14,7 @@
from app.models.user_model import UserModel
from app.service.dialog import update_session_history
from app.service.basic import BasicService
+from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from app.service.service_token import get_bisheng_token, get_ragflow_token
from app.service.session import SessionService
@@ -49,7 +50,6 @@
try:
async def forward_to_ragflow():
while True:
- is_new = False
message = await websocket.receive_json()
print(f"Received from client {chat_id}: {message}")
chat_history = message.get('chatHistory', [])
@@ -57,7 +57,6 @@
if len(chat_history) == 0:
chat_history = await ragflow_service.get_session_history(token, chat_id)
if len(chat_history) == 0:
- is_new = True
chat_history = await ragflow_service.set_session(token, agent_id,
message, chat_id, True)
# print("chat_history------------------------", chat_history)
@@ -103,8 +102,12 @@
result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
await websocket.send_json(result)
print(f"Error process message of ragflow: {e2}")
- dialog_chat_history = await ragflow_service.get_session_history(token, chat_id, 1)
- await update_session_history(db, dialog_chat_history, current_user.id, is_new)
+ 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 = [
@@ -231,14 +234,14 @@
excel_url = None
if file_name:
excel_url = f"/api/files/download/?agent_id=basic_question_talk&file_id={file_name}&file_type=word"
- result = {"message": output, "type": "message", "file_url": excel_url}
+ result = {"message": output, "type": "message", "file_url": excel_url, "file_name":file_name}
try:
SessionService(db).update_session(chat_id,
message={"role": "assistant", "content": result})
except Exception as e:
logger.error(e)
logger.error("-----------------杩斿洖鏁版嵁--------------------")
- await websocket.send_json(result | data)
+ await websocket.send_json(result)
except Exception as e2:
result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
@@ -259,10 +262,19 @@
f"&file_type={file_type}")
excel_url = build_file_url(excel_name, 'excel')
image_url = build_file_url(image_name, 'image')
- try:
- SessionService(db).update_session(chat_id, message={"content": output, "role": "assistant"})
- except Exception as e:
- logger.error(f"Unexpected error when update_session: {e}")
+ if excel_url or data.get("e", ""):
+ try:
+ SessionService(db).update_session(chat_id,
+ message={
+ "content": output,
+ "excel_url": excel_url,
+ "image_url": image_url,
+ "sql": data.get("sql", ""),
+ "code": data.get("code", ""),
+ "e": data.get("e", ""),
+ "role": "assistant"})
+ except Exception as e:
+ logger.error(f"Unexpected error when update_session: {e}")
# 鍙戦�佺粨鏋滅粰瀹㈡埛绔�
data["type"] = "message"
data["message"] = output
@@ -275,6 +287,111 @@
finally:
await websocket.close()
print(f"Client {agent_id} disconnected")
+ if agent_type == AgentType.DIFY:
+ dify_service = DifyService(settings.dify_base_url)
+ # token = get_dify_token(db, current_user.id)
+ token = settings.dify_api_token
+ try:
+ async def forward_to_dify():
+ while True:
+ 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', "")
+ question = receive_message.get('message', "")
+ if not question and not image_url:
+ await websocket.send_json({"message": "Invalid request", "type": "error"})
+ continue
+ try:
+ session = SessionService(db).create_session(
+ chat_id,
+ question,
+ agent_id,
+ AgentType.DIFY,
+ current_user.id
+ )
+ conversation_id = session.conversation_id
+ except Exception as e:
+ logger.error(e)
+ # 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涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
+ complete_response = rag_response[5:].strip()
+ else:
+ # 鍚﹀垯锛屼繚鎸佸師鏍�
+ complete_response = rag_response
+ # complete_response += text
+ try:
+ data = json.loads(complete_response)
+ complete_response = ""
+ # data = json_data.get("data")
+ if data.get("event") == "agent_message":# "event": "message_end"
+ if "answer" not in data or not data["answer"]: # 淇℃伅杩囨护
+ logger.error("闈炴硶鏁版嵁--------------------")
+ # logger.error(data)
+
+ 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:
+ print(f"Error decoding JSON: {e}")
+ # print(f"Response text: {text}")
+ except Exception as e2:
+ result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
+ await websocket.send_json(result)
+ print(f"Error process message of ragflow: {e2}")
+
+
+ # 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
+ tasks = [
+ asyncio.create_task(forward_to_dify())
+ ]
+ await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
+ except WebSocketDisconnect as e1:
+ print(f"Client {chat_id} disconnected: {e1}")
+ await websocket.close()
+ except Exception as e:
+ print(f"Exception occurred: {e}")
+
+ finally:
+ print("Cleaning up resources of ragflow")
+ # 鍙栨秷鎵�鏈変换鍔�
+ for task in tasks:
+ if not task.done():
+ task.cancel()
+ try:
+ await task
+ except asyncio.CancelledError:
+ pass
else:
ret = {"message": "Agent not found", "type": "close"}
await websocket.send_json(ret)
--
Gitblit v1.8.0