lint fix

api/core/agent/base_agent_runner.py

@@ -10,8 +10,9 @@ from core.app.app_queue_manager import AppQueueManager
 from core.app.apps.agent_chat.app_config_manager import AgentChatAppConfig
 from core.app.apps.base_app_runner import AppRunner
 from core.app.entities.app_invoke_entities import (
+    AgentChatAppGenerateEntity,
+    InvokeFrom,
     ModelConfigWithCredentialsEntity,
-    InvokeFrom, AgentChatAppGenerateEntity,
 )
 from core.callback_handler.agent_tool_callback_handler import DifyAgentCallbackHandler
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler

api/core/app/apps/agent_chat/app_generator.py

@@ -1,18 +1,19 @@
 import logging
 import threading
 import uuid
-from typing import Union, Any, Generator
+from collections.abc import Generator
+from typing import Any, Union
 
-from flask import current_app, Flask
+from flask import Flask, current_app
 from pydantic import ValidationError
 
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-from core.app.app_queue_manager import ConversationTaskStoppedException, PublishFrom, AppQueueManager
+from core.app.app_queue_manager import AppQueueManager, ConversationTaskStoppedException, PublishFrom
 from core.app.apps.agent_chat.app_config_manager import AgentChatAppConfigManager
 from core.app.apps.agent_chat.app_runner import AgentChatAppRunner
 from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
-from core.app.entities.app_invoke_entities import InvokeFrom, AgentChatAppGenerateEntity
+from core.app.entities.app_invoke_entities import AgentChatAppGenerateEntity, InvokeFrom
 from core.file.message_file_parser import MessageFileParser
 from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from extensions.ext_database import db

api/core/app/apps/agent_chat/app_runner.py

@@ -7,8 +7,7 @@ from core.agent.fc_agent_runner import FunctionCallAgentRunner
 from core.app.app_queue_manager import AppQueueManager, PublishFrom
 from core.app.apps.agent_chat.app_config_manager import AgentChatAppConfig
 from core.app.apps.base_app_runner import AppRunner
-from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity, \
-    AgentChatAppGenerateEntity
+from core.app.entities.app_invoke_entities import AgentChatAppGenerateEntity, ModelConfigWithCredentialsEntity
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
 from core.model_runtime.entities.llm_entities import LLMUsage

api/core/app/apps/base_app_generator.py

@@ -1,4 +1,4 @@
-from core.app.app_config.entities import VariableEntity, AppConfig
+from core.app.app_config.entities import AppConfig, VariableEntity
 
 
 class BaseAppGenerator:

api/core/app/apps/base_app_runner.py

@@ -5,8 +5,10 @@ from typing import Optional, Union, cast
 from core.app.app_config.entities import ExternalDataVariableEntity, PromptTemplateEntity
 from core.app.app_queue_manager import AppQueueManager, PublishFrom
 from core.app.entities.app_invoke_entities import (
+    AppGenerateEntity,
+    EasyUIBasedAppGenerateEntity,
+    InvokeFrom,
     ModelConfigWithCredentialsEntity,
-    InvokeFrom, AppGenerateEntity, EasyUIBasedAppGenerateEntity,
 )
 from core.app.features.annotation_reply.annotation_reply import AnnotationReplyFeature
 from core.app.features.hosting_moderation.hosting_moderation import HostingModerationFeature

api/core/app/apps/chat/app_generator.py

@@ -1,18 +1,19 @@
 import logging
 import threading
 import uuid
-from typing import Union, Any, Generator
+from collections.abc import Generator
+from typing import Any, Union
 
-from flask import current_app, Flask
+from flask import Flask, current_app
 from pydantic import ValidationError
 
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-from core.app.app_queue_manager import ConversationTaskStoppedException, PublishFrom, AppQueueManager
+from core.app.app_queue_manager import AppQueueManager, ConversationTaskStoppedException, PublishFrom
 from core.app.apps.chat.app_config_manager import ChatAppConfigManager
 from core.app.apps.chat.app_runner import ChatAppRunner
 from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
-from core.app.entities.app_invoke_entities import InvokeFrom, ChatAppGenerateEntity
+from core.app.entities.app_invoke_entities import ChatAppGenerateEntity, InvokeFrom
 from core.file.message_file_parser import MessageFileParser
 from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from extensions.ext_database import db

api/core/app/apps/completion/app_config_manager.py

@@ -10,7 +10,7 @@ from core.app.app_config.entities import EasyUIBasedAppConfig, EasyUIBasedAppMod
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.app_config.features.more_like_this.manager import MoreLikeThisConfigManager
 from core.app.app_config.features.text_to_speech.manager import TextToSpeechConfigManager
-from models.model import App, AppMode, AppModelConfig, Conversation
+from models.model import App, AppMode, AppModelConfig
 
 
 class CompletionAppConfig(EasyUIBasedAppConfig):

api/core/app/apps/completion/app_generator.py

@@ -1,19 +1,19 @@
-import json
 import logging
 import threading
 import uuid
-from typing import Union, Any, Generator
+from collections.abc import Generator
+from typing import Any, Union
 
-from flask import current_app, Flask
+from flask import Flask, current_app
 from pydantic import ValidationError
 
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-from core.app.app_queue_manager import ConversationTaskStoppedException, PublishFrom, AppQueueManager
+from core.app.app_queue_manager import AppQueueManager, ConversationTaskStoppedException, PublishFrom
 from core.app.apps.completion.app_config_manager import CompletionAppConfigManager
 from core.app.apps.completion.app_runner import CompletionAppRunner
 from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
