4.6.8-alpha (#804)

* perf: redirect request and err log replace

perf: dataset openapi

feat: session

fix: retry input error

feat: 468 doc

sub page

feat: standard sub

perf: rerank tip

perf: rerank tip

perf: api sdk

perf: openapi

sub plan

perf: sub ui

fix: ts

* perf: init log

* fix: variable select

* sub page

* icon

* perf: llm model config

* perf: menu ux

* perf: system store

* perf: publish app name

* fix: init data

* perf: flow edit ux

* fix: value type format and ux

* fix prompt editor default value (#13)

* fix prompt editor default value

* fix prompt editor update when not focus

* add key with variable

---------

Co-authored-by: Archer <545436317@qq.com>

* fix: value type

* doc

* i18n

* import path

* home page

* perf: mongo session running

* fix: ts

* perf: use toast

* perf: flow edit

* perf: sse response

* slider ui

* fetch error

* fix prompt editor rerender when not focus by key defaultvalue (#14)

* perf: prompt editor

* feat: dataset search concat

* perf: doc

* fix:ts

* perf: doc

* fix json editor onblur value (#15)

* faq

* vector model default config

* ipv6

---------

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

packages/service/support/wallet/bill/controller.ts

@@ -1,5 +1,6 @@
 import { BillSourceEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import { MongoBill } from './schema';
+import { ClientSession } from '../../../common/mongo';
 
 export const createTrainingBill = async ({
   teamId,
@@ -7,7 +8,8 @@ export const createTrainingBill = async ({
   appName,
   billSource,
   vectorModel,
-  agentModel
+  agentModel,
+  session
 }: {
   teamId: string;
   tmbId: string;
@@ -15,28 +17,34 @@ export const createTrainingBill = async ({
   billSource: `${BillSourceEnum}`;
   vectorModel: string;
   agentModel: string;
+  session?: ClientSession;
 }) => {
-  const { _id } = await MongoBill.create({
-    teamId,
-    tmbId,
-    appName,
-    source: billSource,
-    list: [
+  const [{ _id }] = await MongoBill.create(
+    [
       {
-        moduleName: 'wallet.moduleName.index',
-        model: vectorModel,
-        charsLength: 0,
-        amount: 0
-      },
-      {
-        moduleName: 'wallet.moduleName.qa',
-        model: agentModel,
-        charsLength: 0,
-        amount: 0
+        teamId,
+        tmbId,
+        appName,
+        source: billSource,
+        list: [
+          {
+            moduleName: 'wallet.moduleName.index',
+            model: vectorModel,
+            charsLength: 0,
+            amount: 0
+          },
+          {
+            moduleName: 'wallet.moduleName.qa',
+            model: agentModel,
+            charsLength: 0,
+            amount: 0
+          }
+        ],
+        total: 0
       }
     ],
-    total: 0
-  });
+    { session }
+  );
 
   return { billId: String(_id) };
 };

packages/service/support/wallet/sub/schema.ts

@@ -29,6 +29,15 @@ const SubSchema = new Schema({
     required: true
   },
   mode: {
+    type: String,
+    enum: Object.keys(subModeMap)
+  },
+  currentMode: {
+    type: String,
+    enum: Object.keys(subModeMap),
+    required: true
+  },
+  nextMode: {
     type: String,
     enum: Object.keys(subModeMap),
     required: true
@@ -46,6 +55,10 @@ const SubSchema = new Schema({
     type: Number,
     required: true
   },
+  pointPrice: {
+    // stand level point total price
+    type: Number
+  },
 
   // sub content
   currentSubLevel: {
@@ -56,6 +69,9 @@ const SubSchema = new Schema({
     type: String,
     enum: Object.keys(standardSubLevelMap)
   },
+  totalPoints: {
+    type: Number
+  },
 
   currentExtraDatasetSize: {
     type: Number
@@ -72,48 +88,44 @@ const SubSchema = new Schema({
   },
 
   // standard sub limit
-  maxTeamMember: {
-    type: Number
-  },
-  maxAppAmount: {
-    type: Number
-  },
-  maxDatasetAmount: {
-    type: Number
-  },
-  chatHistoryStoreDuration: {
-    // n day
-    type: Number
-  },
-  maxDatasetSize: {
-    type: Number
-  },
-  trainingWeight: {
-    // 0 1 2 3
-    type: Number
-  },
-  customApiKey: {
-    type: Boolean
-  },
-  customCopyright: {
-    type: Boolean
-  },
-  exportDatasetInterval: {
-    // hours
-    type: Number
-  },
-  websiteSyncInterval: {
-    // hours
-    type: Number
-  },
-  reRankWeight: {
-    // 0 1 2 3
-    type: Number
-  },
-  totalPoints: {
-    // record standard sub points
-    type: Number
-  },
+  // maxTeamMember: {
+  //   type: Number
+  // },
+  // maxAppAmount: {
+  //   type: Number
+  // },
+  // maxDatasetAmount: {
+  //   type: Number
+  // },
+  // chatHistoryStoreDuration: {
+  //   // n day
+  //   type: Number
+  // },
+  // maxDatasetSize: {
+  //   type: Number
+  // },
+  // trainingWeight: {
+  //   // 0 1 2 3
+  //   type: Number
+  // },
+  // customApiKey: {
+  //   type: Boolean
+  // },
+  // customCopyright: {
+  //   type: Boolean
+  // },
+  // websiteSyncInterval: {
+  //   // hours
+  //   type: Number
+  // },
+  // reRankWeight: {
+  //   // 0 1 2 3
+  //   type: Number
+  // },
+  // totalPoints: {
+  //   // record standard sub points
+  //   type: Number
+  // },
 
   surplusPoints: {
     // standard sub / extra points sub

packages/service/support/wallet/sub/utils.ts

@@ -1,28 +1,87 @@
 import { SubTypeEnum } from '@fastgpt/global/support/wallet/sub/constants';
 import { MongoTeamSub } from './schema';
+import { addHours } from 'date-fns';
+import { FeTeamSubType, StandSubPlanLevelMapType } from '@fastgpt/global/support/wallet/sub/type.d';
+import { getVectorCountByTeamId } from '../../../common/vectorStore/controller';
 
-/* get team dataset size */
-export const getTeamDatasetValidSub = async ({
+/* get team dataset max size */
+export const getTeamDatasetMaxSize = async ({
   teamId,
-  freeSize = Infinity
+  standardPlans
 }: {
   teamId: string;
-  freeSize?: number;
+  standardPlans?: StandSubPlanLevelMapType;
 }) => {
-  const sub = await MongoTeamSub.findOne({
+  if (!standardPlans) {
+    return {
+      maxSize: Infinity,
+      sub: null
+    };
+  }
+
+  const plans = await MongoTeamSub.find({
     teamId,
-    type: SubTypeEnum.extraDatasetSize,
-    expiredTime: { $gte: new Date() }
+    expiredTime: { $gte: addHours(new Date(), -3) }
   }).lean();
 
-  const maxSize = (() => {
-    if (!sub || !sub.currentExtraDatasetSize) return freeSize;
+  const standard = plans.find((plan) => plan.type === SubTypeEnum.standard);
+  const extraDatasetSize = plans.find((plan) => plan.type === SubTypeEnum.extraDatasetSize);
 
-    return sub.currentExtraDatasetSize + freeSize;
-  })();
+  const standardMaxDatasetSize =
+    standard?.currentSubLevel && standardPlans
+      ? standardPlans[standard.currentSubLevel]?.maxDatasetSize || Infinity
+      : Infinity;
+  const totalDatasetSize =
+    standardMaxDatasetSize + (extraDatasetSize?.currentExtraDatasetSize || 0);
 
   return {
-    maxSize,
-    sub
+    maxSize: totalDatasetSize,
+    sub: extraDatasetSize
+  };
+};
+
+export const getTeamSubPlanStatus = async ({
+  teamId,
+  standardPlans
+}: {
+  teamId: string;
+  standardPlans?: StandSubPlanLevelMapType;
+}): Promise<FeTeamSubType> => {
+  const [plans, usedDatasetSize] = await Promise.all([
+    MongoTeamSub.find({ teamId }).lean(),
+    getVectorCountByTeamId(teamId)
+  ]);
+
+  const standard = plans.find((plan) => plan.type === SubTypeEnum.standard);
+  const extraDatasetSize = plans.find((plan) => plan.type === SubTypeEnum.extraDatasetSize);
+  const extraPoints = plans.find((plan) => plan.type === SubTypeEnum.extraPoints);
+
+  const standardMaxDatasetSize =
+    standard?.currentSubLevel && standardPlans
+      ? standardPlans[standard.currentSubLevel]?.maxDatasetSize || Infinity
+      : Infinity;
+  const totalDatasetSize =
+    standardMaxDatasetSize + (extraDatasetSize?.currentExtraDatasetSize || 0);
+
+  const standardMaxPoints =
+    standard?.currentSubLevel && standardPlans
+      ? standardPlans[standard.currentSubLevel]?.totalPoints || Infinity
+      : Infinity;
+  const totalPoints = standardMaxPoints + (extraPoints?.currentExtraPoints || 0);
+
+  const surplusPoints = (standard?.surplusPoints || 0) + (extraPoints?.surplusPoints || 0);
+
+  return {
+    [SubTypeEnum.standard]: standard,
+    [SubTypeEnum.extraDatasetSize]: extraDatasetSize,
+    [SubTypeEnum.extraPoints]: extraPoints,
+
+    standardMaxDatasetSize,
+    datasetMaxSize: totalDatasetSize,
+    usedDatasetSize,
+
+    standardMaxPoints,
+    totalPoints,
+    usedPoints: totalPoints - surplusPoints
   };
 };