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

api/controllers/web/__init__.py

@@ -1,10 +1,9 @@
 # -*- coding:utf-8 -*-
 from flask import Blueprint
-
 from libs.external_api import ExternalApi
 
 bp = Blueprint('web', __name__, url_prefix='/api')
 api = ExternalApi(bp)
 
 
-from . import completion, app, conversation, message, site, saved_message, audio, passport, file
+from . import app, audio, completion, conversation, file, message, passport, saved_message, site

api/controllers/web/app.py

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

api/controllers/web/audio.py

@@ -1,21 +1,21 @@
 # -*- coding:utf-8 -*-
 import logging
 
-from flask import request
-from werkzeug.exceptions import InternalServerError
-
 import services
 from controllers.web import api
-from controllers.web.error import AppUnavailableError, ProviderNotInitializeError, CompletionRequestError, \
-    ProviderQuotaExceededError, ProviderModelCurrentlyNotSupportError, NoAudioUploadedError, AudioTooLargeError, \
-    UnsupportedAudioTypeError, ProviderNotSupportSpeechToTextError
+from controllers.web.error import (AppUnavailableError, AudioTooLargeError, CompletionRequestError,
+                                   NoAudioUploadedError, ProviderModelCurrentlyNotSupportError,
+                                   ProviderNotInitializeError, ProviderNotSupportSpeechToTextError,
+                                   ProviderQuotaExceededError, UnsupportedAudioTypeError)
 from controllers.web.wraps import WebApiResource
-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 services.audio_service import AudioService
-from services.errors.audio import NoAudioUploadedServiceError, AudioTooLargeServiceError, \
-    UnsupportedAudioTypeServiceError, ProviderNotSupportSpeechToTextServiceError
+from flask import request
 from models.model import App, AppModelConfig
+from services.audio_service import AudioService
+from services.errors.audio import (AudioTooLargeServiceError, NoAudioUploadedServiceError,
+                                   ProviderNotSupportSpeechToTextServiceError, UnsupportedAudioTypeServiceError)
+from werkzeug.exceptions import InternalServerError
 
 
 class AudioApi(WebApiResource):

api/controllers/web/completion.py

@@ -3,22 +3,21 @@ import json
 import logging
 from typing import Generator, Union
 
-from flask import Response, stream_with_context
-from flask_restful import reqparse
-from werkzeug.exceptions import InternalServerError, NotFound
-
 import services
 from controllers.web import api
-from controllers.web.error import AppUnavailableError, ConversationCompletedError, \
-    ProviderNotInitializeError, NotChatAppError, NotCompletionAppError, CompletionRequestError, \
-    ProviderQuotaExceededError, ProviderModelCurrentlyNotSupportError
+from controllers.web.error import (AppUnavailableError, CompletionRequestError, ConversationCompletedError,
+                                   NotChatAppError, NotCompletionAppError, ProviderModelCurrentlyNotSupportError,
+                                   ProviderNotInitializeError, ProviderQuotaExceededError)
 from controllers.web.wraps import WebApiResource
 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
 
 
 # define completion api for user

api/controllers/web/conversation.py

@@ -1,16 +1,15 @@
 # -*- coding:utf-8 -*-
-from flask_restful import fields, reqparse, marshal_with
-from flask_restful.inputs import int_range
-from werkzeug.exceptions import NotFound
-
 from controllers.web import api
 from controllers.web.error import NotChatAppError
 from controllers.web.wraps import WebApiResource
 from fields.conversation_fields import conversation_infinite_scroll_pagination_fields, simple_conversation_fields
+from flask_restful import fields, marshal_with, reqparse
+from flask_restful.inputs import int_range
 from libs.helper import TimestampField, uuid_value
 from services.conversation_service import ConversationService
-from services.errors.conversation import LastConversationNotExistsError, ConversationNotExistsError
+from services.errors.conversation import ConversationNotExistsError, LastConversationNotExistsError
 from services.web_conversation_service import WebConversationService
+from werkzeug.exceptions import NotFound
 
 
 class ConversationListApi(WebApiResource):

api/controllers/web/file.py

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

api/controllers/web/message.py

