feat: add optional user_id parameter to tool queries and serializers

Author: liuruibin

apps/knowledge/serializers/knowledge_folder.py

@@ -15,8 +15,6 @@ def get_children(self, obj):
 
 
 class KnowledgeFolderFlatSerializer(serializers.ModelSerializer):
-    children = serializers.SerializerMethodField()
-
     class Meta:
         model = KnowledgeFolder
         fields = ['id', 'name', 'desc', 'user_id', 'workspace_id', 'parent_id']

apps/tools/api/tool.py

@@ -194,6 +194,13 @@ def get_parameters():
                 location='query',
                 required=True,
             ),
+            OpenApiParameter(
+                name="user_id",
+                description="创建者id",
+                type=OpenApiTypes.STR,
+                location='query',
+                required=False,
+            ),
             OpenApiParameter(
                 name="tool_type",
                 description="工具类型",

apps/tools/serializers/tool.py

@@ -392,6 +392,7 @@ class Query(serializers.Serializer):
         workspace_id = serializers.CharField(required=True, label=_('workspace id'))
         folder_id = serializers.CharField(required=True, label=_('folder id'))
         name = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('tool name'))
+        user_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('user id'))
         tool_type = serializers.CharField(required=True, label=_('tool type'))
 
         def page_tool(self, current_page: int, page_size: int):
@@ -408,10 +409,12 @@ def page_tool(self, current_page: int, page_size: int):
                 tools = QuerySet(Tool).filter(Q(workspace_id=self.data.get('workspace_id')) &
                                               Q(folder_id__in=all_folders) &
                                               Q(tool_type=self.data.get('tool_type')) &
+                                              Q(user_id=self.data.get('user_id')) &
                                               Q(name__contains=self.data.get('name')))
             else:
                 tools = QuerySet(Tool).filter(Q(workspace_id=self.data.get('workspace_id')) &
                                               Q(folder_id__in=all_folders) &
+                                              Q(user_id=self.data.get('user_id')) &
                                               Q(tool_type=self.data.get('tool_type')))
             return page_search(current_page, page_size, tools, lambda record: ToolModelSerializer(record).data)