From 2ab8a0e98c782a55c69a22d4b49bf294b8cfc2d9 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期一, 10 二月 2025 13:53:09 +0800
Subject: [PATCH] 报告生成代码同步完善
---
app/models/session_model.py | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/app/models/session_model.py b/app/models/session_model.py
index 11bd33a..d91a2b1 100644
--- a/app/models/session_model.py
+++ b/app/models/session_model.py
@@ -1,11 +1,17 @@
import json
from datetime import datetime
from enum import IntEnum
-from sqlalchemy import Column, String, Enum as SQLAlchemyEnum, Integer, DateTime, JSON
-from app.models import AgentType, current_time
+import pytz
+from sqlalchemy import Column, String, Enum as SQLAlchemyEnum, Integer, DateTime, JSON, TEXT
+
+from app.models.agent_model import AgentType
+# from app.models import current_time
from app.models.base_model import Base
+def current_time():
+ tz = pytz.timezone('Asia/Shanghai')
+ return datetime.now(tz)
class SessionModel(Base):
__tablename__ = "sessions"
@@ -14,9 +20,11 @@
agent_id = Column(String(255))
agent_type = Column(SQLAlchemyEnum(AgentType), nullable=False) # 鐩墠鍙瓨basic鐨勶紝ragflow鍜宐isheng鐨勮皟鎺ュ彛鑾峰彇
create_date = Column(DateTime, default=current_time) # 鍒涘缓鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿
- update_date = Column(DateTime, default=current_time, onupdate=current_time) # 鏇存柊鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿锛屾洿鏂版椂鑷姩鏇存柊
+ update_date = Column(DateTime, default=current_time, onupdate=current_time, index=True) # 鏇存柊鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿锛屾洿鏂版椂鑷姩鏇存柊
tenant_id = Column(Integer) # 鍒涘缓浜�
- message = Column(JSON) # 璇存槑
+ message = Column(TEXT) # 璇存槑
+ conversation_id = Column(String(64))
+ workflow = Column(Integer, default=0)
# to_dict 鏂规硶
def to_dict(self):
@@ -25,8 +33,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 +43,17 @@
'name': self.name,
'agent_type': self.agent_type,
'agent_id': self.agent_id,
- 'create_date': self.create_date,
- 'update_date': self.update_date,
- 'message': self.message
+ '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)
}
+
+ def add_message(self, message: dict):
+ if self.message is None:
+ self.message = '[]'
+ try:
+ msg = json.loads(self.message)
+ msg.append(message)
+ except Exception as e:
+ return
+ self.message = json.dumps(msg)
--
Gitblit v1.8.0