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

feat: add scope parameter to ToolTreeSerializer and update get_tools method

Browse Source
This commit is contained in:
CaptainB 2025-07-09 10:58:56 +08:00
parent ee967606cf
commit 4eda4a0d1b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,6 +538,7 @@ class ToolSerializer(serializers.Serializer):
class ToolTreeSerializer(serializers.Serializer): class ToolTreeSerializer(serializers.Serializer):
workspace_id = serializers.CharField(required=True, label=_('workspace id')) workspace_id = serializers.CharField(required=True, label=_('workspace id'))
scope = serializers.CharField(required=True, label=_('scope'))
def get_tools(self, folder_id): def get_tools(self, folder_id):
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
@ -553,8 +554,11 @@ class ToolTreeSerializer(serializers.Serializer):
folders_data = ToolFolderFlatSerializer(child_folders, many=True).data folders_data = ToolFolderFlatSerializer(child_folders, many=True).data
# 获取当前文件夹下的工具 # 获取当前文件夹下的工具
tools = QuerySet(Tool).filter(Q(workspace_id=self.data.get('workspace_id')) & tools = QuerySet(Tool).filter(
Q(folder_id=folder_id)) Q(workspace_id=self.data.get('workspace_id')) &
Q(scope=self.data.get('scope')) &
Q(folder_id=folder_id)
)
tools_data = ToolModelSerializer(tools, many=True).data tools_data = ToolModelSerializer(tools, many=True).data
# 返回包含文件夹和工具的结构 # 返回包含文件夹和工具的结构

2
apps/tools/views/tool.py
View File

@ -68,7 +68,7 @@ class ToolView(APIView):
) )
def get(self, request: Request, workspace_id: str): def get(self, request: Request, workspace_id: str):
return result.success(ToolTreeSerializer( return result.success(ToolTreeSerializer(
data={'workspace_id': workspace_id} data={'workspace_id': workspace_id, 'scope': ToolScope.WORKSPACE, 'user_id': request.user.id}
).get_tools(request.query_params.get('folder_id'))) ).get_tools(request.query_params.get('folder_id')))
class Debug(APIView): class Debug(APIView):