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 auth and access controller ORM models to SQLite (#40572)

Asuka Minato7d635d9f7e4f
diff --git a/api/tests/unit_tests/controllers/console/auth/test_email_register.py b/api/tests/unit_tests/controllers/console/auth/test_email_register.py
index 74a2fbaf321..bcfe87f19bd 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_email_register.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_email_register.py
@@ -14,6 +14,7 @@ from controllers.console.auth.email_register import (
)
from controllers.console.error import AccountInFreezeError, EmailDomainSuspendedError
from enums import DeploymentEdition
+from models.account import Account
from services.entities.feature_entities import SystemFeatureModel
from services.errors.account import (
AccountRegisterError,
@@ -39,9 +40,9 @@ class TestEmailRegisterSendEmailApi:
app: Flask,
):
mock_send_mail.return_value = "token-123"
- mock_is_freeze.return_value = None
- mock_account = MagicMock()
- mock_get_account.return_value = mock_account
+ mock_is_freeze.return_value = False
+ account = Account(name="Invitee", email="[email protected]")
+ mock_get_account.return_value = account
feature_flags = SystemFeatureModel(
deployment_edition=DeploymentEdition.COMMUNITY,
@@ -62,7 +63,7 @@ class TestEmailRegisterSendEmailApi:
assert response == {"result": "success", "data": "token-123"}
mock_is_freeze.assert_called_once_with("[email protected]")
- mock_send_mail.assert_called_once_with(email="[email protected]", account=mock_account, language="en-US")
+ mock_send_mail.assert_called_once_with(email="[email protected]", account=account, language="en-US")
mock_extract_ip.assert_called_once()
mock_is_email_send_ip_limit.assert_called_once_with("127.0.0.1")
@@ -199,7 +200,7 @@ class TestEmailRegisterResetApi:
app: Flask,
):
mock_get_data.return_value = {"phase": "register", "email": "[email protected]"}
- mock_create_account.return_value = MagicMock()
+ mock_create_account.return_value = Account(name="Invitee", email="[email protected]")
token_pair = MagicMock()
token_pair.model_dump.return_value = {"access_token": "a", "refresh_token": "r"}
mock_login.return_value = token_pair
@@ -252,7 +253,7 @@ class TestEmailRegisterResetApi:
app: Flask,
):
mock_get_data.return_value = {"phase": "register", "email": "[email protected]"}
- mock_create_account.return_value = MagicMock()
+ mock_create_account.return_value = Account(name="Invitee", email="[email protected]")
token_pair = MagicMock()
token_pair.model_dump.return_value = {"access_token": "a", "refresh_token": "r"}
mock_login.return_value = token_pair
@@ -310,7 +311,7 @@ class TestEmailRegisterResetApi:
app: Flask,
):
mock_get_data.return_value = {"phase": "register", "email": "[email protected]"}
- mock_create_account.return_value = MagicMock()
+ mock_create_account.return_value = Account(name="Invitee", email="[email protected]")
token_pair = MagicMock()
token_pair.model_dump.return_value = {"access_token": "a", "refresh_token": "r"}
mock_login.return_value = token_pair
diff --git a/api/tests/unit_tests/controllers/console/auth/test_email_register_language.py b/api/tests/unit_tests/controllers/console/auth/test_email_register_language.py
index 385ea0834fe..99d1a5d82b8 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_email_register_language.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_email_register_language.py
@@ -1,14 +1,15 @@
-from unittest.mock import ANY, MagicMock, patch
+from unittest.mock import ANY, patch
import pytest
from pydantic import ValidationError
from controllers.console.auth.email_register import EmailRegisterResetApi, EmailRegisterResetPayload
+from models.account import Account
@patch("controllers.console.auth.email_register.AccountService.create_account_and_tenant")
def test_create_new_account_uses_requested_language(mock_create_account):
- account = MagicMock()
+ account = Account(name="Invitee", email="[email protected]")
mock_create_account.return_value = account
result = EmailRegisterResetApi()._create_new_account(
diff --git a/api/tests/unit_tests/controllers/console/auth/test_email_verification.py b/api/tests/unit_tests/controllers/console/auth/test_email_verification.py
index 5fa6e48e62a..fa376bd9b0f 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_email_verification.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_email_verification.py
@@ -39,6 +39,7 @@ from controllers.console.error import (
WorkspacesLimitExceeded,
)
from enums import DeploymentEdition
+from models.account import Account, Tenant
from services.email_code_login_challenge import (
EmailCodeLoginChallengeResult,
EmailCodeLoginChallengeStatus,
@@ -100,12 +101,9 @@ class TestEmailCodeLoginSendEmailApi:
return app
@pytest.fixture
- def mock_account(self):
- """Create mock account object."""
- account = MagicMock()
- account.email = "[email protected]"
- account.name = "Test User"
- return account
+ def mock_account(self) -> Account:
+ """Create a real transient account for the mail service boundary."""
+ return Account(name="Test User", email="[email protected]")
@patch("controllers.console.wraps.db")
@patch("controllers.console.auth.login.AccountService.is_email_send_ip_limit")
@@ -404,12 +402,9 @@ class TestEmailCodeLoginApi:
return app
@pytest.fixture
- def mock_account(self):
- """Create mock account object."""
- account = MagicMock()
- account.email = "[email protected]"
- account.name = "Test User"
- return account
+ def mock_account(self) -> Account:
+ """Create a real transient account for login orchestration."""
+ return Account(name="Test User", email="[email protected]")
@pytest.fixture
def mock_token_pair(self):
@@ -589,7 +584,7 @@ class TestEmailCodeLoginApi:
status=EmailCodeLoginChallengeStatus.VERIFIED
)
mock_get_user.return_value = mock_account
- mock_get_tenants.return_value = [MagicMock()]
+ mock_get_tenants.return_value = [Tenant(name="Test Workspace")]
mock_login.return_value = mock_token_pair
# Act
diff --git a/api/tests/unit_tests/controllers/console/auth/test_forgot_password.py b/api/tests/unit_tests/controllers/console/auth/test_forgot_password.py
index 438bd35169f..783aac0a5df 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_forgot_password.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_forgot_password.py
@@ -3,7 +3,7 @@
from __future__ import annotations
from collections.abc import Iterator
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
import pytest
from flask import Flask
@@ -43,8 +43,8 @@ class TestForgotPasswordSendEmailApi:
mock_get_account,
app: Flask,
):
- mock_account = MagicMock()
- mock_get_account.return_value = mock_account
+ account = Account(name="User", email="[email protected]")
+ mock_get_account.return_value = account
mock_send_email.return_value = "token-123"
wraps_features = SystemFeatureModel(
@@ -73,7 +73,7 @@ class TestForgotPasswordSendEmailApi:
assert response == {"result": "success", "data": "token-123"}
mock_send_email.assert_called_once_with(
- account=mock_account,
+ account=account,
language="zh-Hans",
is_allow_register=True,
diff --git a/api/tests/unit_tests/controllers/console/auth/test_login_logout.py b/api/tests/unit_tests/controllers/console/auth/test_login_logout.py
index f6c0819c9d3..94ac31e74bb 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_login_logout.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_login_logout.py
@@ -31,6 +31,7 @@ from controllers.console.error import (
WorkspacesLimitExceeded,
)
from enums import DeploymentEdition
+from models.account import Account, Tenant
from services.email_code_login_challenge import EmailCodeLoginChallengeResult, EmailCodeLoginChallengeStatus
from services.entities.auth_entities import LoginFailureReason
from services.errors.account import (
@@ -81,12 +82,10 @@ class TestLoginApi:
return app.test_client()
@pytest.fixture
- def mock_account(self):
- """Create mock account object."""
- account = MagicMock()
+ def mock_account(self) -> Account:
+ """Create a real transient account for the service boundary."""
+ account = Account(name="Test User", email="[email protected]")
account.id = "test-account-id"
- account.email = "[email protected]"
- account.name = "Test User"
return account
@pytest.fixture
@@ -131,7 +130,7 @@ class TestLoginApi:
mock_is_rate_limit.return_value = False
mock_get_invitation.return_value = None
mock_authenticate.return_value = mock_account
- mock_get_tenants.return_value = [MagicMock()] # Has at least one tenant
+ mock_get_tenants.return_value = [Tenant(name="Test Workspace")]
mock_login.return_value = mock_token_pair
# Act
@@ -182,7 +181,7 @@ class TestLoginApi:
mock_is_rate_limit.return_value = False
mock_get_invitation.return_value = {"data": {"email": "[email protected]"}}
mock_authenticate.return_value = mock_account
- mock_get_tenants.return_value = [MagicMock()]
+ mock_get_tenants.return_value = [Tenant(name="Test Workspace")]
mock_login.return_value = mock_token_pair
# Act
@@ -561,7 +560,7 @@ class TestLoginApi:
mock_is_rate_limit.return_value = False
mock_get_invitation.return_value = None
mock_authenticate.side_effect = [AccountPasswordError("Invalid"), mock_account]
- mock_get_tenants.return_value = [MagicMock()]
+ mock_get_tenants.return_value = [Tenant(name="Test Workspace")]
mock_login_service.return_value = mock_token_pair
with app.test_request_context(
@@ -661,11 +660,10 @@ class TestLogoutApi:
return app
@pytest.fixture
- def mock_account(self):
- """Create mock account object."""
- account = MagicMock()
+ def mock_account(self) -> Account:
+ """Create a real transient account for the logout service boundary."""
+ account = Account(name="Test User", email="[email protected]")
account.id = "test-account-id"
- account.email = "[email protected]"
return account
@patch("controllers.console.auth.login.AccountService.logout")
diff --git a/api/tests/unit_tests/controllers/console/auth/test_oauth.py b/api/tests/unit_tests/controllers/console/auth/test_oauth.py
index 98d03ee2ac7..e9a40352e54 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_oauth.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_oauth.py
@@ -6,6 +6,7 @@ from unittest.mock import ANY, MagicMock, patch
import pytest
from flask import Flask
+from sqlalchemy.orm import Session, scoped_session, sessionmaker
from controllers.console.auth.oauth import (
OAuthCallback,
@@ -16,10 +17,8 @@ from controllers.console.auth.oauth import (
)
from enums import DeploymentEdition
from libs.oauth import OAuthUserInfo, encode_oauth_state
-from models.account import AccountStatus
-from services.errors.account import (
- AccountRegisterError,
-)
+from models.account import Account, AccountIntegrate, AccountStatus, Tenant
+from services.errors.account import AccountRegisterError
from services.errors.account import (
EmailDomainSuspendedError as EmailDomainSuspendedRegistrationError,
)
@@ -191,8 +190,8 @@ class TestOAuthCallback:
oauth_provider.get_access_token.return_value = "access_token"
oauth_provider.get_user_info.return_value = OAuthUserInfo(id="123", name="Test User", email="[email protected]")
- account = MagicMock()
- account.status = AccountStatus.ACTIVE
+ account = Account(name="Test User", email="[email protected]", status=AccountStatus.ACTIVE)
+ account.id = "123"
token_pair = MagicMock()
token_pair.access_token = "jwt_access_token"
@@ -320,7 +319,7 @@ class TestOAuthCallback:
mock_register_service.get_invitation_if_token_valid.return_value = {
"account": oauth_setup["account"],
"data": {"email": "[email protected]"},
- "tenant": MagicMock(),
+ "tenant": Tenant(name="Invited Workspace"),
}
mock_account_service.login.return_value = oauth_setup["token_pair"]
@@ -366,8 +365,7 @@ class TestOAuthCallback:
mock_get_providers.return_value = {"github": oauth_setup["provider"]}
- account = MagicMock()
- account.status = account_status
+ account = Account(name="Test User", email="[email protected]", status=account_status)
account.id = "123"
mock_generate_account.return_value = (account, False)
@@ -399,8 +397,7 @@ class TestOAuthCallback:
):
mock_get_providers.return_value = {"github": oauth_setup["provider"]}
- mock_account = MagicMock()
- mock_account.status = AccountStatus.PENDING
+ mock_account = Account(name="Test User", email="[email protected]", status=AccountStatus.PENDING)
mock_generate_account.return_value = (mock_account, False)
mock_token_pair = MagicMock()
@@ -455,10 +452,8 @@ class TestOAuthCallback:
mock_get_providers.return_value = {"github": oauth_setup["provider"]}
# Create account with CLOSED status
- closed_account = MagicMock()
- closed_account.status = AccountStatus.CLOSED
+ closed_account = Account(name="Closed Account", email="[email protected]", status=AccountStatus.CLOSED)
closed_account.id = "123"
- closed_account.name = "Closed Account"
mock_generate_account.return_value = (closed_account, False)
# Mock successful login (current behavior)
@@ -489,36 +484,45 @@ class TestAccountGeneration:
return OAuthUserInfo(id="123", name="Test User", email="[email protected]")
@pytest.fixture
- def mock_account(self):
- account = MagicMock()
- account.name = "Test User"
- return account
+ def mock_account(self) -> Account:
+ return Account(name="Test User", email="[email protected]")
@patch("controllers.console.auth.oauth.AccountService.get_account_by_email_with_case_fallback")
- @patch("controllers.console.auth.oauth.Account")
def test_should_get_account_by_openid_or_email(
self,
- mock_account_model,
mock_get_account,
app: Flask,
user_info: OAuthUserInfo,
- mock_account,
+ sqlite_session: Session,
):
- with app.test_request_context("/"):
+ account = Account(name="Test User", email="[email protected]")
+ sqlite_session.add(account)
+ sqlite_session.flush()
+ sqlite_session.add(
+ AccountIntegrate(
+ account_id=account.id,
+ provider="github",
+ open_id="123",
+ encrypted_token="encrypted-token",
+ )
+ )
+ sqlite_session.commit()
+ database_session = scoped_session(sessionmaker(bind=sqlite_session.get_bind(), expire_on_commit=False))
+
+ with patch("controllers.console.auth.oauth.db.session", database_session), app.test_request_context("/"):
# Test OpenID found
- mock_account_model.get_by_openid.return_value = mock_account
result = _get_account_by_openid_or_email("github", user_info)
- assert result == mock_account
- mock_account_model.get_by_openid.assert_called_once_with("github", "123")
+ assert result is not None
+ assert result.id == account.id
mock_get_account.assert_not_called()
# Test fallback to email lookup
- mock_account_model.get_by_openid.return_value = None
- mock_get_account.return_value = mock_account
+ mock_get_account.return_value = account
- result = _get_account_by_openid_or_email("github", user_info)
- assert result == mock_account
+ result = _get_account_by_openid_or_email("google", user_info)
+ assert result is account
mock_get_account.assert_called_once()
+ database_session.remove()
@pytest.mark.parametrize(
("allow_register", "existing_account", "should_create"),
@@ -621,7 +625,7 @@ class TestAccountGeneration:
):
user_info = OAuthUserInfo(id="123", name="Test User", email="[email protected]")
mock_feature_service.get_system_features.return_value.is_allow_register = True
- mock_register_service.register.return_value = MagicMock()
+ mock_register_service.register.return_value = Account(name="Test User", email="[email protected]")
with app.test_request_context(headers={"Accept-Language": "en-US"}):
_generate_account("github", user_info)
@@ -654,7 +658,7 @@ class TestAccountGeneration:
user_info: OAuthUserInfo,
):
mock_feature_service.get_system_features.return_value.is_allow_register = True
- mock_register_service.register.return_value = MagicMock()
+ mock_register_service.register.return_value = Account(name="Test User", email="[email protected]")
with app.test_request_context(headers={"Accept-Language": "zh-Hans,zh;q=0.9"}):
_generate_account("github", user_info, timezone="Asia/Shanghai")
@@ -687,7 +691,7 @@ class TestAccountGeneration:
user_info: OAuthUserInfo,
):
mock_feature_service.get_system_features.return_value.is_allow_register = True
- mock_register_service.register.return_value = MagicMock()
+ mock_register_service.register.return_value = Account(name="Test User", email="[email protected]")
with app.test_request_context(headers={"Accept-Language": "en-US,en;q=0.9"}):
_generate_account("github", user_info, language="zh-Hans")
diff --git a/api/tests/unit_tests/controllers/console/auth/test_oauth_redirect.py b/api/tests/unit_tests/controllers/console/auth/test_oauth_redirect.py
index e5a4891fe80..59a12a9b329 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_oauth_redirect.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_oauth_redirect.py
@@ -6,7 +6,7 @@ from flask import Flask
from controllers.console.auth.oauth import OAuthCallback, OAuthLogin
from libs.oauth import OAuthUserInfo, encode_oauth_state
-from models.account import AccountStatus
+from models.account import Account, AccountStatus, Tenant
REDIRECT_URL = "/apps?category=workflow"
CONSOLE_WEB_URL = "https://console.example.com"
@@ -65,8 +65,7 @@ def test_oauth_callback_validates_redirect_url_and_appends_new_user_flag(
name="Test User",
)
- account = MagicMock()
- account.status = AccountStatus.ACTIVE
+ account = Account(name="Test User", email="[email protected]", status=AccountStatus.ACTIVE)
token_pair = MagicMock()
token_pair.access_token = "dify-access-token"
token_pair.refresh_token = "dify-refresh-token"
@@ -101,8 +100,7 @@ def test_oauth_callback_with_invitation_establishes_console_session(app: Flask)
name="Test User",
)
- account = MagicMock()
- account.status = AccountStatus.ACTIVE
+ account = Account(name="Test User", email="[email protected]", status=AccountStatus.ACTIVE)
token_pair = MagicMock()
token_pair.access_token = "dify-access-token"
token_pair.refresh_token = "dify-refresh-token"
@@ -129,7 +127,7 @@ def test_oauth_callback_with_invitation_establishes_console_session(app: Flask)
"email": "[email protected]",
"workspace_id": "workspace-id",
},
- "tenant": MagicMock(),
+ "tenant": Tenant(name="Invited Workspace"),
}
response = OAuthCallback().get("google")
@@ -152,8 +150,7 @@ def test_oauth_callback_with_invitation_rejects_another_account(app: Flask) -> N
name="Test User",
)
- account = MagicMock()
- account.status = AccountStatus.ACTIVE
+ account = Account(name="Test User", email="[email protected]", status=AccountStatus.ACTIVE)
state = encode_oauth_state(invite_token="invite-token")
with (
@@ -175,7 +172,7 @@ def test_oauth_callback_with_invitation_rejects_another_account(app: Flask) -> N
"email": "[email protected]",
"workspace_id": "workspace-id",
},
- "tenant": MagicMock(),
+ "tenant": Tenant(name="Invited Workspace"),
}
response = OAuthCallback().get("google")
diff --git a/api/tests/unit_tests/controllers/console/auth/test_oauth_timezone.py b/api/tests/unit_tests/controllers/console/auth/test_oauth_timezone.py
index 631122177b1..74bd9ec0be4 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_oauth_timezone.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_oauth_timezone.py
@@ -6,6 +6,7 @@ from flask import Flask
from controllers.console.auth.oauth import OAuthLogin, _generate_account
from enums import DeploymentEdition
from libs.oauth import OAuthUserInfo
+from models.account import Account
from services.errors.account import AccountRegisterError
@@ -50,7 +51,7 @@ def test_generate_account_registers_with_browser_timezone(
mock_link_account,
app: Flask,
):
- account = MagicMock()
+ account = Account(name="Test User", email="[email protected]")
mock_register_service.register.return_value = account
mock_feature_service.get_system_features.return_value.is_allow_register = True
user_info = OAuthUserInfo(id="github-123", name="Test User", email="[email protected]")
@@ -87,7 +88,7 @@ def test_generate_account_prefers_state_language_over_accept_language(
mock_link_account,
app: Flask,
):
- account = MagicMock()
+ account = Account(name="Test User", email="[email protected]")
mock_register_service.register.return_value = account
mock_feature_service.get_system_features.return_value.is_allow_register = True
user_info = OAuthUserInfo(id="github-123", name="Test User", email="[email protected]")
diff --git a/api/tests/unit_tests/controllers/console/test_extension.py b/api/tests/unit_tests/controllers/console/test_extension.py
index 5d38d982e55..97bad4420f7 100644
--- a/api/tests/unit_tests/controllers/console/test_extension.py
+++ b/api/tests/unit_tests/controllers/console/test_extension.py
@@ -24,7 +24,7 @@ from enums import DeploymentEdition
if _NEEDS_METHOD_VIEW_CLEANUP:
del builtins.__dict__["MethodView"]
-from models.account import AccountStatus
+from models.account import Account, AccountStatus, Tenant
from models.api_based_extension import APIBasedExtension
@@ -52,16 +52,16 @@ def _masked_api_key(api_key: str) -> str:
@pytest.fixture(autouse=True)
-def _mock_console_guards(monkeypatch: pytest.MonkeyPatch) -> MagicMock:
+def _mock_console_guards(monkeypatch: pytest.MonkeyPatch) -> Account:
"""Bypass console decorators so handlers can run in isolation."""
from controllers.console import wraps as wraps_module
- account = MagicMock()
- account.status = AccountStatus.ACTIVE
- account.current_tenant_id = "tenant-123"
+ tenant = Tenant(name="Test Workspace")
+ tenant.id = "tenant-123"
+ account = Account(name="Test User", email="[email protected]", status=AccountStatus.ACTIVE)
account.id = "account-123"
- account.is_authenticated = True
+ account._current_tenant = tenant
monkeypatch.setattr(wraps_module.dify_config, "DEPLOYMENT_EDITION", DeploymentEdition.CLOUD)
monkeypatch.setattr(wraps_module.dify_config, "INIT_PASSWORD", "")
diff --git a/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py b/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py
index 552a3570900..084654f10ad 100644
--- a/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py
+++ b/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py
@@ -1,5 +1,3 @@
-from types import SimpleNamespace
-
import pytest
from werkzeug.exceptions import Forbidden
@@ -11,7 +9,14 @@ from controllers.console.workflow_run_archive import (
WorkflowRunArchiveDownloadsApi,
WorkflowRunArchivesApi,
)
-from models import TenantAccountRole
+from models import Account, TenantAccountRole
+
+
+def _account(role: TenantAccountRole) -> Account:
+ account = Account(name="Test User", email="[email protected]")
+ account.id = "account-1"
+ account.role = role
+ return account
@pytest.mark.parametrize(
@@ -22,7 +27,7 @@ from models import TenantAccountRole
def test_current_owner_or_admin_ids_rejects_non_manager(
monkeypatch: pytest.MonkeyPatch, role: TenantAccountRole, rbac_enabled: bool
) -> None:
- current_user = SimpleNamespace(id="account-1", current_role=role)
+ current_user = _account(role)
monkeypatch.setattr(dify_config, "RBAC_ENABLED", rbac_enabled)
monkeypatch.setattr(
workflow_run_archive,
@@ -39,7 +44,7 @@ def test_current_owner_or_admin_ids_rejects_non_manager(
def test_current_owner_or_admin_ids_returns_current_ids_for_manager(
monkeypatch: pytest.MonkeyPatch, role: TenantAccountRole, rbac_enabled: bool
) -> None:
- current_user = SimpleNamespace(id="account-1", current_role=role)
+ current_user = _account(role)
monkeypatch.setattr(dify_config, "RBAC_ENABLED", rbac_enabled)
monkeypatch.setattr(
workflow_run_archive,
diff --git a/api/tests/unit_tests/controllers/console/test_workspace_members.py b/api/tests/unit_tests/controllers/console/test_workspace_members.py
index 69d05246f2d..6557fba1107 100644
--- a/api/tests/unit_tests/controllers/console/test_workspace_members.py
+++ b/api/tests/unit_tests/controllers/console/test_workspace_members.py
@@ -8,7 +8,13 @@ from flask import Flask, g
from controllers.console.workspace.error import InvalidMemberRoleError
from controllers.console.workspace.members import MemberInviteEmailApi
from enums import DeploymentEdition
-from models.account import Account, TenantAccountRole
+from models.account import Account, Tenant, TenantAccountRole
+
+
+def _tenant() -> Tenant:
+ tenant = Tenant(name="Test Tenant")
+ tenant.id = "tenant-1"
+ return tenant
@pytest.fixture
@@ -55,8 +61,7 @@ class TestMemberInviteEmailApi:
mock_get_features.return_value = _build_feature_flags()
mock_invite_member.return_value = "token-abc"
- tenant = SimpleNamespace(id="tenant-1", name="Test Tenant")
- inviter = SimpleNamespace(email="[email protected]", current_tenant=tenant, status="active")
+ tenant = _tenant()
with (
patch("controllers.console.workspace.members._count_new_member_invites", return_value=(1, 1)),
@@ -102,7 +107,7 @@ class TestMemberInviteEmailApi:
mock_get_features.return_value = _build_feature_flags()
mock_invite_member.return_value = "rbac-token"
- tenant = SimpleNamespace(id="tenant-1", name="Test Tenant")
+ tenant = _tenant()
with app.test_request_context(
"/workspaces/current/members/invite-email",
@@ -133,7 +138,7 @@ class TestMemberInviteEmailApi:
"""When RBAC is disabled, an invalid role string should be rejected."""
mock_get_features.return_value = _build_feature_flags()
- tenant = SimpleNamespace(id="tenant-1", name="Test Tenant")
+ tenant = _tenant()
with app.test_request_context(
"/workspaces/current/members/invite-email",
@@ -163,7 +168,7 @@ class TestMemberInviteEmailApi:
"""When RBAC is disabled, owner role should be rejected for invite."""
mock_get_features.return_value = _build_feature_flags()
- tenant = SimpleNamespace(id="tenant-1", name="Test Tenant")
+ tenant = _tenant()
with app.test_request_context(
"/workspaces/current/members/invite-email",
diff --git a/api/tests/unit_tests/controllers/inner_api/test_agent_files.py b/api/tests/unit_tests/controllers/inner_api/test_agent_files.py
index 8a7d970a889..a4874ae2077 100644
--- a/api/tests/unit_tests/controllers/inner_api/test_agent_files.py
+++ b/api/tests/unit_tests/controllers/inner_api/test_agent_files.py
@@ -1,8 +1,7 @@
import inspect
from collections.abc import Callable
-from types import SimpleNamespace
from typing import cast
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
import pytest
from flask import Flask
@@ -14,11 +13,18 @@ from controllers.inner_api.agent.files import (
AgentFileUploadRequestPayload,
)
from core.workflow.file_reference import build_file_reference
+from models.account import Account, Tenant
from services.file_request_service import DownloadFileRequestResult
MODULE = "controllers.inner_api.agent.files"
+def _tenant() -> Tenant:
+ tenant = Tenant(name="Test Workspace")
+ tenant.id = "tenant-1"
+ return tenant
+
+
def _raw[R](method: Callable[..., R]) -> Callable[..., R]:
return cast(Callable[..., R], inspect.unwrap(method))
@@ -32,8 +38,9 @@ def test_upload_request_returns_origin_free_uri(app: Flask, unbound_session: Ses
"conversation_id": "conversation-1",
"max_size": 64 * 1024 * 1024,
}
- tenant = SimpleNamespace(id="tenant-1")
- user = SimpleNamespace(id="canonical-end-user-1")
+ tenant = _tenant()
+ user = Account(name="Canonical user", email="[email protected]")
+ user.id = "canonical-end-user-1"
session = unbound_session
with app.test_request_context("/", method="POST", json=payload):
with (
@@ -89,7 +96,7 @@ def test_download_request_returns_origin_free_uri_for_sandbox(app: Flask, unboun
patch(f"{MODULE}.TenantService") as tenant_service,
patch(f"{MODULE}.FileRequestService") as service,
):
- tenant_service.get_tenant_by_id.return_value = MagicMock()
+ tenant_service.get_tenant_by_id.return_value = _tenant()
service.return_value.request_download.return_value = DownloadFileRequestResult(
filename="report.pdf",
mime_type="application/pdf",
@@ -132,7 +139,7 @@ def test_download_request_binds_frontend_url(
patch(f"{MODULE}.TenantService") as tenant_service,
patch(f"{MODULE}.FileRequestService") as service,
):
- tenant_service.get_tenant_by_id.return_value = MagicMock()
+ tenant_service.get_tenant_by_id.return_value = _tenant()
service.return_value.request_download.return_value = DownloadFileRequestResult(
filename="report.pdf",
mime_type="application/pdf",
diff --git a/api/tests/unit_tests/controllers/openapi/test_app_payloads.py b/api/tests/unit_tests/controllers/openapi/test_app_payloads.py
index 083a7bd980b..c73e6f3f454 100644
--- a/api/tests/unit_tests/controllers/openapi/test_app_payloads.py
+++ b/api/tests/unit_tests/controllers/openapi/test_app_payloads.py
@@ -4,9 +4,6 @@ HTTP plumbing or DB. Pin the response shapes that are CLI contracts.
from __future__ import annotations
-from types import SimpleNamespace
-from unittest.mock import MagicMock
-
import pytest
from sqlalchemy.orm import Session
@@ -16,35 +13,30 @@ from controllers.openapi.apps import ( # pyright: ignore[reportPrivateUsage]
parameters_payload,
)
from controllers.service_api.app.error import AppUnavailableError
-from models.model import AppMode
+from models.model import App, AppMode, IconType
-def _fake_app(**overrides):
- base = {
- "id": "app1",
- "name": "X",
- "description": "d",
- "mode": "chat",
- "author_name": "alice",
- "tags": [SimpleNamespace(name="prod")],
- "updated_at": None,
- "enable_api": True,
- "workflow": None,
- "app_model_config": None,
- }
- base.update(overrides)
- return SimpleNamespace(**base)
+def _app(*, mode: AppMode = AppMode.CHAT) -> App:
+ return App(
+ id="app1",
+ tenant_id="tenant-1",
+ name="X",
+ description="d",
+ mode=mode,
+ icon_type=IconType.EMOJI,
+ icon="robot",
+ icon_background="#FFFFFF",
+ enable_site=False,
+ enable_api=True,
+ max_active_requests=0,
+ )
def test_parameters_payload_raises_app_unavailable_when_no_config(unbound_session: Session):
- app = _fake_app(mode="chat")
- app.app_model_config_with_session = MagicMock(return_value=None)
- session = unbound_session
+ app = _app()
with pytest.raises(AppUnavailableError):
- parameters_payload(app, session=session)
-
- app.app_model_config_with_session.assert_called_once_with(session=session)
+ parameters_payload(app, session=unbound_session)
def test_empty_parameters_constant_matches_describe_fallback_shape():
@@ -70,9 +62,9 @@ def test_empty_parameters_constant_matches_describe_fallback_shape():
[AppMode.COMPLETION, AppMode.CHAT, AppMode.ADVANCED_CHAT, AppMode.WORKFLOW, AppMode.AGENT_CHAT],
)
def test_is_listable_accepts_supported_app_types(mode):
- assert _is_listable(_fake_app(mode=mode)) is True
+ assert _is_listable(_app(mode=mode)) is True
@pytest.mark.parametrize("mode", [AppMode.AGENT, AppMode.CHANNEL, AppMode.RAG_PIPELINE])
def test_is_listable_hides_non_app_modes(mode):
- assert _is_listable(_fake_app(mode=mode)) is False
+ assert _is_listable(_app(mode=mode)) is False
diff --git a/api/tests/unit_tests/controllers/web/test_audio.py b/api/tests/unit_tests/controllers/web/test_audio.py
index 6bbde4df887..abcc27a9d47 100644
--- a/api/tests/unit_tests/controllers/web/test_audio.py
+++ b/api/tests/unit_tests/controllers/web/test_audio.py
@@ -3,7 +3,6 @@
from __future__ import annotations
from io import BytesIO
-from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
@@ -23,6 +22,8 @@ from controllers.web.error import (
)
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
from graphon.model_runtime.errors.invoke import InvokeError
+from models.enums import EndUserType
+from models.model import App, AppMode, EndUser, IconType
from services.app_ref_service import AppRef, MessageRef
from services.errors.audio import (
AudioTooLargeServiceError,
@@ -33,12 +34,32 @@ from services.errors.audio import (
)
-def _app_model() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="chat")
+def _app_model() -> App:
+ return App(
+ id="app-1",
+ tenant_id="tenant-1",
+ name="Web App",
+ description="",
+ mode=AppMode.CHAT,
+ icon_type=IconType.EMOJI,
+ icon="robot",
+ icon_background="#FFFFFF",
+ enable_site=True,
+ enable_api=False,
+ max_active_requests=0,
+ )
-def _end_user() -> SimpleNamespace:
- return SimpleNamespace(id="eu-1", external_user_id="ext-1")
+def _end_user() -> EndUser:
+ return EndUser(
+ id="eu-1",
+ tenant_id="tenant-1",
+ app_id="app-1",
+ type=EndUserType.BROWSER,
+ external_user_id="ext-1",
+ name="Web User",
+ session_id="session-1",
+ )
# ---------------------------------------------------------------------------
@@ -140,7 +161,7 @@ class TestTextApi:
def test_happy_path_with_message_ref(self, mock_ns: MagicMock, mock_tts: MagicMock, app: Flask) -> None:
message_id = "550e8400-e29b-41d4-a716-446655440000"
mock_ns.payload = {"text": "hello", "message_id": message_id}
- app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", mode="chat")
+ app_model = _app_model()
with app.test_request_context("/text-to-audio", method="POST"):
result = TextApi().post(app_model, _end_user())
diff --git a/api/tests/unit_tests/controllers/web/test_completion.py b/api/tests/unit_tests/controllers/web/test_completion.py
index e76a4d7d6a4..6c7dce3c4ba 100644
--- a/api/tests/unit_tests/controllers/web/test_completion.py
+++ b/api/tests/unit_tests/controllers/web/test_completion.py
@@ -4,7 +4,6 @@ from __future__ import annotations
import uuid
from inspect import unwrap
-from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
@@ -24,18 +23,43 @@ from controllers.web.error import (
from core.app.apps.agent_app.errors import AgentAppNotPublishedError
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
from graphon.model_runtime.errors.invoke import InvokeError
+from models.enums import EndUserType
+from models.model import App, AppMode, EndUser, IconType
+
+
+def _app(mode: AppMode) -> App:
+ return App(
+ id="app-1",
+ tenant_id="tenant-1",
+ name="Web App",
+ description="",
+ mode=mode,
+ icon_type=IconType.EMOJI,
+ icon="robot",
+ icon_background="#FFFFFF",
+ enable_site=True,
+ enable_api=False,
+ max_active_requests=0,
+ )
-def _completion_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="completion")
+def _completion_app() -> App:
+ return _app(AppMode.COMPLETION)
-def _chat_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="chat")
+def _chat_app() -> App:
+ return _app(AppMode.CHAT)
-def _end_user() -> SimpleNamespace:
- return SimpleNamespace(id="eu-1")
+def _end_user() -> EndUser:
+ return EndUser(
+ id="eu-1",
+ tenant_id="tenant-1",
+ app_id="app-1",
+ type=EndUserType.BROWSER,
+ name="Web User",
+ session_id="session-1",
+ )
# ---------------------------------------------------------------------------
@@ -154,7 +178,7 @@ class TestChatApi:
@patch("controllers.web.completion.web_ns")
def test_agent_not_published_error_mapped(self, mock_ns: MagicMock, mock_gen: MagicMock, app: Flask) -> None:
mock_ns.payload = {"inputs": {}, "query": "x"}
- app_model = SimpleNamespace(id="app-1", mode="agent")
+ app_model = _app(AppMode.AGENT)
with app.test_request_context("/chat-messages", method="POST"):
with pytest.raises(AgentNotPublishedError):
diff --git a/api/tests/unit_tests/controllers/web/test_web_forgot_password.py b/api/tests/unit_tests/controllers/web/test_web_forgot_password.py
index f2588ec3450..5532220f52f 100644
--- a/api/tests/unit_tests/controllers/web/test_web_forgot_password.py
+++ b/api/tests/unit_tests/controllers/web/test_web_forgot_password.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import base64
from collections.abc import Iterator
-from unittest.mock import ANY, MagicMock, patch
+from unittest.mock import ANY, patch
import pytest
from flask import Flask
@@ -58,8 +58,8 @@ class TestForgotPasswordSendEmailApi:
mock_send_mail,
app: Flask,
):
- mock_account = MagicMock()
- mock_get_account.return_value = mock_account
+ account = Account(name="User", email="[email protected]")
+ mock_get_account.return_value = account
mock_send_mail.return_value = "token-123"
with app.test_request_context(
@@ -71,7 +71,7 @@ class TestForgotPasswordSendEmailApi:
assert response == {"result": "success", "data": "token-123"}
mock_get_account.assert_called_once_with("[email protected]", session=ANY)
- mock_send_mail.assert_called_once_with(account=mock_account, email="[email protected]", language="zh-Hans")
+ mock_send_mail.assert_called_once_with(account=account, email="[email protected]", language="zh-Hans")
mock_extract_ip.assert_called_once()
mock_rate_limit.assert_called_once_with("127.0.0.1")
diff --git a/api/tests/unit_tests/controllers/web/test_web_login.py b/api/tests/unit_tests/controllers/web/test_web_login.py
index b4dae61bd91..d0e1133fa83 100644
--- a/api/tests/unit_tests/controllers/web/test_web_login.py
+++ b/api/tests/unit_tests/controllers/web/test_web_login.py
@@ -14,6 +14,7 @@ import services.errors.account
from controllers.console import wraps as console_wraps
from controllers.web.login import EmailCodeLoginApi, EmailCodeLoginSendEmailApi, LoginApi, LoginStatusApi, LogoutApi
from enums import DeploymentEdition
+from models.account import Account
from models.model import DifySetup
from services.entities.auth_entities import LoginFailureReason
@@ -71,8 +72,8 @@ class TestEmailCodeLoginSendEmailApi:
mock_send_email,
app: Flask,
):
- mock_account = MagicMock()
- mock_get_user.return_value = mock_account
+ account = Account(name="Test User", email="[email protected]")
+ mock_get_user.return_value = account
mock_send_email.return_value = "token-123"
with app.test_request_context(
@@ -84,7 +85,7 @@ class TestEmailCodeLoginSendEmailApi:
assert response == {"result": "success", "data": "token-123"}
mock_get_user.assert_called_once_with("[email protected]", ANY)
- mock_send_email.assert_called_once_with(account=mock_account, language="en-US")
+ mock_send_email.assert_called_once_with(account=account, language="en-US")
class TestEmailCodeLoginApi:
@@ -103,7 +104,7 @@ class TestEmailCodeLoginApi:
app: Flask,
):
mock_get_token_data.return_value = {"email": "[email protected]", "code": "123456"}
- mock_get_user.return_value = MagicMock()
+ mock_get_user.return_value = Account(name="Test User", email="[email protected]")
with app.test_request_context(
"/web/email-code-login/validity",
@@ -123,7 +124,7 @@ class TestLoginApi:
@patch("controllers.web.login.WebAppAuthService.login", return_value="access-tok")
@patch("controllers.web.login.WebAppAuthService.authenticate")
def test_login_success(self, mock_auth: MagicMock, mock_login: MagicMock, app: Flask) -> None:
- mock_auth.return_value = MagicMock()
+ mock_auth.return_value = Account(name="Test User", email="[email protected]")
with app.test_request_context(
"/web/login",