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.

chore: dep inject for model in explore workflow run (#40158)

Likalikali60d6be5b137b
diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py
index a8c176c6778..29e76d81498 100644
--- a/api/controllers/console/explore/workflow.py
+++ b/api/controllers/console/explore/workflow.py
@@ -15,7 +15,7 @@ from controllers.console.app.error import (
from controllers.console.app.wraps import with_session
from controllers.console.explore.error import NotWorkflowAppError
from controllers.console.explore.wraps import InstalledAppResource
-from controllers.console.wraps import with_current_user
+from controllers.console.wraps import model_validate, with_current_user
from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
from core.app.apps.base_app_queue_manager import AppQueueManager
from core.app.entities.app_invoke_entities import InvokeFrom
@@ -47,7 +47,14 @@ class InstalledAppWorkflowRunApi(InstalledAppResource):
@console_ns.response(200, "Success")
@with_current_user
@with_session
- def post(self, session: Session, current_user: Account, installed_app: InstalledApp):
+ @model_validate(WorkflowRunPayload)
+ def post(
+ self,
+ req_data: WorkflowRunPayload,
+ session: Session,
+ current_user: Account,
+ installed_app: InstalledApp,
+ ):
"""
Run workflow
"""
@@ -58,8 +65,7 @@ class InstalledAppWorkflowRunApi(InstalledAppResource):
if app_mode != AppMode.WORKFLOW:
raise NotWorkflowAppError()
- payload = WorkflowRunPayload.model_validate(console_ns.payload or {})
- args = payload.model_dump(exclude_none=True)
+ args = req_data.model_dump(exclude_none=True)
try:
response = AppGenerateService.generate(
session=session,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_workflow.py b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
index 8bcce0c22b2..247669fe125 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
@@ -5,6 +5,7 @@ import pytest
from flask import Flask
from werkzeug.exceptions import InternalServerError
+from controllers.common.controller_schemas import WorkflowRunPayload
from controllers.console.explore.error import NotWorkflowAppError
from controllers.console.explore.workflow import (
InstalledAppWorkflowRunApi,
@@ -62,11 +63,18 @@ class TestInstalledAppWorkflowRunApi:
with app.test_request_context("/"):
with pytest.raises(NotWorkflowAppError):
- method(api, MagicMock(), MagicMock(), non_workflow_installed_app)
+ method(
+ api,
+ WorkflowRunPayload.model_validate({"inputs": {}}),
+ MagicMock(),
+ MagicMock(),
+ non_workflow_installed_app,
+ )
def test_success(self, app: Flask, installed_workflow_app, user, payload):
api = InstalledAppWorkflowRunApi()
method = unwrap(api.post)
+ req_data = WorkflowRunPayload.model_validate(payload)
with (
app.test_request_context("/", json=payload),
@@ -75,7 +83,7 @@ class TestInstalledAppWorkflowRunApi:
return_value=MagicMock(),
) as generate_mock,
):
- result = method(api, MagicMock(), user, installed_workflow_app)
+ result = method(api, req_data, MagicMock(), user, installed_workflow_app)
generate_mock.assert_called_once()
assert generate_mock.call_args.kwargs["user"] is user
@@ -84,6 +92,7 @@ class TestInstalledAppWorkflowRunApi:
def test_rate_limit_error(self, app: Flask, installed_workflow_app, user, payload):
api = InstalledAppWorkflowRunApi()
method = unwrap(api.post)
+ req_data = WorkflowRunPayload.model_validate(payload)
with (
app.test_request_context("/", json=payload),
@@ -93,11 +102,12 @@ class TestInstalledAppWorkflowRunApi:
),
):
with pytest.raises(InvokeRateLimitHttpError):
- method(api, MagicMock(), user, installed_workflow_app)
+ method(api, req_data, MagicMock(), user, installed_workflow_app)
def test_unexpected_exception(self, app: Flask, installed_workflow_app, user, payload):
api = InstalledAppWorkflowRunApi()
method = unwrap(api.post)
+ req_data = WorkflowRunPayload.model_validate(payload)
with (
app.test_request_context("/", json=payload),
@@ -107,7 +117,7 @@ class TestInstalledAppWorkflowRunApi:
),
):
with pytest.raises(InternalServerError):
- method(api, MagicMock(), user, installed_workflow_app)
+ method(api, req_data, MagicMock(), user, installed_workflow_app)
class TestInstalledAppWorkflowTaskStopApi: