bump version to 0.5.3 (#2306)

api/app.py

@@ -30,7 +30,7 @@ from flask import Flask, Response, request
 from flask_cors import CORS
 from libs.passport import PassportService
 # DO NOT REMOVE BELOW
-from models import account, dataset, model, source, task, tool, web, tools
+from models import account, dataset, model, source, task, tool, tools, web
 from services.account_service import AccountService
 
 # DO NOT REMOVE ABOVE

api/config.py

@@ -87,7 +87,7 @@ class Config:
         # ------------------------
         # General Configurations.
         # ------------------------
-        self.CURRENT_VERSION = "0.5.2"
+        self.CURRENT_VERSION = "0.5.3"
         self.COMMIT_SHA = get_env('COMMIT_SHA')
         self.EDITION = "SELF_HOSTED"
         self.DEPLOY_ENV = get_env('DEPLOY_ENV')

api/constants/languages.py

 
 import json
+
 from models.model import AppModelConfig
 
 languages = ['en-US', 'zh-Hans', 'pt-BR', 'es-ES', 'fr-FR', 'de-DE', 'ja-JP', 'ko-KR', 'ru-RU', 'it-IT']

api/controllers/console/__init__.py

@@ -11,11 +11,11 @@ from .app import (advanced_prompt_template, annotation, app, audio, completion,
                   model_config, site, statistic)
 # Import auth controllers
 from .auth import activate, data_source_oauth, login, oauth
+# Import billing controllers
+from .billing import billing
 # Import datasets controllers
 from .datasets import data_source, datasets, datasets_document, datasets_segments, file, hit_testing
 # Import explore controllers
 from .explore import audio, completion, conversation, installed_app, message, parameter, recommended_app, saved_message
 # Import workspace controllers
 from .workspace import account, members, model_providers, models, tool_providers, workspace
-# Import billing controllers
-from .billing import billing

api/controllers/console/admin.py

 import os
 from functools import wraps
 
+from constants.languages import supported_language
 from controllers.console import api
 from controllers.console.wraps import only_edition_cloud
 from extensions.ext_database import db
 from flask import request
 from flask_restful import Resource, reqparse
-from constants.languages import supported_language
 from models.model import App, InstalledApp, RecommendedApp
 from werkzeug.exceptions import NotFound, Unauthorized
 

api/controllers/console/app/app.py

@@ -3,8 +3,8 @@ import json
 import logging
 from datetime import datetime
 
-from constants.model_template import model_templates
 from constants.languages import demo_model_templates, languages
+from constants.model_template import model_templates
 from controllers.console import api
 from controllers.console.app.error import AppNotFoundError, ProviderNotInitializeError
 from controllers.console.setup import setup_required
@@ -26,6 +26,7 @@ from models.tools import ApiToolProvider
 from services.app_model_config_service import AppModelConfigService
 from werkzeug.exceptions import Forbidden
 
+
 def _get_app(app_id, tenant_id):
     app = db.session.query(App).filter(App.id == app_id, App.tenant_id == tenant_id).first()
     if not app:

api/controllers/console/app/site.py

 # -*- coding:utf-8 -*-
+from constants.languages import supported_language
 from controllers.console import api
 from controllers.console.app import _get_app
 from controllers.console.setup import setup_required
@@ -7,7 +8,6 @@ from extensions.ext_database import db
 from fields.app_fields import app_site_fields
 from flask_login import current_user
 from flask_restful import Resource, marshal_with, reqparse
-from constants.languages import supported_language
 from libs.login import login_required
 from models.model import Site
 from werkzeug.exceptions import Forbidden, NotFound

api/controllers/console/auth/activate.py

@@ -2,12 +2,12 @@ import base64
 import secrets
 from datetime import datetime
 
+from constants.languages import supported_language
 from controllers.console import api
 from controllers.console.error import AlreadyActivateError
 from extensions.ext_database import db
 from flask_restful import Resource, reqparse
 from libs.helper import email, str_len, timezone
-from constants.languages import supported_language
 from libs.password import hash_password, valid_password
 from models.account import AccountStatus, Tenant
 from services.account_service import RegisterService

api/controllers/console/datasets/file.py

@@ -9,7 +9,7 @@ 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, ALLOWED_EXTENSIONS, UNSTRUSTURED_ALLOWED_EXTENSIONS
+from services.file_service import ALLOWED_EXTENSIONS, UNSTRUSTURED_ALLOWED_EXTENSIONS, FileService
 
 PREVIEW_WORDS_LIMIT = 3000
 

api/controllers/console/explore/message.py

@@ -17,9 +17,9 @@ from core.model_runtime.errors.invoke import InvokeError
 from fields.message_fields import message_infinite_scroll_pagination_fields
 from flask import Response, stream_with_context
 from flask_login import current_user
-from flask_restful import marshal_with, reqparse, fields
+from flask_restful import fields, marshal_with, reqparse
 from flask_restful.inputs import int_range
-from libs.helper import uuid_value, TimestampField
+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

api/controllers/console/explore/parameter.py

@@ -3,12 +3,12 @@ import json
 
 from controllers.console import api
 from controllers.console.explore.wraps import InstalledAppResource
+from extensions.ext_database import db
 from flask import current_app
 from flask_restful import fields, marshal_with
-from models.model import InstalledApp, AppModelConfig
+from models.model import AppModelConfig, InstalledApp
 from models.tools import ApiToolProvider
 
-from extensions.ext_database import db
 
 class AppParameterApi(InstalledAppResource):
     """Resource for app variables."""

api/controllers/console/explore/recommended_app.py

 # -*- coding:utf-8 -*-
+from constants.languages import languages
 from controllers.console import api
 from controllers.console.app.error import AppNotFoundError
 from controllers.console.wraps import account_initialization_required
@@ -9,7 +10,6 @@ from libs.login import login_required
 from models.model import App, InstalledApp, RecommendedApp
 from services.account_service import TenantService
 from sqlalchemy import and_
-from constants.languages import languages
 
 app_fields = {
     'id': fields.String,

api/controllers/console/init_validate.py

 import os
+
 from flask import current_app, session
 from flask_restful import Resource, reqparse
 from libs.helper import str_len

api/controllers/console/setup.py

@@ -10,7 +10,7 @@ from models.model import DifySetup
 from services.account_service import AccountService, RegisterService, TenantService
 
 from . import api
-from .error import AlreadySetupError, NotSetupError, NotInitValidateError
+from .error import AlreadySetupError, NotInitValidateError, NotSetupError
 from .init_validate import get_init_validate_status
 from .wraps import only_edition_self_hosted
 

api/controllers/console/workspace/account.py

@@ -2,6 +2,7 @@
 from datetime import datetime
 
 import pytz
+from constants.languages import supported_language
 from controllers.console import api
 from controllers.console.setup import setup_required
 from controllers.console.workspace.error import (AccountAlreadyInitedError, CurrentPasswordIncorrectError,
@@ -12,7 +13,6 @@ from flask import current_app, request
 from flask_login import current_user
 from flask_restful import Resource, fields, marshal_with, reqparse
 from libs.helper import TimestampField, timezone
-from constants.languages import supported_language
 from libs.login import login_required
 from models.account import AccountIntegrate, InvitationCode
 from services.account_service import AccountService

api/controllers/console/workspace/members.py

 # -*- coding:utf-8 -*-
-from flask import current_app
-from flask_login import current_user
-from flask_restful import Resource, abort, fields, marshal_with, reqparse
-
 import services
 from controllers.console import api
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required, cloud_edition_billing_resource_check
 from extensions.ext_database import db
+from flask import current_app
+from flask_login import current_user
+from flask_restful import Resource, abort, fields, marshal_with, reqparse
 from libs.helper import TimestampField
 from libs.login import login_required
 from models.account import Account

api/controllers/console/workspace/tool_providers.py

+import io
 import json
 
-from libs.login import login_required
-from flask_login import current_user
-from flask_restful import Resource, reqparse
-from flask import send_file
-from werkzeug.exceptions import Forbidden
-
 from controllers.console import api
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
-
+from flask import send_file
+from flask_login import current_user
+from flask_restful import Resource, reqparse
+from libs.login import login_required
 from services.tools_manage_service import ToolManageService
+from werkzeug.exceptions import Forbidden
 
-import io
 
 class ToolProviderListApi(Resource):
     @setup_required

api/controllers/console/wraps.py

 # -*- coding:utf-8 -*-
 import json
 from functools import wraps
-from flask import request
 
 from controllers.console.workspace.error import AccountNotInitializedError
-from flask import abort, current_app
+from flask import abort, current_app, request
 from flask_login import current_user
 from services.feature_service import FeatureService
 from services.operation_service import OperationService

api/controllers/files/__init__.py

@@ -6,5 +6,4 @@ bp = Blueprint('files', __name__)
 api = ExternalApi(bp)
 
 
-from . import image_preview
-from . import tool_files
+from . import image_preview, tool_files
\ No newline at end of file

api/controllers/files/tool_files.py

 from controllers.files import api
+from core.tools.tool_file_manager import ToolFileManager
 from flask import Response
 from flask_restful import Resource, reqparse
 from libs.exception import BaseHTTPException
-from werkzeug.exceptions import NotFound, Forbidden
+from werkzeug.exceptions import Forbidden, NotFound
 
-from core.tools.tool_file_manager import ToolFileManager
 
 class ToolFilePreviewApi(Resource):
     def get(self, file_id, extension):

api/controllers/service_api/app/app.py

 # -*- coding:utf-8 -*-
+import json
+
 from controllers.service_api import api
 from controllers.service_api.wraps import AppApiResource
+from extensions.ext_database import db
 from flask import current_app
 from flask_restful import fields, marshal_with
 from models.model import App, AppModelConfig
 from models.tools import ApiToolProvider
 
-import json
-
-from extensions.ext_database import db
-
 
 class AppParameterApi(AppApiResource):
     """Resource for app variables."""

api/controllers/service_api/dataset/dataset.py

-from models.dataset import Dataset
 import services.dataset_service
 from controllers.service_api import api
 from controllers.service_api.dataset.error import DatasetNameDuplicateError
@@ -9,6 +8,7 @@ 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 models.dataset import Dataset
 from services.dataset_service import DatasetService
 
 

api/controllers/service_api/index.py

+from controllers.service_api import api
 from flask import current_app
 from flask_restful import Resource
 
-from controllers.service_api import api
-
 
 class IndexApi(Resource):
     def get(self):

api/controllers/web/app.py

 # -*- coding:utf-8 -*-
+import json
+
 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 App, AppModelConfig
 from models.tools import ApiToolProvider
 
-from extensions.ext_database import db
-
-import json
-
 
 class AppParameterApi(WebApiResource):
     """Resource for app variables."""

api/core/app_runner/app_runner.py

@@ -2,8 +2,13 @@ import time
 from typing import Generator, List, Optional, Tuple, Union, cast
 
 from core.application_queue_manager import ApplicationQueueManager, PublishFrom
-from core.entities.application_entities import AppOrchestrationConfigEntity, ModelConfigEntity, \
-    PromptTemplateEntity, ExternalDataVariableEntity, ApplicationGenerateEntity, InvokeFrom
+from core.entities.application_entities import (ApplicationGenerateEntity, AppOrchestrationConfigEntity,
+                                                ExternalDataVariableEntity, InvokeFrom, ModelConfigEntity,
+                                                PromptTemplateEntity)
+from core.features.annotation_reply import AnnotationReplyFeature
+from core.features.external_data_fetch import ExternalDataFetchFeature
+from core.features.hosting_moderation import HostingModerationFeature
+from core.features.moderation import ModerationFeature
 from core.file.file_obj import FileObj
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
@@ -11,12 +16,9 @@ from core.model_runtime.entities.message_entities import AssistantPromptMessage,
 from core.model_runtime.entities.model_entities import ModelPropertyKey
 from core.model_runtime.errors.invoke import InvokeBadRequestError
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.features.hosting_moderation import HostingModerationFeature
-from core.features.moderation import ModerationFeature
-from core.features.external_data_fetch import ExternalDataFetchFeature
-from core.features.annotation_reply import AnnotationReplyFeature
 from core.prompt.prompt_transform import PromptTransform
-from models.model import App, MessageAnnotation, Message
+from models.model import App, Message, MessageAnnotation
+
 
 class AppRunner:
     def get_pre_calculate_rest_tokens(self, app_record: App,

api/core/app_runner/assistant_app_runner.py

@@ -3,11 +3,10 @@ import logging
 from typing import cast
 
 from core.app_runner.app_runner import AppRunner
+from core.application_queue_manager import ApplicationQueueManager, PublishFrom
+from core.entities.application_entities import AgentEntity, ApplicationGenerateEntity, ModelConfigEntity
 from core.features.assistant_cot_runner import AssistantCotApplicationRunner
 from core.features.assistant_fc_runner import AssistantFunctionCallApplicationRunner
-from core.entities.application_entities import ApplicationGenerateEntity, ModelConfigEntity, \
-    AgentEntity
-from core.application_queue_manager import ApplicationQueueManager, PublishFrom
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
 from core.model_runtime.entities.llm_entities import LLMUsage
@@ -16,7 +15,7 @@ from core.model_runtime.model_providers.__base.large_language_model import Large
 from core.moderation.base import ModerationException
 from core.tools.entities.tool_entities import ToolRuntimeVariablePool
 from extensions.ext_database import db
-from models.model import Conversation, Message, App, MessageChain, MessageAgentThought
+from models.model import App, Conversation, Message, MessageAgentThought, MessageChain
 from models.tools import ToolConversationVariables
 
 logger = logging.getLogger(__name__)

api/core/app_runner/basic_app_runner.py

@@ -4,8 +4,7 @@ from typing import Optional
 from core.app_runner.app_runner import AppRunner
 from core.application_queue_manager import ApplicationQueueManager, PublishFrom
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
-from core.entities.application_entities import (ApplicationGenerateEntity, DatasetEntity,
-                                                 InvokeFrom, ModelConfigEntity)
+from core.entities.application_entities import ApplicationGenerateEntity, DatasetEntity, InvokeFrom, ModelConfigEntity
 from core.features.dataset_retrieval import DatasetRetrievalFeature
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance

api/core/app_runner/generate_task_pipeline.py

@@ -6,21 +6,21 @@ from typing import Generator, Optional, Union, cast
 from core.app_runner.moderation_handler import ModerationRule, OutputModerationHandler
 from core.application_queue_manager import ApplicationQueueManager, PublishFrom
 from core.entities.application_entities import ApplicationGenerateEntity, InvokeFrom
-from core.entities.queue_entities import (AnnotationReplyEvent, QueueAgentThoughtEvent, QueueErrorEvent,
-                                          QueueMessageEndEvent, QueueMessageEvent, QueueMessageReplaceEvent,
-                                          QueuePingEvent, QueueRetrieverResourcesEvent, QueueStopEvent,
-                                          QueueMessageFileEvent, QueueAgentMessageEvent)
-from core.errors.error import ProviderTokenNotInitError, QuotaExceededError, ModelCurrentlyNotSupportError
+from core.entities.queue_entities import (AnnotationReplyEvent, QueueAgentMessageEvent, QueueAgentThoughtEvent,
+                                          QueueErrorEvent, QueueMessageEndEvent, QueueMessageEvent,
+                                          QueueMessageFileEvent, QueueMessageReplaceEvent, QueuePingEvent,
+                                          QueueRetrieverResourcesEvent, QueueStopEvent)
+from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
 from core.model_runtime.entities.message_entities import (AssistantPromptMessage, ImagePromptMessageContent,
                                                           PromptMessage, PromptMessageContentType, PromptMessageRole,
                                                           TextPromptMessageContent)
 from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.tools.tool_file_manager import ToolFileManager
-from core.tools.tool_manager import ToolManager
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.prompt.prompt_template import PromptTemplateParser
+from core.tools.tool_file_manager import ToolFileManager
+from core.tools.tool_manager import ToolManager
 from events.message_event import message_was_created
 from extensions.ext_database import db
 from models.model import Conversation, Message, MessageAgentThought, MessageFile

api/core/application_manager.py

@@ -9,11 +9,12 @@ from core.app_runner.basic_app_runner import BasicApplicationRunner
 from core.app_runner.generate_task_pipeline import GenerateTaskPipeline
 from core.application_queue_manager import ApplicationQueueManager, ConversationTaskStoppedException, PublishFrom
 from core.entities.application_entities import (AdvancedChatPromptTemplateEntity,
-                                                AdvancedCompletionPromptTemplateEntity, AgentEntity, AgentToolEntity,
-                                                ApplicationGenerateEntity, AppOrchestrationConfigEntity, DatasetEntity,
+                                                AdvancedCompletionPromptTemplateEntity, AgentEntity, AgentPromptEntity,
+                                                AgentToolEntity, ApplicationGenerateEntity,
+                                                AppOrchestrationConfigEntity, DatasetEntity,
                                                 DatasetRetrieveConfigEntity, ExternalDataVariableEntity,
                                                 FileUploadEntity, InvokeFrom, ModelConfigEntity, PromptTemplateEntity,
-                                                SensitiveWordAvoidanceEntity, AgentPromptEntity)
+                                                SensitiveWordAvoidanceEntity)
 from core.entities.model_entities import ModelStatus
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.file.file_obj import FileObj

api/core/application_queue_manager.py

@@ -4,10 +4,10 @@ from enum import Enum
 from typing import Any, Generator
 
 from core.entities.application_entities import InvokeFrom
-from core.entities.queue_entities import (AnnotationReplyEvent, AppQueueEvent, QueueAgentThoughtEvent, QueueErrorEvent,
-                                          QueueMessage, QueueMessageEndEvent, QueueMessageEvent,
-                                          QueueMessageReplaceEvent, QueuePingEvent, QueueRetrieverResourcesEvent,
-                                          QueueStopEvent, QueueMessageFileEvent, QueueAgentMessageEvent)
+from core.entities.queue_entities import (AnnotationReplyEvent, AppQueueEvent, QueueAgentMessageEvent,
+                                          QueueAgentThoughtEvent, QueueErrorEvent, QueueMessage, QueueMessageEndEvent,
+                                          QueueMessageEvent, QueueMessageFileEvent, QueueMessageReplaceEvent,
+                                          QueuePingEvent, QueueRetrieverResourcesEvent, QueueStopEvent)
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
 from extensions.ext_redis import redis_client
 from models.model import MessageAgentThought, MessageFile

api/core/callback_handler/agent_tool_callback_handler.py

 import os
 from typing import Any, Dict, Optional, Union
-from pydantic import BaseModel
 
 from langchain.callbacks.base import BaseCallbackHandler
 from langchain.input import print_text
+from pydantic import BaseModel
+
 
 class DifyAgentCallbackHandler(BaseCallbackHandler, BaseModel):
     """Callback Handler that prints to std out."""

api/core/data_loader/loader/unstructured/unstructured_ppt.py

 import logging
 from typing import List
+
 from langchain.document_loaders.base import BaseLoader
 from langchain.schema import Document
 

api/core/embedding/cached_embedding.py

@@ -8,9 +8,8 @@ from core.model_manager import ModelInstance
 from core.model_runtime.entities.model_entities import ModelPropertyKey
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from extensions.ext_database import db
-from langchain.embeddings.base import Embeddings
-
 from extensions.ext_redis import redis_client
+from langchain.embeddings.base import Embeddings
 from libs import helper
 from models.dataset import Embedding
 from sqlalchemy.exc import IntegrityError

api/core/entities/application_entities.py

 from enum import Enum
-from typing import Optional, Any, cast, Literal, Union
-
-from pydantic import BaseModel
+from typing import Any, Literal, Optional, Union, cast
 
 from core.entities.provider_configuration import ProviderModelBundle
 from core.file.file_obj import FileObj
 from core.model_runtime.entities.message_entities import PromptMessageRole
 from core.model_runtime.entities.model_entities import AIModelEntity
+from pydantic import BaseModel
 
 
 class ModelConfigEntity(BaseModel):

api/core/features/agent_runner.py

 import logging
-from typing import cast, Optional, List
-
-from langchain import WikipediaAPIWrapper
-from langchain.callbacks.base import BaseCallbackHandler
-from langchain.tools import BaseTool, WikipediaQueryRun, Tool
-from pydantic import BaseModel, Field
+from typing import List, Optional, cast
 
 from core.agent.agent.agent_llm_callback import AgentLLMCallback
-from core.agent.agent_executor import PlanningStrategy, AgentConfiguration, AgentExecutor
+from core.agent.agent_executor import AgentConfiguration, AgentExecutor, PlanningStrategy
 from core.application_queue_manager import ApplicationQueueManager
 from core.callback_handler.agent_loop_gather_callback_handler import AgentLoopGatherCallbackHandler
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.callback_handler.std_out_callback_handler import DifyStdOutCallbackHandler
-from core.entities.application_entities import ModelConfigEntity, InvokeFrom, \
-    AgentEntity, AgentToolEntity, AppOrchestrationConfigEntity
+from core.entities.application_entities import (AgentEntity, AgentToolEntity, AppOrchestrationConfigEntity, InvokeFrom,
+                                                ModelConfigEntity)
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_runtime.entities.model_entities import ModelFeature, ModelType
 from core.model_runtime.model_providers import model_provider_factory
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.tools.tool.dataset_retriever.dataset_retriever_tool import DatasetRetrieverTool
 from extensions.ext_database import db
+from langchain import WikipediaAPIWrapper
+from langchain.callbacks.base import BaseCallbackHandler
+from langchain.tools import BaseTool, Tool, WikipediaQueryRun
 from models.dataset import Dataset
 from models.model import Message
+from pydantic import BaseModel, Field
 
 logger = logging.getLogger(__name__)
 

api/core/features/assistant_base_runner.py

-import logging
 import json
-
-from typing import Optional, List, Tuple, Union, cast
+import logging
 from datetime import datetime
 from mimetypes import guess_extension
+from typing import List, Optional, Tuple, Union, cast
 
 from core.app_runner.app_runner import AppRunner
-from extensions.ext_database import db
-
-from models.model import MessageAgentThought, Message, MessageFile
-from models.tools import ToolConversationVariables
-
-from core.tools.entities.tool_entities import ToolInvokeMessage, ToolInvokeMessageBinary, \
-    ToolRuntimeVariablePool, ToolParameter
-from core.tools.tool.tool import Tool
-from core.tools.tool_manager import ToolManager
-from core.tools.tool_file_manager import ToolFileManager
-from core.tools.tool.dataset_retriever_tool import DatasetRetrieverTool
-from core.app_runner.app_runner import AppRunner
+from core.application_queue_manager import ApplicationQueueManager
 from core.callback_handler.agent_tool_callback_handler import DifyAgentCallbackHandler
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
-from core.entities.application_entities import ModelConfigEntity, AgentEntity, AgentToolEntity
-from core.application_queue_manager import ApplicationQueueManager
+from core.entities.application_entities import (AgentEntity, AgentToolEntity, ApplicationGenerateEntity,
+                                                AppOrchestrationConfigEntity, InvokeFrom, ModelConfigEntity)
+from core.file.message_file_parser import FileTransferMethod
 from core.memory.token_buffer_memory import TokenBufferMemory
-from core.entities.application_entities import ModelConfigEntity, \
-    AgentEntity, AppOrchestrationConfigEntity, ApplicationGenerateEntity, InvokeFrom
-from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from core.model_manager import ModelInstance
 from core.model_runtime.entities.llm_entities import LLMUsage
+from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
 from core.model_runtime.entities.model_entities import ModelFeature
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.model_manager import ModelInstance
-from core.file.message_file_parser import FileTransferMethod
+from core.model_runtime.utils.encoders import jsonable_encoder
+from core.tools.entities.tool_entities import (ToolInvokeMessage, ToolInvokeMessageBinary, ToolParameter,
+                                               ToolRuntimeVariablePool)
+from core.tools.tool.dataset_retriever_tool import DatasetRetrieverTool
+from core.tools.tool.tool import Tool
+from core.tools.tool_file_manager import ToolFileManager
+from core.tools.tool_manager import ToolManager
+from extensions.ext_database import db
+from models.model import Message, MessageAgentThought, MessageFile
+from models.tools import ToolConversationVariables
 
 logger = logging.getLogger(__name__)
 

api/core/features/assistant_cot_runner.py

 import json
 import logging
 import re
-from typing import Literal, Union, Generator, Dict, List
+from typing import Dict, Generator, List, Literal, Union
 
-from core.entities.application_entities import AgentPromptEntity, AgentScratchpadUnit
 from core.application_queue_manager import PublishFrom
-from core.model_runtime.utils.encoders import jsonable_encoder
-from core.model_runtime.entities.message_entities import PromptMessageTool, PromptMessage, \
-    UserPromptMessage, SystemPromptMessage, AssistantPromptMessage
-from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage, LLMResultChunk, LLMResultChunkDelta
-from core.model_manager import ModelInstance
-
-from core.tools.errors import ToolInvokeError, ToolNotFoundError, \
-    ToolNotSupportedError, ToolProviderNotFoundError, ToolParameterValidationError, \
-          ToolProviderCredentialValidationError
-
+from core.entities.application_entities import AgentPromptEntity, AgentScratchpadUnit
 from core.features.assistant_base_runner import BaseAssistantApplicationRunner
-
+from core.model_manager import ModelInstance
+from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageTool,
+                                                          SystemPromptMessage, UserPromptMessage)
+from core.model_runtime.utils.encoders import jsonable_encoder
+from core.tools.errors import (ToolInvokeError, ToolNotFoundError, ToolNotSupportedError, ToolParameterValidationError,
+                               ToolProviderCredentialValidationError, ToolProviderNotFoundError)
 from models.model import Conversation, Message
 
+
 class AssistantCotApplicationRunner(BaseAssistantApplicationRunner):
     def run(self, conversation: Conversation,
         message: Message,

api/core/features/assistant_fc_runner.py

 import json
 import logging
+from typing import Any, Dict, Generator, List, Tuple, Union
 
-from typing import Union, Generator, Dict, Any, Tuple, List
-
-from core.model_runtime.entities.message_entities import PromptMessage, UserPromptMessage,\
-      SystemPromptMessage, AssistantPromptMessage, ToolPromptMessage, PromptMessageTool
-from core.model_runtime.entities.llm_entities import LLMResultChunk, LLMResult, LLMUsage, LLMResultChunkDelta
-from core.model_manager import ModelInstance
 from core.application_queue_manager import PublishFrom
-
-from core.tools.errors import ToolInvokeError, ToolNotFoundError, \
-    ToolNotSupportedError, ToolProviderNotFoundError, ToolParameterValidationError, \
-          ToolProviderCredentialValidationError
-
 from core.features.assistant_base_runner import BaseAssistantApplicationRunner
-
+from core.model_manager import ModelInstance
+from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageTool,
+                                                          SystemPromptMessage, ToolPromptMessage, UserPromptMessage)
+from core.tools.errors import (ToolInvokeError, ToolNotFoundError, ToolNotSupportedError, ToolParameterValidationError,
+                               ToolProviderCredentialValidationError, ToolProviderNotFoundError)
 from models.model import Conversation, Message, MessageAgentThought
 
 logger = logging.getLogger(__name__)

api/core/file/message_file_parser.py

 from typing import Dict, List, Optional, Union
 
 import requests
-from core.file.file_obj import FileObj, FileTransferMethod, FileType, FileBelongsTo
-from services.file_service import IMAGE_EXTENSIONS
+from core.file.file_obj import FileBelongsTo, FileObj, FileTransferMethod, FileType
 from extensions.ext_database import db
 from models.account import Account
 from models.model import AppModelConfig, EndUser, MessageFile, UploadFile
+from services.file_service import IMAGE_EXTENSIONS
 
 
 class MessageFileParser:

api/core/hosting_configuration.py

@@ -2,7 +2,7 @@ from typing import Optional
 
 from core.entities.provider_entities import QuotaUnit, RestrictModel
 from core.model_runtime.entities.model_entities import ModelType
-from flask import Flask, Config
+from flask import Config, Flask
 from models.provider import ProviderQuotaType
 from pydantic import BaseModel
 

api/core/indexing_runner.py

@@ -13,7 +13,7 @@ from core.docstore.dataset_docstore import DatasetDocumentStore
 from core.errors.error import ProviderTokenNotInitError
 from core.generator.llm_generator import LLMGenerator
 from core.index.index import IndexBuilder
-from core.model_manager import ModelManager, ModelInstance
+from core.model_manager import ModelInstance, ModelManager
 from core.model_runtime.entities.model_entities import ModelType, PriceType
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel

api/core/model_manager.py

@@ -12,8 +12,8 @@ from core.model_runtime.model_providers.__base.large_language_model import Large
 from core.model_runtime.model_providers.__base.moderation_model import ModerationModel
 from core.model_runtime.model_providers.__base.rerank_model import RerankModel
 from core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
-from core.model_runtime.model_providers.__base.tts_model import TTSModel
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
+from core.model_runtime.model_providers.__base.tts_model import TTSModel
 from core.provider_manager import ProviderManager
 
 

api/core/model_runtime/model_providers/__base/tts_model.py

-import uuid
 import hashlib
 import subprocess
+import uuid
 from abc import abstractmethod
 from typing import Optional
 
+from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
 from core.model_runtime.errors.invoke import InvokeBadRequestError
-from core.model_runtime.entities.model_entities import ModelType
 from core.model_runtime.model_providers.__base.ai_model import AIModel
-from core.model_runtime.entities.model_entities import ModelPropertyKey
 
 
 class TTSModel(AIModel):

api/core/model_runtime/model_providers/bedrock/llm/llm.py

+import json
 import logging
 from typing import Generator, List, Optional, Union
 
 import boto3
-from botocore.exceptions import ClientError, EndpointConnectionError, NoRegionError, ServiceNotInRegionError, UnknownServiceError
 from botocore.config import Config
-import json
-
+from botocore.exceptions import (ClientError, EndpointConnectionError, NoRegionError, ServiceNotInRegionError,
+                                 UnknownServiceError)
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta
-
-from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage,
-                                                          PromptMessageTool, SystemPromptMessage, UserPromptMessage)
+from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageTool,
+                                                          SystemPromptMessage, UserPromptMessage)
 from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
                                               InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError

