refactor: use EnumText for TenantCreditPool.pool_type#33959
refactor: use EnumText for TenantCreditPool.pool_type#33959asukaminato0721 merged 1 commit intolanggenius:mainfrom
Conversation
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request refactors the Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here. Footnotes
|
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-03-23 14:01:09.550545707 +0000
+++ /tmp/pyrefly_pr.txt 2026-03-23 14:01:00.312569163 +0000
@@ -1135,9 +1135,9 @@
ERROR Argument `Literal['owner']` is not assignable to parameter `role` with type `SQLCoreOperations[TenantAccountRole] | TenantAccountRole` in function `models.account.TenantAccountJoin.__init__` [bad-argument-type]
--> tests/test_containers_integration_tests/services/test_conversation_service.py:43:18
ERROR Object of class `NoneType` has no attribute `quota_used` [missing-attribute]
- --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:89:16
+ --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:90:16
ERROR Object of class `NoneType` has no attribute `quota_used` [missing-attribute]
- --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:103:16
+ --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:104:16
ERROR Argument `Literal['active']` is not assignable to parameter `status` with type `AccountStatus | SQLCoreOperations[AccountStatus]` in function `models.account.Account.__init__` [bad-argument-type]
--> tests/test_containers_integration_tests/services/test_dataset_permission_service.py:37:20
ERROR Argument `Literal['normal']` is not assignable to parameter `status` with type `SQLCoreOperations[TenantStatus] | TenantStatus` in function `models.account.Tenant.__init__` [bad-argument-type]
|
There was a problem hiding this comment.
Code Review
This pull request refactors the TenantCreditPool.pool_type to use EnumText with the ProviderQuotaType enum, which is a good improvement for type safety and data integrity. The changes in the model, services, and callers are consistent with this refactoring. I have one suggestion to improve a test assertion to make it more robust and aligned with the new enum usage.
api/tests/test_containers_integration_tests/services/test_credit_pool_service.py
Outdated
Show resolved
Hide resolved
fb2f1c1 to
033ac9b
Compare
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-03-23 14:28:09.397653709 +0000
+++ /tmp/pyrefly_pr.txt 2026-03-23 14:27:59.223518316 +0000
@@ -1135,9 +1135,9 @@
ERROR Argument `Literal['owner']` is not assignable to parameter `role` with type `SQLCoreOperations[TenantAccountRole] | TenantAccountRole` in function `models.account.TenantAccountJoin.__init__` [bad-argument-type]
--> tests/test_containers_integration_tests/services/test_conversation_service.py:43:18
ERROR Object of class `NoneType` has no attribute `quota_used` [missing-attribute]
- --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:89:16
+ --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:90:16
ERROR Object of class `NoneType` has no attribute `quota_used` [missing-attribute]
- --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:103:16
+ --> tests/test_containers_integration_tests/services/test_credit_pool_service.py:104:16
ERROR Argument `Literal['active']` is not assignable to parameter `status` with type `AccountStatus | SQLCoreOperations[AccountStatus]` in function `models.account.Account.__init__` [bad-argument-type]
--> tests/test_containers_integration_tests/services/test_dataset_permission_service.py:37:20
ERROR Argument `Literal['normal']` is not assignable to parameter `status` with type `SQLCoreOperations[TenantStatus] | TenantStatus` in function `models.account.Tenant.__init__` [bad-argument-type]
|
|
@asukaminato0721 Thanks for all merging. |
Summary
sa.StringwithEnumText(ProviderQuotaType)forTenantCreditPool.pool_typepool_type=ProviderQuotaType.TRIAL.valuewithpool_type=ProviderQuotaType.TRIAL(remove redundant.value)Continues #33294 (model domain — pool_type)
Details
TenantCreditPool.pool_typeString(40)EnumText(ProviderQuotaType)Note: Service method signatures (
get_pool,check_and_deduct_credits) keeppool_type: strbecause multiple copies ofProviderQuotaTypeexist across the codebase (models.enums,models.provider,core.entities.provider_entities). Callers pass different copies — consolidating these is a separate effort.Test plan
basedpyrightpasses (0 errors on changed files)