[PR #26415] Refactor account models to use SQLAlchemy 2.0 dataclass mapping #31429

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

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

State: closed
Merged: Yes


This commit refactors the models in api/models/account.py to use the native dataclass mapping feature introduced in SQLAlchemy 2.0. This is part of the larger refactoring effort to modernize the codebase and improve type safety.

The following changes were made:

  • All models in api/models/account.py now inherit from TypeBase, which is a dataclass-enabled base class.
  • The @reconstructor decorator in the Account model has been replaced with a __post_init__ method.
  • Default values have been added to nullable and server-defaulted fields in the models to make the dataclass constructors more flexible.
  • The instantiation of the Account and Tenant models in api/services/account_service.py and various test files has been updated to use the new __init__ signature.
  • The unit tests have been updated to reflect the changes in the model constructors.

Important

  1. Make sure you have read our contribution guidelines
  2. Ensure there is an associated issue and you have been assigned to it
  3. Use the correct syntax to link this PR: Fixes #<issue number>.

Summary

part of #23579

Screenshots

Before After
... ...

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/26415 **State:** closed **Merged:** Yes --- This commit refactors the models in `api/models/account.py` to use the native dataclass mapping feature introduced in SQLAlchemy 2.0. This is part of the larger refactoring effort to modernize the codebase and improve type safety. The following changes were made: - All models in `api/models/account.py` now inherit from `TypeBase`, which is a dataclass-enabled base class. - The `@reconstructor` decorator in the `Account` model has been replaced with a `__post_init__` method. - Default values have been added to nullable and server-defaulted fields in the models to make the dataclass constructors more flexible. - The instantiation of the `Account` and `Tenant` models in `api/services/account_service.py` and various test files has been updated to use the new `__init__` signature. - The unit tests have been updated to reflect the changes in the model constructors. > [!IMPORTANT] > > 1. Make sure you have read our [contribution guidelines](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) > 1. Ensure there is an associated issue and you have been assigned to it > 1. Use the correct syntax to link this PR: `Fixes #<issue number>`. ## Summary <!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. --> part of #23579 ## Screenshots | Before | After | |--------|-------| | ... | ... | ## 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:49:27 -05:00
yindo closed this issue 2026-02-21 20:49:27 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: langgenius/dify#31429