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(api): hide the Agent Knowledge Base tool when KnowledgeFS is disabled (#45315)

Stephen Zhou24da932967e9
diff --git a/api/extensions/ext_application_services.py b/api/extensions/ext_application_services.py
index 5ff3b4dfa94..8bedb8fc91c 100644
--- a/api/extensions/ext_application_services.py
+++ b/api/extensions/ext_application_services.py
@@ -160,6 +160,7 @@ from services.init_validation_service import InitValidationService
from services.inner_mail_service import InnerMailService
from services.knowledge.api_key_service import DatasetApiKeyService
from services.knowledge_fs.builtin_tool.knowledge_fs.knowledge_fs import KnowledgeFSProvider
+from services.knowledge_fs.feature_service import get_knowledge_fs_features
from services.knowledge_fs.workflow_runtime import build_knowledge_fs_node_dependencies
from services.message_feedback_service import MessageFeedbackService
from services.message_file_preview_service import MessageFilePreviewService
@@ -876,7 +877,9 @@ def init_app(app: Flask) -> None:
from extensions.ext_login import bind_account_loader
app.extensions["knowledge_fs_node_dependencies"] = build_knowledge_fs_node_dependencies
- ToolManager.register_hardcoded_provider_class(KnowledgeFSProvider)
+ # The Agent Knowledge Base tool cannot run without KnowledgeFS, so keep it out of tool lists when disabled.
+ if get_knowledge_fs_features().enabled:
+ ToolManager.register_hardcoded_provider_class(KnowledgeFSProvider)
ToolManager.configure_credential_resolver(resolve_tool_credentials)
services = build_application_services(
database_client=get_session_maker(),
diff --git a/api/tests/unit_tests/extensions/test_ext_application_services.py b/api/tests/unit_tests/extensions/test_ext_application_services.py
index 7e07f078a88..51c60a08f96 100644
--- a/api/tests/unit_tests/extensions/test_ext_application_services.py
+++ b/api/tests/unit_tests/extensions/test_ext_application_services.py
@@ -141,6 +141,8 @@ from services.knowledge.indexing.adapters.estimate import IndexingEstimateAdapte
from services.knowledge.indexing.adapters.sources import NotionSourceResolver
from services.knowledge.indexing.estimate import IndexingEstimateApplicationService
from services.knowledge.segments.application import DatasetSegmentApplicationService
+from services.knowledge_fs.builtin_tool.knowledge_fs.knowledge_fs import KnowledgeFSProvider
+from services.knowledge_fs.feature_service import KnowledgeFSFeatures
from services.message_file_preview_service import MessageFilePreviewService
from services.network_access_group_gateway import (
BillingNetworkAccessGroupEntitlementGateway,
@@ -282,6 +284,28 @@ def test_init_app_registers_services_for_the_current_app(
assert creators._oauth is services.oauth_server
[email protected]("enabled", [True, False])
+def test_init_app_registers_knowledge_fs_tool_only_when_knowledge_fs_is_enabled(
+ monkeypatch: pytest.MonkeyPatch,
+ sqlite_session_factory: sessionmaker[Session],
+ enabled: bool,
+) -> None:
+ app = Flask(__name__)
+ monkeypatch.setattr(ext_application_services, "get_session_maker", lambda: sqlite_session_factory)
+ monkeypatch.setattr(
+ ext_application_services,
+ "get_knowledge_fs_features",
+ lambda: KnowledgeFSFeatures(enabled=enabled, upload_enabled=False, agent_enabled=False),
+ )
+ monkeypatch.setattr(ext_application_services.ToolManager, "_external_hardcoded_provider_classes", [])
+ apply_config_overrides(monkeypatch, DEPLOYMENT_EDITION=DeploymentEdition.COMMUNITY, INIT_PASSWORD="")
+
+ ext_application_services.init_app(app)
+
+ registered = ext_application_services.ToolManager._external_hardcoded_provider_classes
+ assert (KnowledgeFSProvider in registered) is enabled
+
+
@pytest.mark.parametrize("enabled", [True, False])
def test_init_app_binds_each_apps_agent_hooks_only_when_agent_tracing_is_enabled(
monkeypatch: pytest.MonkeyPatch,