✨ Support delete tenant：concurrently delete all users

Author: WMC001

backend/apps/tenant_app.py

@@ -250,7 +250,7 @@ async def delete_tenant_endpoint(
         user_id, _ = get_current_user_id(authorization)
 
         # Perform tenant deletion with all associated resources
-        delete_tenant(tenant_id, deleted_by=user_id)
+        await delete_tenant(tenant_id, deleted_by=user_id)
 
         logger.info(f"Deleted tenant {tenant_id} and all associated resources by user {user_id}")
 

backend/consts/const.py

@@ -303,4 +303,4 @@ class VectorDatabaseType(str, Enum):
 MODEL_ENGINE_ENABLED = os.getenv("MODEL_ENGINE_ENABLED")
 
 # APP Version
-APP_VERSION = "v1.8.0"
+APP_VERSION = "v1.8.0.1"

backend/services/tenant_service.py

@@ -1,6 +1,7 @@
 """
 Tenant service for managing tenant operations
 """
+import asyncio
 import logging
 import uuid
 from typing import Any, Dict, List, Optional
@@ -14,6 +15,7 @@
     get_all_configs_by_tenant_id,
 )
 from database.user_tenant_db import get_users_by_tenant_id, soft_delete_users_by_tenant_id
+from services.user_service import delete_user_and_cleanup
 from database.group_db import add_group, query_groups_by_tenant, remove_group
 from database.model_management_db import get_model_records, delete_model_record
 from database.knowledge_db import get_knowledge_info_by_tenant_id, delete_knowledge_record
