v4.6-3 (#471)

projects/app/src/web/core/app/basicSettings.ts

@@ -8,7 +8,7 @@ import {
   FlowNodeSpecialInputKeyEnum
 } from '@fastgpt/global/core/module/node/constant';
 import { SystemInputEnum } from '@/constants/app';
-import type { SelectedDatasetType } from '@/types/core/dataset';
+import type { SelectedDatasetType } from '@fastgpt/global/core/module/api.d';
 import type { FlowNodeInputItemType } from '@fastgpt/global/core/module/node/type.d';
 import type { AIChatProps } from '@/types/core/aiChat';
 import { getGuideModule, splitGuideModule } from '@/global/core/app/modules/utils';

projects/app/src/web/core/dataset/api.ts

@@ -1,16 +1,20 @@
 import { GET, POST, PUT, DELETE } from '@/web/common/api/request';
-import type { DatasetItemType, DatasetPathItemType } from '@/types/core/dataset';
+import type { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type.d';
+import type { DatasetItemType } from '@fastgpt/global/core/dataset/type.d';
 import type {
   DatasetUpdateParams,
-  CreateDatasetParams,
   SearchTestProps,
   GetDatasetCollectionsProps,
-  PushDataProps,
   GetDatasetDataListProps,
   CreateDatasetCollectionParams,
-  UpdateDatasetCollectionParams,
-  SetOneDatasetDataProps
+  UpdateDatasetCollectionParams
 } from '@/global/core/api/datasetReq.d';
+import type {
+  PushDatasetDataProps,
+  UpdateDatasetDataProps,
+  CreateDatasetParams,
+  InsertOneDatasetDataProps
+} from '@/global/core/dataset/api.d';
 import type { PushDataResponse } from '@/global/core/api/datasetRes.d';
 import type {
   DatasetCollectionItemType,
@@ -20,8 +24,7 @@ import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constant';
 import { getToken } from '@/web/support/user/auth';
 import download from 'downloadjs';
 import type { DatasetDataItemType } from '@fastgpt/global/core/dataset/type';
-import { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type';
-import { DatasetCollectionsListItemType } from '@/global/core/dataset/response';
+import type { DatasetCollectionsListItemType } from '@/global/core/dataset/type.d';
 import { PagingData } from '@/types';
 
 /* ======================== dataset ======================= */
@@ -34,7 +37,7 @@ export const getDatasets = (data: { parentId?: string; type?: `${DatasetTypeEnum
 export const getAllDataset = () => GET<DatasetItemType[]>(`/core/dataset/allDataset`);
 
 export const getDatasetPaths = (parentId?: string) =>
-  GET<DatasetPathItemType[]>('/core/dataset/paths', { parentId });
+  GET<ParentTreePathItemType[]>('/core/dataset/paths', { parentId });
 
 export const getDatasetById = (id: string) => GET<DatasetItemType>(`/core/dataset/detail?id=${id}`);
 
@@ -64,58 +67,39 @@ export const delDatasetCollectionById = (params: { collectionId: string }) =>
   DELETE(`/core/dataset/collection/delById`, params);
 
 /* =============================== data ==================================== */
-
 /* get dataset list */
 export const getDatasetDataList = (data: GetDatasetDataListProps) =>
-  POST(`/core/dataset/data/getDataList`, data);
-
-/**
- * export and download data
- */
-export const exportDatasetData = (data: { datasetId: string }) =>
-  fetch(`/api/core/dataset/data/exportAll?datasetId=${data.datasetId}`, {
-    method: 'GET',
-    headers: {
-      token: getToken()
-    }
-  })
-    .then(async (res) => {
-      if (!res.ok) {
-        const data = await res.json();
-        throw new Error(data?.message || 'Export failed');
-      }
-      return res.blob();
-    })
-    .then((blob) => download(blob, 'dataset.csv', 'text/csv'));
-
-/* get length of system training queue */
-export const getTrainingQueueLen = () => GET<number>(`/core/dataset/data/getQueueLen`);
+  POST(`/core/dataset/data/list`, data);
 
 export const getDatasetDataItemById = (dataId: string) =>
-  GET<DatasetDataItemType>(`/core/dataset/data/getDataById`, { dataId });
+  GET<DatasetDataItemType>(`/core/dataset/data/detail`, { dataId });
 
 /**
  * push data to training queue
  */
-export const postChunks2Dataset = (data: PushDataProps) =>
+export const postChunks2Dataset = (data: PushDatasetDataProps) =>
   POST<PushDataResponse>(`/core/dataset/data/pushData`, data);
 
 /**
  * insert one data to dataset (immediately insert)
  */
-export const postData2Dataset = (data: SetOneDatasetDataProps) =>
+export const postInsertData2Dataset = (data: InsertOneDatasetDataProps) =>
   POST<string>(`/core/dataset/data/insertData`, data);
 
 /**
- * 更新一条数据
+ * update one datasetData by id
  */
-export const putDatasetDataById = (data: SetOneDatasetDataProps) =>
-  PUT('/core/dataset/data/updateData', data);
+export const putDatasetDataById = (data: UpdateDatasetDataProps) =>
+  PUT('/core/dataset/data/update', data);
 /**
  * 删除一条知识库数据
  */
 export const delOneDatasetDataById = (dataId: string) =>
-  DELETE(`/core/dataset/data/delDataById?dataId=${dataId}`);
+  DELETE<string>(`/core/dataset/data/delete`, { dataId });
+
+/* ================ training ==================== */
+/* get length of system training queue */
+export const getTrainingQueueLen = () => GET<number>(`/core/dataset/training/getQueueLen`);
 
 /* ================== file ======================== */
 export const getFileViewUrl = (fileId: string) =>

projects/app/src/web/core/dataset/components/SelectCollections.tsx

@@ -10,7 +10,7 @@ import { DatasetCollectionTypeEnum } from '@fastgpt/global/core/dataset/constant
 import { getCollectionIcon } from '@fastgpt/global/core/dataset/utils';
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 
 const SelectCollections = ({
   datasetId,

projects/app/src/web/core/dataset/store/dataset.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
-import type { DatasetItemType } from '@/types/core/dataset';
+import type { DatasetItemType } from '@fastgpt/global/core/dataset/type.d';
 import { getAllDataset, getDatasets, getDatasetById, putDatasetById } from '@/web/core/dataset/api';
 import { defaultDatasetDetail } from '@/constants/dataset';
 import type { DatasetUpdateParams } from '@/global/core/api/datasetReq.d';
@@ -69,7 +69,7 @@ export const useDatasetStore = create<State>()(
                 ? {
                     ...item,
                     ...data,
-                    tags: data.tags || ''
+                    tags: data.tags || []
                   }
                 : item
             );

projects/app/src/web/core/dataset/store/markdata.ts

@@ -1,7 +1,6 @@
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
-import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 
 export type MarkDataStore = {
   chatItemId: string;

projects/app/src/web/core/dataset/utils.ts

@@ -1,7 +1,8 @@
 import { getFileViewUrl, postChunks2Dataset } from '@/web/core/dataset/api';
 import { TrainingModeEnum } from '@fastgpt/global/core/dataset/constant';
-import { DatasetChunkItemType } from '@fastgpt/global/core/dataset/type';
 import { delay } from '@/utils/tools';
+import { strIsLink } from '@fastgpt/global/common/string/tools';
+import type { PushDatasetDataChunkProps } from '@fastgpt/global/core/dataset/api.d';
 
 export async function chunksUpload({
   collectionId,
@@ -15,12 +16,12 @@ export async function chunksUpload({
   collectionId: string;
   billId: string;
   mode: `${TrainingModeEnum}`;
-  chunks: DatasetChunkItemType[];
+  chunks: PushDatasetDataChunkProps[];
   prompt?: string;
   rate?: number;
   onUploading?: (insertLen: number, total: number) => void;
 }) {
-  async function upload(data: DatasetChunkItemType[]) {
+  async function upload(data: PushDatasetDataChunkProps[]) {
     return postChunks2Dataset({
       collectionId,
       data,
@@ -51,6 +52,9 @@ export async function chunksUpload({
 }
 
 export async function getFileAndOpen(fileId: string) {
+  if (strIsLink(fileId)) {
+    return window.open(fileId, '_blank');
+  }
   const url = await getFileViewUrl(fileId);
   const asPath = `${location.origin}${url}`;
   window.open(asPath, '_blank');