feat: dataset folder

2023-09-08 18:06:57 +08:00
parent 971c9cb291
commit 0b0f184dd1
22 changed files with 417 additions and 79 deletions
--- a/client/src/pages/api/admin/initv44.ts
+++ b/client/src/pages/api/admin/initv44.ts
@@ -0,0 +1,62 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { authUser } from '@/service/utils/auth';
+import { connectToDatabase, KB } from '@/service/mongo';
+import { KbTypeMap } from '@/constants/kb';
+
+const limit = 50;
+let success = 0;
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await connectToDatabase();
+    await authUser({ req, authRoot: true });
+
+    await initKb();
+
+    jsonRes(res, {});
+  } catch (error) {
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+}
+
+async function initKb(): Promise<any> {
+  try {
+    // 找到所有 type 不存在的 kb
+    const kbList = await KB.find({ type: { $exists: false } }).limit(limit);
+
+    if (kbList.length === 0) return;
+
+    await Promise.allSettled(
+      kbList.map(async (kb) => {
+        let id = '';
+        try {
+          // 创建一组以 kb 的 name，userId 相同文件夹类型的数据
+          const result = await KB.create({
+            parentId: null,
+            userId: kb.userId,
+            avatar: KbTypeMap.folder.avatar,
+            name: kb.name,
+            type: 'folder'
+          });
+          id = result._id;
+          // 将现有的 kb 挂载到这个文件夹下
+          await KB.findByIdAndUpdate(kb._id, {
+            parentId: result._id,
+            type: 'manualData'
+          });
+          console.log(++success);
+        } catch (error) {
+          await KB.findByIdAndDelete(id);
+        }
+      })
+    );
+    return initKb();
+  } catch (error) {
+    return initKb();
+  }
+}
--- a/client/src/pages/api/plugins/kb/create.ts
+++ b/client/src/pages/api/plugins/kb/create.ts
@@ -6,11 +6,7 @@ import type { CreateKbParams } from '@/api/request/kb';

 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
-    const { name, tags, avatar, vectorModel } = req.body as CreateKbParams;
-
-    if (!name || !vectorModel) {
-      throw new Error('缺少参数');
-    }
+    const { name, tags, avatar, vectorModel, parentId, type } = req.body as CreateKbParams;

    // 凭证校验
    const { userId } = await authUser({ req, authToken: true });
@@ -22,7 +18,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
      userId,
      tags,
      vectorModel,
-      avatar
+      avatar,
+      parentId: parentId || null,
+      type
    });

    jsonRes(res, { data: _id });
--- a/client/src/pages/api/plugins/kb/detail.ts
+++ b/client/src/pages/api/plugins/kb/detail.ts
@@ -33,9 +33,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
        _id: data._id,
        avatar: data.avatar,
        name: data.name,
-        userId: data.userId,
-        vectorModel: getVectorModel(data.vectorModel),
-        tags: data.tags.join(' ')
+        userId: data.userId
      }
    });
  } catch (err) {
--- a/client/src/pages/api/plugins/kb/list.ts
+++ b/client/src/pages/api/plugins/kb/list.ts
@@ -2,29 +2,25 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import { KbListItemType } from '@/types/plugin';
 import { getVectorModel } from '@/service/utils/data';
+import { KbListItemType } from '@/types/plugin';

 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
+    const { parentId } = req.query as { parentId: string };
    // 凭证校验
    const { userId } = await authUser({ req, authToken: true });

    await connectToDatabase();

-    const kbList = await KB.find(
-      {
-        userId
-      },
-      '_id avatar name tags vectorModel'
-    ).sort({ updateTime: -1 });
+    const kbList = await KB.find({
+      userId,
+      parentId: parentId || null
+    }).sort({ updateTime: -1 });

    const data = await Promise.all(
      kbList.map(async (item) => ({
-        _id: item._id,
-        avatar: item.avatar,
-        name: item.name,
-        tags: item.tags,
+        ...item.toJSON(),
        vectorModel: getVectorModel(item.vectorModel)
      }))
    );
--- a/client/src/pages/api/plugins/kb/update.ts
+++ b/client/src/pages/api/plugins/kb/update.ts
@@ -6,7 +6,7 @@ import type { KbUpdateParams } from '@/api/request/kb';

 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
-    const { id, name, tags, avatar } = req.body as KbUpdateParams;
+    const { id, name, avatar, tags = '' } = req.body as KbUpdateParams;

    if (!id || !name) {
      throw new Error('缺少参数');
@@ -23,8 +23,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
        userId
      },
      {
-        avatar,
-        name,
+        ...(name && { name }),
+        ...(avatar && { avatar }),
        tags: tags.split(' ').filter((item) => item)
      }
    );
