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

api/controllers/service_api/__init__.py

@@ -1,12 +1,10 @@
 # -*- coding:utf-8 -*-
 from flask import Blueprint
-
 from libs.external_api import ExternalApi
 
 bp = Blueprint('service_api', __name__, url_prefix='/v1')
 api = ExternalApi(bp)
 
 
-from .app import completion, app, conversation, message, audio, file
-
-from .dataset import document, segment, dataset
+from .app import app, audio, completion, conversation, file, message
+from .dataset import dataset, document, segment

api/controllers/service_api/app/app.py

@@ -1,10 +1,8 @@
 # -*- coding:utf-8 -*-
-from flask_restful import fields, marshal_with
-from flask import current_app
-
 from controllers.service_api import api
 from controllers.service_api.wraps import AppApiResource
-
+from flask import current_app
+from flask_restful import fields, marshal_with
 from models.model import App
 
 

api/controllers/service_api/app/audio.py

@@ -1,20 +1,21 @@
 import logging
 
-from flask import request
-from werkzeug.exceptions import InternalServerError
-
 import services
 from controllers.service_api import api
-from controllers.service_api.app.error import AppUnavailableError, ProviderNotInitializeError, CompletionRequestError, ProviderQuotaExceededError, \
-    ProviderModelCurrentlyNotSupportError, NoAudioUploadedError, AudioTooLargeError, UnsupportedAudioTypeError, \
-    ProviderNotSupportSpeechToTextError
+from controllers.service_api.app.error import (AppUnavailableError, AudioTooLargeError, CompletionRequestError,
+                                               NoAudioUploadedError, ProviderModelCurrentlyNotSupportError,
+                                               ProviderNotInitializeError, ProviderNotSupportSpeechToTextError,
+                                               ProviderQuotaExceededError, UnsupportedAudioTypeError)
 from controllers.service_api.wraps import AppApiResource
-from core.errors.error import ProviderTokenNotInitError, QuotaExceededError, ModelCurrentlyNotSupportError
+from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
+from flask import request
 from models.model import App, AppModelConfig
 from services.audio_service import AudioService
-from services.errors.audio import NoAudioUploadedServiceError, AudioTooLargeServiceError, \
-    UnsupportedAudioTypeServiceError, ProviderNotSupportSpeechToTextServiceError
+from services.errors.audio import (AudioTooLargeServiceError, NoAudioUploadedServiceError,
+                                   ProviderNotSupportSpeechToTextServiceError, UnsupportedAudioTypeServiceError)
+from werkzeug.exceptions import InternalServerError
+
 
 class AudioApi(AppApiResource):
     def post(self, app_model: App, end_user):

api/controllers/service_api/app/completion.py

@@ -1,24 +1,23 @@
 import json
 import logging
-from typing import Union, Generator
-
-from flask import stream_with_context, Response
-from flask_restful import reqparse
-from werkzeug.exceptions import NotFound, InternalServerError
+from typing import Generator, Union
 
 import services
 from controllers.service_api import api
 from controllers.service_api.app import create_or_update_end_user_for_user_id
-from controllers.service_api.app.error import AppUnavailableError, ProviderNotInitializeError, NotChatAppError, \
-    ConversationCompletedError, CompletionRequestError, ProviderQuotaExceededError, \
-    ProviderModelCurrentlyNotSupportError
+from controllers.service_api.app.error import (AppUnavailableError, CompletionRequestError, ConversationCompletedError,
+                                               NotChatAppError, ProviderModelCurrentlyNotSupportError,
+                                               ProviderNotInitializeError, ProviderQuotaExceededError)
 from controllers.service_api.wraps import AppApiResource
 from core.application_queue_manager import ApplicationQueueManager
 from core.entities.application_entities import InvokeFrom
-from core.errors.error import ProviderTokenNotInitError, QuotaExceededError, ModelCurrentlyNotSupportError
+from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
+from flask import Response, stream_with_context
+from flask_restful import reqparse
 from libs.helper import uuid_value
 from services.completion_service import CompletionService
+from werkzeug.exceptions import InternalServerError, NotFound
 
 
 class CompletionApi(AppApiResource):

api/controllers/service_api/app/conversation.py

@@ -1,17 +1,16 @@
 # -*- coding:utf-8 -*-
-from flask import request
-from flask_restful import fields, marshal_with, reqparse
-from flask_restful.inputs import int_range
-from werkzeug.exceptions import NotFound
-
+import services
 from controllers.service_api import api
 from controllers.service_api.app import create_or_update_end_user_for_user_id
 from controllers.service_api.app.error import NotChatAppError
 from controllers.service_api.wraps import AppApiResource
 from fields.conversation_fields import conversation_infinite_scroll_pagination_fields, simple_conversation_fields
+from flask import request
+from flask_restful import fields, marshal_with, reqparse
+from flask_restful.inputs import int_range
 from libs.helper import TimestampField, uuid_value
-import services
 from services.conversation_service import ConversationService
+from werkzeug.exceptions import NotFound
 
 
 class ConversationApi(AppApiResource):

api/controllers/service_api/app/file.py

@@ -1,14 +1,13 @@
+import services
+from controllers.service_api import api
+from controllers.service_api.app import create_or_update_end_user_for_user_id
+from controllers.service_api.app.error import (FileTooLargeError, NoFileUploadedError, TooManyFilesError,
+                                               UnsupportedFileTypeError)
+from controllers.service_api.wraps import AppApiResource
+from fields.file_fields import file_fields
 from flask import request
 from flask_restful import marshal_with
