From d430136f656606bf8c7bb1c3bed7492d4b901dfb Mon Sep 17 00:00:00 2001 From: takatost Date: Mon, 19 Feb 2024 16:56:29 +0800 Subject: [PATCH] lint --- api/controllers/console/app/completion.py | 2 +- api/controllers/console/app/message.py | 2 +- api/controllers/console/app/wraps.py | 3 ++- api/core/app_runner/basic_app_runner.py | 9 +++++++-- api/core/prompt/prompt_transform.py | 3 ++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py index f378f7b218..381d0bbb6b 100644 --- a/api/controllers/console/app/completion.py +++ b/api/controllers/console/app/completion.py @@ -22,7 +22,7 @@ from controllers.console.app.wraps import get_app_model from controllers.console.setup import setup_required from controllers.console.wraps import account_initialization_required from core.application_queue_manager import ApplicationQueueManager -from core.entities.application_entities import InvokeFrom, AppMode +from core.entities.application_entities import AppMode, InvokeFrom from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError from core.model_runtime.errors.invoke import InvokeError from libs.helper import uuid_value diff --git a/api/controllers/console/app/message.py b/api/controllers/console/app/message.py index 360602b9c2..5d4f6b7e26 100644 --- a/api/controllers/console/app/message.py +++ b/api/controllers/console/app/message.py @@ -20,7 +20,7 @@ from controllers.console.app.error import ( from controllers.console.app.wraps import get_app_model from controllers.console.setup import setup_required from controllers.console.wraps import account_initialization_required, cloud_edition_billing_resource_check -from core.entities.application_entities import InvokeFrom, AppMode +from core.entities.application_entities import AppMode, InvokeFrom from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError from core.model_runtime.errors.invoke import InvokeError from extensions.ext_database import db diff --git a/api/controllers/console/app/wraps.py b/api/controllers/console/app/wraps.py index b3aca51871..fe2b408702 100644 --- a/api/controllers/console/app/wraps.py +++ b/api/controllers/console/app/wraps.py @@ -1,5 +1,6 @@ +from collections.abc import Callable from functools import wraps -from typing import Union, Optional, Callable +from typing import Optional, Union from controllers.console.app.error import AppNotFoundError from core.entities.application_entities import AppMode diff --git a/api/core/app_runner/basic_app_runner.py b/api/core/app_runner/basic_app_runner.py index d1e16f860c..d87302c717 100644 --- a/api/core/app_runner/basic_app_runner.py +++ b/api/core/app_runner/basic_app_runner.py @@ -4,8 +4,13 @@ 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, \ - AppMode +from core.entities.application_entities import ( + ApplicationGenerateEntity, + AppMode, + DatasetEntity, + InvokeFrom, + ModelConfigEntity, +) from core.features.dataset_retrieval.dataset_retrieval import DatasetRetrievalFeature from core.memory.token_buffer_memory import TokenBufferMemory from core.model_manager import ModelInstance diff --git a/api/core/prompt/prompt_transform.py b/api/core/prompt/prompt_transform.py index 08d94661b7..4bf96ce265 100644 --- a/api/core/prompt/prompt_transform.py +++ b/api/core/prompt/prompt_transform.py @@ -6,8 +6,9 @@ from typing import Optional, cast from core.entities.application_entities import ( AdvancedCompletionPromptTemplateEntity, + AppMode, ModelConfigEntity, - PromptTemplateEntity, AppMode, + PromptTemplateEntity, ) from core.file.file_obj import FileObj from core.memory.token_buffer_memory import TokenBufferMemory