--- a/client/src/pages/app/detail/components/KBSelectModal.tsx
+++ b/client/src/pages/app/detail/components/KBSelectModal.tsx
@@ -11,10 +11,9 @@ import {
  Textarea
 } from '@chakra-ui/react';
 import Avatar from '@/components/Avatar';
-import { KbListItemType } from '@/types/plugin';
 import { useForm } from 'react-hook-form';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
-import type { SelectedKbType } from '@/types/plugin';
+import type { KbListItemType, SelectedKbType } from '@/types/plugin';
 import { useGlobalStore } from '@/store/global';
 import { useToast } from '@/hooks/useToast';
 import MySlider from '@/components/Slider';
--- a/client/src/pages/kb/list/component/CreateModal.tsx
+++ b/client/src/pages/kb/list/component/CreateModal.tsx
@@ -18,7 +18,7 @@ import MySelect from '@/components/Select';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import Tag from '@/components/Tag';

-const CreateModal = ({ onClose }: { onClose: () => void }) => {
+const CreateModal = ({ onClose, parentId }: { onClose: () => void; parentId?: string }) => {
  const [refresh, setRefresh] = useState(false);
  const { toast } = useToast();
  const router = useRouter();
@@ -28,7 +28,9 @@ const CreateModal = ({ onClose }: { onClose: () => void }) => {
      avatar: '/icon/logo.svg',
      name: '',
      tags: [],
-      vectorModel: vectorModelList[0].model
+      vectorModel: vectorModelList[0].model,
+      type: 'dataset',
+      parentId
    }
  });
  const InputRef = useRef<HTMLInputElement>(null);
--- a/client/src/pages/kb/list/component/EditFolderModal.tsx
+++ b/client/src/pages/kb/list/component/EditFolderModal.tsx
@@ -0,0 +1,85 @@
+import React, { useMemo, useRef } from 'react';
+import { ModalFooter, ModalBody, Input, Button } from '@chakra-ui/react';
+import MyModal from '@/components/MyModal';
+import { useTranslation } from 'react-i18next';
+import { useRequest } from '@/hooks/useRequest';
+import { postCreateKb, putKbById } from '@/api/plugins/kb';
+import { FolderAvatarSrc, KbTypeEnum } from '@/constants/kb';
+
+const EditFolderModal = ({
+  onClose,
+  onSuccess,
+  id,
+  parentId,
+  name
+}: {
+  onClose: () => void;
+  onSuccess: () => void;
+  id?: string;
+  parentId?: string;
+  name?: string;
+}) => {
+  const { t } = useTranslation();
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const typeMap = useMemo(
+    () =>
+      id
+        ? {
+            title: t('kb.Edit Folder')
+          }
+        : {
+            title: t('kb.Create Folder')
+          },
+    [id, t]
+  );
+
+  const { mutate: onSave, isLoading } = useRequest({
+    mutationFn: () => {
+      const val = inputRef.current?.value;
+      if (!val) return Promise.resolve('');
+      if (id) {
+        return putKbById({
+          id,
+          name: val
+        });
+      }
+      return postCreateKb({
+        parentId,
+        name: val,
+        type: KbTypeEnum.folder,
+        avatar: FolderAvatarSrc,
+        tags: []
+      });
+    },
+    onSuccess: (res) => {
+      if (!res) return;
+      onSuccess();
+      onClose();
+    }
+  });
+
+  return (
+    <MyModal isOpen onClose={onClose} title={typeMap.title}>
+      <ModalBody>
+        <Input
+          ref={inputRef}
+          defaultValue={name}
+          placeholder={t('kb.Folder Name') || ''}
+          autoFocus
+          maxLength={20}
+        />
+      </ModalBody>
+      <ModalFooter>
+        <Button mr={3} variant={'base'} onClick={onClose}>
+          {t('common.Cancel')}
+        </Button>
+        <Button isLoading={isLoading} onClick={onSave}>
+          {t('Confirm')}
+        </Button>
+      </ModalFooter>
+    </MyModal>
+  );
+};
+
+export default EditFolderModal;
--- a/client/src/pages/kb/list/index.tsx
+++ b/client/src/pages/kb/list/index.tsx
@@ -1,13 +1,14 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import {
  Box,
-  Card,
  Flex,
  Grid,
  useTheme,
-  Button,
+  useDisclosure,
+  Card,
  IconButton,
-  useDisclosure
+  MenuButton,
+  Image
 } from '@chakra-ui/react';
 import { useRouter } from 'next/router';
 import { useUserStore } from '@/store/user';
