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/models/session_model.py | 8 ++++----
app/api/chat.py | 30 ++++++++++++++++++++++--------
app/api/__init__.py | 2 +-
3 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/app/api/__init__.py b/app/api/__init__.py
index 33175b2..09538a7 100644
--- a/app/api/__init__.py
+++ b/app/api/__init__.py
@@ -11,7 +11,7 @@
from starlette.websockets import WebSocket, WebSocketDisconnect
from Log import logger
-from app.models.app_model import AppRegisterModel
+# from app.models.app_model import AppRegisterModel
from app.models.user_model import UserModel
from app.service.auth import SECRET_KEY, ALGORITHM
from app.config.config import settings
diff --git a/app/api/chat.py b/app/api/chat.py
index 60d2fb8..11af093 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -5,6 +5,8 @@
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
@@ -205,13 +207,16 @@
# 鎺ユ敹鍓嶇娑堟伅
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,
- user_id=current_user.id
- )
+ 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
@@ -233,7 +238,11 @@
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}
- SessionService(db).update_session(session_id=chat_id, is_incr=1, message={"role":"assistant", "content": result})
+ 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}")
@@ -263,6 +272,11 @@
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}")
diff --git a/app/models/session_model.py b/app/models/session_model.py
index 11bd33a..6aed237 100644
--- a/app/models/session_model.py
+++ b/app/models/session_model.py
@@ -25,8 +25,8 @@
'name': self.name,
'agent_type': self.agent_type,
'agent_id': self.agent_id,
- 'create_date': self.create_date,
- 'update_date': self.update_date,
+ 'create_date': self.create_date.strftime("%Y-%m-%d %H:%M:%S"),
+ 'update_date': self.update_date.strftime("%Y-%m-%d %H:%M:%S"),
}
def log_to_json(self):
@@ -35,7 +35,7 @@
'name': self.name,
'agent_type': self.agent_type,
'agent_id': self.agent_id,
- 'create_date': self.create_date,
- 'update_date': self.update_date,
+ 'create_date': self.create_date.strftime("%Y-%m-%d %H:%M:%S"),
+ 'update_date': self.update_date.strftime("%Y-%m-%d %H:%M:%S"),
'message': self.message
}
--
Gitblit v1.8.0