From 30ff0afd5d76a3a5aa48058210ae411253574ada Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 13 三月 2025 14:55:30 +0800
Subject: [PATCH] 增加文件多轮问答
---
app/models/v2/chat.py | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/app/models/v2/chat.py b/app/models/v2/chat.py
index 1240c85..7aed562 100644
--- a/app/models/v2/chat.py
+++ b/app/models/v2/chat.py
@@ -23,9 +23,11 @@
class ChatDataRequest(BaseModel):
sessionId: str
+ parentId: Optional[str] = ""
query: str
chatMode: Optional[int] = 1 # 1= 鏅�氬璇濓紝2=鑱旂綉锛�3=鐭ヨ瘑搴�,4=娣卞害
isDeep: Optional[int] = 1 # 1= 鏅��, 2=娣卞害
+ optimizeType: Optional[str] = "" # 浼樺寲绫诲瀷锛氭鼎鑹诧紝鎵╁啓锛岀缉鍐欙紝璋冩暣璇皵锛岃嚜瀹氫箟
knowledgeId: Optional[list] = []
files: Optional[list] = []
@@ -37,6 +39,9 @@
"chatMode": self.chatMode,
"knowledgeId": self.knowledgeId,
"files": self.files,
+ "isDeep": self.isDeep,
+ "optimizeType": self.optimizeType,
+ "parentId": self.parentId,
}
@@ -172,15 +177,24 @@
}
def log_to_json(self):
- return {
- 'id': self.id,
- 'name': self.name,
- 'agent_type': self.agent_type,
- '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)
- }
+ if self.message_type == 1:
+ return {
+ 'id': self.id,
+ 'role': "user",
+ 'content': self.content,
+ }
+ else:
+ query = {}
+ if self.query:
+ query = json.loads(self.query)
+ return {
+ 'id': self.id,
+ 'role': "assistant",
+ 'answer': self.content,
+ 'chat_mode': self.chat_mode,
+ 'node_list': json.loads(self.node_data) if self.node_data else [],
+ "parentId": query.get("parentId")
+ }
class ComplexChatSessionDao:
@@ -237,12 +251,11 @@
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(ComplexChatSessionModel).filter(ComplexChatSessionModel.tenant_id==user_id)
- if agent_id:
- query = query.filter(ComplexChatSessionModel.agent_id==agent_id)
+ async def get_session_list(self, session_id: int, keyword:str="", page: int=1, page_size: int=100) -> any:
+ query = self.db.query(ComplexChatSessionModel).filter(ComplexChatSessionModel.session_id==session_id)
+
if keyword:
- query = query.filter(ComplexChatSessionModel.name.like('%{}%'.format(keyword)))
+ query = query.filter(ComplexChatSessionModel.content.like('%{}%'.format(keyword)))
total = query.count()
- session_list = query.order_by(ComplexChatSessionModel.update_date.desc()).offset((page-1)*page_size).limit(page_size).all()
+ session_list = query.order_by(ComplexChatSessionModel.create_date.desc()).offset((page-1)*page_size).limit(page_size).all()
return total, session_list
\ No newline at end of file
--
Gitblit v1.8.0