From e26a7859a8900b152e10961d91fa6ad19a8deb9c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 三月 2025 14:41:27 +0800
Subject: [PATCH] 首页通用对话增加
---
app/models/group_model.py | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/app/models/group_model.py b/app/models/group_model.py
index 58d4991..281692d 100644
--- a/app/models/group_model.py
+++ b/app/models/group_model.py
@@ -6,12 +6,13 @@
from pydantic import BaseModel
from sqlalchemy.orm import relationship, backref
+from app.config.const import Dialog_STATSU_DELETE
from app.models.base_model import Base
-group_knowledge_table = Table('group_Knowledge', Base.metadata
+group_knowledge_table = Table('group_knowledge', Base.metadata
, Column('group_id', Integer, ForeignKey('group.id', ondelete='CASCADE'))
- , Column('knowledge_id', String(32), ForeignKey('knowledgebase.id', ondelete='CASCADE')))
+ , Column('knowledge_id', String(32), ForeignKey('knowledgebases.id', ondelete='CASCADE')))
group_dialog_table = Table('group_dialogs', Base.metadata
, Column('group_id', Integer, ForeignKey('group.id', ondelete='CASCADE'))
@@ -83,29 +84,29 @@
def to_json(self):
json = {
- 'roleId': self.id,
+ 'groupId': self.id,
'createTime': self.created_at.strftime('%Y-%m-%d %H:%M:%S'),
'updateTime': self.updated_at.strftime('%Y-%m-%d %H:%M:%S'),
'groupName': self.group_name,
- 'remark': self.group_description,
+ 'description': self.group_description,
'status': self.status,
}
- if len(self.knowledges.all()) > 0:
- json['knowledges'] = [knowledge.to_json() for knowledge in self.knowledges]
+ # if len(self.knowledges.all()) > 0:
+ json['knowledges'] = [knowledge.to_json() for knowledge in self.knowledges]
- if len(self.dialogs.all()) > 0:
- json['dialogs'] = [dialog.to_json() for dialog in self.dialogs]
+ # if len(self.dialogs.all()) > 0:
+ json['dialogs'] = [dialog.to_json() for dialog in self.dialogs if dialog.status != Dialog_STATSU_DELETE]
# if len(self.agents.all()) > 0:
# json['agents'] = [agent.to_json() for agent in self.agents]
- if len(self.llms.all()) > 0:
- json['llms'] = [llm.to_json() for llm in self.llms]
+ # if len(self.llms.all()) > 0:
+ json['llms'] = [llm.to_json() for llm in self.llms]
json['users'] = [user.to_dict() for user in self.users]
- if hasattr(self, 'flag'):
- json['flag'] = self.flag
+ # if hasattr(self, 'flag'):
+ # json['flag'] = self.flag
return json
--
Gitblit v1.8.0