From 3259485d66817326c93a9920fa1f9922e5bebc49 Mon Sep 17 00:00:00 2001 From: ZeroZ_JQ Date: Wed, 16 Apr 2025 18:30:04 +0800 Subject: [PATCH] refactor: replace DatasetInvalidActionError with InvalidActionError for consistent error handling in document status updates --- api/controllers/console/datasets/datasets_document.py | 4 ++-- api/controllers/console/datasets/error.py | 5 ----- api/controllers/service_api/dataset/dataset.py | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py index c51d0256cf..1be8937219 100644 --- a/api/controllers/console/datasets/datasets_document.py +++ b/api/controllers/console/datasets/datasets_document.py @@ -18,11 +18,11 @@ from controllers.console.app.error import ( ) from controllers.console.datasets.error import ( ArchivedDocumentImmutableError, - DatasetInvalidActionError, DocumentAlreadyFinishedError, DocumentIndexingError, IndexingEstimateError, InvalidMetadataError, + InvalidActionError, ) from controllers.console.wraps import ( account_initialization_required, @@ -823,7 +823,7 @@ class DocumentStatusApi(DocumentResource): try: DocumentService.batch_update_document_status(dataset, document_ids, action, current_user) except services.errors.account.InvalidActionError as e: - raise DatasetInvalidActionError(str(e)) + raise InvalidActionError(str(e)) return {"result": "success"}, 200 diff --git a/api/controllers/console/datasets/error.py b/api/controllers/console/datasets/error.py index 02a272e81e..31474b97bd 100644 --- a/api/controllers/console/datasets/error.py +++ b/api/controllers/console/datasets/error.py @@ -102,8 +102,3 @@ class ChildChunkDeleteIndexError(BaseHTTPException): description = "Delete child chunk index failed: {message}" code = 500 - -class DatasetInvalidActionError(BaseHTTPException): - error_code = "dataset_invalid_action" - description = "Invalid action performed on the dataset or its documents." - code = 400 diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py index 1e5f9315ac..3277225fe6 100644 --- a/api/controllers/service_api/dataset/dataset.py +++ b/api/controllers/service_api/dataset/dataset.py @@ -372,4 +372,3 @@ class DocumentStatusApi(DatasetApiResource): api.add_resource(DatasetListApi, "/datasets") api.add_resource(DatasetApi, "/datasets/") -api.add_resource(DocumentStatusApi, "/datasets//documents/status/")