refactor(api): use sessionmaker in provider configuration#34855
Open
carlos4s wants to merge 7 commits intolanggenius:mainfrom
Open
refactor(api): use sessionmaker in provider configuration#34855carlos4s wants to merge 7 commits intolanggenius:mainfrom
carlos4s wants to merge 7 commits intolanggenius:mainfrom
Conversation
Contributor
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-04-09 13:48:20.178655301 +0000
+++ /tmp/pyrefly_pr.txt 2026-04-09 13:48:11.661728570 +0000
@@ -3691,21 +3691,21 @@
ERROR Argument `SimpleNamespace` is not assignable to parameter `db_provider` with type `MCPToolProvider` in function `core.entities.mcp_provider.MCPProviderEntity.from_db_model` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_mcp_provider.py:59:46
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:639:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:642:12
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:862:31
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:863:31
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_provider_configuration.py:880:27
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:993:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:996:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:994:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1012:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1010:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1499:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1495:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1688:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1677:12
ERROR Object of class `ModuleType` has no attribute `MockExtension` [missing-attribute]
--> tests/unit_tests/core/extension/test_extensible.py:62:9
ERROR Cannot index into `OrderedDict[str, Unknown]` [bad-index]
|
Contributor
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-04-09 13:50:23.475136786 +0000
+++ /tmp/pyrefly_pr.txt 2026-04-09 13:50:14.897188878 +0000
@@ -3691,21 +3691,21 @@
ERROR Argument `SimpleNamespace` is not assignable to parameter `db_provider` with type `MCPToolProvider` in function `core.entities.mcp_provider.MCPProviderEntity.from_db_model` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_mcp_provider.py:59:46
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:639:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:642:12
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:862:31
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:863:31
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_provider_configuration.py:880:27
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:993:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:996:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:994:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1012:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1010:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1499:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1495:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1688:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1675:12
ERROR Object of class `ModuleType` has no attribute `MockExtension` [missing-attribute]
--> tests/unit_tests/core/extension/test_extensible.py:62:9
ERROR Cannot index into `OrderedDict[str, Unknown]` [bad-index]
|
Contributor
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-04-09 14:26:00.639504437 +0000
+++ /tmp/pyrefly_pr.txt 2026-04-09 14:25:51.748523261 +0000
@@ -3691,21 +3691,21 @@
ERROR Argument `SimpleNamespace` is not assignable to parameter `db_provider` with type `MCPToolProvider` in function `core.entities.mcp_provider.MCPProviderEntity.from_db_model` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_mcp_provider.py:59:46
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:639:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:642:12
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:862:31
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:863:31
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_provider_configuration.py:880:27
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:993:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:996:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:994:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1012:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1010:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1499:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1495:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1688:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1675:12
ERROR Object of class `ModuleType` has no attribute `MockExtension` [missing-attribute]
--> tests/unit_tests/core/extension/test_extensible.py:62:9
ERROR Cannot index into `OrderedDict[str, Unknown]` [bad-index]
|
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors ProviderConfiguration write transactions to use sessionmaker(bind=db.engine).begin() for automatic commit/rollback handling, and updates unit tests to align with the new session pattern.
Changes:
- Replace
with Session(db.engine)+ explicitcommit()/rollback()withsessionmaker(...).begin()across provider-configuration write paths. - Remove explicit
commit()/rollback()calls in refactored blocks and adjust helper behavior accordingly. - Update unit test patching/mocks and assertions to match the
sessionmaker().begin()usage.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 7 comments.
| File | Description |
|---|---|
api/core/entities/provider_configuration.py |
Migrates multiple write operations to sessionmaker(...).begin() and removes explicit commit/rollback calls. |
api/tests/unit_tests/core/entities/test_entities_provider_configuration.py |
Updates session patching and removes commit/rollback assertions to match the new transaction pattern. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
Show resolved
Hide resolved
api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
Show resolved
Hide resolved
…onfiguration' into refactor/sessionmaker-provider-configuration
auto-merge was automatically disabled
April 10, 2026 14:36
Head branch was pushed to by a user without write access
Contributor
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-04-10 14:37:55.122961840 +0000
+++ /tmp/pyrefly_pr.txt 2026-04-10 14:37:46.321071952 +0000
@@ -3711,21 +3711,21 @@
ERROR Argument `SimpleNamespace` is not assignable to parameter `db_provider` with type `MCPToolProvider` in function `core.entities.mcp_provider.MCPProviderEntity.from_db_model` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_mcp_provider.py:59:46
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:639:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:643:12
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:862:31
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:864:31
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:880:27
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:881:27
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:994:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:996:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1012:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1011:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1499:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1496:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1688:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1677:12
ERROR Object of class `ModuleType` has no attribute `MockExtension` [missing-attribute]
--> tests/unit_tests/core/extension/test_extensible.py:62:9
ERROR Cannot index into `OrderedDict[str, Unknown]` [bad-index]
|
Contributor
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-04-10 14:39:45.767636842 +0000
+++ /tmp/pyrefly_pr.txt 2026-04-10 14:39:37.029581971 +0000
@@ -3711,21 +3711,21 @@
ERROR Argument `SimpleNamespace` is not assignable to parameter `db_provider` with type `MCPToolProvider` in function `core.entities.mcp_provider.MCPProviderEntity.from_db_model` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_mcp_provider.py:59:46
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:639:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:643:12
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:862:31
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:864:31
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:880:27
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:881:27
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:994:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:996:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1012:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1011:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1499:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1496:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1688:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1675:12
ERROR Object of class `ModuleType` has no attribute `MockExtension` [missing-attribute]
--> tests/unit_tests/core/extension/test_extensible.py:62:9
ERROR Cannot index into `OrderedDict[str, Unknown]` [bad-index]
|
Contributor
Author
|
@asukaminato0721 |
Contributor
Pyrefly Diffbase → PR--- /tmp/pyrefly_base.txt 2026-04-14 18:30:39.664299536 +0000
+++ /tmp/pyrefly_pr.txt 2026-04-14 18:30:30.527348307 +0000
@@ -3904,21 +3904,21 @@
ERROR Argument `SimpleNamespace` is not assignable to parameter `db_provider` with type `MCPToolProvider` in function `core.entities.mcp_provider.MCPProviderEntity.from_db_model` [bad-argument-type]
--> tests/unit_tests/core/entities/test_entities_mcp_provider.py:59:46
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:639:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:643:12
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:862:31
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:864:31
ERROR Argument `SimpleNamespace` is not assignable to parameter `credential_record` with type `ProviderCredential | ProviderModelCredential` in function `core.entities.provider_configuration.ProviderConfiguration._update_load_balancing_configs_with_credential` [bad-argument-type]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:880:27
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:881:27
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:994:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:996:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:995:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1012:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1011:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1499:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1496:12
ERROR `None` is not subscriptable [unsupported-operation]
- --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1688:12
+ --> tests/unit_tests/core/entities/test_entities_provider_configuration.py:1675:12
ERROR Object of class `ModuleType` has no attribute `MockExtension` [missing-attribute]
--> tests/unit_tests/core/extension/test_extensible.py:62:9
ERROR Cannot index into `OrderedDict[str, Unknown]` [bad-index]
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
with Session(db.engine)+session.commit()withsessionmaker(bind=db.engine).begin()in provider_configuration (14 blocks)
session.rollback()calls —.begin()handles rollback automaticallyprovider_manager.pyskipped (all blocks read-only)This is the final PR in the series completing #24245.
All PRs in this series:
Closes #24245
Test plan
ruff checkpasses