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.

test: migrate residual app generator ORM models to SQLite (#40580)

Asuka Minato6fe87aaca590
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
index 04724d701ef..2aff04a7471 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
@@ -1,37 +1,66 @@
import logging
-from types import SimpleNamespace
from unittest.mock import Mock
import pytest
from sqlalchemy import inspect
+from sqlalchemy.orm import Session
from core.app.apps.base_app_generator import BaseAppGenerator
-from graphon.enums import BuiltinNodeTypes
+from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus
from graphon.variables.input_entities import VariableEntity, VariableEntityType
-from models import Workflow, WorkflowRun
+from models import CreatorUserRole, Workflow, WorkflowRun, WorkflowRunTriggeredFrom, WorkflowType
-def test_restore_workflow_run_graph():
+def _workflow_run(*, graph: str | None) -> WorkflowRun:
+ return WorkflowRun(
+ id="run-id",
+ tenant_id="tenant-1",
+ app_id="app-1",
+ workflow_id="workflow-1",
+ type=WorkflowType.CHAT,
+ triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+ version="1",
+ graph=graph,
+ inputs="{}",
+ status=WorkflowExecutionStatus.PAUSED,
+ created_by_role=CreatorUserRole.ACCOUNT,
+ created_by="account-1",
+ )
+
+
+def test_restore_workflow_run_graph(sqlite_session: Session):
workflow = Workflow(graph='{"nodes": [{"id": "edited"}]}')
- session = SimpleNamespace(get=Mock(return_value=SimpleNamespace(graph='{"nodes": [{"id": "paused"}]}')))
+ workflow_run = _workflow_run(graph='{"nodes": [{"id": "paused"}]}')
+ sqlite_session.add(workflow_run)
+ sqlite_session.commit()
- BaseAppGenerator._restore_workflow_run_graph(session=session, workflow=workflow, workflow_run_id="run-id")
+ BaseAppGenerator._restore_workflow_run_graph(
+ session=sqlite_session,
+ workflow=workflow,
+ workflow_run_id="run-id",
+ )
- session.get.assert_called_once_with(WorkflowRun, "run-id")
+ assert sqlite_session.get(WorkflowRun, "run-id") is workflow_run
assert workflow.graph == '{"nodes": [{"id": "paused"}]}'
assert not inspect(workflow).attrs.graph.history.has_changes()
@pytest.mark.parametrize(
("workflow_run_id", "workflow_run"),
- [(None, None), ("run-id", None), ("run-id", SimpleNamespace(graph=None))],
+ [(None, None), ("run-id", None), ("run-id", _workflow_run(graph=None))],
)
-def test_restore_workflow_run_graph_requires_persisted_snapshot(workflow_run_id, workflow_run):
- session = SimpleNamespace(get=Mock(return_value=workflow_run))
+def test_restore_workflow_run_graph_requires_persisted_snapshot(
+ workflow_run_id: str | None,
+ workflow_run: WorkflowRun | None,
+ sqlite_session: Session,
+):
+ if workflow_run is not None:
+ sqlite_session.add(workflow_run)
+ sqlite_session.commit()
with pytest.raises(ValueError):
BaseAppGenerator._restore_workflow_run_graph(
- session=session,
+ session=sqlite_session,
workflow=Workflow(graph="{}"),
workflow_run_id=workflow_run_id,
)
diff --git a/api/tests/unit_tests/core/app/apps/test_pause_resume.py b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
index 2b1690c2f5e..3f5ac90292d 100644
--- a/api/tests/unit_tests/core/app/apps/test_pause_resume.py
+++ b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
@@ -1,10 +1,12 @@
import sys
import time
from collections.abc import Mapping
+from decimal import Decimal
from types import ModuleType, SimpleNamespace
from typing import Any
from pytest_mock import MockerFixture
+from sqlalchemy.orm import Session
import core.workflow.nodes.human_input.entities # noqa: F401
from core.app.apps.advanced_chat import app_generator as adv_app_gen_module
@@ -33,6 +35,10 @@ from graphon.nodes.base.node import Node
from graphon.nodes.end.entities import EndNodeData
from graphon.nodes.start.entities import StartNodeData
from graphon.runtime import GraphRuntimeState, VariablePool
+from models.account import Account
+from models.enums import ConversationFromSource
+from models.model import App, AppMode, Conversation, Message
+from models.workflow import Workflow, WorkflowType
from tests.workflow_test_utils import build_test_graph_init_params
if "core.ops.ops_trace_manager" not in sys.modules:
@@ -188,6 +194,63 @@ def _build_runtime_state(run_id: str) -> GraphRuntimeState:
return GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
+def _make_app() -> App:
+ return App(
+ id="app",
+ tenant_id="tenant",
+ name="Pause Resume App",
+ mode=AppMode.WORKFLOW,
+ enable_site=False,
+ enable_api=False,
+ )
+
+
+def _make_workflow() -> Workflow:
+ return Workflow(
+ id="workflow",
+ tenant_id="tenant",
+ app_id="app",
+ type=WorkflowType.CHAT,
+ version=Workflow.VERSION_DRAFT,
+ graph="{}",
+ features="{}",
+ created_by="user",
+ )
+
+
+def _make_account() -> Account:
+ account = Account(name="Pause Resume User", email="[email protected]")
+ account.id = "user"
+ return account
+
+
+def _make_conversation() -> Conversation:
+ return Conversation(
+ id="conv",
+ app_id="app",
+ mode=AppMode.ADVANCED_CHAT,
+ name="Pause Resume Conversation",
+ inputs={},
+ from_source=ConversationFromSource.API,
+ )
+
+
+def _make_message() -> Message:
+ return Message(
+ id="msg",
+ app_id="app",
+ conversation_id="conv",
+ inputs={},
+ query="query",
+ message={},
+ answer="answer",
+ message_unit_price=Decimal(0),
+ answer_unit_price=Decimal(0),
+ currency="USD",
+ from_source=ConversationFromSource.API,
+ )
+
+
def _run_with_optional_pause(runtime_state: GraphRuntimeState, *, pause_on: str | None) -> list[GraphEngineEvent]:
command_channel = InMemoryChannel()
graph = _build_graph(runtime_state, pause_on=pause_on)
@@ -235,9 +298,9 @@ def test_workflow_app_pause_resume_matches_baseline(mocker: MockerFixture):
mocker.patch.object(generator, "_generate", side_effect=_fake_generate)
resumed_nodes = generator.resume(
- app_model=SimpleNamespace(mode="workflow"),
- workflow=SimpleNamespace(),
- user=SimpleNamespace(),
+ app_model=_make_app(),
+ workflow=_make_workflow(),
+ user=_make_account(),
application_generate_entity=SimpleNamespace(
stream=False,
invoke_from=InvokeFrom.SERVICE_API,
@@ -252,7 +315,7 @@ def test_workflow_app_pause_resume_matches_baseline(mocker: MockerFixture):
assert resumed_state.outputs == baseline_outputs
-def test_advanced_chat_pause_resume_matches_baseline(mocker: MockerFixture):
+def test_advanced_chat_pause_resume_matches_baseline(mocker: MockerFixture, unbound_session: Session):
_patch_tool_node(mocker)
baseline_state = _build_runtime_state("adv-baseline")
@@ -279,12 +342,12 @@ def test_advanced_chat_pause_resume_matches_baseline(mocker: MockerFixture):
mocker.patch.object(generator, "_generate", side_effect=_fake_generate)
resumed_nodes = generator.resume(
- app_model=SimpleNamespace(mode="workflow"),
- workflow=SimpleNamespace(),
- user=SimpleNamespace(),
- conversation=SimpleNamespace(id="conv"),
- message=SimpleNamespace(id="msg"),
- session=SimpleNamespace(),
+ app_model=_make_app(),
+ workflow=_make_workflow(),
+ user=_make_account(),
+ conversation=_make_conversation(),
+ message=_make_message(),
+ session=unbound_session,
application_generate_entity=SimpleNamespace(
stream=False,
invoke_from=InvokeFrom.SERVICE_API,