From c8a1f923f53f720e84a941456284ee3f3de167c7 Mon Sep 17 00:00:00 2001 From: takatost Date: Mon, 4 Mar 2024 17:23:35 +0800 Subject: [PATCH] lint fix --- api/controllers/console/app/workflow.py | 7 +++---- api/core/app/apps/advanced_chat/app_generator.py | 2 +- api/core/app/apps/advanced_chat/app_runner.py | 5 +++-- api/core/workflow/workflow_engine_manager.py | 6 +++--- api/services/workflow_service.py | 3 ++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py index 9ee6ca9dbd..6e77f50e65 100644 --- a/api/controllers/console/app/workflow.py +++ b/api/controllers/console/app/workflow.py @@ -1,14 +1,14 @@ import json import logging -from typing import Generator +from collections.abc import Generator from flask import Response, stream_with_context from flask_restful import Resource, marshal_with, reqparse -from werkzeug.exceptions import NotFound, InternalServerError +from werkzeug.exceptions import InternalServerError, NotFound import services from controllers.console import api -from controllers.console.app.error import DraftWorkflowNotExist, ConversationCompletedError +from controllers.console.app.error import ConversationCompletedError, DraftWorkflowNotExist from controllers.console.app.wraps import get_app_model from controllers.console.setup import setup_required from controllers.console.wraps import account_initialization_required @@ -19,7 +19,6 @@ from libs.login import current_user, login_required from models.model import App, AppMode from services.workflow_service import WorkflowService - logger = logging.getLogger(__name__) diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py index 918fd4566e..937f95679a 100644 --- a/api/core/app/apps/advanced_chat/app_generator.py +++ b/api/core/app/apps/advanced_chat/app_generator.py @@ -2,7 +2,7 @@ import logging import threading import uuid from collections.abc import Generator -from typing import Any, Union +from typing import Union from flask import Flask, current_app from pydantic import ValidationError diff --git a/api/core/app/apps/advanced_chat/app_runner.py b/api/core/app/apps/advanced_chat/app_runner.py index f853f88af4..02d22072df 100644 --- a/api/core/app/apps/advanced_chat/app_runner.py +++ b/api/core/app/apps/advanced_chat/app_runner.py @@ -6,7 +6,8 @@ from core.app.app_queue_manager import AppQueueManager, PublishFrom from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfig from core.app.apps.base_app_runner import AppRunner from core.app.entities.app_invoke_entities import ( - AdvancedChatAppGenerateEntity, InvokeFrom, + AdvancedChatAppGenerateEntity, + InvokeFrom, ) from core.app.entities.queue_entities import QueueStopEvent from core.moderation.base import ModerationException @@ -14,7 +15,7 @@ from core.workflow.entities.node_entities import SystemVariable from core.workflow.workflow_engine_manager import WorkflowEngineManager from extensions.ext_database import db from models.account import Account -from models.model import App, Conversation, Message, EndUser +from models.model import App, Conversation, EndUser, Message logger = logging.getLogger(__name__) diff --git a/api/core/workflow/workflow_engine_manager.py b/api/core/workflow/workflow_engine_manager.py index 5914bfc152..8a23048705 100644 --- a/api/core/workflow/workflow_engine_manager.py +++ b/api/core/workflow/workflow_engine_manager.py @@ -1,6 +1,6 @@ -from typing import Optional, Union, Generator +from collections.abc import Generator +from typing import Optional, Union -from core.memory.token_buffer_memory import TokenBufferMemory from core.workflow.entities.node_entities import NodeType from core.workflow.nodes.code.code_node import CodeNode from core.workflow.nodes.direct_answer.direct_answer_node import DirectAnswerNode @@ -16,7 +16,7 @@ from core.workflow.nodes.tool.tool_node import ToolNode from core.workflow.nodes.variable_assigner.variable_assigner_node import VariableAssignerNode from extensions.ext_database import db from models.account import Account -from models.model import App, EndUser, Conversation +from models.model import App, EndUser from models.workflow import Workflow node_classes = { diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py index 37f5c16bec..2c1b6eb819 100644 --- a/api/services/workflow_service.py +++ b/api/services/workflow_service.py @@ -1,6 +1,7 @@ import json +from collections.abc import Generator from datetime import datetime -from typing import Optional, Union, Any, Generator +from typing import Optional, Union from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager from core.app.apps.advanced_chat.app_generator import AdvancedChatAppGenerator