api/core/model_runtime/model_providers/chatglm/llm/llm.py

@@ -5,7 +5,8 @@ from typing import Generator, List, Optional, cast
 
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta
 from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageFunction,
-                                                          PromptMessageTool, SystemPromptMessage, UserPromptMessage, ToolPromptMessage)
+                                                          PromptMessageTool, SystemPromptMessage, ToolPromptMessage,
+                                                          UserPromptMessage)
 from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
                                               InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError

api/core/model_runtime/model_providers/cohere/llm/llm.py

 import logging
-from typing import Generator, List, Optional, Union, cast, Tuple
+from typing import Generator, List, Optional, Tuple, Union, cast
 
 import cohere
 from cohere.responses import Chat, Generations
-from cohere.responses.chat import StreamingChat, StreamTextGeneration, StreamEnd
-from cohere.responses.generation import StreamingText, StreamingGenerations
-
+from cohere.responses.chat import StreamEnd, StreamingChat, StreamTextGeneration
+from cohere.responses.generation import StreamingGenerations, StreamingText
 from core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta
 from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage,
-                                                          PromptMessageContentType, SystemPromptMessage,
-                                                          TextPromptMessageContent, UserPromptMessage,
-                                                          PromptMessageTool)
+                                                          PromptMessageContentType, PromptMessageTool,
+                                                          SystemPromptMessage, TextPromptMessageContent,
+                                                          UserPromptMessage)
 from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, I18nObject, ModelType