@@ -300,7 +302,7 @@ def update_tenant_info(tenant_id: str, tenant_name: str, updated_by: Optional[st
     return updated_tenant
 
 
-def delete_tenant(tenant_id: str, deleted_by: Optional[str] = None) -> bool:
+async def delete_tenant(tenant_id: str, deleted_by: Optional[str] = None) -> bool:
     """
     Delete tenant and all associated resources
 
@@ -333,9 +335,23 @@ def delete_tenant(tenant_id: str, deleted_by: Optional[str] = None) -> bool:
     logger.info(f"Starting cascade deletion for tenant {tenant_id} by {deleted_by}")
 
     try:
-        # 1. Delete all users in the tenant (soft delete)
-        logger.info(f"Deleting users for tenant {tenant_id}")
-        soft_delete_users_by_tenant_id(tenant_id, deleted_by or "system")
+        # 1. Deactivate all users in the tenant (full cleanup including Supabase deletion)
+        logger.info(f"Deactivating users for tenant {tenant_id}")
+        users_result = get_users_by_tenant_id(tenant_id, page=1, page_size=10000)
+        users = users_result.get("users", [])
+
+        if users:
+            async def delete_single_user(user: Dict[str, Any]) -> None:
+                user_id = user.get("user_id")
+                if user_id:
+                    try:
+                        await delete_user_and_cleanup(user_id, tenant_id)
+                        logger.info(f"Deactivated user {user_id} for tenant {tenant_id}")
+                    except Exception as e:
+                        logger.warning(f"Failed to deactivate user {user_id}: {str(e)}")
+
+            # Concurrently delete all users
+            await asyncio.gather(*[delete_single_user(user) for user in users])
 
         # 2. Delete all groups in the tenant
         logger.info(f"Deleting groups for tenant {tenant_id}")

backend/services/user_service.py

@@ -4,7 +4,6 @@
 import logging
 from typing import Dict, Any, List
 
-from consts.exceptions import ValidationError
 from database.user_tenant_db import (
     get_users_by_tenant_id, update_user_tenant_role, get_user_tenant_by_user_id,
     soft_delete_user_tenant_by_user_id
@@ -14,6 +13,7 @@
 from database.conversation_db import soft_delete_all_conversations_by_user
 from utils.auth_utils import get_supabase_admin_client
 from utils.memory_utils import build_memory_config
+
 from nexent.memory.memory_service import clear_memory
 
 logger = logging.getLogger(__name__)
@@ -73,8 +73,6 @@ async def update_user(user_id: str, update_data: Dict[str, Any], updated_by: str
     Raises:
         ValueError: When user not found or invalid data
     """
-    from database.user_tenant_db import update_user_tenant_role
-
     try:
         # Validate role if provided
         if "role" in update_data:

…er/sql/v1.8.1_0224_init_agent_id_seq.sql …/sql/v1.8.0.1_0224_init_agent_id_seq.sqldocker/sql/v1.8.1_0224_init_agent_id_seq.sql renamed to docker/sql/v1.8.0.1_0224_init_agent_id_seq.sql docker/sql/v1.8.1_0224_init_agent_id_seq.sql renamed to docker/sql/v1.8.0.1_0224_init_agent_id_seq.sql

@@ -80,6 +80,7 @@ def __init__(self, *args, **kwargs): pass
 sys.modules['nexent.core.models.tts_model'].TTSConfig = MockTTSConfig
 sys.modules['nexent.core.models.tts_model'].TTSModel = MockTTSModel
 sys.modules['nexent.storage.storage_client_factory'] = MagicMock()
+sys.modules['nexent.memory.memory_service'] = MagicMock()
 
 # Patch storage factory and MinIO config validation to avoid errors during initialization
 # These patches must be started before any imports that use MinioClient

…/sql/v1.8.0_0225_delete_empty_tenant.sql …ql/v1.8.0.1_0225_delete_empty_tenant.sqldocker/sql/v1.8.0_0225_delete_empty_tenant.sql renamed to docker/sql/v1.8.0.1_0225_delete_empty_tenant.sql docker/sql/v1.8.0_0225_delete_empty_tenant.sql renamed to docker/sql/v1.8.0.1_0225_delete_empty_tenant.sql

@@ -265,7 +265,7 @@ def test_get_tenants_paginated_custom_page_size(self, service_mocks):
         """Test get_tenants_paginated with custom page and page_size"""
         # Setup
         tenant_ids = ["tenant1", "tenant2", "tenant3", "tenant4", "tenant5"]
-        
+
         # Create a function that returns tenant info based on tenant_id
         def mock_get_tenant_info(tenant_id):
             idx = int(tenant_id.replace("tenant", ""))
@@ -291,7 +291,7 @@ def test_get_tenants_paginated_last_page(self, service_mocks):
         """Test get_tenants_paginated on the last page with fewer items"""
         # Setup
         tenant_ids = ["tenant1", "tenant2", "tenant3", "tenant4", "tenant5"]
-        
+
         # Create a function that returns tenant info based on tenant_id
         def mock_get_tenant_info(tenant_id):
             idx = int(tenant_id.replace("tenant", ""))
@@ -603,15 +603,17 @@ def test_update_tenant_info_name_already_exists(self, service_mocks):
 class TestDeleteTenant:
     """Test cases for delete_tenant function"""
 
-    def test_delete_tenant_success(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_success(self):
         """Test successfully deleting a tenant and all associated resources"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         # Mock dependencies
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
+             patch('backend.services.tenant_service.delete_user_and_cleanup') as mock_delete_user, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -632,6 +634,9 @@ def test_delete_tenant_success(self):
             # Configure mocks
             mock_get_config.return_value = {"tenant_config_id": 1, "config_value": "Test Tenant"}
 
+            # Empty user list
+            mock_get_users.return_value = {"users": [], "total": 0}
+
             # Empty lists for resources
             mock_query_groups.return_value = {"data": []}
             mock_get_models.return_value = []
@@ -647,18 +652,20 @@ def test_delete_tenant_success(self):
             ]
 
             # Execute
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert
             assert result is True
 
-            # Verify soft delete of users was called
-            mock_soft_delete_users.assert_called_once_with(tenant_id, deleted_by)
+            # Verify user cleanup was called
+            mock_get_users.assert_called_once_with(tenant_id, page=1, page_size=10000)
+            mock_delete_user.assert_not_called()
 
             # Verify configs deletion was called
             mock_delete_config.assert_called()
 
-    def test_delete_tenant_not_found(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_not_found(self):
         """Test delete_tenant when tenant doesn't exist"""
         # Setup
         tenant_id = "nonexistent_tenant"
@@ -670,32 +677,34 @@ def test_delete_tenant_not_found(self):
 
         # Execute & Assert
             with pytest.raises(NotFoundException, match="does not exist"):
-                delete_tenant(tenant_id, deleted_by)
+                await delete_tenant(tenant_id, deleted_by)
 
-    def test_delete_tenant_validation_error(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_validation_error(self):
         """Test delete_tenant when validation fails"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         # Mock dependencies to raise ValidationError during deletion
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users:
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users:
             mock_get_config.return_value = {"tenant_config_id": 1}
-            mock_soft_delete_users.side_effect = ValidationError("Database error")
+            mock_get_users.side_effect = ValidationError("Database error")
 
             # Execute & Assert
             with pytest.raises(ValidationError, match="Failed to delete tenant"):
-                delete_tenant(tenant_id, deleted_by)
+                await delete_tenant(tenant_id, deleted_by)
 
-    def test_delete_tenant_with_groups(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_with_groups(self):
         """Test delete_tenant deletes all groups in the tenant"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -708,6 +717,9 @@ def test_delete_tenant_with_groups(self):
 
             mock_get_config.return_value = {"tenant_config_id": 1}
 
+            # Empty user list
+            mock_get_users.return_value = {"users": [], "total": 0}
+
             # Mock groups
             mock_query_groups.return_value = {
                 "data": [
@@ -724,20 +736,21 @@ def test_delete_tenant_with_groups(self):
             mock_get_all_configs.return_value = []
 
             # Execute
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert
             assert result is True
             assert mock_remove_group.call_count == 2
 
-    def test_delete_tenant_with_group_deletion_error(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_with_group_deletion_error(self):
         """Test delete_tenant handles group deletion errors gracefully"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -750,6 +763,9 @@ def test_delete_tenant_with_group_deletion_error(self):
 
             mock_get_config.return_value = {"tenant_config_id": 1}
 
+            # Empty user list
+            mock_get_users.return_value = {"users": [], "total": 0}
+
             # Mock groups - one group
             mock_query_groups.return_value = {
                 "data": [
@@ -768,21 +784,22 @@ def test_delete_tenant_with_group_deletion_error(self):
             mock_get_all_configs.return_value = []
 
             # Execute - should not raise, should handle exception gracefully
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert - deletion should still succeed despite group deletion error
             assert result is True
             # Verify remove_group was called and exception was caught
             mock_remove_group.assert_called_once()
 
-    def test_delete_tenant_with_models(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_with_models(self):
         """Test delete_tenant deletes all models in the tenant"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -810,20 +827,21 @@ def test_delete_tenant_with_models(self):
             mock_get_all_configs.return_value = []
 
             # Execute
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert
             assert result is True
             assert mock_delete_model.call_count == 2
 
-    def test_delete_tenant_with_model_deletion_error(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_with_model_deletion_error(self):
         """Test delete_tenant handles model deletion errors gracefully"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -851,19 +869,20 @@ def test_delete_tenant_with_model_deletion_error(self):
             mock_get_all_configs.return_value = []
 
             # Execute
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert - should succeed despite error
             assert result is True
 
-    def test_delete_tenant_with_agents(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_with_agents(self):
         """Test delete_tenant deletes all agents in the tenant"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -892,7 +911,7 @@ def test_delete_tenant_with_agents(self):
             mock_get_all_configs.return_value = []
 
             # Execute
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert
             assert result is True
@@ -901,14 +920,15 @@ def test_delete_tenant_with_agents(self):
             mock_delete_rel.assert_called()
             mock_delete_agent.assert_called()
 
-    def test_delete_tenant_with_mcp_records(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_with_mcp_records(self):
         """Test delete_tenant deletes all MCP configurations in the tenant"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -936,20 +956,21 @@ def test_delete_tenant_with_mcp_records(self):
             mock_get_all_configs.return_value = []
 
             # Execute
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert
             assert result is True
             assert mock_delete_mcp.call_count == 2
 
-    def test_delete_tenant_with_invitations(self):
+    @pytest.mark.asyncio
+    async def test_delete_tenant_with_invitations(self):
         """Test delete_tenant deletes all invitations in the tenant"""
         # Setup
         tenant_id = "test_tenant"
         deleted_by = "admin_user"
 
         with patch('backend.services.tenant_service.get_single_config_info') as mock_get_config, \
-             patch('backend.services.tenant_service.soft_delete_users_by_tenant_id') as mock_soft_delete_users, \
+             patch('backend.services.tenant_service.get_users_by_tenant_id') as mock_get_users, \
              patch('backend.services.tenant_service.query_groups_by_tenant') as mock_query_groups, \
              patch('backend.services.tenant_service.remove_group') as mock_remove_group, \
              patch('backend.services.tenant_service.get_model_records') as mock_get_models, \
@@ -977,7 +998,7 @@ def test_delete_tenant_with_invitations(self):
             mock_get_all_configs.return_value = []
 
             # Execute
-            result = delete_tenant(tenant_id, deleted_by)
+            result = await delete_tenant(tenant_id, deleted_by)
 
             # Assert
             assert result is True