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(console): dep-inject the snippet draft-variable query with @model_validate (#42315)

Syrinx.ff18b6de0921
diff --git a/api/controllers/console/snippets/snippet_workflow_draft_variable.py b/api/controllers/console/snippets/snippet_workflow_draft_variable.py
index ebf456edf5c..7091cd24c24 100644
--- a/api/controllers/console/snippets/snippet_workflow_draft_variable.py
+++ b/api/controllers/console/snippets/snippet_workflow_draft_variable.py
@@ -14,7 +14,7 @@ from collections.abc import Callable
from functools import wraps
from typing import Any, Concatenate
-from flask import Response, request
+from flask import Response
from flask_restx import Resource
from sqlalchemy.orm import Session, sessionmaker
@@ -106,9 +106,10 @@ class SnippetWorkflowVariableCollectionApi(Resource):
console_ns.models[WorkflowDraftVariableListWithoutValueResponse.__name__],
)
@_snippet_draft_var_prerequisite
- def get(self, current_user: Account, snippet: CustomizedSnippet) -> dict[str, Any]:
- args = WorkflowDraftVariableListQuery.model_validate(request.args.to_dict(flat=True)) # type: ignore
-
+ @model_validate(WorkflowDraftVariableListQuery)
+ def get(
+ self, args: WorkflowDraftVariableListQuery, current_user: Account, snippet: CustomizedSnippet
+ ) -> dict[str, Any]:
snippet_service = _snippet_service()
if snippet_service.get_draft_workflow(snippet=snippet) is None:
raise DraftWorkflowNotExist()
diff --git a/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py b/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py
index 3d7d8900c94..fb41206f65c 100644
--- a/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py
+++ b/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py
@@ -187,9 +187,14 @@ def test_variable_collection_get_raises_when_draft_workflow_missing(
api = module.SnippetWorkflowVariableCollectionApi()
handler = unwrap(api.get)
- with app.test_request_context("/?page=1&limit=20"):
+ with app.test_request_context("/"):
with pytest.raises(module.DraftWorkflowNotExist):
- handler(api, _make_account(), snippet=SimpleNamespace(id="snippet-1"))
+ handler(
+ api,
+ module.WorkflowDraftVariableListQuery(page=1, limit=20),
+ _make_account(),
+ snippet=SimpleNamespace(id="snippet-1"),
+ )
def test_node_variable_collection_get_lists_persisted_node_variables(