-from core.model_runtime.errors.invoke import InvokeConnectionError, InvokeServerUnavailableError, InvokeError, \
-    InvokeRateLimitError, InvokeAuthorizationError, InvokeBadRequestError
+from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
+                                              InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 

api/core/model_runtime/model_providers/cohere/text_embedding/text_embedding.py

@@ -4,11 +4,10 @@ from typing import Optional, Tuple
 import cohere
 import numpy as np
 from cohere.responses import Tokens
-
 from core.model_runtime.entities.model_entities import PriceType
 from core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult
-from core.model_runtime.errors.invoke import InvokeConnectionError, InvokeServerUnavailableError, InvokeRateLimitError, \
-    InvokeAuthorizationError, InvokeBadRequestError, InvokeError
+from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
+                                              InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 

api/core/model_runtime/model_providers/minimax/llm/llm.py

@@ -2,7 +2,7 @@ from typing import Generator, List
 
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta
 from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageTool,
-                                                          SystemPromptMessage, UserPromptMessage, ToolPromptMessage)
+                                                          SystemPromptMessage, ToolPromptMessage, UserPromptMessage)
 from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
                                               InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError

api/core/model_runtime/model_providers/ollama/llm/llm.py

@@ -2,21 +2,20 @@ import json
 import logging
 import re
 from decimal import Decimal
-from typing import Optional, Generator, Union, List, cast
+from typing import Generator, List, Optional, Union, cast
 from urllib.parse import urljoin
 
 import requests
-
-from core.model_runtime.entities.message_entities import PromptMessageTool, PromptMessage, AssistantPromptMessage, \
-    UserPromptMessage, PromptMessageContentType, ImagePromptMessageContent, \
-    TextPromptMessageContent, SystemPromptMessage
-from core.model_runtime.entities.model_entities import I18nObject, ModelType, \
-    PriceConfig, AIModelEntity, FetchFrom, ModelPropertyKey, ParameterRule, ParameterType, DefaultParameterName, \
-    ModelFeature
-from core.model_runtime.entities.llm_entities import LLMMode, LLMResult, \
-    LLMResultChunk, LLMResultChunkDelta
-from core.model_runtime.errors.invoke import InvokeError, InvokeAuthorizationError, InvokeBadRequestError, \
-    InvokeRateLimitError, InvokeServerUnavailableError, InvokeConnectionError
+from core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta
+from core.model_runtime.entities.message_entities import (AssistantPromptMessage, ImagePromptMessageContent,
+                                                          PromptMessage, PromptMessageContentType, PromptMessageTool,
+                                                          SystemPromptMessage, TextPromptMessageContent,
+                                                          UserPromptMessage)
+from core.model_runtime.entities.model_entities import (AIModelEntity, DefaultParameterName, FetchFrom, I18nObject,
+                                                        ModelFeature, ModelPropertyKey, ModelType, ParameterRule,
+                                                        ParameterType, PriceConfig)
+from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
+                                              InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 

api/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py

+import json
 import logging
 import time
 from decimal import Decimal
 from typing import Optional
 from urllib.parse import urljoin
-import requests
-import json
 
 import numpy as np
-
+import requests
 from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.model_entities import PriceType, ModelPropertyKey, ModelType, AIModelEntity, FetchFrom, \
