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.

feat: dataset automatic_include_workspace_members should be false (#42430)

wangxiaolei3edbba21b4bb
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index 0b6986b1972..5ce10105c0b 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -62,7 +62,6 @@ from services.app_service import AppService
from services.dataset_ref_service import DatasetRefService
from services.dataset_service import DatasetPermissionService, DatasetService, DocumentService
from services.enterprise import rbac_service as enterprise_rbac_service
-from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task
register_response_schema_models(console_ns, ApiBaseUrlResponse, SimpleResultResponse, UsageCheckResponse)
@@ -651,9 +650,8 @@ class DatasetListApi(Resource):
current_tenant_id,
current_user.id,
dataset.id,
- enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=False),
)
- initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset.id)
return item, 201
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index 0d69e9ce754..a4d54053800 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -65,7 +65,6 @@ from services.entities.knowledge_entities.knowledge_entities import KnowledgeCon
from services.file_service import FileService
from services.vector_space_admission_service import get_vector_space_admission_error_fields
from tasks.generate_summary_index_task import generate_summary_index_task
-from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task
from ..app.error import (
ProviderModelCurrentlyNotSupportError,
@@ -696,9 +695,8 @@ class DatasetInitApi(Resource):
current_tenant_id,
current_user.id,
dataset.id,
- enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=False),
)
- initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset.id)
return dump_response(
DatasetAndDocumentResponse,
diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
index 094adc42022..ed0a7b0b1bc 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
@@ -26,7 +26,6 @@ from services.dataset_service import DatasetPermissionService, DatasetService
from services.enterprise import rbac_service as enterprise_rbac_service
from services.entities.knowledge_entities.rag_pipeline_entities import IconInfo, RagPipelineDatasetCreateEntity
from services.rag_pipeline.rag_pipeline_dsl_service import RagPipelineDslService
-from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task
class RagPipelineDatasetImportPayload(BaseModel):
@@ -96,9 +95,8 @@ class CreateRagPipelineDatasetApi(Resource):
current_tenant_id,
current_user.id,
dataset_id,
- enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=False),
)
- initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset_id)
return dump_response(RagPipelineImportResponse, import_info), 201
diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py
index 155b2c7850b..1989cb0b427 100644
--- a/api/controllers/service_api/dataset/dataset.py
+++ b/api/controllers/service_api/dataset/dataset.py
@@ -65,7 +65,6 @@ from services.tag_service import (
from services.tag_service import (
UpdateTagPayload as UpdateTagServicePayload,
)
-from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task
register_enum_models(service_api_ns, DatasetPermissionEnum)
@@ -565,9 +564,8 @@ class DatasetListApi(DatasetApiResource):
tenant_id,
current_user.id,
dataset.id,
- enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=True),
+ enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=False),
)
- initialize_created_app_rbac_access_task.delay(tenant_id, current_user.id, dataset_id=dataset.id)
return _dump_service_dataset_detail(dataset, session=session), 200
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
index 44b91144143..c56a65b193a 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
@@ -489,7 +489,6 @@ class TestDatasetInitApi(_UsesSQLiteSession):
patch(
"controllers.console.datasets.datasets_document.enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist"
),
- patch("controllers.console.datasets.datasets_document.initialize_created_app_rbac_access_task.delay"),
):
response = method(api, session, tenant_id, user)
assert response["dataset"]["id"] == "ds-1"