Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(workflow): avoid app context dependency in parallel iteration (#39983)

非法操作8f817644e9ff
diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
index e63c155cca2..e865d7ad9d0 100644
--- a/api/core/provider_manager.py
+++ b/api/core/provider_manager.py
@@ -1557,16 +1557,17 @@ class ProviderManager:
if dify_config.DEPLOYMENT_EDITION == DeploymentEdition.CLOUD:
from services.credit_pool_service import CreditPoolService
- trail_pool = CreditPoolService.get_pool(
- tenant_id=tenant_id,
- pool_type=ProviderQuotaType.TRIAL,
- session=db.session(),
- )
- paid_pool = CreditPoolService.get_pool(
- tenant_id=tenant_id,
- pool_type=ProviderQuotaType.PAID,
- session=db.session(),
- )
+ with session_factory.create_session() as session:
+ trail_pool = CreditPoolService.get_pool(
+ tenant_id=tenant_id,
+ pool_type=ProviderQuotaType.TRIAL,
+ session=session,
+ )
+ paid_pool = CreditPoolService.get_pool(
+ tenant_id=tenant_id,
+ pool_type=ProviderQuotaType.PAID,
+ session=session,
+ )
else:
trail_pool = None
paid_pool = None
diff --git a/api/tests/unit_tests/core/test_provider_manager.py b/api/tests/unit_tests/core/test_provider_manager.py
index dddddf76f10..7f8e1144c40 100644
--- a/api/tests/unit_tests/core/test_provider_manager.py
+++ b/api/tests/unit_tests/core/test_provider_manager.py
@@ -1,8 +1,10 @@
from collections.abc import Iterator
+from concurrent.futures import ThreadPoolExecutor
from types import SimpleNamespace
-from unittest.mock import MagicMock, Mock, PropertyMock, patch
+from unittest.mock import MagicMock, Mock, PropertyMock, call, patch
import pytest
+from flask import has_app_context
from sqlalchemy import Engine, event, select
from sqlalchemy.orm import Session, sessionmaker
@@ -292,6 +294,53 @@ def test_to_system_configuration_never_returns_hosting_credentials_for_package_w
assert configuration.credentials is None
+def test_to_system_configuration_uses_owned_session_for_cloud_credit_pools() -> None:
+ provider_entity = _build_plugin_provider_declaration(PluginInstallationSource.Marketplace)
+ manager = _build_provider_manager()
+ owned_session = Mock()
+ session_context = MagicMock()
+ session_context.__enter__.return_value = owned_session
+ trial_pool = SimpleNamespace(quota_used=0, quota_limit=100)
+ paid_pool = SimpleNamespace(quota_used=0, quota_limit=0)
+
+ with (
+ patch.object(provider_manager_module.dify_config, "EDITION", "CLOUD"),
+ patch(
+ "core.provider_manager.ext_hosting_provider.hosting_configuration.provider_map",
+ {provider_entity.provider: _build_hosting_provider()},
+ ),
+ patch(
+ "core.plugin.plugin_service.PluginService.is_plugin_verified",
+ return_value=True,
+ ),
+ patch.object(
+ provider_manager_module.session_factory,
+ "create_session",
+ return_value=session_context,
+ ) as create_session,
+ patch(
+ "services.credit_pool_service.CreditPoolService.get_pool",
+ side_effect=[trial_pool, paid_pool],
+ ) as get_pool,
+ ):
+ with ThreadPoolExecutor(max_workers=1) as executor:
+ assert executor.submit(has_app_context).result() is False
+ configuration = executor.submit(
+ manager._to_system_configuration,
+ "tenant-id",
+ provider_entity,
+ [_build_trial_provider_record()],
+ ).result()
+
+ assert configuration.enabled is True
+ create_session.assert_called_once_with()
+ assert get_pool.call_args_list == [
+ call(tenant_id="tenant-id", pool_type=ProviderQuotaType.TRIAL, session=owned_session),
+ call(tenant_id="tenant-id", pool_type=ProviderQuotaType.PAID, session=owned_session),
+ ]
+ session_context.__exit__.assert_called_once_with(None, None, None)
+
+
def test_to_system_configuration_preserves_marketplace_behavior() -> None:
provider_entity = _build_plugin_provider_declaration(PluginInstallationSource.Marketplace)
manager = _build_provider_manager()