-    PriceConfig
-from core.model_runtime.entities.text_embedding_entities import TextEmbeddingResult, EmbeddingUsage
-from core.model_runtime.errors.invoke import InvokeError, InvokeAuthorizationError, InvokeBadRequestError, \
-    InvokeRateLimitError, InvokeServerUnavailableError, InvokeConnectionError
+from core.model_runtime.entities.model_entities import (AIModelEntity, FetchFrom, ModelPropertyKey, ModelType,
+                                                        PriceConfig, PriceType)
+from core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult
+from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
+                                              InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 

api/core/model_runtime/model_providers/openai/tts/tts.py

+import concurrent.futures
+from functools import reduce
 from io import BytesIO
 from typing import Optional
-from functools import reduce
-from pydub import AudioSegment
 
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.errors.invoke import InvokeBadRequestError
+from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.tts_model import TTSModel
 from core.model_runtime.model_providers.openai._common import _CommonOpenAI
-
 from flask import Response, stream_with_context
 from openai import OpenAI
-import concurrent.futures
+from pydub import AudioSegment
 
 
 class OpenAIText2SpeechModel(_CommonOpenAI, TTSModel):

api/core/model_runtime/model_providers/tongyi/llm/llm.py

 from typing import Generator, List, Optional, Union
 
-from dashscope import get_tokenizer
-
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMMode
+from core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta
 from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageTool,
                                                           SystemPromptMessage, UserPromptMessage)
 from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
                                               InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+from dashscope import get_tokenizer
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 from dashscope.common.error import (AuthenticationError, InvalidParameter, RequestFailure, ServiceUnavailableError,
                                     UnsupportedHTTPMethod, UnsupportedModel)

api/core/model_runtime/model_providers/tongyi/tts/tts.py

+import concurrent.futures
+from functools import reduce
 from io import BytesIO
 from typing import Optional
-from functools import reduce
-from pydub import AudioSegment
 
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
+import dashscope
 from core.model_runtime.errors.invoke import InvokeBadRequestError
+from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.tts_model import TTSModel
 from core.model_runtime.model_providers.tongyi._common import _CommonTongyi
-
-import dashscope
 from flask import Response, stream_with_context
-import concurrent.futures
+from pydub import AudioSegment
 
 
 class TongyiText2SpeechModel(_CommonTongyi, TTSModel):

api/core/model_runtime/model_providers/xinference/llm/llm.py

@@ -3,9 +3,9 @@ from typing import Generator, Iterator, List, Optional, Union, cast
 from core.model_runtime.entities.common_entities import I18nObject
 from core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta
 from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageTool,
-                                                          SystemPromptMessage, UserPromptMessage, ToolPromptMessage)
-from core.model_runtime.entities.model_entities import (AIModelEntity, FetchFrom, ModelPropertyKey, ModelType,
-                                                        ParameterRule, ParameterType, ModelFeature)
+                                                          SystemPromptMessage, ToolPromptMessage, UserPromptMessage)
+from core.model_runtime.entities.model_entities import (AIModelEntity, FetchFrom, ModelFeature, ModelPropertyKey,
+                                                        ModelType, ParameterRule, ParameterType)
 from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
                                               InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError

api/core/model_runtime/model_providers/xinference/text_embedding/text_embedding.py

@@ -2,15 +2,15 @@ import time
 from typing import Optional
 
 from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType, PriceType, ModelPropertyKey
+from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelPropertyKey, ModelType, PriceType
 from core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult
 from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
                                               InvokeError, InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
+from core.model_runtime.model_providers.xinference.xinference_helper import XinferenceHelper
 from xinference_client.client.restful.restful_client import Client, RESTfulEmbeddingModelHandle, RESTfulModelHandle
 
-from core.model_runtime.model_providers.xinference.xinference_helper import XinferenceHelper
 
 class XinferenceTextEmbeddingModel(TextEmbeddingModel):
     """

api/core/model_runtime/model_providers/xinference/xinference_helper.py

+from os import path
 from threading import Lock
 from time import time
 from typing import List
-from os import path
 
 from requests import get
 from requests.adapters import HTTPAdapter

api/core/model_runtime/model_providers/zhipuai/llm/llm.py

@@ -2,16 +2,19 @@ import json
 from typing import Any, Dict, Generator, List, Optional, Union
 
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta
-from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessage, PromptMessageRole,
-                                                          PromptMessageTool, SystemPromptMessage, UserPromptMessage, ToolPromptMessage,
-                                                          TextPromptMessageContent, ImagePromptMessageContent, PromptMessageContentType)
+from core.model_runtime.entities.message_entities import (AssistantPromptMessage, ImagePromptMessageContent,
+                                                          PromptMessage, PromptMessageContentType, PromptMessageRole,
+                                                          PromptMessageTool, SystemPromptMessage,
+                                                          TextPromptMessageContent, ToolPromptMessage,
+                                                          UserPromptMessage)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
-from core.model_runtime.utils import helper
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.model_runtime.model_providers.zhipuai._common import _CommonZhipuaiAI
 from core.model_runtime.model_providers.zhipuai.zhipuai_sdk._client import ZhipuAI
-from core.model_runtime.model_providers.zhipuai.zhipuai_sdk.types.chat.chat_completion_chunk import ChatCompletionChunk
 from core.model_runtime.model_providers.zhipuai.zhipuai_sdk.types.chat.chat_completion import Completion
+from core.model_runtime.model_providers.zhipuai.zhipuai_sdk.types.chat.chat_completion_chunk import ChatCompletionChunk
+from core.model_runtime.utils import helper
+
 
 class ZhipuAILargeLanguageModel(_CommonZhipuaiAI, LargeLanguageModel):
 

api/core/model_runtime/model_providers/zhipuai/text_embedding/text_embedding.py

@@ -5,8 +5,8 @@ from core.model_runtime.entities.model_entities import PriceType
 from core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
-from core.model_runtime.model_providers.zhipuai.zhipuai_sdk._client import ZhipuAI
 from core.model_runtime.model_providers.zhipuai._common import _CommonZhipuaiAI
+from core.model_runtime.model_providers.zhipuai.zhipuai_sdk._client import ZhipuAI
 from langchain.schema.language_model import _get_token_ids_default_method
 
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py

 
-from ._client import ZhipuAI
-
-from .core._errors import (
-    ZhipuAIError,
-    APIStatusError,
-    APIRequestFailedError,
-    APIAuthenticationError,
-    APIReachLimitError,
-    APIInternalError,
-    APIServerFlowExceedError,
-    APIResponseError,
-    APIResponseValidationError,
-    APITimeoutError,
-)
-
 from .__version__ import __version__
+from ._client import ZhipuAI
+from .core._errors import (APIAuthenticationError, APIInternalError, APIReachLimitError, APIRequestFailedError,
+                           APIResponseError, APIResponseValidationError, APIServerFlowExceedError, APIStatusError,
+                           APITimeoutError, ZhipuAIError)

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py

 from __future__ import annotations
 
-from typing import Union, Mapping
+import os
+from typing import Mapping, Union
 
+import httpx
+from httpx import Timeout
 from typing_extensions import override
 
+from . import api_resource
 from .core import _jwt_token
+from .core._base_type import NOT_GIVEN, NotGiven
 from .core._errors import ZhipuAIError
-from .core._http_client import HttpClient, ZHIPUAI_DEFAULT_MAX_RETRIES
-from .core._base_type import NotGiven, NOT_GIVEN
-from . import api_resource
-import os
-import httpx
-from httpx import Timeout
+from .core._http_client import ZHIPUAI_DEFAULT_MAX_RETRIES, HttpClient
 
 
 class ZhipuAI(HttpClient):

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/__init__.py

 from .chat import chat
-from .images import Images
 from .embeddings import Embeddings
 from .files import Files
 from .fine_tuning import fine_tuning
+from .images import Images

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/async_completions.py

 from __future__ import annotations
 
-from typing import Union, List, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, List, Optional, Union
 
 import httpx
 from typing_extensions import Literal
 
 from ...core._base_api import BaseAPI
-from ...core._base_type import NotGiven, NOT_GIVEN, Headers
+from ...core._base_type import NOT_GIVEN, Headers, NotGiven
 from ...core._http_client import make_user_request_input
-from ...types.chat.async_chat_completion import AsyncTaskStatus, AsyncCompletion
+from ...types.chat.async_chat_completion import AsyncCompletion, AsyncTaskStatus
 
 if TYPE_CHECKING:
     from ..._client import ZhipuAI

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/chat.py

 from typing import TYPE_CHECKING
-from .completions import Completions
-from .async_completions import AsyncCompletions
+
 from ...core._base_api import BaseAPI
+from .async_completions import AsyncCompletions
+from .completions import Completions
 
 if TYPE_CHECKING:
     from ..._client import ZhipuAI

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/chat/completions.py

 from __future__ import annotations
 
-from typing import Union, List, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, List, Optional, Union
 
 import httpx
 from typing_extensions import Literal
 
 from ...core._base_api import BaseAPI
-from ...core._base_type import NotGiven, NOT_GIVEN, Headers
+from ...core._base_type import NOT_GIVEN, Headers, NotGiven
 from ...core._http_client import make_user_request_input
 from ...core._sse_client import StreamResponse
 from ...types.chat.chat_completion import Completion

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/embeddings.py

 from __future__ import annotations
 
-from typing import Union, List, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, List, Optional, Union
 
 import httpx
 
 from ..core._base_api import BaseAPI
-from ..core._base_type import NotGiven, NOT_GIVEN, Headers
+from ..core._base_type import NOT_GIVEN, Headers, NotGiven
 from ..core._http_client import make_user_request_input
 from ..types.embeddings import EmbeddingsResponded
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/files.py

@@ -5,11 +5,9 @@ from typing import TYPE_CHECKING
 import httpx
 
 from ..core._base_api import BaseAPI
-from ..core._base_type import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
+from ..core._base_type import NOT_GIVEN, Body, FileTypes, Headers, NotGiven, Query
 from ..core._files import is_file_content
-from ..core._http_client import (
-    make_user_request_input,
-)
+from ..core._http_client import make_user_request_input
 from ..types.file_object import FileObject, ListOfFileObject
 
 if TYPE_CHECKING:

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/fine_tuning.py

 from typing import TYPE_CHECKING
-from .jobs import Jobs
+
 from ...core._base_api import BaseAPI
+from .jobs import Jobs
 
 if TYPE_CHECKING:
     from ..._client import ZhipuAI

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/fine_tuning/jobs.py

 from __future__ import annotations
 
-from typing import Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 import httpx
 
 from ...core._base_api import BaseAPI
 from ...core._base_type import NOT_GIVEN, Headers, NotGiven
-from ...core._http_client import (
-    make_user_request_input,
-)
-from ...types.fine_tuning import (
-    FineTuningJob,
-    job_create_params,
-    ListOfFineTuningJob,
-    FineTuningJobEvent,
-)
+from ...core._http_client import make_user_request_input
+from ...types.fine_tuning import FineTuningJob, FineTuningJobEvent, ListOfFineTuningJob, job_create_params
 
 if TYPE_CHECKING:
     from ..._client import ZhipuAI

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/api_resource/images.py

 from __future__ import annotations
 
-from typing import Union, List, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, List, Optional, Union
 
 import httpx
 
 from ..core._base_api import BaseAPI
-from ..core._base_type import NotGiven, NOT_GIVEN, Headers
+from ..core._base_type import NOT_GIVEN, Headers, NotGiven
 from ..core._http_client import make_user_request_input
 from ..types.image import ImagesResponded
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_api.py

 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_type.py

 from __future__ import annotations
 
 from os import PathLike
-from typing import (
-    TYPE_CHECKING,
-    Type,
-    Union,
-    Mapping,
-    TypeVar, IO, Tuple, Sequence, Any, List,
-)
+from typing import IO, TYPE_CHECKING, Any, List, Mapping, Sequence, Tuple, Type, TypeVar, Union
 
 import pydantic
-from typing_extensions import (
-    Literal,
-    override,
-)
-
+from typing_extensions import Literal, override
 
 Query = Mapping[str, object]
 Body = object

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_files.py

@@ -5,12 +5,7 @@ import os
 from pathlib import Path
 from typing import Mapping, Sequence
 
-from ._base_type import (
-    FileTypes,
-    HttpxFileTypes,
-    HttpxRequestFiles,
-    RequestFiles,
-)
+from ._base_type import FileTypes, HttpxFileTypes, HttpxRequestFiles, RequestFiles
 
 
 def is_file_content(obj: object) -> bool:

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_http_client.py

@@ -2,20 +2,14 @@
 from __future__ import annotations
 
 import inspect
-from typing import (
-    Any,
-    Type,
-    Union,
-    cast,
-    Mapping,
-)
+from typing import Any, Mapping, Type, Union, cast
 
 import httpx
 import pydantic
 from httpx import URL, Timeout
 
 from . import _errors
-from ._base_type import NotGiven, ResponseT, Body, Headers, NOT_GIVEN, RequestFiles, Query, Data
+from ._base_type import NOT_GIVEN, Body, Data, Headers, NotGiven, Query, RequestFiles, ResponseT
 from ._errors import APIResponseValidationError, APIStatusError, APITimeoutError
 from ._files import make_httpx_files
 from ._request_opt import ClientRequestParam, UserRequestInput

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_request_opt.py

 from __future__ import annotations
 
-from typing import Union, Any, cast
+from typing import Any, Union, cast
 
 import pydantic.generics
 from httpx import Timeout
 from pydantic import ConfigDict
-from typing_extensions import (
-    Unpack, ClassVar, TypedDict
-)
+from typing_extensions import ClassVar, TypedDict, Unpack
 
-from ._base_type import Body, NotGiven, Headers, HttpxRequestFiles, Query
+from ._base_type import Body, Headers, HttpxRequestFiles, NotGiven, Query
 from ._utils import remove_notgiven_indict
 
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_response.py

 from __future__ import annotations
 
 import datetime
-from typing import TypeVar, Generic, cast, Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast
 
 import httpx
 import pydantic
-from typing_extensions import ParamSpec, get_origin, get_args
+from typing_extensions import ParamSpec, get_args, get_origin
 
 from ._base_type import NoneType
 from ._sse_client import StreamResponse

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import json
-from typing import Generic, Iterator, TYPE_CHECKING, Mapping
+from typing import TYPE_CHECKING, Generic, Iterator, Mapping
 
 import httpx
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_utils.py

 from __future__ import annotations
 
-from typing import Mapping, Iterable, TypeVar
+from typing import Iterable, Mapping, TypeVar
 
 from ._base_type import NotGiven
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/embeddings.py

 from __future__ import annotations
 
-from typing import Optional, List
+from typing import List, Optional
 
 from pydantic import BaseModel
+
 from .chat.chat_completion import CompletionUsage
+
 __all__ = ["Embedding", "EmbeddingsResponded"]
 
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/file_object.py

-from typing import Optional, List
+from typing import List, Optional
 
 from pydantic import BaseModel
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job.py

-from typing import List, Union, Optional
-from typing_extensions import Literal
+from typing import List, Optional, Union
 
 from pydantic import BaseModel
+from typing_extensions import Literal
 
 __all__ = ["FineTuningJob", "Error", "Hyperparameters", "ListOfFineTuningJob" ]
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/fine_tuning/fine_tuning_job_event.py

-from typing import List, Union, Optional
-from typing_extensions import Literal
+from typing import List, Optional, Union
 
 from pydantic import BaseModel
+from typing_extensions import Literal
 
 __all__ = ["FineTuningJobEvent", "Metric", "JobEvent"]
 

api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/types/image.py

 from __future__ import annotations
 
-from typing import Optional, List
+from typing import List, Optional
 
 from pydantic import BaseModel
 

api/core/tools/entities/tool_bundle.py

+from typing import Any, Dict, List, Optional
+
+from core.tools.entities.tool_entities import ToolParameter, ToolProviderType
 from pydantic import BaseModel
-from typing import Dict, Optional, Any, List
 
-from core.tools.entities.tool_entities import ToolProviderType, ToolParameter
 
 class ApiBasedToolBundle(BaseModel):
     """