-from core.app.entities.app_invoke_entities import InvokeFrom, CompletionAppGenerateEntity
+from core.app.entities.app_invoke_entities import CompletionAppGenerateEntity, InvokeFrom
 from core.file.message_file_parser import MessageFileParser
 from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from extensions.ext_database import db

api/core/app/apps/message_based_app_generator.py

@@ -1,21 +1,27 @@
 import json
 import logging
-from typing import Union, Generator, Optional
+from collections.abc import Generator
+from typing import Optional, Union
 
 from sqlalchemy import and_
 
 from core.app.app_config.entities import EasyUIBasedAppModelConfigFrom
-from core.app.app_queue_manager import ConversationTaskStoppedException, AppQueueManager
+from core.app.app_queue_manager import AppQueueManager, ConversationTaskStoppedException
 from core.app.apps.base_app_generator import BaseAppGenerator
-from core.app.entities.app_invoke_entities import InvokeFrom, ChatAppGenerateEntity, AppGenerateEntity, \
-    CompletionAppGenerateEntity, AgentChatAppGenerateEntity, AdvancedChatAppGenerateEntity
+from core.app.entities.app_invoke_entities import (
+    AgentChatAppGenerateEntity,
+    AppGenerateEntity,
+    ChatAppGenerateEntity,
+    CompletionAppGenerateEntity,
+    InvokeFrom,
+)
 from core.app.generate_task_pipeline import GenerateTaskPipeline
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from extensions.ext_database import db
 from models.account import Account
-from models.model import Conversation, Message, AppMode, MessageFile, App, EndUser, AppModelConfig
+from models.model import App, AppMode, AppModelConfig, Conversation, EndUser, Message, MessageFile
 from services.errors.app_model_config import AppModelConfigBrokenError
-from services.errors.conversation import ConversationNotExistsError, ConversationCompletedError
+from services.errors.conversation import ConversationCompletedError, ConversationNotExistsError
 
 logger = logging.getLogger(__name__)
 

api/core/app/entities/app_invoke_entities.py

@@ -3,7 +3,7 @@ from typing import Any, Optional
 
 from pydantic import BaseModel
 
-from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig, AppConfig
+from core.app.app_config.entities import AppConfig, EasyUIBasedAppConfig, WorkflowUIBasedAppConfig
 from core.entities.provider_configuration import ProviderModelBundle
 from core.file.file_obj import FileObj
 from core.model_runtime.entities.model_entities import AIModelEntity

api/core/app/features/hosting_moderation/hosting_moderation.py

@@ -1,6 +1,6 @@
 import logging
 
-from core.app.entities.app_invoke_entities import ChatAppGenerateEntity, EasyUIBasedAppGenerateEntity
+from core.app.entities.app_invoke_entities import EasyUIBasedAppGenerateEntity
 from core.helper import moderation
 from core.model_runtime.entities.message_entities import PromptMessage
 

api/core/app/generate_task_pipeline.py

@@ -7,8 +7,12 @@ from typing import Optional, Union, cast
 from pydantic import BaseModel
 
 from core.app.app_queue_manager import AppQueueManager, PublishFrom
-from core.app.entities.app_invoke_entities import ChatAppGenerateEntity, InvokeFrom, CompletionAppGenerateEntity, \
-    AgentChatAppGenerateEntity
+from core.app.entities.app_invoke_entities import (
+    AgentChatAppGenerateEntity,
+    ChatAppGenerateEntity,
+    CompletionAppGenerateEntity,
+    InvokeFrom,
+)
 from core.app.entities.queue_entities import (
     AnnotationReplyEvent,
     QueueAgentMessageEvent,
@@ -40,7 +44,7 @@ from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from core.tools.tool_file_manager import ToolFileManager
 from events.message_event import message_was_created
 from extensions.ext_database import db
-from models.model import Conversation, Message, MessageAgentThought, MessageFile, AppMode
+from models.model import AppMode, Conversation, Message, MessageAgentThought, MessageFile
 from services.annotation_service import AppAnnotationService
 
 logger = logging.getLogger(__name__)

api/core/rag/retrieval/dataset_retrieval.py

@@ -3,7 +3,7 @@ from typing import Optional, cast
 from langchain.tools import BaseTool
 
 from core.app.app_config.entities import DatasetEntity, DatasetRetrieveConfigEntity
-from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity, InvokeFrom
+from core.app.entities.app_invoke_entities import InvokeFrom, ModelConfigWithCredentialsEntity
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.entities.agent_entities import PlanningStrategy
 from core.memory.token_buffer_memory import TokenBufferMemory

api/services/workflow/workflow_converter.py

@@ -4,11 +4,12 @@ from typing import Optional
 from core.app.app_config.entities import (
     DatasetEntity,
     DatasetRetrieveConfigEntity,
+    EasyUIBasedAppConfig,
     ExternalDataVariableEntity,
     FileUploadEntity,
     ModelConfigEntity,
     PromptTemplateEntity,
-    VariableEntity, EasyUIBasedAppConfig,
+    VariableEntity,
 )
 from core.app.apps.agent_chat.app_config_manager import AgentChatAppConfigManager
 from core.app.apps.chat.app_config_manager import ChatAppConfigManager