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: use SQLite sessions in unit misc (#39119)

Asuka Minato97e6a14c1387
diff --git a/api/tests/unit_tests/services/test_workflow_collaboration_service.py b/api/tests/unit_tests/services/test_workflow_collaboration_service.py
index 9e521dff1f0..33c11f4f193 100644
--- a/api/tests/unit_tests/services/test_workflow_collaboration_service.py
+++ b/api/tests/unit_tests/services/test_workflow_collaboration_service.py
@@ -5,11 +5,46 @@ from unittest.mock import Mock, patch
import pytest
from socketio.exceptions import TimeoutError as SocketIOTimeoutError
+from sqlalchemy import Engine
+from sqlalchemy.orm import Session
+from models.base import TypeBase
+from models.model import App, AppMode, IconType
from repositories.workflow_collaboration_repository import WorkflowCollaborationRepository
from services.workflow_collaboration_service import SYNC_REQUEST_TIMEOUT_SECONDS, WorkflowCollaborationService
+def db_session(sqlite_engine: Engine) -> Iterator[Session]:
+ """Provide a real session for tenant-scoped workflow app access checks."""
+
+ TypeBase.metadata.create_all(sqlite_engine, tables=[App.__table__])
+ with Session(sqlite_engine, expire_on_commit=False) as session:
+ yield session
+
+
+def _app(*, app_id: str, tenant_id: str) -> App:
+ return App(
+ id=app_id,
+ tenant_id=tenant_id,
+ name="Workflow app",
+ description="",
+ mode=AppMode.WORKFLOW,
+ icon_type=IconType.EMOJI,
+ icon="robot",
+ icon_background="#ffffff",
+ enable_site=False,
+ enable_api=False,
+ api_rpm=0,
+ api_rph=0,
+ is_demo=False,
+ is_public=False,
+ is_universal=False,
+ max_active_requests=None,
+ use_icon_as_answer_icon=False,
+ )
+
+
class TestWorkflowCollaborationService:
@pytest.fixture
def service(self) -> tuple[WorkflowCollaborationService, Mock, Mock]:
@@ -19,7 +54,7 @@ class TestWorkflowCollaborationService:
return WorkflowCollaborationService(repository, socketio, server_id="server-1"), repository, socketio
def test_authorize_and_join_workflow_room_returns_leader_status(
- self, service: tuple[WorkflowCollaborationService, Mock, Mock]
+ self, service: tuple[WorkflowCollaborationService, Mock, Mock], db_session: Session
) -> None:
# Arrange
collaboration_service, repository, socketio = service
@@ -36,7 +71,7 @@ class TestWorkflowCollaborationService:
patch.object(collaboration_service, "broadcast_online_users"),
):
# Act
- result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=Mock())
+ result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=db_session)
# Assert
assert result == ("u-1", True)
@@ -49,25 +84,25 @@ class TestWorkflowCollaborationService:
socketio.emit.assert_called_once_with("status", {"isLeader": True}, room="sid-1")
def test_authorize_and_join_workflow_room_returns_none_when_missing_user(
- self, service: tuple[WorkflowCollaborationService, Mock, Mock]
+ self, service: tuple[WorkflowCollaborationService, Mock, Mock], db_session: Session
) -> None:
# Arrange
collaboration_service, _repository, socketio = service
socketio.get_session.return_value = {}
# Act
- result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=Mock())
+ result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=db_session)
# Assert
assert result is None
def test_authorize_and_join_workflow_room_returns_none_when_missing_tenant(
- self, service: tuple[WorkflowCollaborationService, Mock, Mock]
+ self, service: tuple[WorkflowCollaborationService, Mock, Mock], db_session: Session
) -> None:
collaboration_service, repository, socketio = service
socketio.get_session.return_value = {"user_id": "u-1", "username": "Jane", "avatar": None}
- result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=Mock())
+ result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=db_session)
assert result is None
repository.set_session_info.assert_not_called()
@@ -75,7 +110,7 @@ class TestWorkflowCollaborationService:
socketio.emit.assert_not_called()
def test_authorize_and_join_workflow_room_returns_none_when_workflow_is_not_accessible(
- self, service: tuple[WorkflowCollaborationService, Mock, Mock]
+ self, service: tuple[WorkflowCollaborationService, Mock, Mock], db_session: Session
) -> None:
collaboration_service, repository, socketio = service
socketio.get_session.return_value = {
@@ -86,7 +121,7 @@ class TestWorkflowCollaborationService:
}
with patch.object(collaboration_service, "_can_access_workflow", return_value=False):
- result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=Mock())
+ result = collaboration_service.authorize_and_join_workflow_room("wf-1", "sid-1", session=db_session)
assert result is None
repository.set_session_info.assert_not_called()
@@ -110,15 +145,23 @@ class TestWorkflowCollaborationService:
{"user_id": "u-1", "username": "Jane", "avatar": "avatar.png", "tenant_id": "t-1"},
)
- def test_can_access_workflow_uses_session(self, service: tuple[WorkflowCollaborationService, Mock, Mock]) -> None:
+ def test_can_access_workflow_uses_session(
+ self, service: tuple[WorkflowCollaborationService, Mock, Mock], db_session: Session
+ ) -> None:
collaboration_service, _repository, _socketio = service
- session = Mock()
- session.scalar.return_value = "wf-1"
+ db_session.add_all(
+ [
+ _app(app_id="wf-1", tenant_id="tenant-1"),
+ _app(app_id="wf-other", tenant_id="tenant-other"),
+ ]
+ )
+ db_session.commit()
- result = collaboration_service._can_access_workflow("wf-1", "tenant-1", session=session)
+ result = collaboration_service._can_access_workflow("wf-1", "tenant-1", session=db_session)
assert result is True
- session.scalar.assert_called_once()
+ assert collaboration_service._can_access_workflow("wf-1", "tenant-other", session=db_session) is False
+ assert collaboration_service._can_access_workflow("wf-other", "tenant-other", session=db_session) is True
def test_relay_collaboration_event_unauthorized(
self, service: tuple[WorkflowCollaborationService, Mock, Mock]
diff --git a/api/tests/unit_tests/tasks/test_mail_human_input_delivery_task.py b/api/tests/unit_tests/tasks/test_mail_human_input_delivery_task.py
index f8f9ec99719..60c047ad20d 100644
--- a/api/tests/unit_tests/tasks/test_mail_human_input_delivery_task.py
+++ b/api/tests/unit_tests/tasks/test_mail_human_input_delivery_task.py
@@ -1,8 +1,13 @@
from collections.abc import Sequence
+from datetime import UTC, datetime, timedelta
from types import SimpleNamespace
+from uuid import uuid4
import pytest
+from sqlalchemy.engine import Engine
+from sqlalchemy.orm import Session, sessionmaker
+from models.human_input import HumanInputForm
from tasks import mail_human_input_delivery_task as task_module
@@ -18,18 +23,17 @@ class _DummyMail:
self.sent.append({"to": to, "subject": subject, "html": html})
-class _DummySession:
- def __init__(self, form):
- self._form = form
-
- def __enter__(self):
- return self
-
- def __exit__(self, exc_type, exc_val, exc_tb):
- return False
-
- def get(self, _model, _form_id):
- return self._form
+def _form(*, workflow_run_id: str | None = None) -> HumanInputForm:
+ return HumanInputForm(
+ tenant_id=str(uuid4()),
+ app_id=str(uuid4()),
+ workflow_run_id=workflow_run_id,
+ conversation_id=None,
+ node_id="human-input",
+ form_definition="{}",
+ rendered_content="content",
+ expiration_time=datetime.now(UTC) + timedelta(hours=1),
+ )
def _build_job(recipient_count: int = 1) -> task_module._EmailDeliveryJob:
@@ -46,9 +50,14 @@ def _build_job(recipient_count: int = 1) -> task_module._EmailDeliveryJob:
)
-def test_dispatch_human_input_email_task_sends_to_each_recipient(monkeypatch: pytest.MonkeyPatch):
[email protected]("sqlite_session", [(HumanInputForm,)], indirect=True)
+def test_dispatch_human_input_email_task_sends_to_each_recipient(
+ monkeypatch: pytest.MonkeyPatch, sqlite_engine: Engine, sqlite_session: Session
+):
mail = _DummyMail()
- form = SimpleNamespace(id="form-1", tenant_id="tenant-1", workflow_run_id=None)
+ form = _form()
+ sqlite_session.add(form)
+ sqlite_session.commit()
monkeypatch.setattr(task_module, "mail", mail)
monkeypatch.setattr(
@@ -60,9 +69,9 @@ def test_dispatch_human_input_email_task_sends_to_each_recipient(monkeypatch: py
monkeypatch.setattr(task_module, "_load_email_jobs", lambda _session, _form: jobs)
task_module.dispatch_human_input_email_task(
- form_id="form-1",
+ form_id=form.id,
node_title="Approve",
- session_factory=lambda: _DummySession(form),
+ session_factory=sessionmaker(bind=sqlite_engine, expire_on_commit=False),
)
assert len(mail.sent) == 2
@@ -70,9 +79,14 @@ def test_dispatch_human_input_email_task_sends_to_each_recipient(monkeypatch: py
assert all("Body for" in payload["html"] for payload in mail.sent)
-def test_dispatch_human_input_email_task_skips_when_feature_disabled(monkeypatch: pytest.MonkeyPatch):
[email protected]("sqlite_session", [(HumanInputForm,)], indirect=True)
+def test_dispatch_human_input_email_task_skips_when_feature_disabled(
+ monkeypatch: pytest.MonkeyPatch, sqlite_engine: Engine, sqlite_session: Session
+):
mail = _DummyMail()
- form = SimpleNamespace(id="form-1", tenant_id="tenant-1", workflow_run_id=None)
+ form = _form()
+ sqlite_session.add(form)
+ sqlite_session.commit()
monkeypatch.setattr(task_module, "mail", mail)
monkeypatch.setattr(
@@ -83,17 +97,22 @@ def test_dispatch_human_input_email_task_skips_when_feature_disabled(monkeypatch
monkeypatch.setattr(task_module, "_load_email_jobs", lambda _session, _form: [])
task_module.dispatch_human_input_email_task(
- form_id="form-1",
+ form_id=form.id,
node_title="Approve",
- session_factory=lambda: _DummySession(form),
+ session_factory=sessionmaker(bind=sqlite_engine, expire_on_commit=False),
)
assert mail.sent == []
-def test_dispatch_human_input_email_task_replaces_body_variables(monkeypatch: pytest.MonkeyPatch):
[email protected]("sqlite_session", [(HumanInputForm,)], indirect=True)
+def test_dispatch_human_input_email_task_replaces_body_variables(
+ monkeypatch: pytest.MonkeyPatch, sqlite_engine: Engine, sqlite_session: Session
+):
mail = _DummyMail()
- form = SimpleNamespace(id="form-1", tenant_id="tenant-1", workflow_run_id="run-1")
+ form = _form(workflow_run_id=str(uuid4()))
+ sqlite_session.add(form)
+ sqlite_session.commit()
job = task_module._EmailDeliveryJob(
form_id="form-1",
subject="Subject",
@@ -115,21 +134,26 @@ def test_dispatch_human_input_email_task_replaces_body_variables(monkeypatch: py
monkeypatch.setattr(task_module, "_load_variable_pool", lambda _workflow_run_id: variable_pool)
task_module.dispatch_human_input_email_task(
- form_id="form-1",
+ form_id=form.id,
node_title="Approve",
- session_factory=lambda: _DummySession(form),
+ session_factory=sessionmaker(bind=sqlite_engine, expire_on_commit=False),
)
assert mail.sent[0]["html"] == "<p>Body OK</p>"
@pytest.mark.parametrize("line_break", ["\r\n", "\r", "\n"])
[email protected]("sqlite_session", [(HumanInputForm,)], indirect=True)
def test_dispatch_human_input_email_task_sanitizes_subject(
monkeypatch: pytest.MonkeyPatch,
line_break: str,
+ sqlite_engine: Engine,
+ sqlite_session: Session,
):
mail = _DummyMail()
- form = SimpleNamespace(id="form-1", tenant_id="tenant-1", workflow_run_id=None)
+ form = _form()
+ sqlite_session.add(form)
+ sqlite_session.commit()
job = task_module._EmailDeliveryJob(
form_id="form-1",
subject=f"Notice{line_break}BCC:[email protected] <b>Alert</b>",
@@ -148,9 +172,9 @@ def test_dispatch_human_input_email_task_sanitizes_subject(
monkeypatch.setattr(task_module, "_load_variable_pool", lambda _workflow_run_id: None)
task_module.dispatch_human_input_email_task(
- form_id="form-1",
+ form_id=form.id,
node_title="Approve",
- session_factory=lambda: _DummySession(form),
+ session_factory=sessionmaker(bind=sqlite_engine, expire_on_commit=False),
)
assert mail.sent[0]["subject"] == "Notice BCC:[email protected] Alert"