-
-from controllers.service_api import api
-from controllers.service_api.wraps import AppApiResource
-from controllers.service_api.app import create_or_update_end_user_for_user_id
-from controllers.service_api.app.error import NoFileUploadedError, TooManyFilesError, FileTooLargeError, \
-    UnsupportedFileTypeError
-import services
 from services.file_service import FileService
-from fields.file_fields import file_fields
 
 
 class FileApi(AppApiResource):

api/controllers/service_api/app/message.py

@@ -1,18 +1,18 @@
 # -*- coding:utf-8 -*-
-from flask_restful import fields, marshal_with, reqparse
-from flask_restful.inputs import int_range
-from werkzeug.exceptions import NotFound
-
 import services
 from controllers.service_api import api
 from controllers.service_api.app import create_or_update_end_user_for_user_id
 from controllers.service_api.app.error import NotChatAppError
 from controllers.service_api.wraps import AppApiResource
-from libs.helper import TimestampField, uuid_value
-from services.message_service import MessageService
 from extensions.ext_database import db
-from models.model import Message, EndUser
 from fields.conversation_fields import message_file_fields
+from flask_restful import fields, marshal_with, reqparse
+from flask_restful.inputs import int_range
+from libs.helper import TimestampField, uuid_value
+from models.model import EndUser, Message
+from services.message_service import MessageService
+from werkzeug.exceptions import NotFound
+
 
 class MessageListApi(AppApiResource):
     feedback_fields = {

api/controllers/service_api/dataset/dataset.py

@@ -1,13 +1,13 @@
-from flask import request
-from flask_restful import reqparse, marshal
 import services.dataset_service
 from controllers.service_api import api
 from controllers.service_api.dataset.error import DatasetNameDuplicateError
 from controllers.service_api.wraps import DatasetApiResource
 from core.model_runtime.entities.model_entities import ModelType
 from core.provider_manager import ProviderManager
-from libs.login import current_user
 from fields.dataset_fields import dataset_detail_fields
+from flask import request
+from flask_restful import marshal, reqparse
+from libs.login import current_user
 from services.dataset_service import DatasetService
 
 

api/controllers/service_api/dataset/document.py

@@ -1,24 +1,23 @@
 import json
 
-from flask import request
-from flask_restful import reqparse, marshal
-from flask_login import current_user
-from sqlalchemy import desc
-from werkzeug.exceptions import NotFound
-
 import services.dataset_service
 from controllers.service_api import api
 from controllers.service_api.app.error import ProviderNotInitializeError
-from controllers.service_api.dataset.error import ArchivedDocumentImmutableError, DocumentIndexingError, \
-    NoFileUploadedError, TooManyFilesError
+from controllers.service_api.dataset.error import (ArchivedDocumentImmutableError, DocumentIndexingError,
+                                                   NoFileUploadedError, TooManyFilesError)
 from controllers.service_api.wraps import DatasetApiResource, cloud_edition_billing_resource_check
-from libs.login import current_user
 from core.errors.error import ProviderTokenNotInitError
 from extensions.ext_database import db
 from fields.document_fields import document_fields, document_status_fields
+from flask import request
+from flask_login import current_user
+from flask_restful import marshal, reqparse
+from libs.login import current_user
 from models.dataset import Dataset, Document, DocumentSegment
 from services.dataset_service import DocumentService
 from services.file_service import FileService
+from sqlalchemy import desc
+from werkzeug.exceptions import NotFound
 
 
 class DocumentAddByTextApi(DatasetApiResource):

api/controllers/service_api/dataset/segment.py

@@ -1,16 +1,16 @@
-from flask_login import current_user
-from flask_restful import reqparse, marshal
-from werkzeug.exceptions import NotFound
 from controllers.service_api import api
 from controllers.service_api.app.error import ProviderNotInitializeError
 from controllers.service_api.wraps import DatasetApiResource, cloud_edition_billing_resource_check
-from core.errors.error import ProviderTokenNotInitError, LLMBadRequestError
+from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.model_manager import ModelManager
 from core.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from fields.segment_fields import segment_fields
+from flask_login import current_user
+from flask_restful import marshal, reqparse
 from models.dataset import Dataset, DocumentSegment
 from services.dataset_service import DatasetService, DocumentService, SegmentService
+from werkzeug.exceptions import NotFound
 
 
 class SegmentApi(DatasetApiResource):

api/controllers/service_api/wraps.py

@@ -2,16 +2,16 @@
 from datetime import datetime
 from functools import wraps
 
-from flask import request, current_app
+from extensions.ext_database import db
+from flask import current_app, request
 from flask_login import user_logged_in
 from flask_restful import Resource
-from werkzeug.exceptions import NotFound, Unauthorized
-
 from libs.login import _get_user
-from extensions.ext_database import db
-from models.account import Tenant, TenantAccountJoin, Account
+from models.account import Account, Tenant, TenantAccountJoin
 from models.model import ApiToken, App
 from services.feature_service import FeatureService
+from werkzeug.exceptions import NotFound, Unauthorized
+
 
 def validate_app_token(view=None):
     def decorator(view):