✨ User management: Model list needs tenant isolation (unit test)

Author: WMC001

test/backend/services/test_model_management_service.py

@@ -287,27 +287,18 @@ async def _clear_model_memories(**kwargs):
 nexent_memory_mod.clear_model_memories = _clear_model_memories
 sys.modules["nexent.memory.memory_service"] = nexent_memory_mod
 
-# Stub services.tenant_service required by list_models_for_admin
+# Stub services.tenant_service required by list_models_for_admin BEFORE any imports
 services_tenant_mod = types.ModuleType("services.tenant_service")
 
 
 def _get_tenant_info(tenant_id):
+    """Mock implementation of get_tenant_info for testing."""
     return {"tenant_name": "Test Tenant"}
 
 
 services_tenant_mod.get_tenant_info = _get_tenant_info
 sys.modules["services.tenant_service"] = services_tenant_mod
 
-# Also stub the backend-level import path
-backend_services_tenant_mod = types.ModuleType("backend.services.tenant_service")
-backend_services_tenant_mod.get_tenant_info = _get_tenant_info
-sys.modules["backend.services.tenant_service"] = backend_services_tenant_mod
-
-# Stub parent 'services' package to prevent attribute access error
-services_pkg = types.ModuleType("services")
-services_pkg.tenant_service = services_tenant_mod
-sys.modules["services"] = services_pkg
-
 
 def import_svc():
     """Import service under MinioClient patch to avoid real initialization."""
@@ -1130,8 +1121,7 @@ async def test_list_models_for_admin_success():
 
     with mock.patch.object(svc, "get_model_records", return_value=records), \
             mock.patch.object(svc, "add_repo_to_name", side_effect=lambda model_repo, model_name: f"{model_repo}/{model_name}" if model_repo else model_name), \
-            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"), \
-            mock.patch.object(svc, "get_tenant_info", return_value={"tenant_name": "Test Tenant"}):
+            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"):
         out = await svc.list_models_for_admin("t1")
         assert out["tenant_id"] == "t1"
         assert out["tenant_name"] == "Test Tenant"
@@ -1155,8 +1145,7 @@ async def test_list_models_for_admin_with_pagination():
 
     with mock.patch.object(svc, "get_model_records", return_value=records), \
             mock.patch.object(svc, "add_repo_to_name", side_effect=lambda model_repo, model_name: f"{model_repo}/{model_name}" if model_repo else model_name), \
-            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"), \
-            mock.patch.object(svc, "get_tenant_info", return_value={"tenant_name": "Test Tenant"}):
+            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"):
         # Page 1, page_size 10
         out = await svc.list_models_for_admin("t1", page=1, page_size=10)
         assert out["page"] == 1
@@ -1191,8 +1180,7 @@ async def test_list_models_for_admin_with_model_type_filter():
 
     with mock.patch.object(svc, "get_model_records", return_value=records) as mock_get_records, \
             mock.patch.object(svc, "add_repo_to_name", side_effect=lambda model_repo, model_name: f"{model_repo}/{model_name}" if model_repo else model_name), \
-            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"), \
-            mock.patch.object(svc, "get_tenant_info", return_value={"tenant_name": "Test Tenant"}):
+            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"):
         # Filter by llm
         out = await svc.list_models_for_admin("t1", model_type="llm")
         mock_get_records.assert_called_once_with({"model_type": "llm"}, "t1")
@@ -1204,8 +1192,7 @@ async def test_list_models_for_admin_empty_tenant():
     """Test list_models_for_tenant handles empty tenant gracefully."""
     svc = import_svc()
 
-    with mock.patch.object(svc, "get_model_records", return_value=[]), \
-            mock.patch.object(svc, "get_tenant_info", return_value={"tenant_name": ""}):
+    with mock.patch.object(svc, "get_model_records", return_value=[]):
         out = await svc.list_models_for_admin("t1")
         assert out["tenant_id"] == "t1"
         assert out["tenant_name"] == ""
@@ -1241,8 +1228,7 @@ async def test_list_models_for_admin_type_mapping():
 
     with mock.patch.object(svc, "get_model_records", return_value=records), \
             mock.patch.object(svc, "add_repo_to_name", side_effect=lambda model_repo, model_name: f"{model_repo}/{model_name}" if model_repo else model_name), \
-            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"), \
-            mock.patch.object(svc, "get_tenant_info", return_value={"tenant_name": "Test Tenant"}):
+            mock.patch.object(svc.ModelConnectStatusEnum, "get_value", side_effect=lambda s: s or "not_detected"):
         out = await svc.list_models_for_admin("t1")
 
         assert len(out["models"]) == 1