🐛 Bugfix: create tenant failed

🐛 Bugfix: create tenant failed

Author: WMC001

backend/services/tenant_service.py

@@ -83,6 +83,32 @@ def _ensure_tenant_name_config(tenant_id: str) -> bool:
     return success
 
 
+def check_tenant_name_exists(tenant_name: str, exclude_tenant_id: Optional[str] = None) -> bool:
+    """
+    Check if a tenant with the given name already exists
+
+    Args:
+        tenant_name (str): Tenant name to check
+        exclude_tenant_id (Optional[str]): Tenant ID to exclude from check (for rename operations)
+
+    Returns:
+        bool: True if tenant name already exists, False otherwise
+    """
+    all_tenant_ids = get_all_tenant_ids()
+
+    for tid in all_tenant_ids:
+        # Skip if this is the tenant being updated
+        if exclude_tenant_id and tid == exclude_tenant_id:
+            continue
+
+        # Check if this tenant has the given name
+        name_config = get_single_config_info(tid, TENANT_NAME)
+        if name_config and name_config.get("config_value") == tenant_name:
+            return True
+
+    return False
+
+
 def get_all_tenants() -> List[Dict[str, Any]]:
     """
     Get all tenants
@@ -122,24 +148,19 @@ def create_tenant(tenant_name: str, created_by: Optional[str] = None) -> Dict[st
         Dict[str, Any]: Created tenant information
 
     Raises:
-        ValidationError: When tenant creation fails
+        ValidationError: When tenant creation fails or tenant name already exists
     """
     # Generate a random UUID for tenant_id
     tenant_id = str(uuid.uuid4())
 
-    # Check if tenant already exists (extremely unlikely with UUID, but good practice)
-    try:
-        existing_tenant = get_tenant_info(tenant_id)
-        if existing_tenant:
-            raise ValidationError(f"Tenant {tenant_id} already exists")
-    except NotFoundException:
-        # Tenant doesn't exist, which is what we want
-        pass
-
     # Validate tenant name
     if not tenant_name or not tenant_name.strip():
         raise ValidationError("Tenant name cannot be empty")
 
+    # Check if tenant name already exists
+    if check_tenant_name_exists(tenant_name.strip()):
+        raise ValidationError(f"Tenant with name '{tenant_name.strip()}' already exists")
+
     try:
         # Create default group first
         default_group_id = _create_default_group_for_tenant(tenant_id, created_by)
