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 repository for human input uploads (#43166)

Asuka Minato52d586a7b46c
diff --git a/api/tests/unit_tests/services/test_human_input_file_upload_service.py b/api/tests/unit_tests/services/test_human_input_file_upload_service.py
index 55dcbbaa6d6..e7ae7c2dfe6 100644
--- a/api/tests/unit_tests/services/test_human_input_file_upload_service.py
+++ b/api/tests/unit_tests/services/test_human_input_file_upload_service.py
@@ -1,26 +1,43 @@
from __future__ import annotations
+from collections.abc import Callable
from datetime import timedelta
from types import SimpleNamespace
+from typing import cast
from unittest.mock import MagicMock
import pytest
+from pytest_mock import MockerFixture
+from sqlalchemy import select
+from sqlalchemy.orm import Session, sessionmaker
import services.human_input_file_upload_service as service_module
+from core.workflow.human_input_adapter import DeliveryMethodType
from core.workflow.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
+from extensions.storage.storage_type import StorageType
from libs.datetime_utils import naive_utc_now
-from models.account import Account
-from models.enums import CreatorUserRole
+from models.account import Account, Tenant, TenantAccountJoin
+from models.enums import CreatorUserRole, EndUserType
+from models.human_input import (
+ HumanInputDelivery,
+ HumanInputForm,
+ HumanInputFormRecipient,
+ HumanInputFormUploadFile,
+ HumanInputFormUploadToken,
+ RecipientType,
+)
+from models.model import App, AppMode, EndUser, UploadFile
+from repositories.human_input_file_upload_repository import SQLAlchemyHumanInputFileUploadRepository
from services.human_input_file_upload_service import (
HITL_UPLOAD_TOKEN_PREFIX,
HumanInputFileUploadRepository,
HumanInputFileUploadService,
HumanInputUploadContext,
HumanInputUploadFormRecord,
- HumanInputUploadGrantRecord,
InvalidUploadTokenError,
)
from services.human_input_service import FormNotFoundError, FormSubmittedError
+from services.remote_file_service import RemoteFileUploadResult
def _active_form(
@@ -44,6 +61,104 @@ def _active_form(
)
+type UploadRepositoryFactory = Callable[[HumanInputUploadFormRecord | None], SQLAlchemyHumanInputFileUploadRepository]
+
+
+def upload_repository(sqlite_session_factory: sessionmaker[Session], mocker: MockerFixture) -> UploadRepositoryFactory:
+ def build(record: HumanInputUploadFormRecord | None) -> SQLAlchemyHumanInputFileUploadRepository:
+ """Persist upload authorization and owners; None leaves the database empty."""
+ if record is not None:
+ account = Account(name="Upload owner", email="[email protected]")
+ account.id = "owner-1"
+ tenant = Tenant(name="Upload tenant")
+ tenant.id = record.tenant_id
+ with sqlite_session_factory.begin() as session:
+ session.add_all(
+ [
+ account,
+ tenant,
+ TenantAccountJoin(tenant_id=record.tenant_id, account_id=account.id),
+ App(
+ id=record.app_id,
+ tenant_id=record.tenant_id,
+ name="Upload app",
+ mode=AppMode.WORKFLOW,
+ enable_site=True,
+ enable_api=True,
+ created_by=account.id,
+ ),
+ EndUser(
+ id="owner-1",
+ tenant_id=record.tenant_id,
+ app_id=record.app_id,
+ type=EndUserType.BROWSER,
+ session_id="session-1",
+ ),
+ HumanInputForm(
+ id=record.form_id,
+ tenant_id=record.tenant_id,
+ app_id=record.app_id,
+ workflow_run_id=record.workflow_run_id,
+ form_kind=record.form_kind,
+ status=record.status,
+ node_id="node-1",
+ form_definition="{}",
+ rendered_content="Upload a file",
+ submitted_at=record.submitted_at,
+ expiration_time=record.expiration_time,
+ created_at=record.created_at,
+ ),
+ HumanInputDelivery(
+ id="delivery-1",
+ form_id=record.form_id,
+ delivery_method_type=DeliveryMethodType.WEBAPP,
+ channel_payload="{}",
+ ),
+ HumanInputFormRecipient(
+ id=record.recipient_id,
+ form_id=record.form_id,
+ delivery_id="delivery-1",
+ recipient_type=RecipientType.STANDALONE_WEB_APP,
+ recipient_payload='{"TYPE":"standalone_web_app"}',
+ access_token="form-token-1",
+ ),
+ HumanInputFormUploadToken(
+ id="token-1",
+ tenant_id=record.tenant_id,
+ app_id=record.app_id,
+ form_id=record.form_id,
+ recipient_id=record.recipient_id,
+ token="upload-token-1",
+ ),
+ ]
+ )
+ repository = SQLAlchemyHumanInputFileUploadRepository(session_factory=sqlite_session_factory)
+ for method in (
+ "get_form_by_recipient_token",
+ "create_upload_token",
+ "get_upload_owner",
+ "get_delivery_test_upload_owner",
+ "add_file",
+ ):
+ mocker.spy(repository, method)
+ return repository
+
+ return build
+
+
+def _assert_file_link(session_factory: sessionmaker[Session]) -> None:
+ with session_factory() as session:
+ link = session.scalars(select(HumanInputFormUploadFile)).one()
+ assert (link.tenant_id, link.app_id, link.form_id, link.upload_token_id, link.upload_file_id) == (
+ "tenant-1",
+ "app-1",
+ "form-1",
+ "token-1",
+ "file-1",
+ )
+
+
def _upload_context() -> HumanInputUploadContext:
return HumanInputUploadContext(
tenant_id="tenant-1",
@@ -57,50 +172,52 @@ def _upload_context() -> HumanInputUploadContext:
def _create_service(
*,
- uploads: MagicMock | None = None,
+ uploads: HumanInputFileUploadRepository,
workflow_runs: MagicMock | None = None,
files: MagicMock | None = None,
remote_files: MagicMock | None = None,
) -> HumanInputFileUploadService:
return HumanInputFileUploadService(
- uploads=uploads if uploads is not None else MagicMock(spec=HumanInputFileUploadRepository),
+ uploads=uploads,
workflow_run_repository=workflow_runs if workflow_runs is not None else MagicMock(),
files=files if files is not None else MagicMock(),
remote_files=remote_files if remote_files is not None else MagicMock(),
)
-def test_issue_upload_token_persists_repository_record(monkeypatch: pytest.MonkeyPatch) -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
+def test_issue_upload_token_persists_repository_record(
+ upload_repository: UploadRepositoryFactory, monkeypatch: pytest.MonkeyPatch
+) -> None:
form = _active_form()
- uploads.get_form_by_recipient_token.return_value = form
+ uploads = upload_repository(form)
monkeypatch.setattr(service_module.secrets, "token_urlsafe", lambda _bytes: "random-value")
token = _create_service(uploads=uploads).issue_upload_token("form-token-1")
assert token.upload_token == f"{HITL_UPLOAD_TOKEN_PREFIX}random-value"
assert token.expires_at == form.expiration_time
- uploads.get_form_by_recipient_token.assert_called_once_with("form-token-1")
- uploads.create_upload_token.assert_called_once_with(form=form, upload_token=token.upload_token)
+ cast(MagicMock, uploads.get_form_by_recipient_token).assert_called_once_with("form-token-1")
+ cast(MagicMock, uploads.create_upload_token).assert_called_once_with(form=form, upload_token=token.upload_token)
+ grant = uploads.get_upload_grant(token.upload_token)
+ assert grant is not None
+ assert grant.form == form
-def test_issue_upload_token_rejects_unknown_form_token() -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
- uploads.get_form_by_recipient_token.return_value = None
+def test_issue_upload_token_rejects_unknown_form_token(upload_repository: UploadRepositoryFactory) -> None:
+ uploads = upload_repository(None)
with pytest.raises(FormNotFoundError):
_create_service(uploads=uploads).issue_upload_token("missing-form-token")
- uploads.create_upload_token.assert_not_called()
+ cast(MagicMock, uploads.create_upload_token).assert_not_called()
@pytest.mark.parametrize("owner_role", [CreatorUserRole.ACCOUNT, CreatorUserRole.END_USER])
-def test_validate_upload_token_resolves_workflow_run_owner(owner_role: CreatorUserRole) -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
+def test_validate_upload_token_resolves_workflow_run_owner(
+ upload_repository: UploadRepositoryFactory, owner_role: CreatorUserRole
+) -> None:
form = _active_form()
- uploads.get_upload_grant.return_value = HumanInputUploadGrantRecord(upload_token_id="token-1", form=form)
- owner = MagicMock()
- uploads.get_upload_owner.return_value = owner
+ uploads = upload_repository(form)
workflow_runs = MagicMock()
workflow_runs.get_workflow_run_by_id.return_value = SimpleNamespace(
created_by="owner-1",
@@ -117,14 +234,16 @@ def test_validate_upload_token_resolves_workflow_run_owner(owner_role: CreatorUs
form_id="form-1",
recipient_id="recipient-1",
upload_token_id="token-1",
- owner=owner,
+ owner=context.owner,
)
+ assert isinstance(context.owner, Account if owner_role == CreatorUserRole.ACCOUNT else EndUser)
+ assert context.owner.id == "owner-1"
workflow_runs.get_workflow_run_by_id.assert_called_once_with(
tenant_id="tenant-1",
app_id="app-1",
run_id="run-1",
)
- uploads.get_upload_owner.assert_called_once_with(
+ cast(MagicMock, uploads.get_upload_owner).assert_called_once_with(
owner_id="owner-1",
owner_role=owner_role,
tenant_id="tenant-1",
@@ -132,44 +251,58 @@ def test_validate_upload_token_resolves_workflow_run_owner(owner_role: CreatorUs
)
-def test_validate_upload_token_resolves_delivery_test_owner() -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
+def test_validate_upload_token_resolves_delivery_test_owner(upload_repository: UploadRepositoryFactory) -> None:
form = _active_form(workflow_run_id=None, form_kind=HumanInputFormKind.DELIVERY_TEST)
- uploads.get_upload_grant.return_value = HumanInputUploadGrantRecord(upload_token_id="token-1", form=form)
- owner = Account(name="Delivery test owner", email="[email protected]")
- uploads.get_delivery_test_upload_owner.return_value = owner
+ uploads = upload_repository(form)
workflow_runs = MagicMock()
context = _create_service(uploads=uploads, workflow_runs=workflow_runs).validate_upload_token("upload-token-1")
- assert context.owner is owner
- uploads.get_delivery_test_upload_owner.assert_called_once_with(tenant_id="tenant-1", app_id="app-1")
+ assert isinstance(context.owner, Account)
+ assert context.owner.id == "owner-1"
+ assert context.owner.current_tenant_id == "tenant-1"
+ cast(MagicMock, uploads.get_delivery_test_upload_owner).assert_called_once_with(
+ tenant_id="tenant-1", app_id="app-1"
+ )
workflow_runs.get_workflow_run_by_id.assert_not_called()
-def test_validate_upload_token_rejects_unknown_upload_token() -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
- uploads.get_upload_grant.return_value = None
+def test_validate_upload_token_rejects_unknown_upload_token(upload_repository: UploadRepositoryFactory) -> None:
+ uploads = upload_repository(None)
with pytest.raises(InvalidUploadTokenError):
_create_service(uploads=uploads).validate_upload_token("missing-upload-token")
-def test_validate_upload_token_rejects_submitted_form() -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
+def test_validate_upload_token_rejects_submitted_form(upload_repository: UploadRepositoryFactory) -> None:
form = _active_form(status=HumanInputFormStatus.SUBMITTED)
- uploads.get_upload_grant.return_value = HumanInputUploadGrantRecord(upload_token_id="token-1", form=form)
+ uploads = upload_repository(form)
with pytest.raises(FormSubmittedError):
_create_service(uploads=uploads).validate_upload_token("upload-token-1")
- uploads.get_upload_owner.assert_not_called()
+ cast(MagicMock, uploads.get_upload_owner).assert_not_called()
-def test_upload_local_file_records_the_form_file_link() -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
+def test_upload_local_file_records_the_form_file_link(
+ upload_repository: UploadRepositoryFactory, sqlite_session_factory: sessionmaker[Session]
+) -> None:
+ uploads = upload_repository(_active_form())
files = MagicMock()
- upload_file = MagicMock(id="file-1")
+ upload_file = UploadFile(
+ tenant_id="tenant-1",
+ storage_type=StorageType.LOCAL,
+ key="sample.txt",
+ name="sample.txt",
+ size=7,
+ extension="txt",
+ mime_type="text/plain",
+ created_by_role=CreatorUserRole.ACCOUNT,
+ created_by="owner-1",
+ created_at=naive_utc_now(),
+ used=False,
+ )
+ upload_file.id = "file-1"
files.upload_file.return_value = upload_file
context = _upload_context()
@@ -188,19 +321,31 @@ def test_upload_local_file_records_the_form_file_link() -> None:
user=context.owner,
source=None,
)
- uploads.add_file.assert_called_once_with(
+ cast(MagicMock, uploads.add_file).assert_called_once_with(
tenant_id="tenant-1",
app_id="app-1",
form_id="form-1",
upload_token_id="token-1",
file_id="file-1",
)
+ _assert_file_link(sqlite_session_factory)
-def test_upload_remote_file_records_the_form_file_link() -> None:
- uploads = MagicMock(spec=HumanInputFileUploadRepository)
+def test_upload_remote_file_records_the_form_file_link(
+ upload_repository: UploadRepositoryFactory, sqlite_session_factory: sessionmaker[Session]
+) -> None:
+ uploads = upload_repository(_active_form())
remote_files = MagicMock()
- upload_file = MagicMock(id="file-1")
+ upload_file = RemoteFileUploadResult(
+ id="file-1",
+ name="sample.txt",
+ size=7,
+ extension="txt",
+ url="https://example.com/sample.txt",
+ mime_type="text/plain",
+ created_by="owner-1",
+ created_at=naive_utc_now(),
+ )
remote_files.upload_from_url.return_value = upload_file
context = _upload_context()
@@ -214,10 +359,11 @@ def test_upload_remote_file_records_the_form_file_link() -> None:
url="https://example.com/sample.txt",
user=context.owner,
)
- uploads.add_file.assert_called_once_with(
+ cast(MagicMock, uploads.add_file).assert_called_once_with(
tenant_id="tenant-1",
app_id="app-1",
form_id="form-1",
upload_token_id="token-1",
file_id="file-1",
)
+ _assert_file_link(sqlite_session_factory)