Merge remote-tracking branch 'upstream/v2' into PR/14-feat-API-support-documentUrl

Author: wangliang181230

apps/common/locale/manager.py

@@ -25,7 +25,7 @@ def __init__(self, external_locale_path: str = None):
         Args:
             external_locale_path: 外置语言包路径，默认从配置读取
         """
-        from apps.maxkb.const import CONFIG, PROJECT_DIR
+        from maxkb.const import CONFIG, PROJECT_DIR
 
         self.PROJECT_DIR = PROJECT_DIR
         self.external_locale_path = external_locale_path or CONFIG.get(

apps/knowledge/serializers/knowledge.py

@@ -775,6 +775,9 @@ class ImportKnowledge(serializers.Serializer):
         user_id = serializers.UUIDField(required=True, label=_("user id"))
         workspace_id = serializers.CharField(required=True, label=_("workspace id"))
         folder_id = serializers.CharField(required=True, label=_("folder id"))
+        scope = serializers.ChoiceField(
+            required=False, label=_("scope"), default=KnowledgeScope.WORKSPACE, choices=KnowledgeScope.choices
+        )
 
         @transaction.atomic
         def import_knowledge(self, file, is_import_tool=False, with_valid=True):

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

@@ -131,10 +131,10 @@ const exportZipKnowledge: (
 
 /**
  * 导出知识库
- * @param knowledge_name 
- * @param knowledge_id 
- * @param loading 
- * @returns 
+ * @param knowledge_name
+ * @param knowledge_id
+ * @param loading
+ * @returns
  */
 const exportKnowledgeBundle: (
   knowledge_name: string,
@@ -149,6 +149,19 @@ const exportKnowledgeBundle: (
   )
 }
 
+/**
+ * 导入知识库
+ * @param data
+ * @param loading
+ * @returns
+ */
+const importKnowledgeBundle: (
+  data: any,
+  loading: Ref<boolean>
+) => Promise<Result<any>> = (data, loading) => {
+  return post(`${prefix}/import_knowledge`, data, undefined, loading)
+}
+
 /**
  * 生成关联问题
  * @param knowledge_id 知识库id
@@ -518,7 +531,8 @@ export default {
   importKnowledgeWorkflow,
   getMcpTools,
   postTransformWorkflow,
-  exportKnowledgeBundle
+  exportKnowledgeBundle,
+  importKnowledgeBundle
 } as {
   [key: string]: any
 }

ui/src/views/knowledge/component/KnowledgeListContainer.vue

@@ -707,10 +707,10 @@ function importKnowledgeBundle(file: any) {
       if (res?.data) {
         const knowledgeId = res.data.knowledge_id
         const knowledgeType = res.data.type
-        const folderId = folder.currentFolder.id || user.getWorkspaceId()
+        const folderId = folder.currentFolder.id
         await user.profile()
         router.push({
-          path: `/knowledge/${knowledgeId}/${folderId}/${knowledgeType}/document`,
+          path: `/knowledge/${knowledgeId}/${folderId || 'shared'}/${knowledgeType}/document`,
           query: {imported: 'true'},
         })
       }