zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enhance Tool API to return folder and tool structure for a given folder ID

Browse Source
This commit is contained in:
CaptainB 2025-05-07 10:05:53 +08:00
parent 115e11052c
commit 4cb513dd3f
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/tools/serializers/tool.py
View File

@ -18,6 +18,7 @@ from common.result import result
from common.utils.tool_code import ToolExecutor from common.utils.tool_code import ToolExecutor
from maxkb.const import CONFIG from maxkb.const import CONFIG
from tools.models import Tool, ToolScope, ToolFolder from tools.models import Tool, ToolScope, ToolFolder
from tools.serializers.tool_folder import ToolFolderTreeSerializer
tool_executor = ToolExecutor(CONFIG.get('SANDBOX')) tool_executor = ToolExecutor(CONFIG.get('SANDBOX'))
@ -325,14 +326,25 @@ class ToolTreeSerializer(serializers.Serializer):
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
if not folder_id: if not folder_id:
folder_id = 'root' folder_id = 'root'
root = ToolFolder.objects.filter(id=folder_id).first() # 获取当前文件夹
if not root: current_folder = ToolFolder.objects.filter(id=folder_id).first()
if not current_folder:
raise serializers.ValidationError(_('Folder not found')) raise serializers.ValidationError(_('Folder not found'))
# 使用MPTT的get_descendants()方法获取所有相关节点
all_folders = root.get_descendants(include_self=True)
tools = QuerySet(Tool).filter(workspace_id=self.data.get('workspace_id'), folder_id__in=all_folders) # 获取当前文件夹下的直接子文件夹
return ToolModelSerializer(tools, many=True).data child_folders = ToolFolder.objects.filter(parent=current_folder)
folders_data = ToolFolderTreeSerializer(child_folders, many=True).data
# 获取当前文件夹下的工具
tools = QuerySet(Tool).filter(Q(workspace_id=self.data.get('workspace_id')) &
Q(folder_id=folder_id))
tools_data = ToolModelSerializer(tools, many=True).data
# 返回包含文件夹和工具的结构
return {
'folders': folders_data,
'tools': tools_data,
}
class Query(serializers.Serializer): class Query(serializers.Serializer):
workspace_id = serializers.CharField(required=True, label=_('workspace id')) workspace_id = serializers.CharField(required=True, label=_('workspace id'))