From 72ae414da44569f25a64df4dad59f02c8f79ae1b Mon Sep 17 00:00:00 2001 From: Bowen Liang Date: Sat, 28 Dec 2024 01:19:31 +0800 Subject: [PATCH] chore(lint): correct allowed-unused-imports settings for cleanup unused imports in tests (#11922) --- api/.ruff.toml | 4 ++-- api/migrations/README | 1 - api/tests/integration_tests/model_runtime/__mock/google.py | 1 - api/tests/integration_tests/vdb/baidu/test_baidu.py | 2 -- .../integration_tests/vdb/tidb_vector/test_tidb_vector.py | 2 -- .../unit_tests/core/prompt/test_advanced_prompt_transform.py | 2 +- .../workflow/nodes/answer/test_answer_stream_processor.py | 2 +- api/tests/unit_tests/core/workflow/nodes/llm/test_node.py | 3 +-- api/tests/unit_tests/core/workflow/nodes/test_retry.py | 1 - .../core/workflow/nodes/variable_assigner/v2/test_helpers.py | 2 -- .../unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py | 2 +- api/tests/unit_tests/utils/test_text_processing.py | 2 -- 12 files changed, 6 insertions(+), 18 deletions(-) diff --git a/api/.ruff.toml b/api/.ruff.toml index f30275a943..89a2da35d6 100644 --- a/api/.ruff.toml +++ b/api/.ruff.toml @@ -85,11 +85,11 @@ ignore = [ ] "tests/*" = [ "F811", # redefined-while-unused - "F401", # unused-import ] [lint.pyflakes] -extend-generics = [ +allowed-unused-imports = [ "_pytest.monkeypatch", "tests.integration_tests", + "tests.unit_tests", ] diff --git a/api/migrations/README b/api/migrations/README index 220678df7a..0e04844159 100644 --- a/api/migrations/README +++ b/api/migrations/README @@ -1,2 +1 @@ Single-database configuration for Flask. - diff --git a/api/tests/integration_tests/model_runtime/__mock/google.py b/api/tests/integration_tests/model_runtime/__mock/google.py index b90f8b4444..3a26b99e37 100644 --- a/api/tests/integration_tests/model_runtime/__mock/google.py +++ b/api/tests/integration_tests/model_runtime/__mock/google.py @@ -1,4 +1,3 @@ -from collections.abc import Generator from unittest.mock import MagicMock import google.generativeai.types.generation_types as generation_config_types # type: ignore diff --git a/api/tests/integration_tests/vdb/baidu/test_baidu.py b/api/tests/integration_tests/vdb/baidu/test_baidu.py index 5dc2ce4f82..25989958d9 100644 --- a/api/tests/integration_tests/vdb/baidu/test_baidu.py +++ b/api/tests/integration_tests/vdb/baidu/test_baidu.py @@ -1,5 +1,3 @@ -from unittest.mock import MagicMock - from core.rag.datasource.vdb.baidu.baidu_vector import BaiduConfig, BaiduVector from tests.integration_tests.vdb.__mock.baiduvectordb import setup_baiduvectordb_mock from tests.integration_tests.vdb.test_vector_store import AbstractVectorTest, get_example_text, setup_mock_redis diff --git a/api/tests/integration_tests/vdb/tidb_vector/test_tidb_vector.py b/api/tests/integration_tests/vdb/tidb_vector/test_tidb_vector.py index 4c83c66bff..df0bb3f81a 100644 --- a/api/tests/integration_tests/vdb/tidb_vector/test_tidb_vector.py +++ b/api/tests/integration_tests/vdb/tidb_vector/test_tidb_vector.py @@ -1,5 +1,3 @@ -from unittest.mock import MagicMock, patch - import pytest from core.rag.datasource.vdb.tidb_vector.tidb_vector import TiDBVector, TiDBVectorConfig diff --git a/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py index ee0f7672f8..f6d22690d1 100644 --- a/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py +++ b/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py @@ -4,7 +4,7 @@ import pytest from configs import dify_config from core.app.app_config.entities import ModelConfigEntity -from core.file import File, FileTransferMethod, FileType, FileUploadConfig, ImageConfig +from core.file import File, FileTransferMethod, FileType from core.memory.token_buffer_memory import TokenBufferMemory from core.model_runtime.entities.message_entities import ( AssistantPromptMessage, diff --git a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py index f6555cfdde..c3a3818655 100644 --- a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py +++ b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer_stream_processor.py @@ -1,6 +1,6 @@ import uuid from collections.abc import Generator -from datetime import UTC, datetime, timezone +from datetime import UTC, datetime from core.workflow.entities.variable_pool import VariablePool from core.workflow.enums import SystemVariableKey diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py index 76db42ef10..7e979bcaa8 100644 --- a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py +++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py @@ -21,8 +21,7 @@ from core.model_runtime.entities.message_entities import ( from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelFeature, ModelType from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory from core.prompt.entities.advanced_prompt_entities import MemoryConfig -from core.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment, StringSegment -from core.workflow.entities.variable_entities import VariableSelector +from core.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment from core.workflow.entities.variable_pool import VariablePool from core.workflow.graph_engine import Graph, GraphInitParams, GraphRuntimeState from core.workflow.nodes.answer import AnswerStreamGenerateRoute diff --git a/api/tests/unit_tests/core/workflow/nodes/test_retry.py b/api/tests/unit_tests/core/workflow/nodes/test_retry.py index c232875ce5..4ac79d7acd 100644 --- a/api/tests/unit_tests/core/workflow/nodes/test_retry.py +++ b/api/tests/unit_tests/core/workflow/nodes/test_retry.py @@ -1,7 +1,6 @@ from core.workflow.graph_engine.entities.event import ( GraphRunFailedEvent, GraphRunPartialSucceededEvent, - GraphRunSucceededEvent, NodeRunRetryEvent, ) from tests.unit_tests.core.workflow.nodes.test_continue_on_error import ContinueOnErrorTestHelper diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py index 16c1370018..1501722b82 100644 --- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py +++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py @@ -1,5 +1,3 @@ -import pytest - from core.variables import SegmentType from core.workflow.nodes.variable_assigner.v2.enums import Operation from core.workflow.nodes.variable_assigner.v2.helpers import is_input_value_valid diff --git a/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py b/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py index 380134bc46..f87a385690 100644 --- a/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py +++ b/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py @@ -1,4 +1,4 @@ -from unittest.mock import MagicMock, patch +from unittest.mock import patch import pytest from oss2 import Auth # type: ignore diff --git a/api/tests/unit_tests/utils/test_text_processing.py b/api/tests/unit_tests/utils/test_text_processing.py index f9d00d0b39..8bfc97ae63 100644 --- a/api/tests/unit_tests/utils/test_text_processing.py +++ b/api/tests/unit_tests/utils/test_text_processing.py @@ -1,5 +1,3 @@ -from textwrap import dedent - import pytest from core.tools.utils.text_processing_utils import remove_leading_symbols