improve: introduce isort for linting Python imports (#1983)

api/controllers/console/datasets/data_source.py

@@ -1,23 +1,22 @@
 import datetime
 import json
 
-from flask import request
-from flask_login import current_user
-from libs.login import login_required
-from flask_restful import Resource, marshal_with, reqparse
-from werkzeug.exceptions import NotFound
-
 from controllers.console import api
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
 from core.data_loader.loader.notion import NotionLoader
 from core.indexing_runner import IndexingRunner
 from extensions.ext_database import db
-from fields.data_source_fields import integrate_notion_info_list_fields, integrate_list_fields
+from fields.data_source_fields import integrate_list_fields, integrate_notion_info_list_fields
+from flask import request
+from flask_login import current_user
+from flask_restful import Resource, marshal_with, reqparse
+from libs.login import login_required
 from models.dataset import Document
 from models.source import DataSourceBinding
 from services.dataset_service import DatasetService, DocumentService
 from tasks.document_indexing_sync_task import document_indexing_sync_task
+from werkzeug.exceptions import NotFound
 
 
 class DataSourceApi(Resource):

api/controllers/console/datasets/datasets.py

@@ -1,29 +1,28 @@
 # -*- coding:utf-8 -*-
 import flask_restful
-from flask import request, current_app
-from flask_login import current_user
-
-from controllers.console.apikey import api_key_list, api_key_fields
-from core.model_runtime.entities.model_entities import ModelType
-from core.provider_manager import ProviderManager
-from libs.login import login_required
-from flask_restful import Resource, reqparse, marshal, marshal_with
-from werkzeug.exceptions import NotFound, Forbidden
 import services
 from controllers.console import api
+from controllers.console.apikey import api_key_fields, api_key_list
 from controllers.console.app.error import ProviderNotInitializeError
 from controllers.console.datasets.error import DatasetNameDuplicateError
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
-from core.indexing_runner import IndexingRunner
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
+from core.indexing_runner import IndexingRunner
+from core.model_runtime.entities.model_entities import ModelType
+from core.provider_manager import ProviderManager
+from extensions.ext_database import db
 from fields.app_fields import related_app_list
 from fields.dataset_fields import dataset_detail_fields, dataset_query_detail_fields
 from fields.document_fields import document_status_fields
-from extensions.ext_database import db
-from models.dataset import DocumentSegment, Document
-from models.model import UploadFile, ApiToken
+from flask import current_app, request
+from flask_login import current_user
+from flask_restful import Resource, marshal, marshal_with, reqparse
+from libs.login import login_required
+from models.dataset import Document, DocumentSegment
+from models.model import ApiToken, UploadFile
 from services.dataset_service import DatasetService, DocumentService
+from werkzeug.exceptions import Forbidden, NotFound
 
 
 def _validate_name(name):

api/controllers/console/datasets/datasets_document.py

@@ -2,38 +2,35 @@
 from datetime import datetime
 from typing import List
 
-from flask import request
-from flask_login import current_user
-
+import services
+from controllers.console import api
+from controllers.console.app.error import (ProviderModelCurrentlyNotSupportError, ProviderNotInitializeError,
+                                           ProviderQuotaExceededError)
+from controllers.console.datasets.error import (ArchivedDocumentImmutableError, DocumentAlreadyFinishedError,
+                                                DocumentIndexingError, InvalidActionError, InvalidMetadataError)
+from controllers.console.setup import setup_required
+from controllers.console.wraps import account_initialization_required, cloud_edition_billing_resource_check
+from core.errors.error import (LLMBadRequestError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError,
+                               QuotaExceededError)
+from core.indexing_runner import IndexingRunner
 from core.model_manager import ModelManager
 from core.model_runtime.entities.model_entities import ModelType
 from core.model_runtime.errors.invoke import InvokeAuthorizationError
-from libs.login import login_required
-from flask_restful import Resource, fields, marshal, marshal_with, reqparse
-from sqlalchemy import desc, asc
-from werkzeug.exceptions import NotFound, Forbidden
-
-import services
-from controllers.console import api
-from controllers.console.app.error import ProviderNotInitializeError, ProviderQuotaExceededError, \
-    ProviderModelCurrentlyNotSupportError
-from controllers.console.datasets.error import DocumentAlreadyFinishedError, InvalidActionError, DocumentIndexingError, \
-    InvalidMetadataError, ArchivedDocumentImmutableError
-from controllers.console.setup import setup_required
-from controllers.console.wraps import account_initialization_required, cloud_edition_billing_resource_check
-from core.indexing_runner import IndexingRunner
-from core.errors.error import ProviderTokenNotInitError, QuotaExceededError, ModelCurrentlyNotSupportError, \
-    LLMBadRequestError
-from extensions.ext_redis import redis_client
-from fields.document_fields import document_with_segments_fields, document_fields, \
-    dataset_and_document_fields, document_status_fields
 from extensions.ext_database import db
-from models.dataset import DatasetProcessRule, Dataset
-from models.dataset import Document, DocumentSegment
+from extensions.ext_redis import redis_client
+from fields.document_fields import (dataset_and_document_fields, document_fields, document_status_fields,
+                                    document_with_segments_fields)
+from flask import request
+from flask_login import current_user
+from flask_restful import Resource, fields, marshal, marshal_with, reqparse
+from libs.login import login_required
+from models.dataset import Dataset, DatasetProcessRule, Document, DocumentSegment
 from models.model import UploadFile
-from services.dataset_service import DocumentService, DatasetService
+from services.dataset_service import DatasetService, DocumentService
+from sqlalchemy import asc, desc
 from tasks.add_document_to_index_task import add_document_to_index_task
 from tasks.remove_document_from_index_task import remove_document_from_index_task
+from werkzeug.exceptions import Forbidden, NotFound
 
 
 class DocumentResource(Resource):

api/controllers/console/datasets/datasets_segments.py

@@ -1,11 +1,8 @@
 # -*- coding:utf-8 -*-
 import uuid
 from datetime import datetime
-from flask import request
-from flask_login import current_user
-from flask_restful import Resource, reqparse, marshal
-from werkzeug.exceptions import NotFound, Forbidden
 
+import pandas as pd
 import services
 from controllers.console import api
 from controllers.console.app.error import ProviderNotInitializeError
@@ -15,17 +12,19 @@ from controllers.console.wraps import account_initialization_required, cloud_edi
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.model_manager import ModelManager
 from core.model_runtime.entities.model_entities import ModelType
-from libs.login import login_required
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.segment_fields import segment_fields
+from flask import request
+from flask_login import current_user
+from flask_restful import Resource, marshal, reqparse
+from libs.login import login_required
 from models.dataset import DocumentSegment
-
 from services.dataset_service import DatasetService, DocumentService, SegmentService
-from tasks.enable_segment_to_index_task import enable_segment_to_index_task
-from tasks.disable_segment_from_index_task import disable_segment_from_index_task
 from tasks.batch_create_segment_to_index_task import batch_create_segment_to_index_task
-import pandas as pd
+from tasks.disable_segment_from_index_task import disable_segment_from_index_task
+from tasks.enable_segment_to_index_task import enable_segment_to_index_task
+from werkzeug.exceptions import Forbidden, NotFound
 
 
 class DatasetDocumentSegmentListApi(Resource):

api/controllers/console/datasets/file.py

@@ -1,18 +1,14 @@
-from flask import request, current_app
-from flask_login import current_user
-
 import services
-from libs.login import login_required
-from flask_restful import Resource, marshal_with
-
 from controllers.console import api
-from controllers.console.datasets.error import NoFileUploadedError, TooManyFilesError, FileTooLargeError, \
-    UnsupportedFileTypeError
-
+from controllers.console.datasets.error import (FileTooLargeError, NoFileUploadedError, TooManyFilesError,
+                                                UnsupportedFileTypeError)
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
-from fields.file_fields import upload_config_fields, file_fields
-
+from fields.file_fields import file_fields, upload_config_fields
+from flask import current_app, request
+from flask_login import current_user
+from flask_restful import Resource, marshal_with
+from libs.login import login_required
 from services.file_service import FileService
 
 PREVIEW_WORDS_LIMIT = 3000

api/controllers/console/datasets/hit_testing.py

@@ -1,24 +1,22 @@
 import logging
 
-from flask_login import current_user
-
-from core.model_runtime.errors.invoke import InvokeError
-from libs.login import login_required
-from flask_restful import Resource, reqparse, marshal
-from werkzeug.exceptions import InternalServerError, NotFound, Forbidden
-
 import services
 from controllers.console import api
-from controllers.console.app.error import ProviderNotInitializeError, ProviderQuotaExceededError, \
-    ProviderModelCurrentlyNotSupportError, CompletionRequestError
-from controllers.console.datasets.error import HighQualityDatasetOnlyError, DatasetNotInitializedError
+from controllers.console.app.error import (CompletionRequestError, ProviderModelCurrentlyNotSupportError,
+                                           ProviderNotInitializeError, ProviderQuotaExceededError)
+from controllers.console.datasets.error import DatasetNotInitializedError, HighQualityDatasetOnlyError
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
-from core.errors.error import ProviderTokenNotInitError, QuotaExceededError, ModelCurrentlyNotSupportError, \
-    LLMBadRequestError
+from core.errors.error import (LLMBadRequestError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError,
+                               QuotaExceededError)
+from core.model_runtime.errors.invoke import InvokeError
 from fields.hit_testing_fields import hit_testing_record_fields
+from flask_login import current_user
+from flask_restful import Resource, marshal, reqparse
+from libs.login import login_required
 from services.dataset_service import DatasetService
 from services.hit_testing_service import HitTestingService
+from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 
 
 class HitTestingApi(Resource):