api/core/tools/entities/tool_entities.py

-from pydantic import BaseModel, Field
 from enum import Enum
-from typing import Optional, List, Dict, Any, Union, cast
+from typing import Any, Dict, List, Optional, Union, cast
 
 from core.tools.entities.common_entities import I18nObject
+from pydantic import BaseModel, Field
+
 
 class ToolProviderType(Enum):
     """

api/core/tools/entities/user_entities.py

-from pydantic import BaseModel
 from enum import Enum
-from typing import List, Dict, Optional
+from typing import Dict, List, Optional
 
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderCredentials
 from core.tools.tool.tool import ToolParameter
+from pydantic import BaseModel
+
 
 class UserToolProvider(BaseModel):
     class ProviderType(Enum):

api/core/tools/model/tool_model_manager.py

@@ -4,23 +4,21 @@
     Therefore, a model manager is needed to list/invoke/validate models.
 """
 
-from core.model_runtime.entities.message_entities import PromptMessage
+import json
+from typing import List, cast
+
+from core.model_manager import ModelManager
 from core.model_runtime.entities.llm_entities import LLMResult
+from core.model_runtime.entities.message_entities import PromptMessage
 from core.model_runtime.entities.model_entities import ModelType
+from core.model_runtime.errors.invoke import (InvokeAuthorizationError, InvokeBadRequestError, InvokeConnectionError,
+                                              InvokeRateLimitError, InvokeServerUnavailableError)
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel, ModelPropertyKey
-from core.model_runtime.errors.invoke import InvokeRateLimitError, InvokeBadRequestError, \
-    InvokeConnectionError, InvokeAuthorizationError, InvokeServerUnavailableError
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.model_manager import ModelManager
-
 from core.tools.model.errors import InvokeModelError
-
 from extensions.ext_database import db
-
 from models.tools import ToolModelInvoke
 
-from typing import List, cast
-import json
 
 class ToolModelManager:
     @staticmethod

api/core/tools/provider/api_tool_provider.py

 from typing import Any, Dict, List
-from core.tools.entities.tool_entities import ToolProviderType, ApiProviderAuthType, ToolProviderCredentials, ToolCredentialsOption
+
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_bundle import ApiBasedToolBundle
-from core.tools.tool.tool import Tool
-from core.tools.tool.api_tool import ApiTool
+from core.tools.entities.tool_entities import (ApiProviderAuthType, ToolCredentialsOption, ToolProviderCredentials,
+                                               ToolProviderType)
 from core.tools.provider.tool_provider import ToolProviderController
-
+from core.tools.tool.api_tool import ApiTool
+from core.tools.tool.tool import Tool
 from extensions.ext_database import db
-
 from models.tools import ApiToolProvider
 
+
 class ApiBasedToolProviderController(ToolProviderController):
     @staticmethod
     def from_db(db_provider: ApiToolProvider, auth_type: ApiProviderAuthType) -> 'ApiBasedToolProviderController':

api/core/tools/provider/app_tool_provider.py

+import logging
 from typing import Any, Dict, List
-from core.tools.entities.tool_entities import ToolProviderType, ToolParameter, ToolParameterOption
-from core.tools.tool.tool import Tool
+
 from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import ToolParameter, ToolParameterOption, ToolProviderType
 from core.tools.provider.tool_provider import ToolProviderController
-
+from core.tools.tool.tool import Tool
 from extensions.ext_database import db
-from models.tools import PublishedAppTool
 from models.model import App, AppModelConfig
-
-import logging
+from models.tools import PublishedAppTool
 
 logger = logging.getLogger(__name__)
 

api/core/tools/provider/builtin/_positions.py

-from core.tools.entities.user_entities import UserToolProvider
 from typing import List
 
+from core.tools.entities.user_entities import UserToolProvider
+
 position = {
     'google': 1,
     'wikipedia': 2,

api/core/tools/provider/builtin/azuredalle/azuredalle.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.provider.builtin.azuredalle.tools.dalle3 import DallE3Tool
+from typing import Any, Dict
+
 from core.tools.errors import ToolProviderCredentialValidationError
+from core.tools.provider.builtin.azuredalle.tools.dalle3 import DallE3Tool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
-from typing import Any, Dict
 
 class AzureDALLEProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: Dict[str, Any]) -> None:

api/core/tools/provider/builtin/azuredalle/tools/dalle3.py

-from typing import Any, Dict, List, Union
-from core.tools.entities.tool_entities import ToolInvokeMessage
-from core.tools.tool.builtin_tool import BuiltinTool
-
 from base64 import b64decode
 from os.path import join
+from typing import Any, Dict, List, Union
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
 from openai import AzureOpenAI
 
