Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(api): enable strict typing for extensions tests (#43894)

Eddy ZHANG981085a5a4a1
diff --git a/api/tests/unit_tests/extensions/otel/conftest.py b/api/tests/unit_tests/extensions/otel/conftest.py
index bc35a64e216..c014b206472 100644
--- a/api/tests/unit_tests/extensions/otel/conftest.py
+++ b/api/tests/unit_tests/extensions/otel/conftest.py
@@ -7,6 +7,7 @@ Provides:
- Test data factories
"""
+from collections.abc import Iterator
from unittest.mock import MagicMock
import pytest
@@ -19,13 +20,13 @@ from models import Account, App, EndUser
@pytest.fixture
-def memory_span_exporter():
+def memory_span_exporter() -> InMemorySpanExporter:
"""Provide an in-memory span exporter for testing."""
return InMemorySpanExporter()
@pytest.fixture
-def tracer_provider_with_memory_exporter(memory_span_exporter):
+def tracer_provider_with_memory_exporter(memory_span_exporter: InMemorySpanExporter) -> Iterator[TracerProvider]:
"""Provide a TracerProvider configured with memory exporter."""
import opentelemetry.trace as trace_api
@@ -43,13 +44,13 @@ def tracer_provider_with_memory_exporter(memory_span_exporter):
@pytest.fixture
-def mock_app_model():
+def mock_app_model() -> App:
"""Create a real transient App model."""
return App(id="test-app-id", tenant_id="test-tenant-id")
@pytest.fixture
-def mock_account_user():
+def mock_account_user() -> Account:
"""Create a real transient Account user."""
user = Account(name="Test User", email="[email protected]")
user.id = "test-user-id"
@@ -57,13 +58,13 @@ def mock_account_user():
@pytest.fixture
-def mock_end_user():
+def mock_end_user() -> EndUser:
"""Create a real transient EndUser."""
return EndUser(id="test-end-user-id", tenant_id="test-tenant-id")
@pytest.fixture
-def mock_workflow_runner():
+def mock_workflow_runner() -> MagicMock:
"""Create a mock WorkflowAppRunner."""
runner = MagicMock()
runner.application_generate_entity = MagicMock()
@@ -77,7 +78,7 @@ def mock_workflow_runner():
@pytest.fixture(autouse=True)
-def reset_handler_instances():
+def reset_handler_instances() -> Iterator[None]:
"""Reset handler singleton instances before each test."""
from extensions.otel.decorators.base import _HANDLER_INSTANCES
diff --git a/api/tests/unit_tests/extensions/otel/test_celery_sqlcommenter.py b/api/tests/unit_tests/extensions/otel/test_celery_sqlcommenter.py
index 7a537b0502f..f2f2d57672a 100644
--- a/api/tests/unit_tests/extensions/otel/test_celery_sqlcommenter.py
+++ b/api/tests/unit_tests/extensions/otel/test_celery_sqlcommenter.py
@@ -8,7 +8,7 @@ from opentelemetry import context
class TestBuildCelerySqlcommenterTags:
"""Tests for _build_celery_sqlcommenter_tags."""
- def test_includes_framework_and_task_name(self):
+ def test_includes_framework_and_task_name(self) -> None:
"""Tags include celery framework version and task name."""
from extensions.otel.celery_sqlcommenter import _build_celery_sqlcommenter_tags
@@ -16,7 +16,7 @@ class TestBuildCelerySqlcommenterTags:
task.name = "tasks.async_workflow_tasks.execute_workflow_team"
task.request = MagicMock()
task.request.retries = 0
- task.request.delivery_info = {}
+ task.request.delivery_info = dict[str, object]()
with patch("extensions.otel.celery_sqlcommenter._get_traceparent", return_value=None):
tags = _build_celery_sqlcommenter_tags(task)
@@ -25,7 +25,7 @@ class TestBuildCelerySqlcommenterTags:
assert tags["framework"].startswith("celery:")
assert tags["task_name"] == "tasks.async_workflow_tasks.execute_workflow_team"
- def test_includes_celery_retries_when_nonzero(self):
+ def test_includes_celery_retries_when_nonzero(self) -> None:
"""celery_retries is included when retries > 0."""
from extensions.otel.celery_sqlcommenter import _build_celery_sqlcommenter_tags
@@ -33,14 +33,14 @@ class TestBuildCelerySqlcommenterTags:
task.name = "tasks.my_task"
task.request = MagicMock()
task.request.retries = 3
- task.request.delivery_info = {}
+ task.request.delivery_info = dict[str, object]()
with patch("extensions.otel.celery_sqlcommenter._get_traceparent", return_value=None):
tags = _build_celery_sqlcommenter_tags(task)
assert tags["celery_retries"] == 3
- def test_omits_celery_retries_when_zero(self):
+ def test_omits_celery_retries_when_zero(self) -> None:
"""celery_retries is omitted when retries is 0."""
from extensions.otel.celery_sqlcommenter import _build_celery_sqlcommenter_tags
@@ -48,14 +48,14 @@ class TestBuildCelerySqlcommenterTags:
task.name = "tasks.my_task"
task.request = MagicMock()
task.request.retries = 0
- task.request.delivery_info = {}
+ task.request.delivery_info = dict[str, object]()
with patch("extensions.otel.celery_sqlcommenter._get_traceparent", return_value=None):
tags = _build_celery_sqlcommenter_tags(task)
assert "celery_retries" not in tags
- def test_includes_routing_key_from_delivery_info(self):
+ def test_includes_routing_key_from_delivery_info(self) -> None:
"""routing_key is included when present in delivery_info."""
from extensions.otel.celery_sqlcommenter import _build_celery_sqlcommenter_tags
@@ -70,7 +70,7 @@ class TestBuildCelerySqlcommenterTags:
assert tags["routing_key"] == "workflow_based_app_execution"
- def test_includes_traceparent_when_available(self):
+ def test_includes_traceparent_when_available(self) -> None:
"""traceparent is included when injectable from current context."""
from extensions.otel.celery_sqlcommenter import _build_celery_sqlcommenter_tags
@@ -78,7 +78,7 @@ class TestBuildCelerySqlcommenterTags:
task.name = "tasks.my_task"
task.request = MagicMock()
task.request.retries = 0
- task.request.delivery_info = {}
+ task.request.delivery_info = dict[str, object]()
traceparent = "00-5db86c23fa8d05b67db315694b518684-737bbf30cdcda066-00"
with patch(
@@ -89,7 +89,7 @@ class TestBuildCelerySqlcommenterTags:
assert tags["traceparent"] == traceparent
- def test_handles_task_without_request(self):
+ def test_handles_task_without_request(self) -> None:
"""Gracefully handles task without request attribute."""
from extensions.otel.celery_sqlcommenter import _build_celery_sqlcommenter_tags
@@ -107,7 +107,7 @@ class TestBuildCelerySqlcommenterTags:
class TestTaskPrerunPostrunHandlers:
"""Tests for task_prerun and task_postrun signal handlers."""
- def test_prerun_sets_context_postrun_detaches(self):
+ def test_prerun_sets_context_postrun_detaches(self) -> None:
"""task_prerun attaches SQLCOMMENTER context; task_postrun detaches it."""
from extensions.otel.celery_sqlcommenter import (
_SQLCOMMENTER_CONTEXT_KEY,
@@ -132,7 +132,7 @@ class TestTaskPrerunPostrunHandlers:
_on_task_prerun(task=task)
tags = context.get_value(_SQLCOMMENTER_CONTEXT_KEY)
- assert tags is not None
+ assert isinstance(tags, dict)
assert tags["framework"].startswith("celery:")
assert tags["task_name"] == "tasks.async_workflow_tasks.execute_workflow_team"
assert tags["celery_retries"] == 1
@@ -148,7 +148,7 @@ class TestTaskPrerunPostrunHandlers:
finally:
context.detach(token)
- def test_prerun_skips_when_no_task(self):
+ def test_prerun_skips_when_no_task(self) -> None:
"""prerun does nothing when task is missing from kwargs."""
from extensions.otel.celery_sqlcommenter import (
_SQLCOMMENTER_CONTEXT_KEY,
@@ -164,7 +164,7 @@ class TestTaskPrerunPostrunHandlers:
finally:
context.detach(token)
- def test_postrun_skips_when_no_token(self):
+ def test_postrun_skips_when_no_token(self) -> None:
"""postrun does nothing when task has no token (e.g. prerun was skipped)."""
from extensions.otel.celery_sqlcommenter import _on_task_postrun
diff --git a/api/tests/unit_tests/extensions/otel/test_context.py b/api/tests/unit_tests/extensions/otel/test_context.py
index 7a837d13ee1..cd2f00caa4e 100644
--- a/api/tests/unit_tests/extensions/otel/test_context.py
+++ b/api/tests/unit_tests/extensions/otel/test_context.py
@@ -33,7 +33,7 @@ def test_propagate_context_detaches_context_after_exception() -> None:
finally:
otel_context.detach(token)
- def invoke_and_read_context() -> str | None:
+ def invoke_and_read_context() -> object:
with pytest.raises(RuntimeError, match="retrieval failed"):
wrapped()
return otel_context.get_value(context_key)
diff --git a/api/tests/unit_tests/extensions/otel/test_runtime.py b/api/tests/unit_tests/extensions/otel/test_runtime.py
index 1bf4aff293a..3c9a402140c 100644
--- a/api/tests/unit_tests/extensions/otel/test_runtime.py
+++ b/api/tests/unit_tests/extensions/otel/test_runtime.py
@@ -1,3 +1,4 @@
+from collections.abc import Iterator
from unittest import mock
import pytest
@@ -16,7 +17,7 @@ def _user() -> Account:
@pytest.fixture(autouse=True)
-def _reset_logging_context():
+def _reset_logging_context() -> Iterator[None]:
clear_request_context()
yield
clear_request_context()
@@ -64,7 +65,7 @@ def test_on_user_loaded_sets_attributes_on_recording_span() -> None:
)
-def test_on_user_loaded_ignores_ended_sdk_span(caplog) -> None:
+def test_on_user_loaded_ignores_ended_sdk_span(caplog: pytest.LogCaptureFixture) -> None:
from extensions.otel import runtime
tracer_provider = TracerProvider()
diff --git a/api/tests/unit_tests/extensions/storage/test_supabase_storage.py b/api/tests/unit_tests/extensions/storage/test_supabase_storage.py
index dade3adc9c9..1a04d2f3934 100644
--- a/api/tests/unit_tests/extensions/storage/test_supabase_storage.py
+++ b/api/tests/unit_tests/extensions/storage/test_supabase_storage.py
@@ -1,4 +1,4 @@
-from collections.abc import Generator
+from collections.abc import Callable, Generator
from pathlib import Path
from unittest.mock import Mock, patch
@@ -11,14 +11,14 @@ class TestSupabaseStorage:
"""Test suite for SupabaseStorage class."""
@pytest.fixture(autouse=True)
- def _supabase_config(self, config_overrides) -> None:
+ def _supabase_config(self, config_overrides: Callable[..., None]) -> None:
config_overrides(
SUPABASE_URL="https://test.supabase.co",
SUPABASE_API_KEY="test-api-key",
SUPABASE_BUCKET_NAME="test-bucket",
)
- def test_init_success_with_all_config(self):
+ def test_init_success_with_all_config(self) -> None:
"""Test successful initialization when all required config is provided."""
with patch("extensions.storage.supabase_storage.Client", autospec=True) as mock_client_class:
mock_client = Mock()
@@ -33,25 +33,25 @@ class TestSupabaseStorage:
supabase_url="https://test.supabase.co", supabase_key="test-api-key"
)
- def test_init_raises_error_when_url_missing(self, config_overrides):
+ def test_init_raises_error_when_url_missing(self, config_overrides: Callable[..., None]) -> None:
"""Test initialization raises ValueError when SUPABASE_URL is None."""
config_overrides(SUPABASE_URL=None)
with pytest.raises(ValueError, match="SUPABASE_URL is not set"):
SupabaseStorage()
- def test_init_raises_error_when_api_key_missing(self, config_overrides):
+ def test_init_raises_error_when_api_key_missing(self, config_overrides: Callable[..., None]) -> None:
"""Test initialization raises ValueError when SUPABASE_API_KEY is None."""
config_overrides(SUPABASE_API_KEY=None)
with pytest.raises(ValueError, match="SUPABASE_API_KEY is not set"):
SupabaseStorage()
- def test_init_raises_error_when_bucket_name_missing(self, config_overrides):
+ def test_init_raises_error_when_bucket_name_missing(self, config_overrides: Callable[..., None]) -> None:
"""Test initialization raises ValueError when SUPABASE_BUCKET_NAME is None."""
config_overrides(SUPABASE_BUCKET_NAME=None)
with pytest.raises(ValueError, match="SUPABASE_BUCKET_NAME is not set"):
SupabaseStorage()
- def test_create_bucket_when_not_exists(self):
+ def test_create_bucket_when_not_exists(self) -> None:
"""Test create_bucket creates bucket when it doesn't exist."""
with patch("extensions.storage.supabase_storage.Client", autospec=True) as mock_client_class:
mock_client = Mock()
@@ -62,7 +62,7 @@ class TestSupabaseStorage:
mock_client.storage.create_bucket.assert_called_once_with(id="test-bucket", name="test-bucket")
- def test_create_bucket_when_exists(self):
+ def test_create_bucket_when_exists(self) -> None:
"""Test create_bucket does not create bucket when it already exists."""
with patch("extensions.storage.supabase_storage.Client", autospec=True) as mock_client_class:
mock_client = Mock()
@@ -74,7 +74,7 @@ class TestSupabaseStorage:
mock_client.storage.create_bucket.assert_not_called()
@pytest.fixture
- def storage_with_mock_client(self):
+ def storage_with_mock_client(self) -> Generator[tuple[SupabaseStorage, Mock]]:
"""Fixture providing SupabaseStorage with mocked client."""
with patch("extensions.storage.supabase_storage.Client", autospec=True) as mock_client_class:
mock_client = Mock()
@@ -86,7 +86,7 @@ class TestSupabaseStorage:
mock_client.reset_mock()
yield storage, mock_client
- def test_save(self, storage_with_mock_client):
+ def test_save(self, storage_with_mock_client: tuple[SupabaseStorage, Mock]) -> None:
"""Test save calls client.storage.from_(bucket).upload(path, data)."""
storage, mock_client = storage_with_mock_client
@@ -98,7 +98,7 @@ class TestSupabaseStorage:
mock_client.storage.from_.assert_called_once_with("test-bucket")
mock_client.storage.from_().upload.assert_called_once_with(filename, data)
- def test_load_once_returns_bytes(self, storage_with_mock_client):
+ def test_load_once_returns_bytes(self, storage_with_mock_client: tuple[SupabaseStorage, Mock]) -> None:
"""Test load_once returns bytes."""
storage, mock_client = storage_with_mock_client
@@ -112,7 +112,7 @@ class TestSupabaseStorage:
assert "test-bucket" in [call[0][0] for call in mock_client.storage.from_.call_args_list if call[0]]
mock_client.storage.from_().download.assert_called_with("test.txt")
- def test_load_stream_yields_chunks(self, storage_with_mock_client):
+ def test_load_stream_yields_chunks(self, storage_with_mock_client: tuple[SupabaseStorage, Mock]) -> None:
"""Test load_stream yields chunks."""
storage, mock_client = storage_with_mock_client
@@ -132,7 +132,9 @@ class TestSupabaseStorage:
assert "test-bucket" in [call[0][0] for call in mock_client.storage.from_.call_args_list if call[0]]
mock_client.storage.from_().download.assert_called_with("test.txt")
- def test_download_writes_bytes_to_disk(self, storage_with_mock_client, tmp_path: Path):
+ def test_download_writes_bytes_to_disk(
+ self, storage_with_mock_client: tuple[SupabaseStorage, Mock], tmp_path: Path
+ ) -> None:
"""Test download writes expected bytes to disk."""
storage, mock_client = storage_with_mock_client
@@ -149,7 +151,7 @@ class TestSupabaseStorage:
assert "test-bucket" in [call[0][0] for call in mock_client.storage.from_.call_args_list if call[0]]
mock_client.storage.from_().download.assert_called_with("test.txt")
- def test_exists_returns_true_when_file_found(self, storage_with_mock_client):
+ def test_exists_returns_true_when_file_found(self, storage_with_mock_client: tuple[SupabaseStorage, Mock]) -> None:
"""Test exists returns True when list() returns items."""
storage, mock_client = storage_with_mock_client
@@ -161,7 +163,9 @@ class TestSupabaseStorage:
assert "test-bucket" in [call[0][0] for call in mock_client.storage.from_.call_args_list if call[0]]
mock_client.storage.from_().list.assert_called_with(path="test.txt")
- def test_exists_returns_false_when_file_not_found(self, storage_with_mock_client):
+ def test_exists_returns_false_when_file_not_found(
+ self, storage_with_mock_client: tuple[SupabaseStorage, Mock]
+ ) -> None:
"""Test exists returns False when list() returns an empty list."""
storage, mock_client = storage_with_mock_client
@@ -173,7 +177,9 @@ class TestSupabaseStorage:
assert "test-bucket" in [call[0][0] for call in mock_client.storage.from_.call_args_list if call[0]]
mock_client.storage.from_().list.assert_called_with(path="test.txt")
- def test_delete_calls_remove_with_filename_in_list(self, storage_with_mock_client):
+ def test_delete_calls_remove_with_filename_in_list(
+ self, storage_with_mock_client: tuple[SupabaseStorage, Mock]
+ ) -> None:
"""Test delete calls remove([...]) (some client versions require a list)."""
storage, mock_client = storage_with_mock_client
@@ -184,7 +190,7 @@ class TestSupabaseStorage:
mock_client.storage.from_.assert_called_once_with("test-bucket")
mock_client.storage.from_().remove.assert_called_once_with([filename])
- def test_bucket_exists_returns_true_when_bucket_found(self):
+ def test_bucket_exists_returns_true_when_bucket_found(self) -> None:
"""Test bucket_exists returns True when bucket is found in list."""
with patch("extensions.storage.supabase_storage.Client", autospec=True) as mock_client_class:
mock_client = Mock()
@@ -199,7 +205,7 @@ class TestSupabaseStorage:
assert result is True
assert mock_client.storage.list_buckets.call_count >= 1
- def test_bucket_exists_returns_false_when_bucket_not_found(self):
+ def test_bucket_exists_returns_false_when_bucket_not_found(self) -> None:
"""Test bucket_exists returns False when bucket is not found in list."""
with patch("extensions.storage.supabase_storage.Client", autospec=True) as mock_client_class:
mock_client = Mock()
@@ -217,13 +223,13 @@ class TestSupabaseStorage:
assert result is False
assert mock_client.storage.list_buckets.call_count >= 1
- def test_bucket_exists_returns_false_when_no_buckets(self):
+ def test_bucket_exists_returns_false_when_no_buckets(self) -> None:
"""Test bucket_exists returns False when no buckets exist."""
with patch("extensions.storage.supabase_storage.Client", autospec=True) as mock_client_class:
mock_client = Mock()
mock_client_class.return_value = mock_client
- mock_client.storage.list_buckets.return_value = []
+ mock_client.storage.list_buckets.return_value = list[object]()
mock_client.storage.create_bucket = Mock()
storage = SupabaseStorage()
diff --git a/api/tests/unit_tests/extensions/test_ext_blueprints_openapi.py b/api/tests/unit_tests/extensions/test_ext_blueprints_openapi.py
index 43d768974fd..a81a7a20a12 100644
--- a/api/tests/unit_tests/extensions/test_ext_blueprints_openapi.py
+++ b/api/tests/unit_tests/extensions/test_ext_blueprints_openapi.py
@@ -27,7 +27,6 @@ inside its function body, so the patched value is what it sees.
from __future__ import annotations
import importlib
-from collections.abc import Iterator
import pytest
from flask import Blueprint
@@ -55,7 +54,7 @@ def _probe_view() -> tuple[str, int]:
@pytest.fixture
-def fresh_blueprints(monkeypatch: pytest.MonkeyPatch) -> Iterator[dict[str, Blueprint]]:
+def fresh_blueprints(monkeypatch: pytest.MonkeyPatch) -> dict[str, Blueprint]:
"""Replace each production blueprint singleton with a fresh, unregistered copy.
Mirrors the production `name` and `url_prefix` so the gate can still
diff --git a/api/tests/unit_tests/extensions/test_ext_request_logging.py b/api/tests/unit_tests/extensions/test_ext_request_logging.py
index 38787ac63a2..fc0752128a1 100644
--- a/api/tests/unit_tests/extensions/test_ext_request_logging.py
+++ b/api/tests/unit_tests/extensions/test_ext_request_logging.py
@@ -11,7 +11,7 @@ from extensions.ext_request_logging import _is_content_type_json, _log_request_f
from tests.unit_tests.config_override import apply_config_overrides
-def test_is_content_type_json():
+def test_is_content_type_json() -> None:
"""
Test the _is_content_type_json function.
"""
@@ -30,11 +30,11 @@ _VALUE_NEEDLE = _KEY_NEEDLE[::-1]
_RESPONSE_NEEDLE = "response"
-def _get_test_app():
+def _get_test_app() -> Flask:
app = Flask(__name__)
@app.route("/", methods=["GET", "POST"])
- def handler():
+ def handler() -> str:
return _RESPONSE_NEEDLE
return app
@@ -58,7 +58,7 @@ def mock_response_receiver(monkeypatch: pytest.MonkeyPatch) -> mock.Mock:
@pytest.fixture
-def enable_request_logging(monkeypatch: pytest.MonkeyPatch):
+def enable_request_logging(monkeypatch: pytest.MonkeyPatch) -> None:
apply_config_overrides(monkeypatch, ENABLE_REQUEST_LOGGING=True)
@@ -70,13 +70,20 @@ def _captured_records(caplog: pytest.LogCaptureFixture, level: int) -> list[logg
]
+def _log_args(record: logging.LogRecord) -> list[str]:
+ assert isinstance(record.args, tuple)
+ args = [arg for arg in record.args if isinstance(arg, str)]
+ assert len(args) == len(record.args)
+ return args
+
+
class TestRequestLoggingExtension:
def test_receiver_should_not_be_invoked_if_configuration_is_disabled(
self,
monkeypatch: pytest.MonkeyPatch,
mock_request_receiver: MagicMock,
mock_response_receiver: MagicMock,
- ):
+ ) -> None:
apply_config_overrides(monkeypatch, ENABLE_REQUEST_LOGGING=False)
app = _get_test_app()
@@ -90,10 +97,10 @@ class TestRequestLoggingExtension:
def test_receiver_should_be_called_if_enabled(
self,
- enable_request_logging,
+ enable_request_logging: None,
mock_request_receiver: MagicMock,
mock_response_receiver: MagicMock,
- ):
+ ) -> None:
"""
Test the request logging extension with JSON data.
"""
@@ -111,8 +118,8 @@ class TestRequestLoggingExtension:
class TestLoggingLevel:
@pytest.mark.usefixtures("enable_request_logging")
def test_logging_should_be_skipped_if_level_is_above_debug(
- self, enable_request_logging, caplog: pytest.LogCaptureFixture
- ):
+ self, enable_request_logging: None, caplog: pytest.LogCaptureFixture
+ ) -> None:
caplog.set_level(logging.INFO, logger=ext_request_logging.logger.name)
app = _get_test_app()
init_app(app)
@@ -124,7 +131,9 @@ class TestLoggingLevel:
class TestRequestReceiverLogging:
@pytest.mark.usefixtures("enable_request_logging")
- def test_non_json_request(self, enable_request_logging, caplog: pytest.LogCaptureFixture, mock_response_receiver):
+ def test_non_json_request(
+ self, enable_request_logging: None, caplog: pytest.LogCaptureFixture, mock_response_receiver: mock.Mock
+ ) -> None:
caplog.set_level(logging.DEBUG, logger=ext_request_logging.logger.name)
app = _get_test_app()
init_app(app)
@@ -139,7 +148,9 @@ class TestRequestReceiverLogging:
assert "Request Body" not in record.msg
@pytest.mark.usefixtures("enable_request_logging")
- def test_json_request(self, enable_request_logging, caplog: pytest.LogCaptureFixture, mock_response_receiver):
+ def test_json_request(
+ self, enable_request_logging: None, caplog: pytest.LogCaptureFixture, mock_response_receiver: mock.Mock
+ ) -> None:
caplog.set_level(logging.DEBUG, logger=ext_request_logging.logger.name)
app = _get_test_app()
init_app(app)
@@ -149,16 +160,17 @@ class TestRequestReceiverLogging:
debug_records = _captured_records(caplog, logging.DEBUG)
assert len(debug_records) == 1
record = debug_records[0]
+ args = _log_args(record)
assert "Received Request" in record.msg
assert "Request Body" in record.msg
- assert record.args[0] == "POST"
- assert record.args[1] == "/"
- assert _KEY_NEEDLE in record.args[2]
+ assert args[0] == "POST"
+ assert args[1] == "/"
+ assert _KEY_NEEDLE in args[2]
@pytest.mark.usefixtures("enable_request_logging")
def test_json_request_with_empty_body(
- self, enable_request_logging, caplog: pytest.LogCaptureFixture, mock_response_receiver
- ):
+ self, enable_request_logging: None, caplog: pytest.LogCaptureFixture, mock_response_receiver: mock.Mock
+ ) -> None:
caplog.set_level(logging.DEBUG, logger=ext_request_logging.logger.name)
app = _get_test_app()
init_app(app)
@@ -175,8 +187,8 @@ class TestRequestReceiverLogging:
@pytest.mark.usefixtures("enable_request_logging")
def test_json_request_with_invalid_json_as_body(
- self, enable_request_logging, caplog: pytest.LogCaptureFixture, mock_response_receiver
- ):
+ self, enable_request_logging: None, caplog: pytest.LogCaptureFixture, mock_response_receiver: mock.Mock
+ ) -> None:
caplog.set_level(logging.DEBUG, logger=ext_request_logging.logger.name)
app = _get_test_app()
init_app(app)
@@ -195,7 +207,7 @@ class TestRequestReceiverLogging:
class TestResponseReceiverLogging:
@pytest.mark.usefixtures("enable_request_logging")
- def test_non_json_response(self, enable_request_logging, caplog: pytest.LogCaptureFixture):
+ def test_non_json_response(self, enable_request_logging: None, caplog: pytest.LogCaptureFixture) -> None:
caplog.set_level(logging.DEBUG, logger=ext_request_logging.logger.name)
app = _get_test_app()
response = Response(
@@ -206,13 +218,16 @@ class TestResponseReceiverLogging:
debug_records = _captured_records(caplog, logging.DEBUG)
assert len(debug_records) == 1
record = debug_records[0]
+ args = _log_args(record)
assert "Response" in record.msg
- assert "200" in record.args[0]
- assert record.args[1] == "text/plain"
+ assert "200" in args[0]
+ assert args[1] == "text/plain"
assert "Response Body" not in record.msg
@pytest.mark.usefixtures("enable_request_logging")
- def test_json_response(self, enable_request_logging, caplog: pytest.LogCaptureFixture, mock_response_receiver):
+ def test_json_response(
+ self, enable_request_logging: None, caplog: pytest.LogCaptureFixture, mock_response_receiver: mock.Mock
+ ) -> None:
caplog.set_level(logging.DEBUG, logger=ext_request_logging.logger.name)
app = _get_test_app()
response = Response(
@@ -223,16 +238,17 @@ class TestResponseReceiverLogging:
debug_records = _captured_records(caplog, logging.DEBUG)
assert len(debug_records) == 1
record = debug_records[0]
+ args = _log_args(record)
assert "Response" in record.msg
assert "Response Body" in record.msg
- assert "200" in record.args[0]
- assert record.args[1] == "application/json"
- assert _KEY_NEEDLE in record.args[2]
+ assert "200" in args[0]
+ assert args[1] == "application/json"
+ assert _KEY_NEEDLE in args[2]
@pytest.mark.usefixtures("enable_request_logging")
def test_json_request_with_invalid_json_as_body(
- self, enable_request_logging, caplog: pytest.LogCaptureFixture, mock_response_receiver
- ):
+ self, enable_request_logging: None, caplog: pytest.LogCaptureFixture, mock_response_receiver: mock.Mock
+ ) -> None:
caplog.set_level(logging.DEBUG, logger=ext_request_logging.logger.name)
app = _get_test_app()
@@ -248,7 +264,7 @@ class TestResponseReceiverLogging:
class TestResponseUnmodified:
- def test_when_request_logging_disabled(self):
+ def test_when_request_logging_disabled(self) -> None:
app = _get_test_app()
init_app(app)
@@ -262,7 +278,7 @@ class TestResponseUnmodified:
assert response.status_code == 200
@pytest.mark.usefixtures("enable_request_logging")
- def test_when_request_logging_enabled(self, enable_request_logging):
+ def test_when_request_logging_enabled(self, enable_request_logging: None) -> None:
app = _get_test_app()
init_app(app)
@@ -279,7 +295,7 @@ class TestResponseUnmodified:
class TestRequestFinishedInfoAccessLine:
def test_info_access_log_includes_method_path_status_duration_trace_id(
self, monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
- ):
+ ) -> None:
"""Ensure INFO access line contains expected fields with computed duration and trace id."""
app = _get_test_app()
# Push a real request context so flask.request and g are available
@@ -314,7 +330,7 @@ class TestRequestFinishedInfoAccessLine:
def test_info_access_log_uses_dash_without_start_timestamp(
self, monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
- ):
+ ) -> None:
app = _get_test_app()
with app.test_request_context("/bar", method="POST"):
# No g.__request_started_ts set -> duration should be '-'
diff --git a/api/tests/unit_tests/extensions/test_set_secretkey.py b/api/tests/unit_tests/extensions/test_set_secretkey.py
index b49ff7107b8..6d3037c8bb6 100644
--- a/api/tests/unit_tests/extensions/test_set_secretkey.py
+++ b/api/tests/unit_tests/extensions/test_set_secretkey.py
@@ -1,8 +1,8 @@
from __future__ import annotations
import pytest
-from flask import Flask
+from dify_app import DifyApp
from extensions import ext_set_secretkey
from tests.unit_tests.config_override import apply_config_overrides
@@ -28,7 +28,7 @@ def test_init_app_uses_configured_secret_key(monkeypatch: pytest.MonkeyPatch) ->
storage = InMemoryStorage()
apply_config_overrides(monkeypatch, SECRET_KEY=secret_key)
monkeypatch.setattr("configs.secret_key.storage", storage)
- app = Flask(__name__)
+ app = DifyApp(__name__)
app.config["SECRET_KEY"] = secret_key
ext_set_secretkey.init_app(app)
@@ -44,7 +44,7 @@ def test_init_app_generates_and_persists_secret_key_when_missing(
storage = InMemoryStorage()
apply_config_overrides(monkeypatch, SECRET_KEY="")
monkeypatch.setattr("configs.secret_key.storage", storage)
- app = Flask(__name__)
+ app = DifyApp(__name__)
app.config["SECRET_KEY"] = ""
ext_set_secretkey.init_app(app)
@@ -64,7 +64,7 @@ def test_init_app_reuses_persisted_secret_key_when_missing(
storage = InMemoryStorage({".dify_secret_key": f"{persisted_key}\n".encode()})
apply_config_overrides(monkeypatch, SECRET_KEY="")
monkeypatch.setattr("configs.secret_key.storage", storage)
- app = Flask(__name__)
+ app = DifyApp(__name__)
app.config["SECRET_KEY"] = ""
ext_set_secretkey.init_app(app)
diff --git a/api/tests/unit_tests/pyrefly.toml b/api/tests/unit_tests/pyrefly.toml
index f94177096bf..0f5ec443f6d 100644
--- a/api/tests/unit_tests/pyrefly.toml
+++ b/api/tests/unit_tests/pyrefly.toml
@@ -562,23 +562,15 @@ project-excludes = [
"events/test_events_package_compat.py",
"extensions/logstore/repositories/test_logstore_api_workflow_node_execution_repository.py",
"extensions/logstore/test_sql_escape.py",
- "extensions/otel/conftest.py",
"extensions/otel/decorators/handlers/test_generate_handler.py",
"extensions/otel/decorators/handlers/test_workflow_app_runner_handler.py",
"extensions/otel/decorators/test_base.py",
"extensions/otel/decorators/test_handler.py",
- "extensions/otel/test_celery_sqlcommenter.py",
- "extensions/otel/test_context.py",
"extensions/otel/test_retrieval_tracing.py",
- "extensions/otel/test_runtime.py",
- "extensions/storage/test_supabase_storage.py",
"extensions/test_celery_ssl.py",
- "extensions/test_ext_blueprints_openapi.py",
"extensions/test_ext_login.py",
- "extensions/test_ext_request_logging.py",
"extensions/test_ext_socketio.py",
"extensions/test_pubsub_channel.py",
- "extensions/test_set_secretkey.py",
"extensions/test_workflow_warm_shutdown.py",
"factories/test_build_from_mapping.py",
"factories/test_file_factory.py",