From 545e5cbcd6fdd6ad2c4fba05b2a87f2da4edb428 Mon Sep 17 00:00:00 2001 From: Joe <79627742+ZhouhaoJiang@users.noreply.github.com> Date: Wed, 12 Mar 2025 12:51:00 +0800 Subject: [PATCH] fix: dataset editor (#15218) --- .../console/datasets/datasets_document.py | 12 +++---- .../console/datasets/datasets_segments.py | 32 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py index 6e0e8f1903..38a80b4129 100644 --- a/api/controllers/console/datasets/datasets_document.py +++ b/api/controllers/console/datasets/datasets_document.py @@ -325,8 +325,8 @@ class DatasetInitApi(Resource): @cloud_edition_billing_resource_check("vector_space") @cloud_edition_billing_rate_limit_check("knowledge") def post(self): - # The role of the current user in the ta table must be admin, owner, or editor - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() parser = reqparse.RequestParser() @@ -704,8 +704,8 @@ class DocumentProcessingApi(DocumentResource): document_id = str(document_id) document = self.get_document(dataset_id, document_id) - # The role of the current user in the ta table must be admin, owner, or editor - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() if action == "pause": @@ -769,8 +769,8 @@ class DocumentMetadataApi(DocumentResource): doc_type = req_data.get("doc_type") doc_metadata = req_data.get("doc_metadata") - # The role of the current user in the ta table must be admin, owner, or editor - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() if doc_type is None or doc_metadata is None: diff --git a/api/controllers/console/datasets/datasets_segments.py b/api/controllers/console/datasets/datasets_segments.py index 4642ed3573..1b38d0776a 100644 --- a/api/controllers/console/datasets/datasets_segments.py +++ b/api/controllers/console/datasets/datasets_segments.py @@ -123,8 +123,8 @@ class DatasetDocumentSegmentListApi(Resource): raise NotFound("Document not found.") segment_ids = request.args.getlist("segment_id") - # The role of the current user in the ta table must be admin or owner - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() try: DatasetService.check_dataset_permission(dataset, current_user) @@ -151,8 +151,8 @@ class DatasetDocumentSegmentApi(Resource): raise NotFound("Document not found.") # check user's model setting DatasetService.check_dataset_model_setting(dataset) - # The role of the current user in the ta table must be admin, owner, or editor - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() try: @@ -206,7 +206,7 @@ class DatasetDocumentSegmentAddApi(Resource): document = DocumentService.get_document(dataset_id, document_id) if not document: raise NotFound("Document not found.") - if not current_user.is_editor: + if not current_user.is_dataset_editor: raise Forbidden() # check embedding model setting if dataset.indexing_technique == "high_quality": @@ -281,8 +281,8 @@ class DatasetDocumentSegmentUpdateApi(Resource): ).first() if not segment: raise NotFound("Segment not found.") - # The role of the current user in the ta table must be admin, owner, or editor - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() try: DatasetService.check_dataset_permission(dataset, current_user) @@ -325,8 +325,8 @@ class DatasetDocumentSegmentUpdateApi(Resource): ).first() if not segment: raise NotFound("Segment not found.") - # The role of the current user in the ta table must be admin or owner - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() try: DatasetService.check_dataset_permission(dataset, current_user) @@ -428,7 +428,7 @@ class ChildChunkAddApi(Resource): ).first() if not segment: raise NotFound("Segment not found.") - if not current_user.is_editor: + if not current_user.is_dataset_editor: raise Forbidden() # check embedding model setting if dataset.indexing_technique == "high_quality": @@ -528,8 +528,8 @@ class ChildChunkAddApi(Resource): ).first() if not segment: raise NotFound("Segment not found.") - # The role of the current user in the ta table must be admin, owner, or editor - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() try: DatasetService.check_dataset_permission(dataset, current_user) @@ -579,8 +579,8 @@ class ChildChunkUpdateApi(Resource): ).first() if not child_chunk: raise NotFound("Child chunk not found.") - # The role of the current user in the ta table must be admin or owner - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() try: DatasetService.check_dataset_permission(dataset, current_user) @@ -624,8 +624,8 @@ class ChildChunkUpdateApi(Resource): ).first() if not child_chunk: raise NotFound("Child chunk not found.") - # The role of the current user in the ta table must be admin or owner - if not current_user.is_editor: + # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor + if not current_user.is_dataset_editor: raise Forbidden() try: DatasetService.check_dataset_permission(dataset, current_user)