+
 class DallE3Tool(BuiltinTool):
     def _invoke(self, 
                 user_id: str, 

api/core/tools/provider/builtin/chart/chart.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
+import matplotlib.pyplot as plt
 from core.tools.errors import ToolProviderCredentialValidationError
-
 from core.tools.provider.builtin.chart.tools.line import LinearChartTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
-import matplotlib.pyplot as plt
 # use a business theme
 plt.style.use('seaborn-v0_8-darkgrid')
 

api/core/tools/provider/builtin/chart/tools/bar.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-import matplotlib.pyplot as plt
 import io
-
 from typing import Any, Dict, List, Union
 
+import matplotlib.pyplot as plt
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
+
+
 class BarChartTool(BuiltinTool):
     def _invoke(self, user_id: str, tool_parameters: Dict[str, Any]) \
           -> Union[ToolInvokeMessage, List[ToolInvokeMessage]]:

api/core/tools/provider/builtin/chart/tools/line.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-import matplotlib.pyplot as plt
 import io
-
 from typing import Any, Dict, List, Union
 
+import matplotlib.pyplot as plt
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
+
+
 class LinearChartTool(BuiltinTool):
     def _invoke(self, 
                 user_id: str, 

api/core/tools/provider/builtin/chart/tools/pie.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-import matplotlib.pyplot as plt
 import io
-
 from typing import Any, Dict, List, Union
 
+import matplotlib.pyplot as plt
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
+
+
 class PieChartTool(BuiltinTool):
     def _invoke(self, 
                 user_id: str, 

api/core/tools/provider/builtin/dalle/dalle.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.provider.builtin.dalle.tools.dalle2 import DallE2Tool
+from typing import Any, Dict
+
 from core.tools.errors import ToolProviderCredentialValidationError
+from core.tools.provider.builtin.dalle.tools.dalle2 import DallE2Tool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
-from typing import Any, Dict
 
 class DALLEProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: Dict[str, Any]) -> None:

api/core/tools/provider/builtin/dalle/tools/dalle2.py

-from typing import Any, Dict, List, Union
-from core.tools.entities.tool_entities import ToolInvokeMessage
-from core.tools.tool.builtin_tool import BuiltinTool
-
 from base64 import b64decode
 from os.path import join
+from typing import Any, Dict, List, Union
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
 from openai import OpenAI
 
+
 class DallE2Tool(BuiltinTool):
     def _invoke(self, 
                 user_id: str, 

api/core/tools/provider/builtin/dalle/tools/dalle3.py

-from typing import Any, Dict, List, Union
-from core.tools.entities.tool_entities import ToolInvokeMessage
-from core.tools.tool.builtin_tool import BuiltinTool
-
 from base64 import b64decode
 from os.path import join
+from typing import Any, Dict, List, Union
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
 from openai import OpenAI
 
+
 class DallE3Tool(BuiltinTool):
     def _invoke(self, 
                 user_id: str, 

api/core/tools/provider/builtin/gaode/gaode.py

-import requests
 import urllib.parse
-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
+
+import requests
 from core.tools.errors import ToolProviderCredentialValidationError
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
 
 class GaodeProvider(BuiltinToolProviderController):

api/core/tools/provider/builtin/gaode/tools/gaode_weather.py

 import json
+from typing import Any, Dict, List, Union
+
 import requests
-from core.tools.tool.builtin_tool import BuiltinTool
 from core.tools.entities.tool_entities import ToolInvokeMessage
-from typing import Any, Dict, List, Union
+from core.tools.tool.builtin_tool import BuiltinTool
 
 
 class GaodeRepositoriesTool(BuiltinTool):

api/core/tools/provider/builtin/github/github.py

 import requests
-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 from core.tools.errors import ToolProviderCredentialValidationError
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
 
 class GihubProvider(BuiltinToolProviderController):

api/core/tools/provider/builtin/github/tools/github_repositories.py

 import json
-import requests
 from datetime import datetime
+from typing import Any, Dict, List, Union
 from urllib.parse import quote
-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
 
-from typing import Any, Dict, List, Union
+import requests
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
 
 
 class GihubRepositoriesTool(BuiltinTool):

api/core/tools/provider/builtin/google/google.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.errors import ToolProviderCredentialValidationError
+from typing import Any, Dict, List
 
+from core.tools.errors import ToolProviderCredentialValidationError
 from core.tools.provider.builtin.google.tools.google_search import GoogleSearchTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
-from typing import Any, Dict, List
 
 class GoogleProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: Dict[str, Any]) -> None:

api/core/tools/provider/builtin/google/tools/google_search.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-
-from typing import Any, Dict, List, Union
-
 import os
 import sys
+from typing import Any, Dict, List, Union
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
 from serpapi import GoogleSearch
 
+
 class HiddenPrints:
     """Context manager to hide prints."""
 

api/core/tools/provider/builtin/stablediffusion/stablediffusion.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.errors import ToolProviderCredentialValidationError
+from typing import Any, Dict
 
+from core.tools.errors import ToolProviderCredentialValidationError
 from core.tools.provider.builtin.stablediffusion.tools.stable_diffusion import StableDiffusionTool
-
-from typing import Any, Dict
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
 
 class StableDiffusionProvider(BuiltinToolProviderController):

api/core/tools/provider/builtin/stablediffusion/tools/stable_diffusion.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter, ToolParameterOption
+import io
+import json
+from base64 import b64decode, b64encode
+from copy import deepcopy
+from os.path import join
+from typing import Any, Dict, List, Union
+
 from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter, ToolParameterOption
 from core.tools.errors import ToolProviderCredentialValidationError
-
-from typing import Any, Dict, List, Union
-from httpx import post, get
-from os.path import join
-from base64 import b64decode, b64encode
+from core.tools.tool.builtin_tool import BuiltinTool
+from httpx import get, post
 from PIL import Image
 
-import json
-import io
-
-from copy import deepcopy
-
 DRAW_TEXT_OPTIONS = {
     "prompt": "",
     "negative_prompt": "",

api/core/tools/provider/builtin/time/time.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.errors import ToolProviderCredentialValidationError
+from typing import Any, Dict
 
+from core.tools.errors import ToolProviderCredentialValidationError
 from core.tools.provider.builtin.time.tools.current_time import CurrentTimeTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
-from typing import Any, Dict
 
 class WikiPediaProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: Dict[str, Any]) -> None:

api/core/tools/provider/builtin/time/tools/current_time.py

+from datetime import datetime, timezone
+from typing import Any, Dict, List, Union
+
 from core.tools.entities.tool_entities import ToolInvokeMessage
 from core.tools.tool.builtin_tool import BuiltinTool
-
-from typing import Any, Dict, List, Union
 from pytz import timezone as pytz_timezone
 
-from datetime import datetime, timezone
 
 class CurrentTimeTool(BuiltinTool):
     def _invoke(self, 

api/core/tools/provider/builtin/vectorizer/tools/vectorizer.py

-from core.tools.tool.builtin_tool import BuiltinTool
+from base64 import b64decode
+from typing import Any, Dict, List, Union
+
 from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
-from core.tools.provider.builtin.vectorizer.tools.test_data import VECTORIZER_ICON_PNG
 from core.tools.errors import ToolProviderCredentialValidationError
-
-from typing import Any, Dict, List, Union
+from core.tools.provider.builtin.vectorizer.tools.test_data import VECTORIZER_ICON_PNG
+from core.tools.tool.builtin_tool import BuiltinTool
 from httpx import post
-from base64 import b64decode
+
 
 class VectorizerTool(BuiltinTool):
     def _invoke(self, user_id: str, tool_parameters: Dict[str, Any]) \

api/core/tools/provider/builtin/vectorizer/vectorizer.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.errors import ToolProviderCredentialValidationError
+from typing import Any, Dict
 
+from core.tools.errors import ToolProviderCredentialValidationError
 from core.tools.provider.builtin.vectorizer.tools.vectorizer import VectorizerTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
-from typing import Any, Dict
 
 class VectorizerProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: Dict[str, Any]) -> None:

api/core/tools/provider/builtin/webscraper/tools/webscraper.py

-from core.tools.tool.builtin_tool import BuiltinTool
+from typing import Any, Dict, List, Union
+
 from core.tools.entities.tool_entities import ToolInvokeMessage
 from core.tools.errors import ToolInvokeError
+from core.tools.tool.builtin_tool import BuiltinTool
 
-from typing import Any, Dict, List, Union
 
 class WebscraperTool(BuiltinTool):
     def _invoke(self,

api/core/tools/provider/builtin/webscraper/webscraper.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.errors import ToolProviderCredentialValidationError
+from typing import Any, Dict, List
 
+from core.tools.errors import ToolProviderCredentialValidationError
 from core.tools.provider.builtin.webscraper.tools.webscraper import WebscraperTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 
-from typing import Any, Dict, List
 
 class WebscraperProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: Dict[str, Any]) -> None:

api/core/tools/provider/builtin/wikipedia/tools/wikipedia_search.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-
-from pydantic import BaseModel, Field
-
 from typing import Any, Dict, List, Union
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
 from langchain import WikipediaAPIWrapper
 from langchain.tools import WikipediaQueryRun
+from pydantic import BaseModel, Field
+
 
 class WikipediaInput(BaseModel):
     query: str = Field(..., description="search query.")

api/core/tools/provider/builtin/wikipedia/wikipedia.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 from core.tools.errors import ToolProviderCredentialValidationError
-
 from core.tools.provider.builtin.wikipedia.tools.wikipedia_search import WikiPediaSearchTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
+
 
 class WikiPediaProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: dict) -> None:

api/core/tools/provider/builtin/wolframalpha/tools/wolframalpha.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-from core.tools.errors import ToolProviderCredentialValidationError, ToolInvokeError
-
 from typing import Any, Dict, List, Union
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.errors import ToolInvokeError, ToolProviderCredentialValidationError
+from core.tools.tool.builtin_tool import BuiltinTool
 from httpx import get
 
+
 class WolframAlphaTool(BuiltinTool):
     _base_url = 'https://api.wolframalpha.com/v2/query'
 

api/core/tools/provider/builtin/wolframalpha/wolframalpha.py

+from typing import Any, Dict, List
+
 from core.tools.entities.tool_entities import ToolInvokeMessage, ToolProviderType
-from core.tools.tool.tool import Tool
-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 from core.tools.errors import ToolProviderCredentialValidationError
-
 from core.tools.provider.builtin.wolframalpha.tools.wolframalpha import WolframAlphaTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
+from core.tools.tool.tool import Tool
 
-from typing import Any, Dict, List
 
 class GoogleProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: Dict[str, Any]) -> None:

api/core/tools/provider/builtin/yahoo/tools/analytics.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-
-from typing import Any, Dict, List, Union
-from requests.exceptions import HTTPError, ReadTimeout
 from datetime import datetime
+from typing import Any, Dict, List, Union
 
-from yfinance import download
 import pandas as pd
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
+from requests.exceptions import HTTPError, ReadTimeout
+from yfinance import download
+
 
 class YahooFinanceAnalyticsTool(BuiltinTool):
     def _invoke(self, user_id: str, tool_parameters: Dict[str, Any]) \

api/core/tools/provider/builtin/yahoo/tools/news.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-
 from typing import Any, Dict, List, Union
-from requests.exceptions import HTTPError, ReadTimeout
 
 import yfinance
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
+from requests.exceptions import HTTPError, ReadTimeout
+
 
 class YahooFinanceSearchTickerTool(BuiltinTool):
     def _invoke(self,user_id: str, tool_parameters: Dict[str, Any]) \

api/core/tools/provider/builtin/yahoo/tools/ticker.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-
 from typing import Any, Dict, List, Union
-from requests.exceptions import HTTPError, ReadTimeout
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
+from requests.exceptions import HTTPError, ReadTimeout
 from yfinance import Ticker
 
+
 class YahooFinanceSearchTickerTool(BuiltinTool):
     def _invoke(self, user_id: str, tool_parameters: Dict[str, Any]) \
           -> Union[ToolInvokeMessage, List[ToolInvokeMessage]]:

api/core/tools/provider/builtin/yahoo/yahoo.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 from core.tools.errors import ToolProviderCredentialValidationError
-
 from core.tools.provider.builtin.yahoo.tools.ticker import YahooFinanceSearchTickerTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
+
 
 class YahooFinanceProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: dict) -> None:

api/core/tools/provider/builtin/youtube/tools/videos.py

-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.entities.tool_entities import ToolInvokeMessage
-
-from typing import Any, Dict, List, Union
 from datetime import datetime
+from typing import Any, Dict, List, Union
 
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.tool.builtin_tool import BuiltinTool
 from googleapiclient.discovery import build
 
+
 class YoutubeVideosAnalyticsTool(BuiltinTool):
     def _invoke(self, user_id: str, tool_parameters: Dict[str, Any]) \
           -> Union[ToolInvokeMessage, List[ToolInvokeMessage]]:

api/core/tools/provider/builtin/youtube/youtube.py

-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
 from core.tools.errors import ToolProviderCredentialValidationError
-
 from core.tools.provider.builtin.youtube.tools.videos import YoutubeVideosAnalyticsTool
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
+
 
 class YahooFinanceProvider(BuiltinToolProviderController):
     def _validate_credentials(self, credentials: dict) -> None:

api/core/tools/provider/builtin_tool_provider.py

+import importlib
 from abc import abstractmethod
-from typing import List, Dict, Any
-
-from os import path, listdir
-from yaml import load, FullLoader
+from os import listdir, path
+from typing import Any, Dict, List
 
-from core.tools.entities.tool_entities import ToolProviderType, \
-      ToolParameter, ToolProviderCredentials
-from core.tools.tool.tool import Tool
-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.provider.tool_provider import ToolProviderController
+from core.tools.entities.tool_entities import ToolParameter, ToolProviderCredentials, ToolProviderType
 from core.tools.entities.user_entities import UserToolProviderCredentials
-from core.tools.errors import ToolNotFoundError, ToolProviderNotFoundError, \
-    ToolParameterValidationError, ToolProviderCredentialValidationError
+from core.tools.errors import (ToolNotFoundError, ToolParameterValidationError, ToolProviderCredentialValidationError,
+                               ToolProviderNotFoundError)
+from core.tools.provider.tool_provider import ToolProviderController
+from core.tools.tool.builtin_tool import BuiltinTool
+from core.tools.tool.tool import Tool
+from yaml import FullLoader, load
 
-import importlib
 
 class BuiltinToolProviderController(ToolProviderController):
     def __init__(self, **data: Any) -> None:

api/core/tools/provider/tool_provider.py

 from abc import ABC, abstractmethod
-from typing import List, Dict, Any, Optional
+from typing import Any, Dict, List, Optional
 