@@ -3,27 +3,27 @@ import json
 import logging
 from typing import Generator, Union
 
-from flask import stream_with_context, Response
-from flask_restful import reqparse, fields, marshal_with
-from flask_restful.inputs import int_range
-from werkzeug.exceptions import NotFound, InternalServerError
-
 import services
 from controllers.web import api
-from controllers.web.error import NotChatAppError, CompletionRequestError, ProviderNotInitializeError, \
-    AppMoreLikeThisDisabledError, NotCompletionAppError, AppSuggestedQuestionsAfterAnswerDisabledError, \
-    ProviderQuotaExceededError, ProviderModelCurrentlyNotSupportError
+from controllers.web.error import (AppMoreLikeThisDisabledError, AppSuggestedQuestionsAfterAnswerDisabledError,
+                                   CompletionRequestError, NotChatAppError, NotCompletionAppError,
+                                   ProviderModelCurrentlyNotSupportError, ProviderNotInitializeError,
+                                   ProviderQuotaExceededError)
 from controllers.web.wraps import WebApiResource
 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 libs.helper import uuid_value, TimestampField
+from fields.conversation_fields import message_file_fields
+from flask import Response, stream_with_context
+from flask_restful import fields, marshal_with, reqparse
+from flask_restful.inputs import int_range
+from libs.helper import TimestampField, uuid_value
 from services.completion_service import CompletionService
 from services.errors.app import MoreLikeThisDisabledError
 from services.errors.conversation import ConversationNotExistsError
 from services.errors.message import MessageNotExistsError, SuggestedQuestionsAfterAnswerDisabledError
 from services.message_service import MessageService
-from fields.conversation_fields import message_file_fields
+from werkzeug.exceptions import InternalServerError, NotFound
 
 
 class MessageListApi(WebApiResource):

api/controllers/web/passport.py

@@ -1,12 +1,14 @@
 # -*- coding:utf-8 -*-
 import uuid
+
 from controllers.web import api
-from flask_restful import Resource
-from flask import request
-from werkzeug.exceptions import Unauthorized, NotFound
-from models.model import Site, EndUser, App
 from extensions.ext_database import db
+from flask import request
+from flask_restful import Resource
 from libs.passport import PassportService
+from models.model import App, EndUser, Site
+from werkzeug.exceptions import NotFound, Unauthorized
+
 
 class PassportResource(Resource):
     """Base resource for passport."""

api/controllers/web/saved_message.py

@@ -1,15 +1,13 @@
-from flask_restful import reqparse, marshal_with, fields
-from flask_restful.inputs import int_range
-from werkzeug.exceptions import NotFound
-
 from controllers.web import api
 from controllers.web.error import NotCompletionAppError
 from controllers.web.wraps import WebApiResource
-from libs.helper import uuid_value, TimestampField
+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 services.errors.message import MessageNotExistsError
 from services.saved_message_service import SavedMessageService
-from fields.conversation_fields import message_file_fields
-
+from werkzeug.exceptions import NotFound
 
 feedback_fields = {
     'rating': fields.String

api/controllers/web/site.py

@@ -1,15 +1,14 @@
 # -*- coding:utf-8 -*-
 import os
 
-from flask_restful import fields, marshal_with
-from flask import current_app
-from werkzeug.exceptions import Forbidden
-
 from controllers.web import api
 from controllers.web.wraps import WebApiResource
 from extensions.ext_database import db
+from flask import current_app
+from flask_restful import fields, marshal_with
 from models.model import Site
 from services.feature_service import FeatureService
+from werkzeug.exceptions import Forbidden
 
 
 class AppSiteApi(WebApiResource):

api/controllers/web/wraps.py

@@ -1,13 +1,13 @@
 # -*- coding:utf-8 -*-
 from functools import wraps
 
+from extensions.ext_database import db
 from flask import request
 from flask_restful import Resource
+from libs.passport import PassportService
+from models.model import App, EndUser, Site
 from werkzeug.exceptions import NotFound, Unauthorized
 
-from extensions.ext_database import db
-from models.model import App, EndUser, Site
-from libs.passport import PassportService
 
 def validate_jwt_token(view=None):
     def decorator(view):