opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-08 11:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: migrate MessageAnnotation to TypeBase (#34807)

Browse Source
This commit is contained in:
sxxtony 2026-04-12 23:22:43 -07:00 committed by GitHub
parent 29bfa33d59
commit 98e74c8fde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/models/model.py
View File

@ -1078,7 +1078,7 @@ class Conversation(Base):
messages = db.relationship("Message", backref="conversation", lazy="select", passive_deletes="all") messages = db.relationship("Message", backref="conversation", lazy="select", passive_deletes="all")
message_annotations = db.relationship( message_annotations = db.relationship(
"MessageAnnotation", backref="conversation", lazy="select", passive_deletes="all" lambda: MessageAnnotation, backref="conversation", lazy="select", passive_deletes="all"
) )
is_deleted: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("false")) is_deleted: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("false"))
@ -1837,7 +1837,7 @@ class MessageFile(TypeBase):
) )
class MessageAnnotation(Base): class MessageAnnotation(TypeBase):
__tablename__ = "message_annotations" __tablename__ = "message_annotations"
__table_args__ = ( __table_args__ = (
sa.PrimaryKeyConstraint("id", name="message_annotation_pkey"), sa.PrimaryKeyConstraint("id", name="message_annotation_pkey"),
@ -1846,17 +1846,25 @@ class MessageAnnotation(Base):
sa.Index("message_annotation_message_idx", "message_id"), sa.Index("message_annotation_message_idx", "message_id"),
) )
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4())) id: Mapped[str] = mapped_column(
StringUUID, insert_default=lambda: str(uuid4()), default_factory=lambda: str(uuid4()), init=False
)
app_id: Mapped[str] = mapped_column(StringUUID) app_id: Mapped[str] = mapped_column(StringUUID)
conversation_id: Mapped[str | None] = mapped_column(StringUUID, sa.ForeignKey("conversations.id"))
message_id: Mapped[str | None] = mapped_column(StringUUID)
question: Mapped[str] = mapped_column(LongText, nullable=False) question: Mapped[str] = mapped_column(LongText, nullable=False)
content: Mapped[str] = mapped_column(LongText, nullable=False) content: Mapped[str] = mapped_column(LongText, nullable=False)
hit_count: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=sa.text("0"))
account_id: Mapped[str] = mapped_column(StringUUID, nullable=False) account_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
created_at: Mapped[datetime] = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp()) conversation_id: Mapped[str | None] = mapped_column(StringUUID, sa.ForeignKey("conversations.id"), default=None)
message_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
hit_count: Mapped[int] = mapped_column(sa.Integer, nullable=False, server_default=sa.text("0"), default=0)
created_at: Mapped[datetime] = mapped_column(
sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
)
updated_at: Mapped[datetime] = mapped_column( updated_at: Mapped[datetime] = mapped_column(
sa.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp() sa.DateTime,
nullable=False,
server_default=func.current_timestamp(),
onupdate=func.current_timestamp(),
init=False,
) )
@property @property