v4.5.1 (#417)

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

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

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

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

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

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+import { connectionMongo, type Model } from '@fastgpt/service/common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { ChatItemSchema as ChatItemType } from '@/types/mongoSchema';
 import { ChatRoleMap, TaskResponseKeyEnum } from '@/constants/chat';
@@ -43,9 +43,11 @@ const ChatItemSchema = new Schema({
   },
   adminFeedback: {
     type: {
-      kbId: String,
+      datasetId: String,
+      collectionId: String,
       dataId: String,
-      content: String
+      q: String,
+      a: String
     }
   },
   [TaskResponseKeyEnum.responseData]: {

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

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+import { connectionMongo, type Model } from '@fastgpt/service/common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { CollectionSchema as CollectionType } from '@/types/mongoSchema';
 

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

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

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

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

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

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

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

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

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

@@ -1,73 +0,0 @@
-/* 模型的知识库 */
-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';
-
-// pgList and vectorList, Only one of them will work
-const TrainingDataSchema = new Schema({
-  userId: {
-    type: Schema.Types.ObjectId,
-    ref: 'user',
-    required: true
-  },
-  kbId: {
-    type: Schema.Types.ObjectId,
-    ref: 'kb',
-    required: true
-  },
-  expireAt: {
-    type: Date,
-    default: () => new Date()
-  },
-  lockTime: {
-    type: Date,
-    default: () => new Date('2000/1/1')
-  },
-  mode: {
-    type: String,
-    enum: Object.keys(TrainingTypeMap),
-    required: true
-  },
-  vectorModel: {
-    type: String,
-    required: true,
-    default: 'text-embedding-ada-002'
-  },
-  prompt: {
-    // qa split prompt
-    type: String,
-    default: ''
-  },
-  q: {
-    type: String,
-    default: ''
-  },
-  a: {
-    type: String,
-    default: ''
-  },
-  source: {
-    type: String,
-    default: ''
-  },
-  file_id: {
-    type: String,
-    default: ''
-  },
-  billId: {
-    type: String,
-    default: ''
-  }
-});
-
-try {
-  TrainingDataSchema.index({ lockTime: 1 });
-  TrainingDataSchema.index({ userId: 1 });
-  TrainingDataSchema.index({ expireAt: 1 }, { expireAfterSeconds: 7 * 24 * 60 });
-} catch (error) {
-  console.log(error);
-}
-
-export const TrainingData: Model<TrainingDateType> =
-  models['trainingData'] || model('trainingData', TrainingDataSchema);