From 4eb8d55ec0a664678895132256c97cc63a80be2b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 21 十一月 2024 19:56:49 +0800
Subject: [PATCH] 写入记录问题
---
app/api/chat.py | 167 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 149 insertions(+), 18 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 1e9218c..9784eb9 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -5,13 +5,18 @@
import asyncio
import websockets
from sqlalchemy.orm import Session
+
+from Log import logger
from app.api import get_current_user_websocket
from app.config.config import settings
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.basic import BasicService
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
+from app.service.session import SessionService
router = APIRouter()
@@ -23,6 +28,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")
@@ -38,11 +44,12 @@
return
if agent_type == AgentType.RAGFLOW:
- ragflow_service = RagflowService(settings.ragflow_base_url)
+ ragflow_service = RagflowService(settings.fwr_base_url)
token = get_ragflow_token(db, current_user.id)
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 +57,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,46 +72,65 @@
"doc_ids": message.get("doc_ids", []),
"role": "user"
})
+ complete_response = ""
async for rag_response in ragflow_service.chat(token, chat_id, chat_history):
try:
- print(f"Received from ragflow: {rag_response}")
if rag_response[:5] == "data:":
# 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
text = rag_response[5:].strip()
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"}
elif data is None: # 鍙戠敓閿欒
answer = json_data.get("retmsg", json_data.get("retcode"))
- result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "stream"}
+ result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "message"}
else: # 姝ｅ父杈撳嚭
answer = data.get("answer", "")
- result = {"message": answer, "type": "stream"}
- except json.JSONDecodeError:
- result = {"message": text, "type": "stream"}
+ reference = data.get("reference", {})
+ result = {"message": answer, "type": "message", "reference": reference}
+ 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"Forwarded to client {chat_id}: {result}")
- except Exception as e:
- result = {"message": f"鍐呴儴閿欒锛� {e}", "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)
- service_uri = f"{settings.bisheng_websocket_url}/api/v1/assistant/chat/{agent_id}?t=&chat_id={chat_id}"
+ service_uri = f"{settings.sgb_websocket_url}/api/v1/assistant/chat/{agent_id}?t=&chat_id={chat_id}"
headers = {'cookie': f"access_token_cookie={token};"}
async with websockets.connect(service_uri, extra_headers=headers) as service_websocket:
@@ -155,8 +183,111 @@
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
+ elif agent_type == AgentType.BASIC:
+ try:
+ service = BasicService(base_url=settings.basic_base_url)
+ while True:
+ # 鎺ユ敹鍓嶇娑堟伅
+ message = await websocket.receive_json()
+ question = message.get("message")
+ try:
+ SessionService(db).create_session(
+ session_id=chat_id,
+ name=question,
+ agent_id=agent_id,
+ agent_type=AgentType.BASIC,
+ user_id=current_user.id
+ )
+ except Exception as e:
+ logger.error(e)
+ if not question:
+ await websocket.send_json({"message": "Invalid request", "type": "error"})
+ continue
+ logger.error(agent.type)
+ if agent.type == "questionTalk":
+
+ try:
+ data = await service.questions_talk(question, chat_id)
+ output = data.get("output", "")
+ file_name = data.get("filename", "")
+
+ 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}
+ try:
+ SessionService(db).update_session(chat_id,
+ message={"role": "assistant", "content": result})
+ except Exception as e:
+ logger.error(e)
+ logger.error("-----------------11111111--------------------")
+ await websocket.send_json(result | data)
+ except Exception as e2:
+
+ result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
+ logger.error(str(e2))
+ logger.error(f"Error process message of basic chuti agent: {e2}")
+ await websocket.send_json(result)
+
+ else:
+ async for result in service.excel_talk(question, chat_id):
+ try:
+ if result[:5] == "data:":
+ # 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
+ text = result[5:].strip()
+ else:
+ # 鍚﹀垯锛屼繚鎸佸師鏍�
+ text = result
+ try:
+ data = json.loads(text)
+ output = data.get("output", "")
+ excel_name = data.get("excel_name", "")
+ image_name = data.get("image_name", "")
+ excel_url = None
+ image_url = None
+ if excel_name:
+ excel_url = f"/api/files/download/?agent_id=basic_excel_talk&file_id={excel_name}&file_type=excel"
+ if image_name:
+ image_url = f"/api/files/download/?agent_id=basic_excel_talk&file_id={image_name}&file_type=image"
+ result = {"message": output, "type": "message", "excel_url": excel_url, "image_url": image_url}
+ try:
+ SessionService(db).update_session(chat_id,
+ message={"role": "assistant", "content": result})
+ except Exception as e:
+ logger.error(e)
+ await websocket.send_json(result | data)
+ 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 basic agent: {e2}")
+ except Exception as e:
+ logger.error("----------------------------------------------fffffff")
+ logger.error(e)
+ print(e)
+ await websocket.send_json({"message": "鍑虹幇閿欒锛�", "type": "error"})
+ finally:
+ await websocket.close()
+ print(f"Client {agent_id} disconnected")
else:
ret = {"message": "Agent not found", "type": "close"}
await websocket.send_json(ret)
--
Gitblit v1.8.0