From 88d47a7ba689114a58c07d0d80318ff22ca67711 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 十一月 2024 16:28:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/chat.py | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index fe86fb5..11af093 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.service_token import get_bisheng_token, get_ragflow_token
+from app.service.session import SessionService
router = APIRouter()
@@ -44,6 +49,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', [])
@@ -51,9 +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)
+ # print("chat_history------------------------", chat_history)
if len(chat_history) == 0:
result = {"message": "鍐呴儴閿欒锛氬垱寤轰細璇濆け璐�", "type": "close"}
await websocket.send_json(result)
@@ -91,11 +98,14 @@
complete_response = ""
except json.JSONDecodeError as e:
print(f"Error decoding JSON: {e}")
- print(f"Response text: {text}")
+ # 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}")
+ 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())
@@ -190,6 +200,96 @@
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
+ if agent.agent_type == "questionTalk":
+ async for result in service.questions_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", "")
+ 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(session_id=chat_id, is_incr=1,
+ 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}")
+ 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(session_id=chat_id, is_incr=1,
+ 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:
+ await websocket.send_json({"message": str(e), "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