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 agent v2 output tests (#43987)

Eddy ZHANGcfcd7648f1ef
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_file_tenant_validator.py b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_file_tenant_validator.py
index 07776187a9e..043c6c552d2 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_file_tenant_validator.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_file_tenant_validator.py
@@ -31,7 +31,7 @@ USER_ID = "33333333-3333-3333-3333-333333333333"
def executed_statements(sqlite_engine: Engine) -> Iterator[list[str]]:
statements: list[str] = []
- def record_statement(_connection, _cursor, statement, _parameters, _context, _executemany) -> None:
+ def record_statement(_connection, _cursor, statement: str, _parameters, _context, _executemany) -> None:
statements.append(statement)
event.listen(sqlite_engine, "before_cursor_execute", record_statement)
@@ -41,7 +41,7 @@ def executed_statements(sqlite_engine: Engine) -> Iterator[list[str]]:
event.remove(sqlite_engine, "before_cursor_execute", record_statement)
-def test_empty_inputs_return_false_without_db_hit(executed_statements: list[str]):
+def test_empty_inputs_return_false_without_db_hit(executed_statements: list[str]) -> None:
validator = UploadFileTenantValidator()
assert (
validator.is_accessible_file_mapping(
@@ -73,7 +73,7 @@ def test_empty_inputs_return_false_without_db_hit(executed_statements: list[str]
"550e8400-e29b-41d4-a716-446655440000-trailing",
],
)
-def test_non_uuid_file_ids_return_false_without_db_hit(bad_file_id: str, executed_statements: list[str]):
+def test_non_uuid_file_ids_return_false_without_db_hit(bad_file_id: str, executed_statements: list[str]) -> None:
validator = UploadFileTenantValidator()
assert (
validator.is_accessible_file_mapping(
@@ -86,7 +86,7 @@ def test_non_uuid_file_ids_return_false_without_db_hit(bad_file_id: str, execute
assert executed_statements == []
-def test_db_error_swallowed_and_returns_false(sqlite_engine: Engine):
+def test_db_error_swallowed_and_returns_false(sqlite_engine: Engine) -> None:
"""Any DB-level fault (timeout, dialect quirk, connection drop) must reject
the file rather than crash the workflow node."""
validator = UploadFileTenantValidator()
@@ -118,7 +118,7 @@ def test_db_error_swallowed_and_returns_false(sqlite_engine: Engine):
@pytest.mark.parametrize("sqlite_session", [TABLES], indirect=True)
-def test_accessible_file_mapping_checks_transfer_method_family(sqlite_session: Session):
+def test_accessible_file_mapping_checks_transfer_method_family(sqlite_session: Session) -> None:
validator = UploadFileTenantValidator()
upload_file = UploadFile(
tenant_id=TENANT_ID,
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_failure_orchestrator.py b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_failure_orchestrator.py
index f142540f614..6590d1973ba 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_failure_orchestrator.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_failure_orchestrator.py
@@ -29,7 +29,7 @@ def _output(
on_failure: OutputErrorStrategy = OutputErrorStrategy.STOP,
max_retries: int = 0,
retry_enabled: bool = False,
- default_value=None,
+ default_value: object = None,
) -> DeclaredOutputConfig:
strategy = DeclaredOutputFailureStrategy(
retry=DeclaredOutputRetryConfig(enabled=retry_enabled, max_retries=max_retries),
@@ -48,7 +48,7 @@ def _failure(declared: DeclaredOutputConfig, kind: OutputFailureKind = OutputFai
# ──────────────────────────────────────────────────────────────────────────────
-def test_retry_within_budget_returns_retry_and_increments_attempt():
+def test_retry_within_budget_returns_retry_and_increments_attempt() -> None:
orch = OutputFailureOrchestrator()
declared = _output("x", retry_enabled=True, max_retries=2)
@@ -58,7 +58,7 @@ def test_retry_within_budget_returns_retry_and_increments_attempt():
assert outcome.next_attempt == 1
-def test_retry_budget_uses_max_across_multiple_outputs():
+def test_retry_budget_uses_max_across_multiple_outputs() -> None:
"""If two outputs fail and their retry budgets differ, retry continues
until the *larger* budget is spent (§7)."""
orch = OutputFailureOrchestrator()
@@ -71,7 +71,7 @@ def test_retry_budget_uses_max_across_multiple_outputs():
assert outcome.next_attempt == 2
-def test_retry_disabled_skips_retry_even_with_max_retries_set():
+def test_retry_disabled_skips_retry_even_with_max_retries_set() -> None:
orch = OutputFailureOrchestrator()
declared = _output("x", retry_enabled=False, max_retries=5) # disabled wins
@@ -80,7 +80,7 @@ def test_retry_disabled_skips_retry_even_with_max_retries_set():
assert outcome.decision != OutputFailureDecision.RETRY
-def test_retry_budget_exhausted_falls_to_terminal():
+def test_retry_budget_exhausted_falls_to_terminal() -> None:
orch = OutputFailureOrchestrator()
declared = _output(
"x", retry_enabled=True, max_retries=1, on_failure=OutputErrorStrategy.DEFAULT_VALUE, default_value="fallback"
@@ -97,7 +97,7 @@ def test_retry_budget_exhausted_falls_to_terminal():
# ──────────────────────────────────────────────────────────────────────────────
-def test_stop_terminal_returns_fail_node():
+def test_stop_terminal_returns_fail_node() -> None:
orch = OutputFailureOrchestrator()
declared = _output("x", on_failure=OutputErrorStrategy.STOP)
@@ -107,7 +107,7 @@ def test_stop_terminal_returns_fail_node():
assert outcome.per_output_actions == {}
-def test_default_value_terminal_collects_per_output_defaults():
+def test_default_value_terminal_collects_per_output_defaults() -> None:
orch = OutputFailureOrchestrator()
out_a = _output("a", on_failure=OutputErrorStrategy.DEFAULT_VALUE, default_value="A")
out_b = _output("b", on_failure=OutputErrorStrategy.DEFAULT_VALUE, default_value="B")
@@ -118,7 +118,7 @@ def test_default_value_terminal_collects_per_output_defaults():
assert outcome.per_output_actions == {"a": "A", "b": "B"}
-def test_fail_branch_terminal_returns_take_fail_branch():
+def test_fail_branch_terminal_returns_take_fail_branch() -> None:
orch = OutputFailureOrchestrator()
declared = _output("x", on_failure=OutputErrorStrategy.FAIL_BRANCH)
@@ -132,7 +132,7 @@ def test_fail_branch_terminal_returns_take_fail_branch():
# ──────────────────────────────────────────────────────────────────────────────
-def test_fail_branch_wins_over_stop_and_default_value():
+def test_fail_branch_wins_over_stop_and_default_value() -> None:
orch = OutputFailureOrchestrator()
out_a = _output("a", on_failure=OutputErrorStrategy.DEFAULT_VALUE, default_value="x")
out_b = _output("b", on_failure=OutputErrorStrategy.STOP)
@@ -148,7 +148,7 @@ def test_fail_branch_wins_over_stop_and_default_value():
assert outcome.per_output_actions == {}
-def test_stop_wins_over_default_value_when_no_fail_branch():
+def test_stop_wins_over_default_value_when_no_fail_branch() -> None:
orch = OutputFailureOrchestrator()
out_a = _output("a", on_failure=OutputErrorStrategy.DEFAULT_VALUE, default_value="x")
out_b = _output("b", on_failure=OutputErrorStrategy.STOP)
@@ -163,7 +163,7 @@ def test_stop_wins_over_default_value_when_no_fail_branch():
# ──────────────────────────────────────────────────────────────────────────────
-def test_failure_kinds_dedupes_and_preserves_order():
+def test_failure_kinds_dedupes_and_preserves_order() -> None:
orch = OutputFailureOrchestrator()
decl = _output("x")
failures = [
@@ -182,7 +182,7 @@ def test_failure_kinds_dedupes_and_preserves_order():
# ──────────────────────────────────────────────────────────────────────────────
-def test_primary_reason_includes_every_failure():
+def test_primary_reason_includes_every_failure() -> None:
orch = OutputFailureOrchestrator()
out_a = _output("a")
out_b = _output("b")
@@ -199,7 +199,7 @@ def test_primary_reason_includes_every_failure():
assert "b[output_check]: missing section 3" in outcome.primary_reason
-def test_no_failures_raises():
+def test_no_failures_raises() -> None:
orch = OutputFailureOrchestrator()
with pytest.raises(ValueError, match="at least one failure"):
orch.decide(failures=[], current_attempt=0)
@@ -210,19 +210,19 @@ def test_no_failures_raises():
# ──────────────────────────────────────────────────────────────────────────────
-def test_idempotency_key_first_attempt_matches_pre_stage_4_shape():
+def test_idempotency_key_first_attempt_matches_pre_stage_4_shape() -> None:
key = retry_idempotency_key(workflow_run_id="run-1", node_execution_id="node-exec-1", attempt=0)
assert key == "run-1:node-exec-1"
-def test_idempotency_key_appends_retry_attempt_for_retries():
+def test_idempotency_key_appends_retry_attempt_for_retries() -> None:
assert (
retry_idempotency_key(workflow_run_id="run-1", node_execution_id="node-exec-1", attempt=2)
== "run-1:node-exec-1:retry-2"
)
-def test_idempotency_key_handles_missing_workflow_run_id():
+def test_idempotency_key_handles_missing_workflow_run_id() -> None:
assert retry_idempotency_key(workflow_run_id=None, node_execution_id="node-exec-9", attempt=0) == "node-exec-9"
assert (
retry_idempotency_key(workflow_run_id=None, node_execution_id="node-exec-9", attempt=1) == "node-exec-9:retry-1"
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_file_rebacker.py b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_file_rebacker.py
index d42a896260e..b66371596e9 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_file_rebacker.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_file_rebacker.py
@@ -11,6 +11,7 @@ from core.db.session_factory import session_factory
from core.workflow.file_reference import resolve_file_record_id
from core.workflow.nodes.agent_v2.output_file_rebacker import reback_tool_file_output
from graphon.file import FileTransferMethod, FileType
+from models.base import TypeBase
from models.tools import ToolFile
TENANT = "11111111-1111-1111-1111-111111111111"
@@ -19,7 +20,7 @@ TENANT = "11111111-1111-1111-1111-111111111111"
@pytest.fixture(autouse=True)
def _tables() -> Generator[None]:
engine = session_factory.get_session_maker().kw["bind"]
- ToolFile.__table__.create(bind=engine, checkfirst=True)
+ TypeBase.metadata.tables[ToolFile.__tablename__].create(bind=engine, checkfirst=True)
yield
with session_factory.create_session() as session:
session.execute(delete(ToolFile))
@@ -42,7 +43,7 @@ def _seed(*, mimetype: str = "application/pdf", name: str = "report.pdf", size:
return tool_file.id
-def test_reback_resolves_tenant_tool_file_to_file():
+def test_reback_resolves_tenant_tool_file_to_file() -> None:
tf = _seed(mimetype="image/png", name="chart.png", size=99)
file = reback_tool_file_output(tenant_id=TENANT, tool_file_id=tf)
@@ -57,7 +58,7 @@ def test_reback_resolves_tenant_tool_file_to_file():
assert file.extension == ".png"
-def test_reback_prefers_filename_extension_over_mimetype():
+def test_reback_prefers_filename_extension_over_mimetype() -> None:
tf = _seed(mimetype="application/octet-stream", name="report.docx", size=99)
file = reback_tool_file_output(tenant_id=TENANT, tool_file_id=tf)
@@ -68,17 +69,17 @@ def test_reback_prefers_filename_extension_over_mimetype():
assert file.type == FileType.CUSTOM
-def test_reback_other_tenant_returns_none():
+def test_reback_other_tenant_returns_none() -> None:
tf = _seed()
assert reback_tool_file_output(tenant_id="33333333-3333-3333-3333-333333333333", tool_file_id=tf) is None
@pytest.mark.parametrize("bad", ["", "not-a-uuid", "550e8400-e29b-41d4-a716-446655440000"])
-def test_reback_missing_or_malformed_returns_none(bad: str):
+def test_reback_missing_or_malformed_returns_none(bad: str) -> None:
# empty / non-UUID / valid-but-absent all resolve to None (never raise)
assert reback_tool_file_output(tenant_id=TENANT, tool_file_id=bad) is None
-def test_reback_empty_tenant_returns_none():
+def test_reback_empty_tenant_returns_none() -> None:
tf = _seed()
assert reback_tool_file_output(tenant_id="", tool_file_id=tf) is None
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_type_checker.py b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_type_checker.py
index 3c472b3fb5b..b2fbc4371b1 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_type_checker.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent_v2/test_output_type_checker.py
@@ -67,7 +67,7 @@ def _make_checker(
# ──────────────────────────────────────────────────────────────────────────────
-def test_all_scalar_types_ready_on_correct_payload():
+def test_all_scalar_types_ready_on_correct_payload() -> None:
checker = _make_checker()
declared = [
DeclaredOutputConfig(name="s", type=DeclaredOutputType.STRING),
@@ -88,7 +88,7 @@ def test_all_scalar_types_ready_on_correct_payload():
}
-def test_number_rejects_bool_even_though_python_says_isinstance_int():
+def test_number_rejects_bool_even_though_python_says_isinstance_int() -> None:
checker = _make_checker()
outcome = checker.check(
declared_outputs=[DeclaredOutputConfig(name="n", type=DeclaredOutputType.NUMBER)],
@@ -109,7 +109,9 @@ def test_number_rejects_bool_even_though_python_says_isinstance_int():
(DeclaredOutputType.OBJECT, [1, 2], "list"),
],
)
-def test_type_mismatch_reported_with_actual_kind(declared_type, wrong_value, expected_kind):
+def test_type_mismatch_reported_with_actual_kind(
+ declared_type: DeclaredOutputType, wrong_value: object, expected_kind: str
+) -> None:
checker = _make_checker()
outcome = checker.check(
declared_outputs=[DeclaredOutputConfig(name="x", type=declared_type)],
@@ -126,7 +128,7 @@ def test_type_mismatch_reported_with_actual_kind(declared_type, wrong_value, exp
# ──────────────────────────────────────────────────────────────────────────────
-def test_array_of_strings_validates_each_item():
+def test_array_of_strings_validates_each_item() -> None:
checker = _make_checker()
declared = DeclaredOutputConfig(
name="tags",
@@ -143,7 +145,7 @@ def test_array_of_strings_validates_each_item():
assert reason.startswith("items[1]:")
-def test_array_of_files_validates_per_item_file_ref():
+def test_array_of_files_validates_per_item_file_ref() -> None:
checker = _make_checker(allowed={"t-1": {"file-A"}})
declared = DeclaredOutputConfig(
name="docs",
@@ -174,7 +176,7 @@ def test_array_of_files_validates_per_item_file_ref():
# ──────────────────────────────────────────────────────────────────────────────
-def test_file_ref_must_be_tenant_owned():
+def test_file_ref_must_be_tenant_owned() -> None:
checker = _make_checker(allowed={"t-1": {"my-file"}})
declared = DeclaredOutputConfig(name="report", type=DeclaredOutputType.FILE)
allowed_reference = build_file_reference(record_id="my-file")
@@ -195,7 +197,7 @@ def test_file_ref_must_be_tenant_owned():
assert outcome.has_failures
-def test_file_ref_must_match_transfer_method_family():
+def test_file_ref_must_match_transfer_method_family() -> None:
tool_reference = build_file_reference(record_id="tool-file-1")
checker = _make_checker(
allowed={"t-1": {"tool-file-1"}},
@@ -215,7 +217,7 @@ def test_file_ref_must_match_transfer_method_family():
assert "not accessible" in (outcome.failures[0].reason or "")
-def test_datasource_file_ref_is_accepted_for_matching_transfer_method_family():
+def test_datasource_file_ref_is_accepted_for_matching_transfer_method_family() -> None:
datasource_reference = build_file_reference(record_id="datasource-file-1")
checker = _make_checker(
allowed={"t-1": {"datasource-file-1"}},
@@ -234,7 +236,7 @@ def test_datasource_file_ref_is_accepted_for_matching_transfer_method_family():
assert not outcome.has_failures
-def test_datasource_file_ref_rejects_transfer_method_family_mismatch():
+def test_datasource_file_ref_rejects_transfer_method_family_mismatch() -> None:
tool_reference = build_file_reference(record_id="tool-file-1")
checker = _make_checker(
allowed={"t-1": {"tool-file-1"}},
@@ -254,7 +256,7 @@ def test_datasource_file_ref_rejects_transfer_method_family_mismatch():
assert "not accessible" in (outcome.failures[0].reason or "")
-def test_file_ref_missing_reference_or_url_fails():
+def test_file_ref_missing_reference_or_url_fails() -> None:
checker = _make_checker()
declared = DeclaredOutputConfig(name="r", type=DeclaredOutputType.FILE)
@@ -269,7 +271,7 @@ def test_file_ref_missing_reference_or_url_fails():
)
-def test_file_ref_accepts_remote_url_mapping_without_tenant_lookup():
+def test_file_ref_accepts_remote_url_mapping_without_tenant_lookup() -> None:
checker = _make_checker()
declared = DeclaredOutputConfig(name="r", type=DeclaredOutputType.FILE)
@@ -282,7 +284,7 @@ def test_file_ref_accepts_remote_url_mapping_without_tenant_lookup():
assert not outcome.has_failures
-def test_file_ref_rejects_legacy_id_only_shape():
+def test_file_ref_rejects_legacy_id_only_shape() -> None:
checker = _make_checker(allowed={"t-1": {"tool-file-1"}})
declared = DeclaredOutputConfig(name="r", type=DeclaredOutputType.FILE)
@@ -367,7 +369,7 @@ def test_file_ref_rejects_non_canonical_reference() -> None:
# ──────────────────────────────────────────────────────────────────────────────
-def test_optional_output_missing_is_not_produced_not_a_failure():
+def test_optional_output_missing_is_not_produced_not_a_failure() -> None:
checker = _make_checker()
declared = [
DeclaredOutputConfig(name="opt", type=DeclaredOutputType.STRING, required=False),
@@ -379,7 +381,7 @@ def test_optional_output_missing_is_not_produced_not_a_failure():
assert outcome.results[0].status == OutputTypeCheckStatus.NOT_PRODUCED
-def test_required_output_missing_is_failure():
+def test_required_output_missing_is_failure() -> None:
checker = _make_checker()
declared = [_str_output(required=True)]
@@ -390,7 +392,7 @@ def test_required_output_missing_is_failure():
assert "missing" in outcome.failures[0].reason
-def test_non_dict_payload_fails_all_required_outputs():
+def test_non_dict_payload_fails_all_required_outputs() -> None:
"""If backend returns a string instead of an object, every required declared
output is marked failed; optional outputs are marked failed too because we
can't even attempt a lookup."""
@@ -408,7 +410,7 @@ def test_non_dict_payload_fails_all_required_outputs():
# ──────────────────────────────────────────────────────────────────────────────
-def test_outcome_by_name_indexes_results():
+def test_outcome_by_name_indexes_results() -> None:
checker = _make_checker()
declared = [_str_output("a"), _str_output("b")]
diff --git a/api/tests/unit_tests/pyrefly.toml b/api/tests/unit_tests/pyrefly.toml
index 25c285a9f48..8be9641554d 100644
--- a/api/tests/unit_tests/pyrefly.toml
+++ b/api/tests/unit_tests/pyrefly.toml
@@ -431,11 +431,7 @@ project-excludes = [
"core/workflow/nodes/agent_v2/test_agent_node.py",
"core/workflow/nodes/agent_v2/test_binding_resolver.py",
"core/workflow/nodes/agent_v2/test_dify_tools_builder.py",
- "core/workflow/nodes/agent_v2/test_file_tenant_validator.py",
"core/workflow/nodes/agent_v2/test_output_adapter.py",
- "core/workflow/nodes/agent_v2/test_output_failure_orchestrator.py",
- "core/workflow/nodes/agent_v2/test_output_file_rebacker.py",
- "core/workflow/nodes/agent_v2/test_output_type_checker.py",
"core/workflow/nodes/agent_v2/test_runtime_request_builder.py",
"core/workflow/nodes/agent_v2/test_session_store.py",
"core/workflow/nodes/agent_v2/test_validators.py",