From ce9fb375be9a551b4cdc5cb78a759fbcea1eac22 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 十一月 2024 20:13:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/models/session_model.py | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/app/models/session_model.py b/app/models/session_model.py
index 21bfb7e..6aed237 100644
--- a/app/models/session_model.py
+++ b/app/models/session_model.py
@@ -1,9 +1,9 @@
import json
from datetime import datetime
from enum import IntEnum
-from sqlalchemy import Column, String, Enum as SQLAlchemyEnum, Integer, DateTime
+from sqlalchemy import Column, String, Enum as SQLAlchemyEnum, Integer, DateTime, JSON
-from app.models import AgentType
+from app.models import AgentType, current_time
from app.models.base_model import Base
@@ -13,8 +13,10 @@
name = Column(String(255))
agent_id = Column(String(255))
agent_type = Column(SQLAlchemyEnum(AgentType), nullable=False) # 鐩墠鍙瓨basic鐨勶紝ragflow鍜宐isheng鐨勮皟鎺ュ彛鑾峰彇
- create_date = Column(DateTime) # 鍒涘缓鏃堕棿
- update_date = Column(DateTime) # 鏇存柊鏃堕棿
+ create_date = Column(DateTime, default=current_time) # 鍒涘缓鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿
+ update_date = Column(DateTime, default=current_time, onupdate=current_time) # 鏇存柊鏃堕棿锛岄粯璁ゅ�间负褰撳墠鏃跺尯鏃堕棿锛屾洿鏂版椂鑷姩鏇存柊
+ tenant_id = Column(Integer) # 鍒涘缓浜�
+ message = Column(JSON) # 璇存槑
# to_dict 鏂规硶
def to_dict(self):
@@ -23,6 +25,17 @@
'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):
+ return {
+ 'id': self.id,
+ 'name': self.name,
+ 'agent_type': self.agent_type,
+ 'agent_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': self.message
}
--
Gitblit v1.8.0