v4.6-3 (#471)

projects/app/src/global/core/api/datasetReq.d.ts

@@ -2,7 +2,7 @@ import { DatasetCollectionTypeEnum, DatasetTypeEnum } from '@fastgpt/global/core
 import type { RequestPaging } from '@/types';
 import { TrainingModeEnum } from '@fastgpt/global/core/dataset/constant';
 import type { SearchTestItemType } from '@/types/core/dataset';
-import { DatasetChunkItemType, UploadChunkItemType } from '@fastgpt/global/core/dataset/type';
+import { UploadChunkItemType } from '@fastgpt/global/core/dataset/type';
 import { DatasetCollectionSchemaType } from '@fastgpt/global/core/dataset/type';
 import { PermissionTypeEnum } from '@fastgpt/global/support/permission/constant';
 
@@ -10,19 +10,11 @@ import { PermissionTypeEnum } from '@fastgpt/global/support/permission/constant'
 export type DatasetUpdateParams = {
   id: string;
   parentId?: string;
-  tags?: string;
+  tags?: string[];
   name?: string;
   avatar?: string;
   permission?: `${PermissionTypeEnum}`;
 };
-export type CreateDatasetParams = {
-  parentId?: string;
-  name: string;
-  tags: string;
-  avatar: string;
-  vectorModel?: string;
-  type: `${DatasetTypeEnum}`;
-};
 
 export type SearchTestProps = {
   datasetId: string;
@@ -54,20 +46,6 @@ export type UpdateDatasetCollectionParams = {
 };
 
 /* ==== data ===== */
-export type SetOneDatasetDataProps = {
-  id?: string;
-  collectionId: string;
-  q?: string; // embedding content
-  a?: string; // bonus content
-};
-export type PushDataProps = {
-  collectionId: string;
-  data: DatasetChunkItemType[];
-  mode: `${TrainingModeEnum}`;
-  prompt?: string;
-  billId?: string;
-};
-
 export type GetDatasetDataListProps = RequestPaging & {
   searchText?: string;
   collectionId: string;

projects/app/src/global/core/dataset/api.d.ts

@@ -0,0 +1,35 @@
+import { PushDatasetDataChunkProps } from '@fastgpt/global/core/dataset/api';
+import { TrainingModeEnum } from '@fastgpt/global/core/dataset/constant';
+import { DatasetDataIndexItemType } from '@fastgpt/global/core/dataset/type';
+
+/* ================= dataset ===================== */
+export type CreateDatasetParams = {
+  parentId?: string;
+  name: string;
+  tags: string;
+  avatar: string;
+  vectorModel?: string;
+  type: `${DatasetTypeEnum}`;
+};
+
+/* ================= collection ===================== */
+
+/* ================= data ===================== */
+export type InsertOneDatasetDataProps = PushDatasetDataChunkProps & {
+  collectionId: string;
+};
+export type PushDatasetDataProps = {
+  collectionId: string;
+  data: PushDatasetDataChunkProps[];
+  mode: `${TrainingModeEnum}`;
+  prompt?: string;
+  billId?: string;
+};
+export type UpdateDatasetDataProps = {
+  id: string;
+  q?: string; // embedding content
+  a?: string; // bonus content
+  indexes: (Omit<DatasetDataIndexItemType, 'dataId'> & {
+    dataId?: string; // pg data id
+  })[];
+};

projects/app/src/global/core/dataset/type.d.ts

@@ -1,5 +1,8 @@
 import { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type';
-import { DatasetCollectionSchemaType } from '@fastgpt/global/core/dataset/type.d';
+import {
+  DatasetCollectionSchemaType,
+  DatasetDataSchemaType
+} from '@fastgpt/global/core/dataset/type.d';
 
 /* ================= dataset ===================== */
 
@@ -11,7 +14,7 @@ export type DatasetCollectionsListItemType = {
   name: string;
   type: DatasetCollectionSchemaType['type'];
   updateTime: Date;
-  dataAmount?: number;
+  dataAmount: number;
   trainingAmount: number;
   metadata: DatasetCollectionSchemaType['metadata'];
   canWrite: boolean;
@@ -19,7 +22,10 @@ export type DatasetCollectionsListItemType = {
 
 /* ================= data ===================== */
 export type DatasetDataListItemType = {
-  id: string;
+  _id: string;
+  datasetId: string;
+  collectionId: string;
   q: string; // embedding content
   a: string; // bonus content
+  indexes: DatasetDataSchemaType['indexes'];
 };