From fe918ced376839c2b34676199f6d7d925f71a6a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 20 十一月 2024 17:00:13 +0800
Subject: [PATCH] fix
---
app/api/chat.py | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index ea1be48..5e6f1da 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -11,8 +11,10 @@
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()
@@ -196,6 +198,56 @@
await task
except asyncio.CancelledError:
pass
+ elif agent_type == AgentType.BASIC:
+ try:
+ while True:
+ # 鎺ユ敹鍓嶇娑堟伅
+ message = await websocket.receive_json()
+ question = message.get("message")
+ SessionService(db).create_session(
+ session_id=chat_id,
+ name=question,
+ agent_id=agent_id,
+ agent_type=AgentType.BASIC
+ )
+ if not question:
+ await websocket.send_json({"message": "Invalid request", "type": "error"})
+ continue
+
+ service = BasicService(base_url=settings.basic_base_url)
+ 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}
+ 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