fix(api): fix DetachedInstanceError for Account.current_tenant_id
#24789
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
QuantumGhost
force-pushed
the
fix/detached-instance
branch
from
16cf3fe to
44c3887
Compare
…t_tenant_id 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.
QuantumGhost
force-pushed
the
fix/detached-instance
branch
from
44c3887 to
d80868e
Compare
laipz8200
previously approved these changes
Aug 29, 2025
laipz8200
previously approved these changes
Aug 29, 2025
dosubot
bot
added
the
size:L
QuantumGhost
force-pushed
the
fix/detached-instance
branch
from
8032c3e to
eec9a02
Compare
dosubot
bot
added
size:M
5 tasks
laipz8200
approved these changes
Aug 29, 2025
Cluas
pushed a commit
to Cluas/dify
that referenced
this pull request
Sep 1, 2025
…anggenius#24789) 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.
6 tasks
This was referenced Sep 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Closes #24706
Close #24722
The
Account._current_tenantobject is loaded by a database session (typicallydb.session) whose lifetime is not alignedwith the Account model instance. This misalignment causes a
DetachedInstanceErrorto be raised when accessingattributes of
Account._current_tenantafter the original session has been closed.To resolve this issue, we now reload the tenant object with
expire_on_commit=False, ensuring the tenant remainsaccessible even after the session is closed.
Screenshots
Checklist
dev/reformat(backend) andcd web && npx lint-staged(frontend) to appease the lint gods