From 08c8e8c9a4d65677de6a493446a605d70efee631 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 16:32:07 +0800
Subject: [PATCH] 12.10 16
---
app/models/group_model.py | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/app/models/group_model.py b/app/models/group_model.py
index b9c30e9..529db57 100644
--- a/app/models/group_model.py
+++ b/app/models/group_model.py
@@ -17,9 +17,9 @@
, Column('group_id', Integer, ForeignKey('group.id', ondelete='CASCADE'))
, Column('dialog_id', String(36), ForeignKey('dialogs.id', ondelete='CASCADE')))
-group_agent_table = Table('group_agent', Base.metadata
+group_agent_table = Table('group_canvas', Base.metadata
, Column('group_id', Integer, ForeignKey('group.id', ondelete='CASCADE'))
- , Column('agent_id', String(36), ForeignKey('user_canvas.id', ondelete='CASCADE')))
+ , Column('canvas_id', String(36), ForeignKey('canvas.id', ondelete='CASCADE')))
group_llm_table = Table('group_llm', Base.metadata
, Column('group_id', Integer, ForeignKey('group.id', ondelete='CASCADE'))
@@ -39,6 +39,7 @@
created_at = Column(DateTime, default=datetime.now())
updated_at = Column(DateTime, default=datetime.now(), onupdate=datetime.now())
creator = Column(Integer)
+ group_type = Column(Integer, default=1)
knowledges = relationship('KnowledgeModel',
@@ -53,18 +54,15 @@
agents = relationship('CanvasModel',
secondary=group_agent_table,
- backref=backref('groups', lazy='dynamic'),
- lazy="dynamic")
+ backref=backref('groups', lazy='dynamic'))
llms = relationship('CommonLlmModel',
secondary=group_llm_table,
- backref=backref('groups', lazy='dynamic'),
- lazy="dynamic")
+ backref=backref('groups', lazy='dynamic'))
unified_agents = relationship('UnifiedAgentModel',
secondary=group_unified_agent_table,
- backref=backref('roles', lazy='dynamic'),
- lazy="dynamic")
+ backref=backref('groups', lazy='dynamic'))
def to_dict(self):
return {
'groupId': self.id,
@@ -130,3 +128,10 @@
id: int
user_list: list
+
+class GroupResource(BaseModel):
+ id: int
+ agents: list
+ dialogs: list
+ knowledges: list
+
--
Gitblit v1.8.0