AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 21:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: update database query and model definitions (#14415)

Browse Source
This commit is contained in:
Yeuoly 2025-02-26 18:45:12 +08:00 committed by GitHub
parent 90bc51ed2e
commit 9a417bfc5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/controllers/service_api/wraps.py
View File

@ -154,7 +154,7 @@ def validate_dataset_token(view=None):
) # TODO: only owner information is required, so only one is returned. ) # TODO: only owner information is required, so only one is returned.
if tenant_account_join: if tenant_account_join:
tenant, ta = tenant_account_join tenant, ta = tenant_account_join
account = Account.query.filter_by(id=ta.account_id).first() account = db.session.query(Account).filter(Account.id == ta.account_id).first()
# Login admin # Login admin
if account: if account:
account.current_tenant = tenant account.current_tenant = tenant

12
api/models/model.py
View File

@ -604,7 +604,7 @@ class InstalledApp(Base):
return tenant return tenant
class Conversation(Base): class Conversation(db.Model): # type: ignore[name-defined]
__tablename__ = "conversations" __tablename__ = "conversations"
__table_args__ = ( __table_args__ = (
db.PrimaryKeyConstraint("id", name="conversation_pkey"), db.PrimaryKeyConstraint("id", name="conversation_pkey"),
@ -839,7 +839,7 @@ class Conversation(Base):
return self.override_model_configs is not None return self.override_model_configs is not None
class Message(Base): class Message(db.Model): # type: ignore[name-defined]
__tablename__ = "messages" __tablename__ = "messages"
__table_args__ = ( __table_args__ = (
PrimaryKeyConstraint("id", name="message_pkey"), PrimaryKeyConstraint("id", name="message_pkey"),
@ -1190,7 +1190,7 @@ class Message(Base):
) )
class MessageFeedback(Base): class MessageFeedback(db.Model): # type: ignore[name-defined]
__tablename__ = "message_feedbacks" __tablename__ = "message_feedbacks"
__table_args__ = ( __table_args__ = (
db.PrimaryKeyConstraint("id", name="message_feedback_pkey"), db.PrimaryKeyConstraint("id", name="message_feedback_pkey"),
@ -1217,7 +1217,7 @@ class MessageFeedback(Base):
return account return account
class MessageFile(Base): class MessageFile(db.Model): # type: ignore[name-defined]
__tablename__ = "message_files" __tablename__ = "message_files"
__table_args__ = ( __table_args__ = (
db.PrimaryKeyConstraint("id", name="message_file_pkey"), db.PrimaryKeyConstraint("id", name="message_file_pkey"),
@ -1258,7 +1258,7 @@ class MessageFile(Base):
created_at: Mapped[datetime] = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp()) created_at: Mapped[datetime] = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
class MessageAnnotation(Base): class MessageAnnotation(db.Model): # type: ignore[name-defined]
__tablename__ = "message_annotations" __tablename__ = "message_annotations"
__table_args__ = ( __table_args__ = (
db.PrimaryKeyConstraint("id", name="message_annotation_pkey"), db.PrimaryKeyConstraint("id", name="message_annotation_pkey"),
@ -1327,7 +1327,7 @@ class AppAnnotationHitHistory(db.Model): # type: ignore[name-defined]
return account return account
class AppAnnotationSetting(Base): class AppAnnotationSetting(db.Model): # type: ignore[name-defined]
__tablename__ = "app_annotation_settings" __tablename__ = "app_annotation_settings"
__table_args__ = ( __table_args__ = (
db.PrimaryKeyConstraint("id", name="app_annotation_settings_pkey"), db.PrimaryKeyConstraint("id", name="app_annotation_settings_pkey"),