From 36a51dca8bc4036ead11eafde870ce02aed2c5d4 Mon Sep 17 00:00:00 2001 From: hjlarry Date: Tue, 26 May 2026 09:30:17 +0800 Subject: [PATCH] chore: backend feature api exclude_vector_space --- api/controllers/console/workspace/members.py | 50 ++++++++++++++++++- .../console/workspace/workspace.py | 4 +- api/controllers/console/wraps.py | 21 +++++--- api/controllers/service_api/wraps.py | 14 ++++-- api/controllers/web/site.py | 4 +- api/core/provider_manager.py | 4 +- api/libs/workspace_permission.py | 2 +- api/schedule/clean_unused_datasets_task.py | 2 +- .../mail_clean_document_notify_task.py | 2 +- api/services/annotation_service.py | 2 +- api/services/dataset_service.py | 6 +-- api/services/document_indexing_proxy/base.py | 2 +- .../human_input_delivery_test_service.py | 2 +- .../rag_pipeline/rag_pipeline_task_proxy.py | 2 +- api/services/workspace_service.py | 2 +- api/tasks/mail_human_input_delivery_task.py | 2 +- .../controllers/console/test_wraps.py | 30 ++++++++++- .../console/workspace/test_workspace.py | 4 +- .../controllers/service_api/test_wraps.py | 28 +++++++++++ .../libs/test_workspace_permission.py | 2 +- .../services/test_batch_indexing_base.py | 2 +- .../test_document_indexing_task_proxy.py | 2 +- ..._duplicate_document_indexing_task_proxy.py | 2 +- .../services/test_rag_pipeline_task_proxy.py | 2 +- 24 files changed, 154 insertions(+), 39 deletions(-) diff --git a/api/controllers/console/workspace/members.py b/api/controllers/console/workspace/members.py index 910e07e14d..962b90e50d 100644 --- a/api/controllers/console/workspace/members.py +++ b/api/controllers/console/workspace/members.py @@ -76,7 +76,55 @@ register_response_schema_models(console_ns, SimpleResultDataResponse, Verificati def _is_role_enabled(role: TenantAccountRole | str, tenant_id: str) -> bool: if role != TenantAccountRole.DATASET_OPERATOR: return True - return FeatureService.get_features(tenant_id=tenant_id).dataset_operator_enabled + return FeatureService.get_features(tenant_id=tenant_id, exclude_vector_space=True).dataset_operator_enabled + + +def _normalize_invitee_emails(emails: list[str]) -> list[str]: + return list(dict.fromkeys(email.lower() for email in emails)) + + +def _count_new_member_invites(tenant_id: str, emails: list[str]) -> int: + new_member_count = 0 + for email in emails: + account = AccountService.get_account_by_email_with_case_fallback(email) + if not account: + new_member_count += 1 + continue + + exists = db.session.scalar( + select(TenantAccountJoin.id) + .where(TenantAccountJoin.tenant_id == tenant_id, TenantAccountJoin.account_id == account.id) + .limit(1) + ) + if not exists: + new_member_count += 1 + + return new_member_count + + +def _count_current_members(tenant_id: str) -> int: + return ( + db.session.scalar(select(func.count(TenantAccountJoin.id)).where(TenantAccountJoin.tenant_id == tenant_id)) or 0 + ) + + +def _check_member_invite_limits(tenant_id: str, new_member_count: int) -> None: + if new_member_count <= 0: + return + + features = FeatureService.get_features(tenant_id=tenant_id, exclude_vector_space=True) + + if dify_config.ENTERPRISE_ENABLED: + workspace_members = features.workspace_members + if workspace_members.enabled is True and not workspace_members.is_available(new_member_count): + raise WorkspaceMembersLimitExceeded() + return + + if dify_config.BILLING_ENABLED and features.billing.enabled is True: + members = features.members + current_member_count = _count_current_members(tenant_id) + if 0 < members.limit < current_member_count + new_member_count: + raise WorkspaceMembersLimitExceeded() @console_ns.route("/workspaces/current/members") diff --git a/api/controllers/console/workspace/workspace.py b/api/controllers/console/workspace/workspace.py index 77501eed72..57a37f20f1 100644 --- a/api/controllers/console/workspace/workspace.py +++ b/api/controllers/console/workspace/workspace.py @@ -166,10 +166,10 @@ class TenantListApi(Resource): if tenant_plan: plan = tenant_plan["plan"] or CloudPlan.SANDBOX else: - features = FeatureService.get_features(tenant.id) + features = FeatureService.get_features(tenant.id, exclude_vector_space=True) plan = features.billing.subscription.plan or CloudPlan.SANDBOX elif not is_enterprise_only: - features = FeatureService.get_features(tenant.id) + features = FeatureService.get_features(tenant.id, exclude_vector_space=True) plan = features.billing.subscription.plan or CloudPlan.SANDBOX # Create a dictionary with tenant attributes diff --git a/api/controllers/console/wraps.py b/api/controllers/console/wraps.py index ef2931ce9b..ecb66b00e5 100644 --- a/api/controllers/console/wraps.py +++ b/api/controllers/console/wraps.py @@ -96,21 +96,26 @@ def cloud_edition_billing_resource_check[**P, R](resource: str) -> Callable[[Cal @wraps(view) def decorated(*args: P.args, **kwargs: P.kwargs): _, current_tenant_id = current_account_with_tenant() - features = FeatureService.get_features(current_tenant_id) + features = FeatureService.get_features( + current_tenant_id, + exclude_vector_space=resource != "vector_space", + ) if features.billing.enabled: members = features.members apps = features.apps - vector_space = features.vector_space documents_upload_quota = features.documents_upload_quota annotation_quota_limit = features.annotation_quota_limit if resource == "members" and 0 < members.limit <= members.size: abort(403, "The number of members has reached the limit of your subscription.") elif resource == "apps" and 0 < apps.limit <= apps.size: abort(403, "The number of apps has reached the limit of your subscription.") - elif resource == "vector_space" and 0 < vector_space.limit <= vector_space.size: - abort( - 403, "The capacity of the knowledge storage space has reached the limit of your subscription." - ) + elif resource == "vector_space": + vector_space = features.vector_space + if 0 < vector_space.limit <= vector_space.size: + abort( + 403, + "The capacity of the knowledge storage space has reached the limit of your subscription.", + ) elif resource == "documents" and 0 < documents_upload_quota.limit <= documents_upload_quota.size: # The api of file upload is used in the multiple places, # so we need to check the source of the request from datasets @@ -140,7 +145,7 @@ def cloud_edition_billing_knowledge_limit_check[**P, R]( @wraps(view) def decorated(*args: P.args, **kwargs: P.kwargs): _, current_tenant_id = current_account_with_tenant() - features = FeatureService.get_features(current_tenant_id) + features = FeatureService.get_features(current_tenant_id, exclude_vector_space=True) if features.billing.enabled: if resource == "add_segment": if features.billing.subscription.plan == CloudPlan.SANDBOX: @@ -295,7 +300,7 @@ def knowledge_pipeline_publish_enabled[**P, R](view: Callable[P, R]) -> Callable @wraps(view) def decorated(*args: P.args, **kwargs: P.kwargs): _, current_tenant_id = current_account_with_tenant() - features = FeatureService.get_features(current_tenant_id) + features = FeatureService.get_features(current_tenant_id, exclude_vector_space=True) if features.knowledge_pipeline.publish_enabled: return view(*args, **kwargs) abort(403) diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py index b9389ccc47..f8e32b3af6 100644 --- a/api/controllers/service_api/wraps.py +++ b/api/controllers/service_api/wraps.py @@ -140,20 +140,24 @@ def cloud_edition_billing_resource_check[**P, R]( def interceptor(view: Callable[P, R]): def decorated(*args: P.args, **kwargs: P.kwargs): api_token = validate_and_get_api_token(api_token_type) - features = FeatureService.get_features(api_token.tenant_id) + features = FeatureService.get_features( + api_token.tenant_id, + exclude_vector_space=resource != "vector_space", + ) if features.billing.enabled: members = features.members apps = features.apps - vector_space = features.vector_space documents_upload_quota = features.documents_upload_quota if resource == "members" and 0 < members.limit <= members.size: raise Forbidden("The number of members has reached the limit of your subscription.") elif resource == "apps" and 0 < apps.limit <= apps.size: raise Forbidden("The number of apps has reached the limit of your subscription.") - elif resource == "vector_space" and 0 < vector_space.limit <= vector_space.size: - raise Forbidden("The capacity of the vector space has reached the limit of your subscription.") + elif resource == "vector_space": + vector_space = features.vector_space + if 0 < vector_space.limit <= vector_space.size: + raise Forbidden("The capacity of the vector space has reached the limit of your subscription.") elif resource == "documents" and 0 < documents_upload_quota.limit <= documents_upload_quota.size: raise Forbidden("The number of documents has reached the limit of your subscription.") else: @@ -174,7 +178,7 @@ def cloud_edition_billing_knowledge_limit_check[**P, R]( @wraps(view) def decorated(*args: P.args, **kwargs: P.kwargs): api_token = validate_and_get_api_token(api_token_type) - features = FeatureService.get_features(api_token.tenant_id) + features = FeatureService.get_features(api_token.tenant_id, exclude_vector_space=True) if features.billing.enabled: if resource == "add_segment": if features.billing.subscription.plan == CloudPlan.SANDBOX: diff --git a/api/controllers/web/site.py b/api/controllers/web/site.py index 7d2080dd91..bd21632b05 100644 --- a/api/controllers/web/site.py +++ b/api/controllers/web/site.py @@ -81,7 +81,7 @@ class AppSiteApi(WebApiResource): if app_model.tenant.status == TenantStatus.ARCHIVE: raise Forbidden() - can_replace_logo = FeatureService.get_features(app_model.tenant_id).can_replace_logo + can_replace_logo = FeatureService.get_features(app_model.tenant_id, exclude_vector_space=True).can_replace_logo return AppSiteInfo(app_model.tenant, app_model, site, end_user.id, can_replace_logo) @@ -119,6 +119,6 @@ def serialize_site(site: Site) -> dict[str, Any]: def serialize_app_site_payload(app_model: App, site: Site, end_user_id: str | None) -> dict[str, Any]: - can_replace_logo = FeatureService.get_features(app_model.tenant_id).can_replace_logo + can_replace_logo = FeatureService.get_features(app_model.tenant_id, exclude_vector_space=True).can_replace_logo app_site_info = AppSiteInfo(app_model.tenant, app_model, site, end_user_id, can_replace_logo) return cast(dict[str, Any], marshal(app_site_info, AppSiteApi.app_fields)) diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py index 9faa70a0b8..0ba668a5e8 100644 --- a/api/core/provider_manager.py +++ b/api/core/provider_manager.py @@ -534,7 +534,9 @@ class ProviderManager: cache_key = f"tenant:{tenant_id}:model_load_balancing_enabled" cache_result = redis_client.get(cache_key) if cache_result is None: - model_load_balancing_enabled = FeatureService.get_features(tenant_id).model_load_balancing_enabled + model_load_balancing_enabled = FeatureService.get_features( + tenant_id, exclude_vector_space=True + ).model_load_balancing_enabled redis_client.setex(cache_key, 120, str(model_load_balancing_enabled)) else: cache_result = cache_result.decode("utf-8") diff --git a/api/libs/workspace_permission.py b/api/libs/workspace_permission.py index dd42a7facf..435b07dd6e 100644 --- a/api/libs/workspace_permission.py +++ b/api/libs/workspace_permission.py @@ -58,7 +58,7 @@ def check_workspace_owner_transfer_permission(workspace_id: str) -> None: Raises: Forbidden: If either billing plan or workspace policy prohibits ownership transfer """ - features = FeatureService.get_features(workspace_id) + features = FeatureService.get_features(workspace_id, exclude_vector_space=True) if not features.is_allow_transfer_workspace: raise Forbidden("Your current plan does not allow workspace ownership transfer") diff --git a/api/schedule/clean_unused_datasets_task.py b/api/schedule/clean_unused_datasets_task.py index 0b0fc1b229..849274311a 100644 --- a/api/schedule/clean_unused_datasets_task.py +++ b/api/schedule/clean_unused_datasets_task.py @@ -112,7 +112,7 @@ def clean_unused_datasets_task(): features_cache_key = f"features:{dataset.tenant_id}" plan_cache = redis_client.get(features_cache_key) if plan_cache is None: - features = FeatureService.get_features(dataset.tenant_id) + features = FeatureService.get_features(dataset.tenant_id, exclude_vector_space=True) redis_client.setex(features_cache_key, 600, features.billing.subscription.plan) plan = features.billing.subscription.plan else: diff --git a/api/schedule/mail_clean_document_notify_task.py b/api/schedule/mail_clean_document_notify_task.py index 2cc0192a4a..1a76a4aa30 100644 --- a/api/schedule/mail_clean_document_notify_task.py +++ b/api/schedule/mail_clean_document_notify_task.py @@ -45,7 +45,7 @@ def mail_clean_document_notify_task(): dataset_auto_disable_logs_map[dataset_auto_disable_log.tenant_id].append(dataset_auto_disable_log) url = f"{dify_config.CONSOLE_WEB_URL}/datasets" for tenant_id, tenant_dataset_auto_disable_logs in dataset_auto_disable_logs_map.items(): - features = FeatureService.get_features(tenant_id) + features = FeatureService.get_features(tenant_id, exclude_vector_space=True) plan = features.billing.subscription.plan if plan != CloudPlan.SANDBOX: knowledge_details = [] diff --git a/api/services/annotation_service.py b/api/services/annotation_service.py index aa6b8ffc6e..e1762c686f 100644 --- a/api/services/annotation_service.py +++ b/api/services/annotation_service.py @@ -521,7 +521,7 @@ class AppAnnotationService: ) # Check annotation quota limit - features = FeatureService.get_features(current_tenant_id) + features = FeatureService.get_features(current_tenant_id, exclude_vector_space=True) if features.billing.enabled: annotation_quota_limit = features.annotation_quota_limit if annotation_quota_limit.limit < len(result) + annotation_quota_limit.size: diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py index ea8896a5aa..c5b17d9461 100644 --- a/api/services/dataset_service.py +++ b/api/services/dataset_service.py @@ -1295,7 +1295,7 @@ class DatasetService: def get_dataset_auto_disable_logs(dataset_id: str) -> AutoDisableLogsDict: assert isinstance(current_user, Account) assert current_user.current_tenant_id is not None - features = FeatureService.get_features(current_user.current_tenant_id) + features = FeatureService.get_features(current_user.current_tenant_id, exclude_vector_space=True) if not features.billing.enabled or features.billing.subscription.plan == CloudPlan.SANDBOX: return { "document_ids": [], @@ -1977,7 +1977,7 @@ class DocumentService: assert isinstance(current_user, Account) assert current_user.current_tenant_id is not None - features = FeatureService.get_features(current_user.current_tenant_id) + features = FeatureService.get_features(current_user.current_tenant_id, exclude_vector_space=True) if features.billing.enabled: if not knowledge_config.original_document_id: @@ -2768,7 +2768,7 @@ class DocumentService: assert current_user.current_tenant_id is not None assert knowledge_config.data_source - features = FeatureService.get_features(current_user.current_tenant_id) + features = FeatureService.get_features(current_user.current_tenant_id, exclude_vector_space=True) if features.billing.enabled: count = 0 diff --git a/api/services/document_indexing_proxy/base.py b/api/services/document_indexing_proxy/base.py index 56e47857c9..02df6752f3 100644 --- a/api/services/document_indexing_proxy/base.py +++ b/api/services/document_indexing_proxy/base.py @@ -41,7 +41,7 @@ class DocumentTaskProxyBase(ABC): @cached_property def features(self): - return FeatureService.get_features(self._tenant_id) + return FeatureService.get_features(self._tenant_id, exclude_vector_space=True) @abstractmethod def _send_to_direct_queue(self, task_func: Callable[..., Any]): diff --git a/api/services/human_input_delivery_test_service.py b/api/services/human_input_delivery_test_service.py index 8b4983e5f7..c266d4f958 100644 --- a/api/services/human_input_delivery_test_service.py +++ b/api/services/human_input_delivery_test_service.py @@ -136,7 +136,7 @@ class EmailDeliveryTestHandler: ) -> DeliveryTestResult: if not isinstance(method, EmailDeliveryMethod): raise DeliveryTestUnsupportedError("Delivery method does not support test send.") - features = FeatureService.get_features(context.tenant_id) + features = FeatureService.get_features(context.tenant_id, exclude_vector_space=True) if not features.human_input_email_delivery_enabled: raise DeliveryTestError("Email delivery is not available for current plan.") if not mail.is_inited(): diff --git a/api/services/rag_pipeline/rag_pipeline_task_proxy.py b/api/services/rag_pipeline/rag_pipeline_task_proxy.py index 1a7b104a70..52ebbce65a 100644 --- a/api/services/rag_pipeline/rag_pipeline_task_proxy.py +++ b/api/services/rag_pipeline/rag_pipeline_task_proxy.py @@ -29,7 +29,7 @@ class RagPipelineTaskProxy: @cached_property def features(self): - return FeatureService.get_features(self._dataset_tenant_id) + return FeatureService.get_features(self._dataset_tenant_id, exclude_vector_space=True) def _upload_invoke_entities(self) -> str: text = [item.model_dump() for item in self._rag_pipeline_invoke_entities] diff --git a/api/services/workspace_service.py b/api/services/workspace_service.py index eb4671cfaa..70114a83f0 100644 --- a/api/services/workspace_service.py +++ b/api/services/workspace_service.py @@ -33,7 +33,7 @@ class WorkspaceService: assert tenant_account_join is not None, "TenantAccountJoin not found" tenant_info["role"] = tenant_account_join.role - feature = FeatureService.get_features(tenant.id) + feature = FeatureService.get_features(tenant.id, exclude_vector_space=True) can_replace_logo = feature.can_replace_logo if can_replace_logo and TenantService.has_roles(tenant, [TenantAccountRole.OWNER, TenantAccountRole.ADMIN]): diff --git a/api/tasks/mail_human_input_delivery_task.py b/api/tasks/mail_human_input_delivery_task.py index 2a60be7762..8ed50071df 100644 --- a/api/tasks/mail_human_input_delivery_task.py +++ b/api/tasks/mail_human_input_delivery_task.py @@ -157,7 +157,7 @@ def dispatch_human_input_email_task(form_id: str, node_title: str | None = None, if form is None: logger.warning("Human input form not found, form_id=%s", form_id) return - features = FeatureService.get_features(form.tenant_id) + features = FeatureService.get_features(form.tenant_id, exclude_vector_space=True) if not features.human_input_email_delivery_enabled: logger.info( "Human input email delivery is not available for tenant=%s, form_id=%s", diff --git a/api/tests/unit_tests/controllers/console/test_wraps.py b/api/tests/unit_tests/controllers/console/test_wraps.py index aa4973851a..1e525d6e7d 100644 --- a/api/tests/unit_tests/controllers/console/test_wraps.py +++ b/api/tests/unit_tests/controllers/console/test_wraps.py @@ -166,11 +166,39 @@ class TestBillingResourceLimits: with patch( "controllers.console.wraps.current_account_with_tenant", return_value=(MockUser("test_user"), "tenant123") ): - with patch("controllers.console.wraps.FeatureService.get_features", return_value=mock_features): + with patch( + "controllers.console.wraps.FeatureService.get_features", return_value=mock_features + ) as get_features: result = add_member() # Assert assert result == "member_added" + get_features.assert_called_once_with("tenant123", exclude_vector_space=True) + + def test_should_load_vector_space_for_vector_space_limit(self): + """Test vector-space limit checks keep vector-space in feature payload.""" + # Arrange + mock_features = MagicMock() + mock_features.billing.enabled = True + mock_features.vector_space.limit = 10 + mock_features.vector_space.size = 5 + + @cloud_edition_billing_resource_check("vector_space") + def add_segment(): + return "segment_added" + + # Act + with patch( + "controllers.console.wraps.current_account_with_tenant", return_value=(MockUser("test_user"), "tenant123") + ): + with patch( + "controllers.console.wraps.FeatureService.get_features", return_value=mock_features + ) as get_features: + result = add_segment() + + # Assert + assert result == "segment_added" + get_features.assert_called_once_with("tenant123", exclude_vector_space=False) def test_should_reject_when_over_resource_limit(self): """Test that requests are rejected when over resource limits""" diff --git a/api/tests/unit_tests/controllers/console/workspace/test_workspace.py b/api/tests/unit_tests/controllers/console/workspace/test_workspace.py index 0ee1877630..95c69d30c2 100644 --- a/api/tests/unit_tests/controllers/console/workspace/test_workspace.py +++ b/api/tests/unit_tests/controllers/console/workspace/test_workspace.py @@ -139,7 +139,7 @@ class TestTenantListApi: assert result["workspaces"][0]["plan"] == CloudPlan.TEAM assert result["workspaces"][1]["plan"] == CloudPlan.PROFESSIONAL get_plan_bulk_mock.assert_called_once_with(["t1", "t2"]) - get_features_mock.assert_called_once_with("t2") + get_features_mock.assert_called_once_with("t2", exclude_vector_space=True) def test_get_saas_path_falls_back_to_legacy_feature_path_on_bulk_error(self, app: Flask): """Test fallback to FeatureService when bulk billing returns empty result. @@ -235,7 +235,7 @@ class TestTenantListApi: assert status == 200 assert result["workspaces"][0]["plan"] == CloudPlan.SANDBOX - get_features_mock.assert_called_once_with("t1") + get_features_mock.assert_called_once_with("t1", exclude_vector_space=True) def test_get_enterprise_only_skips_feature_service(self, app: Flask): api = TenantListApi() diff --git a/api/tests/unit_tests/controllers/service_api/test_wraps.py b/api/tests/unit_tests/controllers/service_api/test_wraps.py index 6e8d971c0d..ff3b09f091 100644 --- a/api/tests/unit_tests/controllers/service_api/test_wraps.py +++ b/api/tests/unit_tests/controllers/service_api/test_wraps.py @@ -265,6 +265,34 @@ class TestCloudEditionBillingResourceCheck: # Assert assert result == "member_added" + mock_get_features.assert_called_once_with("tenant123", exclude_vector_space=True) + + @patch("controllers.service_api.wraps.validate_and_get_api_token") + @patch("controllers.service_api.wraps.FeatureService.get_features") + def test_loads_vector_space_when_checking_vector_space_limit( + self, mock_get_features, mock_validate_token, app: Flask + ): + """Test vector-space resource checks keep vector-space in feature payload.""" + # Arrange + mock_validate_token.return_value = Mock(tenant_id="tenant123") + + mock_features = Mock() + mock_features.billing.enabled = True + mock_features.vector_space.limit = 10 + mock_features.vector_space.size = 5 + mock_get_features.return_value = mock_features + + @cloud_edition_billing_resource_check("vector_space", "dataset") + def add_segment(): + return "segment_added" + + # Act + with app.test_request_context("/", method="GET"): + result = add_segment() + + # Assert + assert result == "segment_added" + mock_get_features.assert_called_once_with("tenant123", exclude_vector_space=False) @patch("controllers.service_api.wraps.validate_and_get_api_token") @patch("controllers.service_api.wraps.FeatureService.get_features") diff --git a/api/tests/unit_tests/libs/test_workspace_permission.py b/api/tests/unit_tests/libs/test_workspace_permission.py index 89586ccf26..48d9b351a4 100644 --- a/api/tests/unit_tests/libs/test_workspace_permission.py +++ b/api/tests/unit_tests/libs/test_workspace_permission.py @@ -36,7 +36,7 @@ class TestWorkspacePermissionHelper: # Should not raise check_workspace_owner_transfer_permission("test-workspace-id") - mock_feature_service.get_features.assert_called_once_with("test-workspace-id") + mock_feature_service.get_features.assert_called_once_with("test-workspace-id", exclude_vector_space=True) @patch("libs.workspace_permission.EnterpriseService") @patch("libs.workspace_permission.dify_config") diff --git a/api/tests/unit_tests/services/test_batch_indexing_base.py b/api/tests/unit_tests/services/test_batch_indexing_base.py index bd68b67d89..8d07fc3050 100644 --- a/api/tests/unit_tests/services/test_batch_indexing_base.py +++ b/api/tests/unit_tests/services/test_batch_indexing_base.py @@ -344,7 +344,7 @@ class TestDispatchRouting: proxy._dispatch() # Assert - mock_features.assert_called_once_with(TENANT_ID) + mock_features.assert_called_once_with(TENANT_ID, exclude_vector_space=True) class TestBaseRouterHelpers: diff --git a/api/tests/unit_tests/services/test_document_indexing_task_proxy.py b/api/tests/unit_tests/services/test_document_indexing_task_proxy.py index 98c30c3722..28de9efa57 100644 --- a/api/tests/unit_tests/services/test_document_indexing_task_proxy.py +++ b/api/tests/unit_tests/services/test_document_indexing_task_proxy.py @@ -75,7 +75,7 @@ class TestDocumentIndexingTaskProxy: assert features1 == mock_features assert features2 == mock_features assert features1 is features2 # Should be the same instance due to caching - mock_feature_service.get_features.assert_called_once_with("tenant-123") + mock_feature_service.get_features.assert_called_once_with("tenant-123", exclude_vector_space=True) @patch("services.document_indexing_proxy.document_indexing_task_proxy.normal_document_indexing_task") def test_send_to_direct_queue(self, mock_task): diff --git a/api/tests/unit_tests/services/test_duplicate_document_indexing_task_proxy.py b/api/tests/unit_tests/services/test_duplicate_document_indexing_task_proxy.py index 68bafe3d5e..20358d6a0c 100644 --- a/api/tests/unit_tests/services/test_duplicate_document_indexing_task_proxy.py +++ b/api/tests/unit_tests/services/test_duplicate_document_indexing_task_proxy.py @@ -94,7 +94,7 @@ class TestDuplicateDocumentIndexingTaskProxy: assert features1 == mock_features assert features2 == mock_features assert features1 is features2 # Should be the same instance due to caching - mock_feature_service.get_features.assert_called_once_with("tenant-123") + mock_feature_service.get_features.assert_called_once_with("tenant-123", exclude_vector_space=True) @patch( "services.document_indexing_proxy.duplicate_document_indexing_task_proxy.normal_duplicate_document_indexing_task" diff --git a/api/tests/unit_tests/services/test_rag_pipeline_task_proxy.py b/api/tests/unit_tests/services/test_rag_pipeline_task_proxy.py index f5a48b1416..cfc685e4cb 100644 --- a/api/tests/unit_tests/services/test_rag_pipeline_task_proxy.py +++ b/api/tests/unit_tests/services/test_rag_pipeline_task_proxy.py @@ -144,7 +144,7 @@ class TestRagPipelineTaskProxy: assert features1 == mock_features assert features2 == mock_features assert features1 is features2 # Should be the same instance due to caching - mock_feature_service.get_features.assert_called_once_with("tenant-123") + mock_feature_service.get_features.assert_called_once_with("tenant-123", exclude_vector_space=True) @patch("services.rag_pipeline.rag_pipeline_task_proxy.FileService") @patch("services.rag_pipeline.rag_pipeline_task_proxy.db")