+from core.tools.entities.tool_entities import (ToolParameter, ToolProviderCredentials, ToolProviderIdentity,
+                                               ToolProviderType)
+from core.tools.entities.user_entities import UserToolProviderCredentials
+from core.tools.errors import ToolNotFoundError, ToolParameterValidationError, ToolProviderCredentialValidationError
+from core.tools.tool.tool import Tool
 from pydantic import BaseModel
 
-from core.tools.entities.tool_entities import ToolProviderType, \
-    ToolProviderIdentity, ToolParameter, ToolProviderCredentials
-from core.tools.tool.tool import Tool
-from core.tools.entities.user_entities import UserToolProviderCredentials
-from core.tools.errors import ToolNotFoundError, \
-    ToolParameterValidationError, ToolProviderCredentialValidationError
 
 class ToolProviderController(BaseModel, ABC):
     identity: Optional[ToolProviderIdentity] = None

api/core/tools/tool/api_tool.py

-from typing import Any, Dict, List, Union
+import json
 from json import dumps
+from typing import Any, Dict, List, Union
 
+import httpx
+import requests
 from core.tools.entities.tool_bundle import ApiBasedToolBundle
 from core.tools.entities.tool_entities import ToolInvokeMessage
-from core.tools.tool.tool import Tool
 from core.tools.errors import ToolProviderCredentialValidationError
+from core.tools.tool.tool import Tool
 
-import httpx
-import requests
-import json
 
 class ApiTool(Tool):
     api_bundle: ApiBasedToolBundle

api/core/tools/tool/builtin_tool.py

-from core.tools.tool.tool import Tool
-from core.tools.model.tool_model_manager import ToolModelManager
-from core.model_runtime.entities.message_entities import PromptMessage
+from enum import Enum
+from typing import List
+
 from core.model_runtime.entities.llm_entities import LLMResult
-from core.model_runtime.entities.message_entities import SystemPromptMessage, UserPromptMessage
+from core.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
+from core.tools.model.tool_model_manager import ToolModelManager
+from core.tools.tool.tool import Tool
 from core.tools.utils.web_reader_tool import get_url
 
-from typing import List
-from enum import Enum
-
 _SUMMARY_PROMPT = """You are a professional language researcher, you are interested in the language
 and you can quickly aimed at the main point of an webpage and reproduce it in your own words but 
 retain the original meaning and keep the key points. 

api/core/tools/tool/dataset_retriever_tool.py

 from typing import Any, Dict, List, Union
-from core.features.dataset_retrieval import DatasetRetrievalFeature
-from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter, ToolIdentity, ToolDescription
-from core.tools.tool.tool import Tool
-from core.tools.entities.common_entities import I18nObject
+
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.entities.application_entities import DatasetRetrieveConfigEntity, InvokeFrom
-
+from core.features.dataset_retrieval import DatasetRetrievalFeature
+from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import ToolDescription, ToolIdentity, ToolInvokeMessage, ToolParameter
+from core.tools.tool.tool import Tool
 from langchain.tools import BaseTool
 
+
 class DatasetRetrieverTool(Tool):
     langchain_tool: BaseTool
 

api/core/tools/tool/tool.py

-from pydantic import BaseModel
-
-from typing import List, Dict, Any, Union, Optional
-from abc import abstractmethod, ABC
+from abc import ABC, abstractmethod
 from enum import Enum
+from typing import Any, Dict, List, Optional, Union
 
-from core.tools.entities.tool_entities import ToolIdentity, ToolInvokeMessage,\
-    ToolParameter, ToolDescription, ToolRuntimeVariablePool, ToolRuntimeVariable, ToolRuntimeImageVariable
-from core.tools.tool_file_manager import ToolFileManager
 from core.callback_handler.agent_tool_callback_handler import DifyAgentCallbackHandler
+from core.tools.entities.tool_entities import (ToolDescription, ToolIdentity, ToolInvokeMessage, ToolParameter,
+                                               ToolRuntimeImageVariable, ToolRuntimeVariable, ToolRuntimeVariablePool)
+from core.tools.tool_file_manager import ToolFileManager
+from pydantic import BaseModel
+
 
 class Tool(BaseModel, ABC):
     identity: ToolIdentity = None

api/core/tools/tool_file_manager.py

-import logging
-import time
-import os
-import hmac
 import base64
 import hashlib
-
-from typing import Union, Tuple, Generator
-from uuid import uuid4
+import hmac
+import logging
+import os
+import time
 from mimetypes import guess_extension, guess_type
-from httpx import get
-
-from flask import current_app
-
-from models.tools import ToolFile
-from models.model import MessageFile
+from typing import Generator, Tuple, Union
+from uuid import uuid4
 
 from extensions.ext_database import db
 from extensions.ext_storage import storage
+from flask import current_app
+from httpx import get
+from models.model import MessageFile
+from models.tools import ToolFile
 
 logger = logging.getLogger(__name__)
 
@@ -194,4 +191,5 @@ class ToolFileManager:
     
 # init tool_file_parser
 from core.file.tool_file_parser import tool_file_manager
+
 tool_file_manager['manager'] = ToolFileManager

api/core/tools/tool_manager.py

-from typing import List, Dict, Any, Tuple, Union
+import importlib
+import json
+import logging
+import mimetypes
 from os import listdir, path
+from typing import Any, Dict, List, Tuple, Union
 
-from core.tools.entities.tool_entities import ToolInvokeMessage, ApiProviderAuthType, ToolProviderCredentials
-from core.tools.provider.tool_provider import ToolProviderController
-from core.tools.tool.builtin_tool import BuiltinTool
-from core.tools.tool.api_tool import ApiTool
-from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
-from core.tools.entities.constant import DEFAULT_PROVIDERS
+from core.callback_handler.agent_tool_callback_handler import DifyAgentCallbackHandler
+from core.model_runtime.entities.message_entities import PromptMessage
 from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.constant import DEFAULT_PROVIDERS
+from core.tools.entities.tool_entities import ApiProviderAuthType, ToolInvokeMessage, ToolProviderCredentials
+from core.tools.entities.user_entities import UserToolProvider
 from core.tools.errors import ToolProviderNotFoundError
 from core.tools.provider.api_tool_provider import ApiBasedToolProviderController
 from core.tools.provider.app_tool_provider import AppBasedToolProviderEntity
-from core.tools.entities.user_entities import UserToolProvider
+from core.tools.provider.builtin._positions import BuiltinToolProviderSort
+from core.tools.provider.builtin_tool_provider import BuiltinToolProviderController
+from core.tools.provider.tool_provider import ToolProviderController
+from core.tools.tool.api_tool import ApiTool
+from core.tools.tool.builtin_tool import BuiltinTool
 from core.tools.utils.configuration import ToolConfiguration
 from core.tools.utils.encoder import serialize_base_model_dict
-from core.tools.provider.builtin._positions import BuiltinToolProviderSort
-
-from core.model_runtime.entities.message_entities import PromptMessage
-from core.callback_handler.agent_tool_callback_handler import DifyAgentCallbackHandler
-
 from extensions.ext_database import db
-
 from models.tools import ApiToolProvider, BuiltinToolProvider
 
-import importlib
-import logging
-import json
-import mimetypes
-
 logger = logging.getLogger(__name__)
 
 _builtin_providers = {}

api/core/tools/utils/configuration.py

-from typing import Dict, Any
-from pydantic import BaseModel
+from typing import Any, Dict
 
+from core.helper import encrypter
 from core.tools.entities.tool_entities import ToolProviderCredentials
 from core.tools.provider.tool_provider import ToolProviderController
-from core.helper import encrypter
+from pydantic import BaseModel
+
 
 class ToolConfiguration(BaseModel):
     tenant_id: str

api/core/tools/utils/encoder.py

-from pydantic import BaseModel
 from enum import Enum
 from typing import List
 
+from pydantic import BaseModel
+
+
 def serialize_base_model_array(l: List[BaseModel]) -> str:
     class _BaseModel(BaseModel):
         __root__: List[BaseModel]

api/core/tools/utils/parser.py

 
-from core.tools.entities.tool_bundle import ApiBasedToolBundle
-from core.tools.entities.tool_entities import ToolParameter, ToolParameterOption, ApiProviderSchemaType
-from core.tools.entities.common_entities import I18nObject
-from core.tools.errors import ToolProviderNotFoundError, ToolNotSupportedError, \
-      ToolApiSchemaError
-
+from json import dumps as json_dumps
+from json import loads as json_loads
 from typing import List, Tuple
 
-from yaml import FullLoader, load
-from json import loads as json_loads, dumps as json_dumps
+from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_bundle import ApiBasedToolBundle
+from core.tools.entities.tool_entities import ApiProviderSchemaType, ToolParameter, ToolParameterOption
+from core.tools.errors import ToolApiSchemaError, ToolNotSupportedError, ToolProviderNotFoundError
 from requests import get
+from yaml import FullLoader, load
+
 
 class ApiBasedToolSchemaParser:
     @staticmethod

api/core/tools/utils/web_reader_tool.py

@@ -7,10 +7,14 @@ import subprocess
 import tempfile
 import unicodedata
 from contextlib import contextmanager
-from typing import Type, Any
+from typing import Any, Type
 
 import requests
-from bs4 import BeautifulSoup, NavigableString, Comment, CData
+from bs4 import BeautifulSoup, CData, Comment, NavigableString
+from core.chain.llm_chain import LLMChain
+from core.data_loader import file_extractor
+from core.data_loader.file_extractor import FileExtractor
+from core.entities.application_entities import ModelConfigEntity
 from langchain.chains import RefineDocumentsChain
 from langchain.chains.summarize import refine_prompts
 from langchain.schema import Document
@@ -20,11 +24,6 @@ from newspaper import Article
 from pydantic import BaseModel, Field
 from regex import regex
 
-from core.chain.llm_chain import LLMChain
-from core.data_loader import file_extractor
-from core.data_loader.file_extractor import FileExtractor
-from core.entities.application_entities import ModelConfigEntity
-
 FULL_TEMPLATE = """
 TITLE: {title}
 AUTHORS: {authors}

api/libs/gmpy2_pkcs10aep_cipher.py

@@ -20,16 +20,17 @@
 # SOFTWARE.
 # ===================================================================
 
-from Crypto.Signature.pss import MGF1
-import Crypto.Hash.SHA1
+from hashlib import sha1
 
-from Crypto.Util.py3compat import bord, _copy_bytes
+import Crypto.Hash.SHA1
 import Crypto.Util.number
-from   Crypto.Util.number import ceil_div, bytes_to_long, long_to_bytes
-from   Crypto.Util.strxor import strxor
-from Crypto import Random
-from hashlib import sha1
 import gmpy2
