feat: add download skill file functionality and update related components

Author: liuruibin

apps/tools/serializers/tool.py

@@ -1356,6 +1356,27 @@ def upload(self):
             file.save(self.data.get('file').read())
             return file_id
 
+    class DownloadSkillFile(serializers.Serializer):
+        user_id = serializers.UUIDField(required=True, label=_("User ID"))
+        workspace_id = serializers.CharField(required=True, label=_("workspace id"))
+        tool_id = serializers.CharField(required=True, label=_("tool id"))
+
+        def download(self):
+            self.is_valid(raise_exception=True)
+            tool = QuerySet(Tool).filter(
+                id=self.data.get('tool_id'), workspace_id=self.data.get('workspace_id'), tool_type=ToolType.SKILL
+            ).first()
+
+            if tool is None:
+                raise AppApiException(500, _('Tool does not exist'))
+            skill_file = QuerySet(File).filter(id=tool.code).first()
+            if skill_file is None:
+                raise AppApiException(500, _('Skill file does not exist'))
+
+            response = HttpResponse(content_type='application/zip', content=skill_file.get_bytes())
+            response['Content-Disposition'] = f'attachment; filename="{skill_file.file_name}"'
+            return response
+
     class GenerateCodeSerializer(serializers.Serializer):
         workspace_id = serializers.CharField(required=True, label=_('Workspace ID'))
         model_id = serializers.UUIDField(required=True, label=_('Model ID'))

apps/tools/urls.py

@@ -28,6 +28,7 @@
     path('workspace/<str:workspace_id>/tool/<str:tool_id>/add_internal_tool', views.ToolView.AddInternalTool.as_view()),
     path('workspace/<str:workspace_id>/tool/<str:tool_id>/add_store_tool', views.ToolView.AddStoreTool.as_view()),
     path('workspace/<str:workspace_id>/tool/<str:tool_id>/update_store_tool', views.ToolView.UpdateStoreTool.as_view()),
+    path('workspace/<str:workspace_id>/tool/<str:tool_id>/download_skill_file', views.ToolView.DownloadSkillFile.as_view()),
     path('workspace/<str:workspace_id>/tool/<str:tool_id>/tool_record/<str:record_id>', views.ToolView.ToolRecord.as_view()),
     path('workspace/<str:workspace_id>/tool/<str:tool_id>/tool_record/<int:current_page>/<int:page_size>', views.ToolView.PageToolRecord.as_view()),
     path('workspace/<str:workspace_id>/tool/<int:current_page>/<int:page_size>', views.ToolView.Page.as_view()),

apps/tools/views/tool.py

@@ -5,11 +5,11 @@
 from rest_framework.request import Request
 from rest_framework.views import APIView
 
+from common import result
 from common.auth import TokenAuth
 from common.auth.authentication import has_permissions, check_batch_permissions
 from common.constants.permission_constants import PermissionConstants, RoleConstants, ViewPermission, CompareConstants
 from common.log.log import log
-from common import result
 from tools.api.tool import ToolCreateAPI, ToolEditAPI, ToolReadAPI, ToolDeleteAPI, ToolTreeReadAPI, ToolDebugApi, \
     ToolExportAPI, ToolImportAPI, ToolPageAPI, PylintAPI, EditIconAPI, GetInternalToolAPI, AddInternalToolAPI, \
     ToolBatchOperateAPI
@@ -25,6 +25,7 @@ def get_tool_operation_object(tool_id):
         }
     return {}
 
+
 def get_tool_operation_object_batch(tool_id_list):
     tool_model_list = QuerySet(model=Tool).filter(id__in=tool_id_list)
     if tool_model_list is not None:
@@ -684,6 +685,22 @@ def put(self, request: Request, workspace_id: str):
                 'file': request.FILES.get('file'),
             }).upload())
 
+    class DownloadSkillFile(APIView):
+        authentication_classes = [TokenAuth]
+
+        @has_permissions(
+            PermissionConstants.TOOL_EDIT.get_workspace_permission(),
+            PermissionConstants.TOOL_EDIT.get_workspace_permission_workspace_manage_role(),
+            RoleConstants.WORKSPACE_MANAGE.get_workspace_role(),
+            RoleConstants.USER.get_workspace_role()
+        )
+        def get(self, request: Request, workspace_id: str, tool_id: str):
+            return ToolSerializer.DownloadSkillFile(data={
+                'workspace_id': workspace_id,
+                'user_id': request.user.id,
+                'tool_id': tool_id,
+            }).download()
+
     class GenerateCode(APIView):
         authentication_classes = [TokenAuth]
 

ui/src/api/system-resource-management/tool.ts

@@ -1,5 +1,5 @@
 import { Result } from '@/request/Result'
-import { get, post, del, put, exportFile, postStream } from '@/request/index'
+import { get, post, del, put, exportFile, postStream, download } from '@/request/index'
 import { type Ref } from 'vue'
 import type { pageRequest } from '@/api/type/common'
 import type { toolData } from '@/api/type/tool'
@@ -146,6 +146,13 @@ const uploadSkillFile: (data: toolData, loading?: Ref<boolean>) => Promise<Resul
   return put(`${prefix}/upload_skill_file`, data, undefined, loading)
 }
 
