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 web controller identity ORM models to real entities (#40639)

Asuka Minato4b189777c48a
diff --git a/api/tests/unit_tests/controllers/service_api/test_trace_session_id_parsing.py b/api/tests/unit_tests/controllers/service_api/test_trace_session_id_parsing.py
index 61af8fcfc12..89766162a1d 100644
--- a/api/tests/unit_tests/controllers/service_api/test_trace_session_id_parsing.py
+++ b/api/tests/unit_tests/controllers/service_api/test_trace_session_id_parsing.py
@@ -1,4 +1,3 @@
-from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
@@ -8,7 +7,8 @@ from werkzeug.exceptions import BadRequest
from controllers.service_api.app import completion as completion_module
from controllers.service_api.app import workflow as workflow_module
from core.helper.trace_id_helper import get_trace_session_id
-from models.model import AppMode
+from models.enums import EndUserType
+from models.model import App, AppMode, EndUser
class _Request:
@@ -40,12 +40,17 @@ def test_trace_session_id_invalid_highest_priority_raises_bad_request():
get_trace_session_id(req)
-def _app(mode: AppMode) -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode=mode, tenant_id="tenant-1")
+def _app(mode: AppMode) -> App:
+ return App(id="app-1", mode=mode, tenant_id="tenant-1")
-def _end_user() -> SimpleNamespace:
- return SimpleNamespace(id="user-1")
+def _end_user() -> EndUser:
+ return EndUser(
+ id="user-1",
+ tenant_id="tenant-1",
+ type=EndUserType.SERVICE_API,
+ session_id="session-1",
+ )
def _assert_generate_trace_session_id(mock_generate_service: MagicMock, expected: str) -> None:
diff --git a/api/tests/unit_tests/controllers/web/test_message_endpoints.py b/api/tests/unit_tests/controllers/web/test_message_endpoints.py
index da88b109a81..eb34738880c 100644
--- a/api/tests/unit_tests/controllers/web/test_message_endpoints.py
+++ b/api/tests/unit_tests/controllers/web/test_message_endpoints.py
@@ -2,7 +2,6 @@
from __future__ import annotations
-from types import SimpleNamespace
from unittest.mock import MagicMock, patch
from uuid import uuid4
@@ -20,20 +19,27 @@ from controllers.web.message import (
MessageMoreLikeThisApi,
MessageSuggestedQuestionApi,
)
+from models.enums import EndUserType
+from models.model import App, AppMode, EndUser
from services.errors.app import MoreLikeThisDisabledError
from services.errors.message import MessageNotExistsError
-def _chat_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="chat")
+def _chat_app() -> App:
+ return App(id="app-1", tenant_id="tenant-1", mode=AppMode.CHAT)
-def _completion_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="completion")
+def _completion_app() -> App:
+ return App(id="app-1", tenant_id="tenant-1", mode=AppMode.COMPLETION)
-def _end_user() -> SimpleNamespace:
- return SimpleNamespace(id="eu-1")
+def _end_user() -> EndUser:
+ return EndUser(
+ id="eu-1",
+ tenant_id="tenant-1",
+ type=EndUserType.BROWSER,
+ session_id="session-1",
+ )
# ---------------------------------------------------------------------------
diff --git a/api/tests/unit_tests/controllers/web/test_saved_message.py b/api/tests/unit_tests/controllers/web/test_saved_message.py
index 5de740192fe..5cb572b54fd 100644
--- a/api/tests/unit_tests/controllers/web/test_saved_message.py
+++ b/api/tests/unit_tests/controllers/web/test_saved_message.py
@@ -12,19 +12,26 @@ from werkzeug.exceptions import NotFound
from controllers.web.error import NotCompletionAppError
from controllers.web.saved_message import SavedMessageApi, SavedMessageListApi
+from models.enums import EndUserType
+from models.model import App, AppMode, EndUser
from services.errors.message import MessageNotExistsError
-def _completion_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="completion")
+def _completion_app() -> App:
+ return App(id="app-1", tenant_id="tenant-1", mode=AppMode.COMPLETION)
-def _chat_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="chat")
+def _chat_app() -> App:
+ return App(id="app-1", tenant_id="tenant-1", mode=AppMode.CHAT)
-def _end_user() -> SimpleNamespace:
- return SimpleNamespace(id="eu-1")
+def _end_user() -> EndUser:
+ return EndUser(
+ id="eu-1",
+ tenant_id="tenant-1",
+ type=EndUserType.BROWSER,
+ session_id="session-1",
+ )
# ---------------------------------------------------------------------------
diff --git a/api/tests/unit_tests/controllers/web/test_workflow.py b/api/tests/unit_tests/controllers/web/test_workflow.py
index 09733405272..2013b1e8db5 100644
--- a/api/tests/unit_tests/controllers/web/test_workflow.py
+++ b/api/tests/unit_tests/controllers/web/test_workflow.py
@@ -2,7 +2,6 @@
from __future__ import annotations
-from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
@@ -15,18 +14,25 @@ from controllers.web.error import (
)
from controllers.web.workflow import WorkflowRunApi, WorkflowTaskStopApi
from core.errors.error import ProviderTokenNotInitError, QuotaExceededError
+from models.enums import EndUserType
+from models.model import App, AppMode, EndUser
-def _workflow_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="workflow")
+def _workflow_app() -> App:
+ return App(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW)
-def _chat_app() -> SimpleNamespace:
- return SimpleNamespace(id="app-1", mode="chat")
+def _chat_app() -> App:
+ return App(id="app-1", tenant_id="tenant-1", mode=AppMode.CHAT)
-def _end_user() -> SimpleNamespace:
- return SimpleNamespace(id="eu-1")
+def _end_user() -> EndUser:
+ return EndUser(
+ id="eu-1",
+ tenant_id="tenant-1",
+ type=EndUserType.BROWSER,
+ session_id="session-1",
+ )
# ---------------------------------------------------------------------------