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 | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 11af093..9784eb9 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -220,37 +220,32 @@
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", "")
+ logger.error(agent.type)
+ if agent.type == "questionTalk":
- 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}")
+ 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:
@@ -273,7 +268,7 @@
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,
+ SessionService(db).update_session(chat_id,
message={"role": "assistant", "content": result})
except Exception as e:
logger.error(e)
@@ -286,7 +281,10 @@
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"})
+ 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")
--
Gitblit v1.8.0