v4.6 -1 (#459)

packages/service/core/dataset/auth.ts

@@ -1,26 +0,0 @@
-import { ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
-import { MongoDatasetCollection } from './collection/schema';
-import { DatasetSchemaType } from '@fastgpt/global/core/dataset/type';
-
-export async function authCollection({
-  collectionId,
-  userId
-}: {
-  collectionId: string;
-  userId: string;
-}) {
-  const collection = await MongoDatasetCollection.findOne({
-    _id: collectionId,
-    userId
-  })
-    .populate('datasetId')
-    .lean();
-
-  if (collection) {
-    return {
-      ...collection,
-      dataset: collection.datasetId as unknown as DatasetSchemaType
-    };
-  }
-  return Promise.reject(ERROR_ENUM.unAuthDataset);
-}

packages/service/core/dataset/collection/schema.ts

@@ -3,6 +3,10 @@ const { Schema, model, models } = connectionMongo;
 import { DatasetCollectionSchemaType } from '@fastgpt/global/core/dataset/type.d';
 import { DatasetCollectionTypeMap } from '@fastgpt/global/core/dataset/constant';
 import { DatasetCollectionName } from '../schema';
+import {
+  TeamCollectionName,
+  TeamMemberCollectionName
+} from '@fastgpt/global/support/user/team/constant';
 
 export const DatasetColCollectionName = 'dataset.collections';
 
@@ -13,8 +17,18 @@ const DatasetCollectionSchema = new Schema({
     default: null
   },
   userId: {
+    // abandoned
     type: Schema.Types.ObjectId,
-    ref: 'user',
+    ref: 'user'
+  },
+  teamId: {
+    type: Schema.Types.ObjectId,
+    ref: TeamCollectionName,
+    required: true
+  },
+  tmbId: {
+    type: Schema.Types.ObjectId,
+    ref: TeamMemberCollectionName,
     required: true
   },
   datasetId: {

packages/service/core/dataset/collection/utils.ts

@@ -31,18 +31,16 @@ export async function findCollectionAndChild(id: string, fields = '_id parentId
 }
 
 export async function getDatasetCollectionPaths({
-  parentId = '',
-  userId
+  parentId = ''
 }: {
   parentId?: string;
-  userId: string;
 }): Promise<ParentTreePathItemType[]> {
   async function find(parentId?: string): Promise<ParentTreePathItemType[]> {
     if (!parentId) {
       return [];
     }
 
-    const parent = await MongoDatasetCollection.findOne({ _id: parentId, userId }, 'name parentId');
+    const parent = await MongoDatasetCollection.findOne({ _id: parentId }, 'name parentId');
 
     if (!parent) return [];
 

packages/service/core/dataset/controller.ts

@@ -0,0 +1,12 @@
+import { CollectionWithDatasetType } from '@fastgpt/global/core/dataset/type';
+import { MongoDatasetCollection } from './collection/schema';
+
+export async function getCollectionWithDataset(collectionId: string) {
+  const data = (
+    await MongoDatasetCollection.findById(collectionId).populate('datasetId')
+  )?.toJSON() as CollectionWithDatasetType;
+  if (!data) {
+    return Promise.reject('Collection is not exist');
+  }
+  return data;
+}

packages/service/core/dataset/file/controller.ts

@@ -0,0 +1,9 @@
+import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
+import { getGFSCollection } from '../../../common/file/gridfs/controller';
+
+export async function delDatasetFiles({ datasetId }: { datasetId: string }) {
+  const db = getGFSCollection(BucketNameEnum.dataset);
+  await db.deleteMany({
+    'metadata.datasetId': String(datasetId)
+  });
+}

packages/service/core/dataset/schema.ts

@@ -2,6 +2,11 @@ import { connectionMongo, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { DatasetSchemaType } from '@fastgpt/global/core/dataset/type.d';
 import { DatasetTypeMap } from '@fastgpt/global/core/dataset/constant';
+import {
+  TeamCollectionName,
+  TeamMemberCollectionName
+} from '@fastgpt/global/support/user/team/constant';
+import { PermissionTypeEnum, PermissionTypeMap } from '@fastgpt/global/support/permission/constant';
 
 export const DatasetCollectionName = 'datasets';
 
@@ -12,8 +17,18 @@ const DatasetSchema = new Schema({
     default: null
   },
   userId: {
+    //abandon
     type: Schema.Types.ObjectId,
-    ref: 'user',
+    ref: 'user'
+  },
+  teamId: {
+    type: Schema.Types.ObjectId,
+    ref: TeamCollectionName,
+    required: true
+  },
+  tmbId: {
+    type: Schema.Types.ObjectId,
+    ref: TeamMemberCollectionName,
     required: true
   },
   updateTime: {
@@ -41,7 +56,16 @@ const DatasetSchema = new Schema({
   },
   tags: {
     type: [String],
-    default: []
+    default: [],
+    set(val: string | string[]) {
+      if (Array.isArray(val)) return val;
+      return val.split(' ').filter((item) => item);
+    }
+  },
+  permission: {
+    type: String,
+    enum: Object.keys(PermissionTypeMap),
+    default: PermissionTypeEnum.private
   }
 });
 

packages/service/core/dataset/training/schema.ts

@@ -5,13 +5,27 @@ import { DatasetTrainingSchemaType } from '@fastgpt/global/core/dataset/type';
 import { TrainingTypeMap } from '@fastgpt/global/core/dataset/constant';
 import { DatasetColCollectionName } from '../collection/schema';
 import { DatasetCollectionName } from '../schema';
+import {
+  TeamCollectionName,
+  TeamMemberCollectionName
+} from '@fastgpt/global/support/user/team/constant';
 
 export const DatasetTrainingCollectionName = 'dataset.trainings';
 
 const TrainingDataSchema = new Schema({
   userId: {
+    // abandon
     type: Schema.Types.ObjectId,
-    ref: 'user',
+    ref: 'user'
+  },
+  teamId: {
+    type: Schema.Types.ObjectId,
+    ref: TeamCollectionName,
+    required: true
+  },
+  tmbId: {
+    type: Schema.Types.ObjectId,
+    ref: TeamMemberCollectionName,
     required: true
   },
   datasetId: {