+from Crypto import Random
+from Crypto.Signature.pss import MGF1
+from Crypto.Util.number import bytes_to_long, ceil_div, long_to_bytes
+from Crypto.Util.py3compat import _copy_bytes, bord
+from Crypto.Util.strxor import strxor
+
 
 class PKCS1OAEP_Cipher:
     """Cipher object for PKCS#1 v1.5 OAEP.

api/libs/rsa.py

 # -*- coding:utf-8 -*-
 import hashlib
 
+import libs.gmpy2_pkcs10aep_cipher as gmpy2_pkcs10aep_cipher
 from Crypto.Cipher import AES
 from Crypto.PublicKey import RSA
 from Crypto.Random import get_random_bytes
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
 
-import libs.gmpy2_pkcs10aep_cipher as gmpy2_pkcs10aep_cipher
 
 def generate_key_pair(tenant_id):
     private_key = RSA.generate(2048)

api/migrations/versions/00bacef91f18_rename_api_provider_description.py

@@ -5,9 +5,8 @@ Revises: 8ec536f3c800
 Create Date: 2024-01-07 04:07:34.482983
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '00bacef91f18'

api/migrations/versions/053da0c1d756_add_api_tool_privacy.py

@@ -5,8 +5,8 @@ Revises: 4829e54d2fee
 Create Date: 2024-01-12 06:47:21.656262
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.

api/migrations/versions/114eed84c228_remove_tool_id_from_model_invoke.py

@@ -5,8 +5,8 @@ Revises: c71211c8f604
 Create Date: 2024-01-10 04:40:57.257824
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.

api/migrations/versions/23db93619b9d_add_message_files_into_agent_thought.py

@@ -5,9 +5,8 @@ Revises: 8ae9bc661daa
 Create Date: 2024-01-18 08:46:37.302657
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '23db93619b9d'

api/migrations/versions/380c6aa5a70d_add_tool_labels_to_agent_thought.py

@@ -5,9 +5,8 @@ Revises: dfb3b7f477da
 Create Date: 2024-01-24 10:58:15.644445
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '380c6aa5a70d'

api/migrations/versions/3ef9b2b6bee6_add_assistant_app.py

@@ -5,8 +5,8 @@ Revises: 89c7899ca936
 Create Date: 2024-01-05 15:26:25.117551
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.

api/migrations/versions/4823da1d26cf_add_tool_file.py

@@ -5,8 +5,8 @@ Revises: 053da0c1d756
 Create Date: 2024-01-15 11:37:16.782718
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.

api/migrations/versions/4829e54d2fee_change_message_chain_id_to_nullable.py

@@ -5,8 +5,8 @@ Revises: 114eed84c228
 Create Date: 2024-01-12 03:42:27.362415
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.

api/migrations/versions/89c7899ca936_.py

@@ -5,9 +5,8 @@ Revises: 187385f442fc
 Create Date: 2024-01-21 04:10:23.192853
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '89c7899ca936'

api/migrations/versions/8ae9bc661daa_add_tool_conversation_variables_idx.py

@@ -5,9 +5,8 @@ Revises: 9fafbd60eca1
 Create Date: 2024-01-15 14:22:03.597692
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '8ae9bc661daa'

api/migrations/versions/8ec536f3c800_rename_api_provider_credentails.py

@@ -5,9 +5,8 @@ Revises: ad472b61a054
 Create Date: 2024-01-07 03:57:35.257545
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '8ec536f3c800'

api/migrations/versions/9fafbd60eca1_add_message_file_belongs_to.py

@@ -5,9 +5,8 @@ Revises: 4823da1d26cf
 Create Date: 2024-01-15 13:07:20.340896
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '9fafbd60eca1'

api/migrations/versions/ad472b61a054_add_api_provider_icon.py

@@ -5,9 +5,8 @@ Revises: 3ef9b2b6bee6
 Create Date: 2024-01-07 02:21:23.114790
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = 'ad472b61a054'

api/migrations/versions/b24be59fbb04_.py

@@ -5,9 +5,8 @@ Revises: 187385f442fc
 Create Date: 2024-01-17 01:31:12.670556
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = 'b24be59fbb04'

api/migrations/versions/c71211c8f604_add_tool_invoke_model_log.py

@@ -5,8 +5,8 @@ Revises: f25003750af4
 Create Date: 2024-01-09 11:42:50.664797
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.

api/migrations/versions/de95f5c77138_migration_serpapi_api_key.py

@@ -5,10 +5,10 @@ Revises: 23db93619b9d
 Create Date: 2024-01-21 12:09:04.651394
 
 """
-from alembic import op
-import sqlalchemy as sa
 from json import dumps, loads
 
+import sqlalchemy as sa
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = 'de95f5c77138'

api/migrations/versions/dfb3b7f477da_add_tool_index.py

@@ -5,9 +5,8 @@ Revises: b24be59fbb04
 Create Date: 2024-01-24 02:17:01.631635
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = 'dfb3b7f477da'

api/migrations/versions/f25003750af4_add_created_updated_at.py

@@ -5,9 +5,8 @@ Revises: 00bacef91f18
 Create Date: 2024-01-07 04:53:24.441861
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = 'f25003750af4'

api/models/model.py

 import json
 import uuid
 
-from core.file.upload_file_parser import UploadFileParser
 from core.file.tool_file_parser import ToolFileParser
+from core.file.upload_file_parser import UploadFileParser
 from extensions.ext_database import db
 from flask import current_app, request
 from flask_login import UserMixin

api/models/tools.py

@@ -2,16 +2,14 @@ import json
 from enum import Enum
 from typing import List
 
-from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy import ForeignKey
-
-from extensions.ext_database import db
-
-from core.tools.entities.tool_bundle import ApiBasedToolBundle
 from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_bundle import ApiBasedToolBundle
 from core.tools.entities.tool_entities import ApiProviderSchemaType, ToolRuntimeVariablePool
+from extensions.ext_database import db
+from models.model import Account, App, Tenant
+from sqlalchemy import ForeignKey
+from sqlalchemy.dialects.postgresql import UUID
 
-from models.model import Tenant, Account, App
 
 class BuiltinToolProvider(db.Model):
     """

api/services/account_service.py

@@ -8,7 +8,7 @@ from datetime import datetime, timedelta
 from hashlib import sha256
 from typing import Any, Dict, Optional
 
-from constants.languages import languages, language_timezone_mapping
+from constants.languages import language_timezone_mapping, languages
 from events.tenant_event import tenant_was_created
 from extensions.ext_redis import redis_client
 from flask import current_app, session

api/services/audio_service.py

@@ -3,11 +3,9 @@ from typing import Optional
 
 from core.model_manager import ModelManager
 from core.model_runtime.entities.model_entities import ModelType
-from services.errors.audio import (AudioTooLargeServiceError,
-                                   NoAudioUploadedServiceError,
-                                   ProviderNotSupportTextToSpeechServiceError,
+from services.errors.audio import (AudioTooLargeServiceError, NoAudioUploadedServiceError,
                                    ProviderNotSupportSpeechToTextServiceError,
-                                   UnsupportedAudioTypeServiceError)
+                                   ProviderNotSupportTextToSpeechServiceError, UnsupportedAudioTypeServiceError)
 from werkzeug.datastructures import FileStorage
 
 FILE_SIZE = 15

api/services/tools_manage_service.py

+import json
 from typing import List, Tuple
 
-from flask import current_app
-
-from core.tools.tool_manager import ToolManager
-from core.tools.entities.user_entities import UserToolProvider, UserTool
-from core.tools.entities.tool_entities import ApiProviderSchemaType, ApiProviderAuthType, ToolProviderCredentials, \
-    ToolCredentialsOption
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_bundle import ApiBasedToolBundle
-from core.tools.provider.tool_provider import ToolProviderController
+from core.tools.entities.tool_entities import (ApiProviderAuthType, ApiProviderSchemaType, ToolCredentialsOption,
+                                               ToolProviderCredentials)
+from core.tools.entities.user_entities import UserTool, UserToolProvider
+from core.tools.errors import ToolNotFoundError, ToolProviderCredentialValidationError, ToolProviderNotFoundError
 from core.tools.provider.api_tool_provider import ApiBasedToolProviderController
-from core.tools.utils.parser import ApiBasedToolSchemaParser
-from core.tools.utils.encoder import serialize_base_model_array, serialize_base_model_dict
+from core.tools.provider.tool_provider import ToolProviderController
+from core.tools.tool_manager import ToolManager
 from core.tools.utils.configuration import ToolConfiguration
-from core.tools.errors import ToolProviderCredentialValidationError, ToolProviderNotFoundError, ToolNotFoundError
-
+from core.tools.utils.encoder import serialize_base_model_array, serialize_base_model_dict
+from core.tools.utils.parser import ApiBasedToolSchemaParser
 from extensions.ext_database import db
-from models.tools import BuiltinToolProvider, ApiToolProvider
-
+from flask import current_app
 from httpx import get
+from models.tools import ApiToolProvider, BuiltinToolProvider
 
-import json
 
 class ToolManageService:
     @staticmethod

api/tasks/mail_invite_member_task.py

@@ -3,9 +3,10 @@ import time
 
 import click
 from celery import shared_task
+from constants.languages import languages
 from extensions.ext_mail import mail
 from flask import current_app, render_template
-from constants.languages import languages
+
 
 @shared_task(queue='mail')
 def send_invite_member_mail_task(language: str, to: str, token: str, inviter_name: str, workspace_name: str):

api/tests/integration_tests/model_runtime/bedrock/test_llm.py

@@ -7,6 +7,7 @@ from core.model_runtime.entities.message_entities import AssistantPromptMessage,
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.bedrock.llm.llm import BedrockLargeLanguageModel
 
+
 def test_validate_credentials():
     model = BedrockLargeLanguageModel()
 

api/tests/integration_tests/model_runtime/bedrock/test_provider.py

@@ -4,6 +4,7 @@ import pytest
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.bedrock.bedrock import BedrockProvider
 
+
 def test_validate_provider_credentials():
     provider = BedrockProvider()
 

api/tests/integration_tests/model_runtime/cohere/test_llm.py

@@ -3,8 +3,7 @@ from typing import Generator
 
 import pytest
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta
-from core.model_runtime.entities.message_entities import (AssistantPromptMessage, SystemPromptMessage,
-                                                          UserPromptMessage)
+from core.model_runtime.entities.message_entities import AssistantPromptMessage, SystemPromptMessage, UserPromptMessage
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.cohere.llm.llm import CohereLargeLanguageModel
 

api/tests/integration_tests/model_runtime/ollama/test_llm.py

@@ -2,11 +2,10 @@ import os
 from typing import Generator
 
 import pytest
-
-from core.model_runtime.entities.message_entities import AssistantPromptMessage, UserPromptMessage, \
-    SystemPromptMessage, TextPromptMessageContent, ImagePromptMessageContent
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunkDelta, \
-    LLMResultChunk
+from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta
+from core.model_runtime.entities.message_entities import (AssistantPromptMessage, ImagePromptMessageContent,
+                                                          SystemPromptMessage, TextPromptMessageContent,
+                                                          UserPromptMessage)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.ollama.llm.llm import OllamaLargeLanguageModel
 

api/tests/integration_tests/model_runtime/ollama/test_text_embedding.py

 import os
 
 import pytest
-
 from core.model_runtime.entities.text_embedding_entities import TextEmbeddingResult
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.ollama.text_embedding.text_embedding import OllamaEmbeddingModel

api/tests/integration_tests/model_runtime/zhipuai/test_llm.py

@@ -3,8 +3,8 @@ from typing import Generator
 
 import pytest
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta
-from core.model_runtime.entities.message_entities import (AssistantPromptMessage, SystemPromptMessage, 
-                                                          UserPromptMessage, PromptMessageTool)
+from core.model_runtime.entities.message_entities import (AssistantPromptMessage, PromptMessageTool,
+                                                          SystemPromptMessage, UserPromptMessage)
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.zhipuai.llm.llm import ZhipuAILargeLanguageModel
 

api/tests/integration_tests/tools/test_all_provider.py

 from core.tools.tool_manager import ToolManager
 
+
 def test_tool_providers():
     """
     Test that all tool providers can be loaded

docker/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.1'
 services:
   # API service
   api:
-    image: langgenius/dify-api:0.5.2
+    image: langgenius/dify-api:0.5.3
     restart: always
     environment:
       # Startup mode, 'api' starts the API server.
@@ -130,7 +130,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:0.5.2
+    image: langgenius/dify-api:0.5.3
     restart: always
     environment:
       # Startup mode, 'worker' starts the Celery worker for processing the queue.
@@ -201,7 +201,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:0.5.2
+    image: langgenius/dify-web:0.5.3
     restart: always
     environment:
       EDITION: SELF_HOSTED

web/package.json

 {
   "name": "dify-web",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "private": true,
   "scripts": {
     "dev": "next dev",