@@ -17,21 +18,34 @@ import { AddIcon } from '@chakra-ui/icons';
 import { useQuery } from '@tanstack/react-query';
 import { useToast } from '@/hooks/useToast';
 import { delKbById } from '@/api/plugins/kb';
+import { useTranslation } from 'react-i18next';
 import Avatar from '@/components/Avatar';
 import MyIcon from '@/components/Icon';
-import Tag from '@/components/Tag';
 import { serviceSideProps } from '@/utils/i18n';
 import dynamic from 'next/dynamic';
+import { FolderAvatarSrc, KbTypeEnum } from '@/constants/kb';
+import Tag from '@/components/Tag';
+import MyMenu from '@/components/MyMenu';
+import { getErrText } from '@/utils/tools';

 const CreateModal = dynamic(() => import('./component/CreateModal'), { ssr: false });
+const EditFolderModal = dynamic(() => import('./component/EditFolderModal'), { ssr: false });

 const Kb = () => {
+  const { t } = useTranslation();
  const theme = useTheme();
  const router = useRouter();
+  const { parentId } = router.query as { parentId: string };
  const { toast } = useToast();
+
+  const DeleteTipsMap = useRef({
+    [KbTypeEnum.folder]: t('kb.deleteFolderTips'),
+    [KbTypeEnum.dataset]: t('kb.deleteDatasetTips')
+  });
+
  const { openConfirm, ConfirmModal } = useConfirm({
-    title: '删除提示',
-    content: '确认删除该知识库？知识库相关的文件、记录将永久删除，无法恢复！'
+    title: t('common.Delete Warning'),
+    content: ''
  });
  const { myKbList, loadKbList, setKbList } = useUserStore();

@@ -40,8 +54,12 @@ const Kb = () => {
    onOpen: onOpenCreateModal,
    onClose: onCloseCreateModal
  } = useDisclosure();
+  const [editFolderData, setEditFolderData] = useState<{
+    id?: string;
+    name?: string;
+  }>();

-  const { refetch } = useQuery(['loadKbList'], () => loadKbList());
+  const { refetch } = useQuery(['loadKbList', parentId], () => loadKbList(parentId));

  /* 点击删除 */
  const onclickDelKb = useCallback(
@@ -55,7 +73,7 @@ const Kb = () => {
        setKbList(myKbList.filter((item) => item._id !== id));
      } catch (err: any) {
        toast({
-          title: err?.message || '删除失败',
+          title: getErrText(err, '删除失败'),
          status: 'error'
        });
      }
@@ -69,9 +87,49 @@ const Kb = () => {
        <Box flex={1} className="textlg" letterSpacing={1} fontSize={'24px'} fontWeight={'bold'}>
          我的知识库
        </Box>
-        <Button leftIcon={<AddIcon />} variant={'base'} onClick={onOpenCreateModal}>
-          新建
-        </Button>
+        <MyMenu
+          offset={[-30, 10]}
+          width={120}
+          Button={
+            <MenuButton
+              _hover={{
+                color: 'myBlue.600'
+              }}
+            >
+              <Flex
+                alignItems={'center'}
+                border={theme.borders.base}
+                px={5}
+                py={2}
+                borderRadius={'md'}
+                cursor={'pointer'}
+              >
+                <AddIcon mr={2} />
+                <Box>{t('Create New')}</Box>
+              </Flex>
+            </MenuButton>
+          }
+          menuList={[
+            {
+              child: (
+                <Flex>
+                  <Image src={FolderAvatarSrc} alt={''} w={'20px'} mr={1} />
+                  {t('Folder')}
+                </Flex>
+              ),
+              onClick: () => setEditFolderData({})
+            },
+            {
+              child: (
+                <Flex>
+                  <Image src={'/imgs/module/db.png'} alt={''} w={'20px'} mr={1} />
+                  {t('Dataset')}
+                </Flex>
+              ),
+              onClick: onOpenCreateModal
+            }
+          ]}
+        />
      </Flex>
      <Grid
        p={5}
@@ -86,7 +144,7 @@ const Kb = () => {
            py={4}
            px={5}
            cursor={'pointer'}
-            h={'140px'}
+            h={'130px'}
            border={theme.borders.md}
            boxShadow={'none'}
            userSelect={'none'}
@@ -98,14 +156,23 @@ const Kb = () => {
                display: 'block'
              }
            }}
-            onClick={() =>
-              router.push({
-                pathname: '/kb/detail',
-                query: {
-                  kbId: kb._id
-                }
-              })
-            }
+            onClick={() => {
+              if (kb.type === KbTypeEnum.folder) {
+                router.push({
+                  pathname: '/kb/list',
+                  query: {
+                    parentId: kb._id
+                  }
+                });
+              } else if (kb.type === KbTypeEnum.dataset) {
+                router.push({
+                  pathname: '/kb/detail',
+                  query: {
+                    kbId: kb._id
+                  }
+                });
+              }
+            }}
          >
            <Flex alignItems={'center'} h={'38px'}>
              <Avatar src={kb.avatar} borderRadius={'lg'} w={'28px'} />
@@ -126,7 +193,11 @@ const Kb = () => {
                }}
                onClick={(e) => {
                  e.stopPropagation();
-                  openConfirm(() => onclickDelKb(kb._id))();
+                  openConfirm(
+                    () => onclickDelKb(kb._id),
+                    undefined,
+                    DeleteTipsMap.current[kb.type]
+                  )();
                }}
              />
            </Flex>
@@ -140,8 +211,14 @@ const Kb = () => {
              </Flex>
            </Box>
            <Flex justifyContent={'flex-end'} alignItems={'center'} fontSize={'sm'}>
-              <MyIcon mr={1} name="kbTest" w={'12px'} />
-              <Box color={'myGray.500'}>{kb.vectorModel.name}</Box>
+              {kb.type === KbTypeEnum.folder ? (
+                <Box color={'myGray.500'}>{t('Folder')}</Box>
+              ) : (
+                <>
+                  <MyIcon mr={1} name="kbTest" w={'12px'} />
+                  <Box color={'myGray.500'}>{kb.vectorModel.name}</Box>
+                </>
+              )}
            </Flex>
          </Card>
        ))}
@@ -155,7 +232,15 @@ const Kb = () => {
        </Flex>
      )}
      <ConfirmModal />
-      {isOpenCreateModal && <CreateModal onClose={onCloseCreateModal} />}
+      {isOpenCreateModal && <CreateModal onClose={onCloseCreateModal} parentId={parentId} />}
+      {!!editFolderData && (
+        <EditFolderModal
+          onClose={() => setEditFolderData(undefined)}
+          onSuccess={refetch}
+          parentId={parentId}
+          {...editFolderData}
+        />
+      )}
    </PageContainer>
  );
 };