v4.6 -1 (#459)

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

@@ -1,5 +1,5 @@
 import { GET, POST, PUT, DELETE } from '@/web/common/api/request';
-import type { DatasetItemType, DatasetsItemType, DatasetPathItemType } from '@/types/core/dataset';
+import type { DatasetItemType, DatasetPathItemType } from '@/types/core/dataset';
 import type {
   DatasetUpdateParams,
   CreateDatasetParams,
@@ -12,27 +12,26 @@ import type {
   SetOneDatasetDataProps
 } from '@/global/core/api/datasetReq.d';
 import type { PushDataResponse } from '@/global/core/api/datasetRes.d';
-import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
+import type {
+  DatasetCollectionItemType,
+  SearchDataResponseItemType
+} from '@fastgpt/global/core/dataset/type';
 import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constant';
-import type { GSFileInfoType } from '@/types/common/file';
 import { getToken } from '@/web/support/user/auth';
 import download from 'downloadjs';
-import type {
-  DatasetCollectionSchemaType,
-  DatasetDataItemType
-} from '@fastgpt/global/core/dataset/type';
+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 { PagingData } from '@/types';
 
 /* ======================== dataset ======================= */
 export const getDatasets = (data: { parentId?: string; type?: `${DatasetTypeEnum}` }) =>
-  GET<DatasetsItemType[]>(`/core/dataset/list`, data);
+  GET<DatasetItemType[]>(`/core/dataset/list`, data);
 
 /**
  * get type=dataset list
  */
-export const getAllDataset = () => GET<DatasetsItemType[]>(`/core/dataset/allDataset`);
+export const getAllDataset = () => GET<DatasetItemType[]>(`/core/dataset/allDataset`);
 
 export const getDatasetPaths = (parentId?: string) =>
   GET<DatasetPathItemType[]>('/core/dataset/paths', { parentId });
@@ -56,7 +55,7 @@ export const getDatasetCollections = (data: GetDatasetCollectionsProps) =>
 export const getDatasetCollectionPathById = (parentId: string) =>
   GET<ParentTreePathItemType[]>(`/core/dataset/collection/paths`, { parentId });
 export const getDatasetCollectionById = (id: string) =>
-  GET<DatasetCollectionSchemaType>(`/core/dataset/collection/detail`, { id });
+  GET<DatasetCollectionItemType>(`/core/dataset/collection/detail`, { id });
 export const postDatasetCollection = (data: CreateDatasetCollectionParams) =>
   POST<string>(`/core/dataset/collection/create`, data);
 export const putDatasetCollectionById = (data: UpdateDatasetCollectionParams) =>
@@ -119,7 +118,5 @@ export const delOneDatasetDataById = (dataId: string) =>
   DELETE(`/core/dataset/data/delDataById?dataId=${dataId}`);
 
 /* ================== file ======================== */
-export const getFileInfoById = (fileId: string) =>
-  GET<GSFileInfoType>(`/core/dataset/file/detail`, { fileId });
-export const delDatasetEmptyFiles = (datasetId: string) =>
-  DELETE(`/core/dataset/file/delEmptyFiles`, { datasetId });
+export const getFileViewUrl = (fileId: string) =>
+  GET<string>('/core/dataset/file/getPreviewUrl', { fileId });

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

@@ -1,17 +1,17 @@
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
-import type { DatasetItemType, DatasetsItemType } from '@/types/core/dataset';
+import type { DatasetItemType } from '@/types/core/dataset';
 import { getAllDataset, getDatasets, getDatasetById, putDatasetById } from '@/web/core/dataset/api';
-import { defaultKbDetail } from '@/constants/dataset';
+import { defaultDatasetDetail } from '@/constants/dataset';
 import type { DatasetUpdateParams } from '@/global/core/api/datasetReq.d';
 
 type State = {
-  allDatasets: DatasetsItemType[];
-  loadAllDatasets: () => Promise<DatasetsItemType[]>;
-  myDatasets: DatasetsItemType[];
+  allDatasets: DatasetItemType[];
+  loadAllDatasets: () => Promise<DatasetItemType[]>;
+  myDatasets: DatasetItemType[];
   loadDatasets: (parentId?: string) => Promise<any>;
-  setDatasets(val: DatasetsItemType[]): void;
+  setDatasets(val: DatasetItemType[]): void;
   datasetDetail: DatasetItemType;
   loadDatasetDetail: (id: string, init?: boolean) => Promise<DatasetItemType>;
   updateDataset: (data: DatasetUpdateParams) => Promise<any>;
@@ -42,7 +42,7 @@ export const useDatasetStore = create<State>()(
             state.myDatasets = val;
           });
         },
-        datasetDetail: defaultKbDetail,
+        datasetDetail: defaultDatasetDetail,
         async loadDatasetDetail(id: string, init = false) {
           if (!id || (id === get().datasetDetail._id && !init)) return get().datasetDetail;
 
@@ -69,7 +69,7 @@ export const useDatasetStore = create<State>()(
                 ? {
                     ...item,
                     ...data,
-                    tags: data.tags?.split(' ') || []
+                    tags: data.tags || ''
                   }
                 : item
             );

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

@@ -1,4 +1,4 @@
-import { postChunks2Dataset } from '@/web/core/dataset/api';
+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';
@@ -49,3 +49,9 @@ export async function chunksUpload({
 
   return { insertLen: successInsert };
 }
+
+export async function getFileAndOpen(fileId: string) {
+  const url = await getFileViewUrl(fileId);
+  const asPath = `${location.origin}${url}`;
+  window.open(asPath, '_blank');
+}