lint

api/controllers/console/app/model_config.py

@@ -14,7 +14,7 @@ from core.tools.utils.configuration import ToolParameterConfigurationManager
 from events.app_event import app_model_config_was_updated
 from extensions.ext_database import db
 from libs.login import login_required
-from models.model import AppModelConfig, AppMode
+from models.model import AppMode, AppModelConfig
 from services.app_model_config_service import AppModelConfigService
 
 

api/core/apps/config_validators/agent.py

@@ -1,5 +1,4 @@
 import uuid
-from typing import Tuple
 
 from core.agent.agent_executor import PlanningStrategy
 from core.apps.config_validators.dataset import DatasetValidator
@@ -9,7 +8,7 @@ OLD_TOOLS = ["dataset", "google_search", "web_reader", "wikipedia", "current_dat
 
 class AgentValidator:
     @classmethod
-    def validate_and_set_defaults(cls, tenant_id: str, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, tenant_id: str, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for agent feature
 

api/core/apps/config_validators/dataset.py

@@ -1,5 +1,4 @@
 import uuid
-from typing import Tuple
 
 from core.agent.agent_executor import PlanningStrategy
 from models.model import AppMode
@@ -8,7 +7,7 @@ from services.dataset_service import DatasetService
 
 class DatasetValidator:
     @classmethod
-    def validate_and_set_defaults(cls, tenant_id: str, app_mode: AppMode, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, tenant_id: str, app_mode: AppMode, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for dataset feature
 

api/core/apps/config_validators/external_data_tools.py

@@ -1,11 +1,10 @@
-from typing import Tuple
 
 from core.external_data_tool.factory import ExternalDataToolFactory
 
 
 class ExternalDataToolsValidator:
     @classmethod
-    def validate_and_set_defaults(cls, tenant_id: str, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, tenant_id: str, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for external data fetch feature
 

api/core/apps/config_validators/file_upload.py

@@ -1,9 +1,8 @@
-from typing import Tuple
 
 
 class FileUploadValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for file upload feature
 

api/core/apps/config_validators/model.py

@@ -1,13 +1,12 @@
-from typing import Tuple
 
-from core.model_runtime.entities.model_entities import ModelType, ModelPropertyKey
+from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
 from core.model_runtime.model_providers import model_provider_factory
 from core.provider_manager import ProviderManager
 
 
 class ModelValidator:
     @classmethod
-    def validate_and_set_defaults(cls, tenant_id: str, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, tenant_id: str, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for model config
 

api/core/apps/config_validators/moderation.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Tuple
 
 from core.moderation.factory import ModerationFactory
 
@@ -8,7 +7,7 @@ logger = logging.getLogger(__name__)
 
 class ModerationValidator:
     @classmethod
-    def validate_and_set_defaults(cls, tenant_id, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, tenant_id, config: dict) -> tuple[dict, list[str]]:
         if not config.get("sensitive_word_avoidance"):
             config["sensitive_word_avoidance"] = {
                 "enabled": False

api/core/apps/config_validators/more_like_this.py

@@ -1,9 +1,8 @@
-from typing import Tuple
 
 
 class MoreLikeThisValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for more like this feature
 

api/core/apps/config_validators/opening_statement.py

@@ -1,9 +1,8 @@
-from typing import Tuple
 
 
 class OpeningStatementValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for opening statement feature
 

api/core/apps/config_validators/prompt.py

@@ -1,4 +1,3 @@
-from typing import Tuple
 
 from core.entities.application_entities import PromptTemplateEntity
 from core.prompt.simple_prompt_transform import ModelMode
@@ -7,7 +6,7 @@ from models.model import AppMode
 
 class PromptValidator:
     @classmethod
-    def validate_and_set_defaults(cls, app_mode: AppMode, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, app_mode: AppMode, config: dict) -> tuple[dict, list[str]]:
         """
         Validate pre_prompt and set defaults for prompt feature
         depending on the config['model']

api/core/apps/config_validators/retriever_resource.py

@@ -1,9 +1,8 @@
-from typing import Tuple
 
 
 class RetrieverResourceValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for retriever resource feature
 

api/core/apps/config_validators/speech_to_text.py

@@ -1,9 +1,8 @@
-from typing import Tuple
 
 
 class SpeechToTextValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for speech to text feature
 

api/core/apps/config_validators/suggested_questions.py

@@ -1,9 +1,8 @@
-from typing import Tuple
 
 
 class SuggestedQuestionsValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for suggested questions feature
 

api/core/apps/config_validators/text_to_speech.py

@@ -1,9 +1,8 @@
-from typing import Tuple
 
 
 class TextToSpeechValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for text to speech feature
 

api/core/apps/config_validators/user_input_form.py

@@ -1,10 +1,9 @@
 import re
-from typing import Tuple
 
 
 class UserInputFormValidator:
     @classmethod
-    def validate_and_set_defaults(cls, config: dict) -> Tuple[dict, list[str]]:
+    def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:
         """
         Validate and set defaults for user input form
 

api/services/completion_service.py

@@ -9,7 +9,7 @@ from core.apps.config_validators.model import ModelValidator
 from core.entities.application_entities import InvokeFrom
 from core.file.message_file_parser import MessageFileParser
 from extensions.ext_database import db
-from models.model import Account, App, AppModelConfig, Conversation, EndUser, Message, AppMode
+from models.model import Account, App, AppMode, AppModelConfig, Conversation, EndUser, Message
 from services.app_model_config_service import AppModelConfigService
 from services.errors.app import MoreLikeThisDisabledError
 from services.errors.app_model_config import AppModelConfigBrokenError