mirror of
https://github.com/langgenius/dify.git
synced 2026-11-14 07:11:06 +08:00
refactor(api): move app-scoped end users behind application services (#41398)
This commit is contained in:
1 parent
9badde4d65
commit
ce2eaab9f7
41 files changed
+1384
-481
No files matched your search
@@ -22,8 +22,8 @@ from controllers.inner_api.plugin.wraps import (
|
||||
)
|
||||
from models.account import Tenant
|
||||
from models.base import TypeBase
|
||||
from models.enums import EndUserType
|
||||
from models.model import DefaultEndUserSessionID, EndUser
|
||||
from models.enums import DEFAULT_END_USER_SESSION_ID, EndUserType
|
||||
from models.model import EndUser
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -201,7 +201,7 @@ class TestGetUser:
|
||||
_persist_end_user(
|
||||
sqlite_plugin_engine,
|
||||
user_id="default-user-id",
|
||||
session_id=DefaultEndUserSessionID.DEFAULT_SESSION_ID,
|
||||
session_id=DEFAULT_END_USER_SESSION_ID,
|
||||
is_anonymous=True,
|
||||
)
|
||||
|
||||
@@ -209,7 +209,7 @@ class TestGetUser:
|
||||
result = get_user("tenant123", None)
|
||||
|
||||
assert result.id == "default-user-id"
|
||||
assert result.session_id == DefaultEndUserSessionID.DEFAULT_SESSION_ID
|
||||
assert result.session_id == DEFAULT_END_USER_SESSION_ID
|
||||
|
||||
def test_should_raise_error_on_database_exception(self, sqlite_plugin_engine: Engine, app: Flask):
|
||||
"""Test raising ValueError when database operation fails"""
|
||||
@@ -301,7 +301,7 @@ class TestGetUserTenant:
|
||||
_persist_end_user(
|
||||
sqlite_plugin_engine,
|
||||
user_id="default-user-id",
|
||||
session_id=DefaultEndUserSessionID.DEFAULT_SESSION_ID,
|
||||
session_id=DEFAULT_END_USER_SESSION_ID,
|
||||
is_anonymous=True,
|
||||
)
|
||||
|
||||
@@ -312,7 +312,7 @@ class TestGetUserTenant:
|
||||
|
||||
assert result["tenant"].id == "tenant123"
|
||||
assert result["user"].id == "default-user-id"
|
||||
assert result["user"].session_id == DefaultEndUserSessionID.DEFAULT_SESSION_ID
|
||||
assert result["user"].session_id == DEFAULT_END_USER_SESSION_ID
|
||||
|
||||
|
||||
class PluginTestPayload:
|
||||
|
||||
Reference in new issue
Block a user