Extraction schema (#398)

projects/app/src/service/models/app.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { AppSchema as AppType } from '@/types/mongoSchema';
 
 const AppSchema = new Schema({

projects/app/src/service/models/chat.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { ChatSchema as ChatType } from '@/types/mongoSchema';
 import { ChatRoleMap, TaskResponseKeyEnum } from '@/constants/chat';
 import { ChatSourceMap } from '@/constants/chat';

projects/app/src/service/models/chatItem.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { ChatItemSchema as ChatItemType } from '@/types/mongoSchema';
 import { ChatRoleMap, TaskResponseKeyEnum } from '@/constants/chat';
 import { customAlphabet } from 'nanoid';

projects/app/src/service/models/collection.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model as MongoModel } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { CollectionSchema as CollectionType } from '@/types/mongoSchema';
 
 const CollectionSchema = new Schema({
@@ -14,5 +15,5 @@ const CollectionSchema = new Schema({
   }
 });
 
-export const Collection: MongoModel<CollectionType> =
+export const Collection: Model<CollectionType> =
   models['collection'] || model('collection', CollectionSchema);

projects/app/src/service/models/image.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 
 const ImageSchema = new Schema({
   userId: {

projects/app/src/service/models/inform.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { informSchema } from '@/types/mongoSchema';
 import { InformTypeMap } from '@/constants/user';
 

projects/app/src/service/models/kb.ts

@@ -1,45 +0,0 @@
-import { Schema, model, models, Model } from 'mongoose';
-import { kbSchema as SchemaType } from '@/types/mongoSchema';
-import { KbTypeMap } from '@/constants/dataset';
-
-const kbSchema = new Schema({
-  parentId: {
-    type: Schema.Types.ObjectId,
-    ref: 'kb',
-    default: null
-  },
-  userId: {
-    type: Schema.Types.ObjectId,
-    ref: 'user',
-    required: true
-  },
-  updateTime: {
-    type: Date,
-    default: () => new Date()
-  },
-  avatar: {
-    type: String,
-    default: '/icon/logo.svg'
-  },
-  name: {
-    type: String,
-    required: true
-  },
-  vectorModel: {
-    type: String,
-    required: true,
-    default: 'text-embedding-ada-002'
-  },
-  type: {
-    type: String,
-    enum: Object.keys(KbTypeMap),
-    required: true,
-    default: 'dataset'
-  },
-  tags: {
-    type: [String],
-    default: []
-  }
-});
-
-export const KB: Model<SchemaType> = models['kb'] || model('kb', kbSchema);

projects/app/src/service/models/pay.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { PaySchema as PayType } from '@/types/mongoSchema';
 const PaySchema = new Schema({
   userId: {

projects/app/src/service/models/promotionRecord.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { PromotionRecordSchema as PromotionRecordType } from '@/types/mongoSchema';
 
 const PromotionRecordSchema = new Schema({

projects/app/src/service/models/trainingData.ts

@@ -1,5 +1,6 @@
 /* 模型的知识库 */
-import { Schema, model, models, Model as MongoModel } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { TrainingDataSchema as TrainingDateType } from '@/types/mongoSchema';
 import { TrainingTypeMap } from '@/constants/plugin';
 
@@ -68,5 +69,5 @@ try {
   console.log(error);
 }
 
-export const TrainingData: MongoModel<TrainingDateType> =
+export const TrainingData: Model<TrainingDateType> =
   models['trainingData'] || model('trainingData', TrainingDataSchema);

projects/app/src/service/models/user.ts

@@ -1,59 +0,0 @@
-import { Schema, model, models, Model } from 'mongoose';
-import { hashPassword } from '@/service/utils/tools';
-import { PRICE_SCALE } from '@fastgpt/common/bill/constants';
-import { UserModelSchema } from '@/types/mongoSchema';
-
-const UserSchema = new Schema({
-  username: {
-    // 可以是手机/邮箱，新的验证都只用手机
-    type: String,
-    required: true,
-    unique: true // 唯一
-  },
-  password: {
-    type: String,
-    required: true,
-    set: (val: string) => hashPassword(val),
-    get: (val: string) => hashPassword(val),
-    select: false
-  },
-  createTime: {
-    type: Date,
-    default: () => new Date()
-  },
-  avatar: {
-    type: String,
-    default: '/icon/human.svg'
-  },
-  balance: {
-    type: Number,
-    default: 2 * PRICE_SCALE
-  },
-  inviterId: {
-    // 谁邀请注册的
-    type: Schema.Types.ObjectId,
-    ref: 'user'
-  },
-  promotionRate: {
-    type: Number,
-    default: 15
-  },
-  limit: {
-    exportKbTime: {
-      // Every half hour
-      type: Date
-    }
-  },
-  openaiAccount: {
-    type: {
-      key: String,
-      baseUrl: String
-    }
-  },
-  timezone: {
-    type: String,
-    default: 'Asia/Shanghai'
-  }
-});
-
-export const User: Model<UserModelSchema> = models['user'] || model('user', UserSchema);