From f13239560d9a6888d3bf95699ed5fc10395b50ff Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 24 二月 2025 18:57:51 +0800
Subject: [PATCH] 历史记录增加
---
app/models/v2/session_model.py | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/app/models/v2/session_model.py b/app/models/v2/session_model.py
index aa85f19..3fa4eef 100644
--- a/app/models/v2/session_model.py
+++ b/app/models/v2/session_model.py
@@ -3,11 +3,11 @@
from datetime import datetime
from sqlalchemy.orm import Session
-from typing import Optional, Type
+from typing import Optional, Type, List
from pydantic import BaseModel
from sqlalchemy import Column, String, Integer, DateTime, JSON, TEXT, Index
-from Log import logger
+# from Log import logger
from app.models.agent_model import AgentType
from app.models.base_model import Base
@@ -35,14 +35,17 @@
reference = Column(TEXT)
conversation_id = Column(String(36), index=True)
event_type = Column(String(16))
+ session_type = Column(String(16))
# to_dict 鏂规硶
def to_dict(self):
return {
- 'id': self.id,
+ 'session_id': self.id,
'name': self.name,
'agent_type': self.agent_type,
- 'agent_id': self.agent_id,
+ 'chat_id': self.agent_id,
+ 'event_type': self.event_type,
+ 'session_type': self.session_type if self.session_type else 0,
'create_date': self.create_date.strftime("%Y-%m-%d %H:%M:%S"),
'update_date': self.update_date.strftime("%Y-%m-%d %H:%M:%S"),
}
@@ -52,7 +55,7 @@
'id': self.id,
'name': self.name,
'agent_type': self.agent_type,
- 'agent_id': self.agent_id,
+ 'chat_id': self.agent_id,
'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': json.loads(self.message)
@@ -71,10 +74,12 @@
-class ChatDialogData(BaseModel):
+class ChatData(BaseModel):
sessionId: Optional[str] = ""
- question: str
- chatId: str
+
+ class Config:
+ extra = 'allow' # 鍏佽鍏朵粬鍔ㄦ�佸瓧娈�
+
class ChatSessionDao:
@@ -98,17 +103,20 @@
session = self.db.query(ChatSessionModel).filter_by(id=session_id).first()
return session
- async def update_session_by_id(self, session_id: str, session, message: dict) -> ChatSessionModel | None:
+ async def update_session_by_id(self, session_id: str, session, message: dict, conversation_id=None) -> ChatSessionModel | None:
+ # print(message)
if not session:
session = await self.get_session_by_id(session_id)
if session:
try:
+ if conversation_id:
+ session.conversation_id=conversation_id
session.add_message(message)
session.update_date = current_time()
self.db.commit()
self.db.refresh(session)
except Exception as e:
- logger.error(e)
+ # logger.error(e)
self.db.rollback()
return session
@@ -125,3 +133,15 @@
if session:
self.db.delete(session)
self.db.commit()
+
+ async def get_session_list(self, user_id: int, agent_id: str, keyword:str, page: int, page_size: int) -> any:
+ query = self.db.query(ChatSessionModel).filter(ChatSessionModel.tenant_id==user_id)
+ if agent_id:
+ query = query.filter(ChatSessionModel.agent_id==agent_id)
+ if keyword:
+ query = query.filter(ChatSessionModel.name.like('%{}%'.format(keyword)))
+ total = query.count()
+ session_list = query.order_by(ChatSessionModel.update_date.desc()).offset((page-1)*page_size).limit(page_size).all()
+ return total, session_list
+
+
--
Gitblit v1.8.0