[PR #24789] fix(api): fix DetachedInstanceError for Account.current_tenant_id #30791

Closed
opened 2026-02-21 20:48:14 -05:00 by yindo · 0 comments
Owner

Original Pull Request: https://github.com/langgenius/dify/pull/24789

State: closed
Merged: Yes


Summary

Closes #24706
Close https://github.com/langgenius/dify/pull/24722

The Account._current_tenant object is loaded by a database session (typically db.session) whose lifetime is not aligned
with the Account model instance. This misalignment causes a DetachedInstanceError to be raised when accessing
attributes of Account._current_tenant after the original session has been closed.

To resolve this issue, we now reload the tenant object with expire_on_commit=False, ensuring the tenant remains
accessible even after the session is closed.

Screenshots

Before After
image image

Checklist

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods
**Original Pull Request:** https://github.com/langgenius/dify/pull/24789 **State:** closed **Merged:** Yes --- ## Summary Closes #24706 Close https://github.com/langgenius/dify/pull/24722 The `Account._current_tenant` object is loaded by a database session (typically `db.session`) whose lifetime is not aligned with the Account model instance. This misalignment causes a `DetachedInstanceError` to be raised when accessing attributes of `Account._current_tenant` after the original session has been closed. To resolve this issue, we now reload the tenant object with `expire_on_commit=False`, ensuring the tenant remains accessible even after the session is closed. ## Screenshots | Before | After | |--------|-------| | <img width="458" height="601" alt="image" src="https://github.com/user-attachments/assets/f0ae633f-28a6-4022-9046-1e68d23557ec" /> | <img width="458" height="330" alt="image" src="https://github.com/user-attachments/assets/d70fe4e4-cc49-4e68-a5ea-0025e39cdf87" /> | ## Checklist - [ ] This change requires a documentation update, included: [Dify Document](https://github.com/langgenius/dify-docs) - [x] I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!) - [x] I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change. - [x] I've updated the documentation accordingly. - [x] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods
yindo added the pull-request label 2026-02-21 20:48:14 -05:00
yindo closed this issue 2026-02-21 20:48:14 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: langgenius/dify#30791