Merge branch 'main' into pr@main@feat_user_ws_api_doc

Author: fit2cloud-chenyw

backend/apps/datasource/api/table_relation.py

@@ -2,16 +2,18 @@
 # Date: 2025/9/24
 from typing import List
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Path
 
 from apps.datasource.models.datasource import CoreDatasource
+from apps.swagger.i18n import PLACEHOLDER_PREFIX
 from common.core.deps import SessionDep
 
-router = APIRouter(tags=["table_relation"], prefix="/table_relation")
+router = APIRouter(tags=["Table Relation"], prefix="/table_relation")
 
 
-@router.post("/save/{ds_id}")
-async def save_relation(session: SessionDep, ds_id: int, relation: List[dict]):
+@router.post("/save/{ds_id}", response_model=List[dict], summary=f"{PLACEHOLDER_PREFIX}tr_save")
+async def save_relation(session: SessionDep, relation: List[dict],
+                        ds_id: int = Path(..., description=f"{PLACEHOLDER_PREFIX}ds_id")):
     ds = session.get(CoreDatasource, ds_id)
     if ds:
         ds.table_relation = relation
@@ -21,8 +23,8 @@ async def save_relation(session: SessionDep, ds_id: int, relation: List[dict]):
     return True
 
 
-@router.post("/get/{ds_id}")
-async def save_relation(session: SessionDep, ds_id: int):
+@router.post("/get/{ds_id}", response_model=List[dict], summary=f"{PLACEHOLDER_PREFIX}tr_get")
+async def save_relation(session: SessionDep, ds_id: int = Path(..., description=f"{PLACEHOLDER_PREFIX}ds_id")):
     ds = session.get(CoreDatasource, ds_id)
     if ds:
         return ds.table_relation if ds.table_relation else []

backend/apps/mcp/mcp.py

@@ -33,7 +33,7 @@
     tokenUrl=f"{settings.API_V1_STR}/login/access-token"
 )
 
-router = APIRouter(tags=["mcp"], prefix="/mcp")
+router = APIRouter(tags=["mcp"], prefix="/mcp", include_in_schema=False)
 
 
 # @router.post("/access_token", operation_id="access_token")

backend/apps/swagger/i18n.py

@@ -54,6 +54,14 @@ def load_translation(lang: str) -> Dict[str, str]:
         "name": "system_ws",
         "description": f"{PLACEHOLDER_PREFIX}system_ws_api"
     }
+        "name": "Table Relation",
+        "description": f"{PLACEHOLDER_PREFIX}tr_api"
+    },
+    {
+        "name": "Data Permission",
+        "description": f"{PLACEHOLDER_PREFIX}per_api"
+    },
+
 ]
 
 

backend/apps/swagger/locales/en.json

@@ -24,48 +24,59 @@
   "ds_excel": "File",
 
   "system": "System Management",
-"system_user_api": "User APIs",
-"system_user_current_user": "Get Current User",
-"system_user_current_user_desc": "Retrieve information of the currently logged-in user",
-"system_user_grid": "Get User List",
-"user_name": "Username",
-"user_account": "Account",
-"user_email": "User Email",
-"page_num": "Page Number",
-"page_size": "Page Size",
-"keyword": "Search Keyword",
-"status": "Status",
-"origin": "Origin",
-"oid": "Workspace ID",
-"grid_items": "List Data",
-"grid_total": "Total Count",
-"grid_total_pages": "Total Pages",
-"create_time": "Creation Time",
-"language": "Language",
-"switch_oid_api": "Switch Workspace",
-"user_detail_api": "Get User Details",
-"uid": "User ID",
-"user_create_api": "Create User",
-"user_update_api": "Update User",
-"user_del_api": "Delete User",
-"user_batchdel_api": "Batch Delete Users",
-"language_change": "Change Language",
-"reset_pwd": "Reset Password",
-"update_pwd": "Update Password",
-"update_status": "Toggle Status",
-"origin_pwd": "Original Password",
-"new_pwd": "New Password",
+  "system_user_api": "User APIs",
+  "system_user_current_user": "Get Current User",
+  "system_user_current_user_desc": "Retrieve information of the currently logged-in user",
+  "system_user_grid": "Get User List",
+  "user_name": "Username",
+  "user_account": "Account",
+  "user_email": "User Email",
+  "page_num": "Page Number",
+  "page_size": "Page Size",
+  "keyword": "Search Keyword",
+  "status": "Status",
+  "origin": "Origin",
+  "oid": "Workspace ID",
+  "grid_items": "List Data",
+  "grid_total": "Total Count",
+  "grid_total_pages": "Total Pages",
+  "create_time": "Creation Time",
+  "language": "Language",
+  "switch_oid_api": "Switch Workspace",
+  "user_detail_api": "Get User Details",
+  "uid": "User ID",
+  "user_create_api": "Create User",
+  "user_update_api": "Update User",
+  "user_del_api": "Delete User",
+  "user_batchdel_api": "Batch Delete Users",
+  "language_change": "Change Language",
+  "reset_pwd": "Reset Password",
+  "update_pwd": "Update Password",
+  "update_status": "Toggle Status",
+  "origin_pwd": "Original Password",
+  "new_pwd": "New Password",
 
-"system_ws_api": "Workspace APIs",
-"ws_user_grid_api": "Get Workspace User List",
-"ws_user_bind_api": "Bind User to Workspace",
-"ws_user_unbind_api": "Remove User from Workspace",
-"ws_user_status_api": "Toggle User Role",
-"ws_all_api": "Get All Workspaces",
-"ws_create_api": "Create Workspace",
-"ws_update_api": "Update Workspace",
-"ws_query_api": "Get Workspace Details",
-"ws_del_api": "Delete Workspace",
+  "system_ws_api": "Workspace APIs",
+  "ws_user_grid_api": "Get Workspace User List",
+  "ws_user_bind_api": "Bind User to Workspace",
+  "ws_user_unbind_api": "Remove User from Workspace",
+  "ws_user_status_api": "Toggle User Role",
+  "ws_all_api": "Get All Workspaces",
+  "ws_create_api": "Create Workspace",
+  "ws_update_api": "Update Workspace",
+  "ws_query_api": "Get Workspace Details",
+  "ws_del_api": "Delete Workspace",
 
-"weight": "Weight (1: Admin, 0: Regular User)"
+  "weight": "Weight (1: Admin, 0: Regular User)"
+  
+  "per_api": "Data Permission",
+  "per_save": "Save Permission",
+  "per_delete": "Delete Permission",
+  "per_id": "Permission ID",
+  "per_list": "Get Permission List",
+  "per_get": "Get Permission Item Info",
+
+  "tr_api": "Table Relation",
+  "tr_save": "Save Table Relation",
+  "tr_get": "Get Table Relation"
 }

backend/apps/swagger/locales/zh.json

@@ -68,4 +68,15 @@
   "ws_del_api": "删除工作空间",
 
   "weight": "权重(1: 管理员, 0: 普通用户)"
+
+  "per_api": "数据权限",
+  "per_save": "保存权限",
+  "per_delete": "删除权限",
+  "per_id": "权限 ID",
+  "per_list": "获取权限列表",
+  "per_get": "获取单条权限详情",
+
+  "tr_api": "表关联关系",
+  "tr_save": "保存关联关系",
+  "tr_get": "查询关联关系"
 }