+const downloadSkillFile: (tool_id: string, loading?: Ref<boolean>) => Promise<Result<any>> = (
+  tool_id,
+  loading,
+) => {
+  return download(`${prefix}/${tool_id}/download_skill_file`, 'GET', undefined, undefined, loading)
+}
+
 const generateCode: (data: any) => Promise<Result<any>> = (data: any) => {
   const p = (window.MaxKB?.prefix ? window.MaxKB?.prefix : '/admin') + '/api'
   return postStream(`${p}${prefix}/generate_code`, data)
@@ -227,6 +234,7 @@ export default {
   pageToolRecord,
   getToolRecordDetail,
   uploadSkillFile,
+  downloadSkillFile,
   generateCode,
   listToolWorkflowVersion,
   updateToolWorkflowVersion,

ui/src/api/system-shared/tool.ts

@@ -1,5 +1,5 @@
 import {Result} from '@/request/Result'
-import {get, post, del, put, exportFile, postStream} from '@/request/index'
+import { get, post, del, put, exportFile, postStream, download } from '@/request/index'
 import {type Ref} from 'vue'
 import type {pageRequest} from '@/api/type/common'
 import type {toolData, AddInternalToolParam} from '@/api/type/tool'
@@ -200,6 +200,13 @@ const uploadSkillFile: (data: toolData, loading?: Ref<boolean>) => Promise<Resul
   return put(`${prefix}/upload_skill_file`, data, undefined, loading)
 }
 
+const downloadSkillFile: (tool_id: string, loading?: Ref<boolean>) => Promise<Result<any>> = (
+  tool_id,
+  loading,
+) => {
+  return download(`${prefix}/${tool_id}/download_skill_file`, 'GET', undefined, undefined, loading)
+}
+
 const generateCode: (data: any) => Promise<Result<any>> = (
   data: any,
 ) => {
@@ -301,6 +308,7 @@ export default {
   pageToolRecord,
   getToolRecordDetail,
   uploadSkillFile,
+  downloadSkillFile,
   generateCode,
   putToolWorkflow,
   importToolWorkflow,

ui/src/api/tool/tool.ts

@@ -1,5 +1,5 @@
 import { Result } from '@/request/Result'
-import { get, post, del, put, exportFile, postStream } from '@/request/index'
+import { get, post, del, put, exportFile, postStream, download } from '@/request/index'
 import { type Ref } from 'vue'
 import type { pageRequest } from '@/api/type/common'
 import type { AddInternalToolParam, toolData } from '@/api/type/tool'
@@ -195,6 +195,14 @@ const uploadSkillFile: (data: toolData, loading?: Ref<boolean>) => Promise<Resul
 ) => {
   return put(`${prefix.value}/upload_skill_file`, data, undefined, loading)
 }
+
+const downloadSkillFile: (tool_id: string, loading?: Ref<boolean>) => Promise<Result<any>> = (
+  tool_id,
+  loading,
+) => {
+  return download(`${prefix.value}/${tool_id}/download_skill_file`, 'GET', undefined, undefined, loading)
+}
+
 /**
  * 保存工具工作流
  * @param tool_id
@@ -348,6 +356,7 @@ export default {
   pageToolRecord,
   getToolRecordDetail,
   uploadSkillFile,
+  downloadSkillFile,
   putToolWorkflow,
   importToolWorkflow,
   listToolWorkflowVersion,

ui/src/views/tool/SkillToolFormDrawer.vue

@@ -145,17 +145,19 @@
                 </div>
               </el-card>
             </template>
-
-            <el-upload
-              v-model:file-list="form.fileList"
-              action="#"
-              :auto-upload="false"
-              :show-file-list="false"
-              accept=".zip"
-              :on-change="fileHandleChange"
-            >
-              <el-button link type="primary">{{ $t('views.tool.skill.reUpload') }}</el-button>
-            </el-upload>
+            <div class="flex">
+              <el-upload
+                v-model:file-list="form.fileList"
+                action="#"
+                :auto-upload="false"
+                :show-file-list="false"
+                accept=".zip"
+                :on-change="fileHandleChange"
+              >
+                <el-button link type="primary">{{ $t('views.tool.skill.reUpload') }}</el-button>
+              </el-upload>
+              <el-button link type="primary" @click="downloadZip">下载</el-button>
+            </div>
           </div>
           <el-upload
             v-else
@@ -378,6 +380,25 @@ const fileHandleChange = (file: any, fileList: UploadFiles) => {
     })
 }
 
+const downloadZip = () => {
+  if (!form.value.code) {
+    MsgError(t('views.tool.skill.noFileTip'))
+    return
+  }
+  const fileName = form.value.fileList && form.value.fileList[0] ? form.value.fileList[0].name : `${form.value.name}.zip`
+  loadSharedApi({ type: 'tool', systemType: apiType.value })
+    .downloadSkillFile(form.value.id as string)
+    .then((res: any) => {
+      const url = window.URL.createObjectURL(new Blob([res]))
+      const link = document.createElement('a')
+      link.href = url
+      link.setAttribute('download', fileName)
+      document.body.appendChild(link)
+      link.click()
+      window.URL.revokeObjectURL(link.href)
+    })
+}
+
 const submit = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate((valid: any) => {