merge

zhaoqingang

2025-02-25 ac9373fd6f0db53c983d87c4790cb627e82759e9

 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'))
@@ -94,7 +95,7 @@
        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]
        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]