From 9ea07e00fc8b92e9b75849859c1ecce77c7096d1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 10 四月 2025 13:31:23 +0800
Subject: [PATCH] 优化
---
app/models/v2/chat.py | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/app/models/v2/chat.py b/app/models/v2/chat.py
index 7aed562..1ee30d2 100644
--- a/app/models/v2/chat.py
+++ b/app/models/v2/chat.py
@@ -6,7 +6,7 @@
from sqlalchemy import Column, Integer, String, BigInteger, ForeignKey, DateTime, Text, TEXT
from sqlalchemy.orm import Session
-from app.config.const import Dialog_STATSU_DELETE
+from app.config.const import Dialog_STATSU_DELETE, Dialog_STATSU_ON, complex_knowledge_chat, complex_knowledge_chat_deep
from app.models.base_model import Base
from app.utils.common import current_time
@@ -138,7 +138,7 @@
return [i.id for i in session_list]
async def get_complex_chat_by_mode(self, chat_mode: int) -> ComplexChatModel | None:
- session = self.db.query(ComplexChatModel).filter(ComplexChatModel.chat_mode==chat_mode, ComplexChatModel.status!=Dialog_STATSU_DELETE).first()
+ session = self.db.query(ComplexChatModel).filter(ComplexChatModel.chat_mode==chat_mode, ComplexChatModel.status==Dialog_STATSU_ON).first()
return session
@@ -177,24 +177,32 @@
}
def log_to_json(self):
+ query = {}
+ if self.query:
+ query = json.loads(self.query)
if self.message_type == 1:
return {
'id': self.id,
'role': "user",
'content': self.content,
+ 'files': query.get("files", []),
}
else:
- query = {}
- if self.query:
- query = json.loads(self.query)
- return {
+
+ res = {
'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")
+ "parentId": query.get("parentId"),
+ "isDeep": query.get("isDeep", 1),
+ "mindmap": True if self.mindmap else False,
}
+ if self.chat_mode == complex_knowledge_chat or self.chat_mode == complex_knowledge_chat_deep:
+ res['reference'] = json.loads(self.node_data) if self.node_data else {}
+ else:
+ res['node_list'] = json.loads(self.node_data) if self.node_data else []
+ return res
class ComplexChatSessionDao:
--
Gitblit v1.8.0