From 1b417d75a8e24e5ec9fd29e9b75ee53049f3b79e Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 17:13:14 +0800
Subject: [PATCH] 跨域问题
---
app/api/chat.py | 67 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 7bb7d8a..ea1be48 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -10,8 +10,9 @@
from app.models.agent_model import AgentModel, AgentType
from app.models.base_model import get_db
from app.models.user_model import UserModel
+from app.service.dialog import update_session_history
from app.service.ragflow import RagflowService
-from app.service.token import get_bisheng_token, get_ragflow_token
+from app.service.service_token import get_bisheng_token, get_ragflow_token
router = APIRouter()
@@ -23,6 +24,7 @@
chat_id: str,
current_user: UserModel = Depends(get_current_user_websocket),
db: Session = Depends(get_db)):
+ tasks = []
await websocket.accept()
print(f"Client {agent_id} connected")
@@ -43,6 +45,7 @@
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', [])
@@ -50,8 +53,10 @@
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)
if len(chat_history) == 0:
result = {"message": "鍐呴儴閿欒锛氬垱寤轰細璇濆け璐�", "type": "close"}
await websocket.send_json(result)
@@ -63,6 +68,7 @@
"doc_ids": message.get("doc_ids", []),
"role": "user"
})
+ complete_response = ""
async for rag_response in ragflow_service.chat(token, chat_id, chat_history):
try:
if rag_response[:5] == "data:":
@@ -71,8 +77,9 @@
else:
# 鍚﹀垯锛屼繚鎸佸師鏍�
text = rag_response
+ complete_response += text
try:
- json_data = json.loads(text)
+ json_data = json.loads(complete_response)
data = json_data.get("data")
if data is True: # 瀹屾垚杈撳嚭
result = {"message": "", "type": "close"}
@@ -81,24 +88,41 @@
result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "message"}
else: # 姝ｅ父杈撳嚭
answer = data.get("answer", "")
- result = {"message": answer, "type": "message"}
+ reference = data.get("reference", {})
+ result = {"message": answer, "type": "message", "reference": reference}
await websocket.send_json(result)
- except json.JSONDecodeError:
- print(f"Error decode ragflow response: {text}")
- pass
-
- except Exception as e:
- result = {"message": f"鍐呴儴閿欒锛� {e}", "type": "close"}
+ 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: {e}")
+ 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)
# 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
asyncio.create_task(forward_to_ragflow())
]
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
- except WebSocketDisconnect:
- print(f"Client {chat_id} disconnected")
+ 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
elif agent_type == AgentType.BISHENG:
token = get_bisheng_token(db, current_user.id)
@@ -155,8 +179,23 @@
except asyncio.CancelledError:
pass
- except WebSocketDisconnect:
- print(f"Client {chat_id} disconnected")
+ except WebSocketDisconnect as e:
+ print(f"WebSocket connection closed with code {e.code}: {e.reason}")
+ await websocket.close()
+ await service_websocket.close()
+ except Exception as e:
+ print(f"Exception occurred: {e}")
+
+ finally:
+ print("Cleaning up resources of bisheng")
+ # 鍙栨秷鎵�鏈変换鍔�
+ 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