@@ -215,6 +236,10 @@ def update_tenant_info(tenant_id: str, tenant_name: str, updated_by: Optional[st
     if not tenant_name or not tenant_name.strip():
         raise ValidationError("Tenant name cannot be empty")
 
+    # Check if tenant name already exists (exclude current tenant)
+    if check_tenant_name_exists(tenant_name.strip(), exclude_tenant_id=tenant_id):
+        raise ValidationError(f"Tenant with name '{tenant_name.strip()}' already exists")
+
     # Check if tenant name config exists
     name_config = get_single_config_info(tenant_id, TENANT_NAME)
     if not name_config:

frontend/app/[locale]/tenant-resources/components/UserManageComp.tsx

@@ -103,8 +103,20 @@ function TenantList({
         message.success(t("tenantResources.tenants.created"));
       }
       setModalVisible(false);
-    } catch (err) {
-      message.error(t("tenantResources.tenantOperationFailed"));
+    } catch (err: any) {
+      const errorMessage = err?.response?.data?.message || err?.message || "";
+      const nameConflictMatch = errorMessage.match(/Tenant with name '(.*)' already exists/i);
+
+      if (nameConflictMatch && nameConflictMatch[1]) {
+        // Extract the duplicate name and show translated error
+        message.error(t("tenantResources.tenants.nameExists", { name: nameConflictMatch[1] }));
+      } else if (errorMessage.includes("Tenant name cannot be empty")) {
+        // Handle empty name error
+        message.error(t("tenantResources.tenants.nameRequired"));
+      } else {
+        // Show generic error for other cases
+        message.error(t("tenantResources.tenantOperationFailed"));
+      }
     }
   };
 

frontend/app/[locale]/tenant-resources/components/resources/ModelList.tsx

@@ -68,13 +68,13 @@ export default function ModelList({ tenantId }: { tenantId: string | null }) {
   const handleDelete = async (modelId: string, provider?: string) => {
     try {
       await modelService.deleteCustomModel(modelId, provider);
-      message.success("Model deleted");
+      message.success(t("tenantResources.models.deleteSuccess"));
       refetch();
     } catch (error: any) {
       if (error.response?.data?.message) {
         message.error(error.response.data.message);
       } else {
-        message.error("Delete failed");
+        message.error(t("tenantResources.models.deleteFailed"));
       }
     }
   };
@@ -160,7 +160,7 @@ export default function ModelList({ tenantId }: { tenantId: string | null }) {
           </Tooltip>
           <Popconfirm
             title={t("tenantResources.models.confirmDelete")}
-            description="This action cannot be undone."
+            description={t("common.cannotBeUndone")}
             onConfirm={() => handleDelete(record.displayName, record.source)}
           >
             <Tooltip title={t("tenantResources.models.deleteModel")}>

frontend/hooks/auth/useAuthenticationState.ts

@@ -147,7 +147,7 @@ export function useAuthenticationState(): AuthenticationStateReturn {
           setIsAuthenticated(true);
 
           setTimeout(() => {
-            message.success(t("auth.registrationSuccess"));
+            message.success(t("auth.registerSuccessAutoLogin"));
 
             // Emit register success event to close register modal
             authEventUtils.emitRegisterSuccess();

frontend/public/locales/en/common.json

@@ -1309,6 +1309,10 @@
   "tenantResources.models.type.vlm": "Visual Language Model",
 
   "tenantResources.models.confirmDelete": "Delete model?",
+  "tenantResources.models.editModel": "Edit Model",
+  "tenantResources.models.deleteModel": "Delete Model",
+  "tenantResources.models.deleteSuccess": "Model deleted",
+  "tenantResources.models.deleteFailed": "Delete failed",
   "tenantResources.models.enterDescription": "Enter model description",
   "tenantResources.models.enterName": "Enter model name",
 
@@ -1322,6 +1326,8 @@
   "tenantResources.tenants.tenants": "Tenants",
   "tenantResources.tenants.unnamed": "Unnamed Tenant",
   "tenantResources.tenants.updated": "Tenant updated",
+  "tenantResources.tenants.nameExists": "Tenant name '{{name}}' already exists, please use a different name",
+  "tenantResources.tenants.nameRequired": "Please enter a tenant name",
 
   "tenantResources.users.confirmDelete": "Delete user \"{{name}}\"?",
   "tenantResources.users.deleteUser": "Delete User",

frontend/public/locales/zh/common.json

@@ -1310,6 +1310,10 @@
   "tenantResources.models.type.vlm": "视觉语言模型",
 
   "tenantResources.models.confirmDelete": "删除模型？",
+  "tenantResources.models.editModel": "编辑模型",
+  "tenantResources.models.deleteModel": "删除模型",
+  "tenantResources.models.deleteSuccess": "模型已删除",
+  "tenantResources.models.deleteFailed": "删除模型失败",
   "tenantResources.models.enterDescription": "输入模型描述",
   "tenantResources.models.enterName": "输入模型名称",
 
@@ -1323,6 +1327,8 @@
   "tenantResources.tenants.tenants": "租户",
   "tenantResources.tenants.unnamed": "未命名租户",
   "tenantResources.tenants.updated": "租户已更新",
+  "tenantResources.tenants.nameExists": "租户名称 '{{name}}' 已存在，请使用其他名称",
+  "tenantResources.tenants.nameRequired": "请输入租户名称",
 
   "tenantResources.users.confirmDelete": "删除用户\"{{name}}\"？",
   "tenantResources.users.deleteUser": "删除用户",