sub plan page (#885)

* perf: insert mongo dataset data session

* perf: dataset data index

* remove delay

* rename bill schema

* rename bill record

* perf: bill table

* perf: prompt

* perf: sub plan

* change the usage count

* feat: usage bill

* publish usages

* doc

* 新增团队聊天功能 (#20)

* perf: doc

* feat 添加标签部分

feat 信息团队标签配置

feat 新增团队同步管理

feat team分享页面

feat 完成team分享页面

feat 实现模糊搜索

style 格式化

fix 修复迷糊匹配

style 样式修改

fix 团队标签功能修复

* fix 修复鉴权功能

* merge 合并代码

* fix 修复引用错误

* fix 修复pr问题

* fix 修复ts格式问题

---------

Co-authored-by: archer <545436317@qq.com>
Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>

* update extra plan

* fix: ts

* format

* perf: bill field

* feat: standard plan

* fix: ts

* feat 个人账号页面修改 (#22)

* feat 添加标签部分

feat 信息团队标签配置

feat 新增团队同步管理

feat team分享页面

feat 完成team分享页面

feat 实现模糊搜索

style 格式化

fix 修复迷糊匹配

style 样式修改

fix 团队标签功能修复

* fix 修复鉴权功能

* merge 合并代码

* fix 修复引用错误

* fix 修复pr问题

* fix 修复ts格式问题

* feat 修改个人账号页

---------

Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>

* fix chunk index; error page text

* feat: dataset process Integral prediction

* feat: stand plan field

* feat: sub plan limit

* perf: index

* query extension

* perf: share link push app name

* perf: plan point unit

* perf: get sub plan

* perf: account page

---------

Co-authored-by: yst <77910600+yu-and-liu@users.noreply.github.com>
Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>

packages/global/support/openapi/type.d.ts

@@ -1,6 +1,5 @@
 export type OpenApiSchema = {
   _id: string;
-  userId: string;
   teamId: string;
   tmbId: string;
   createTime: Date;
@@ -8,9 +7,9 @@ export type OpenApiSchema = {
   apiKey: string;
   appId?: string;
   name: string;
-  usage: number;
+  usagePoints: number;
   limit?: {
     expiredTime?: Date;
-    credit?: number;
+    maxUsagePoints: number;
   };
 };

packages/global/support/outLink/api.d.ts

@@ -1,5 +1,5 @@
 import type { HistoryItemType, ChatSiteItemType } from '../../core/chat/type.d';
-import { OutLinkSchema } from '@fastgpt/global/support/outLink/type';
+import { OutLinkSchema } from './type.d';
 
 export type AuthOutLinkInitProps = {
   outLinkUid: string;

packages/global/support/outLink/type.d.ts

@@ -7,14 +7,14 @@ export type OutLinkSchema = {
   tmbId: string;
   appId: string;
   name: string;
-  total: number;
+  usagePoints: number;
   lastTime: Date;
   type: `${OutLinkTypeEnum}`;
   responseDetail: boolean;
   limit?: {
     expiredTime?: Date;
     QPM: number;
-    credit: number;
+    maxUsagePoints: number;
     hookUrl?: string;
   };
 };

packages/global/support/permission/type.d.ts

@@ -1,7 +1,6 @@
 import { AuthUserTypeEnum } from './constant';
 
 export type AuthResponseType = {
-  userId: string;
   teamId: string;
   tmbId: string;
   isOwner: boolean;

packages/global/support/user/team/constant.ts

@@ -1,5 +1,6 @@
 export const TeamCollectionName = 'teams';
 export const TeamMemberCollectionName = 'team.members';
+export const TeamTagsCollectionName = 'team.tags';
 
 export enum TeamMemberRoleEnum {
   owner = 'owner',

packages/global/support/user/team/controller.d.ts

@@ -15,6 +15,7 @@ export type UpdateTeamProps = {
   teamId: string;
   name?: string;
   avatar?: string;
+  tagsUrl?: string;
 };
 
 /* ------------- member ----------- */

packages/global/support/user/team/type.d.ts

@@ -9,11 +9,23 @@ export type TeamSchema = {
   createTime: Date;
   balance: number;
   maxSize: number;
+  tagsUrl: string;
   limit: {
     lastExportDatasetTime: Date;
     lastWebsiteSyncTime: Date;
   };
 };
+export type tagsType = {
+  label: string,
+  key: string
+}
+export type TeamTagsSchema = {
+  _id: string;
+  label: string;
+  teamId: string;
+  key: string;
+  createTime: Date;
+};
 
 export type TeamMemberSchema = {
   _id: string;
@@ -26,13 +38,13 @@ export type TeamMemberSchema = {
   defaultTeam: boolean;
 };
 
-export type TeamMemberWithUserSchema = TeamMemberSchema & {
+export type TeamMemberWithUserSchema = Omit<TeamMemberSchema, 'userId'> & {
   userId: UserModelSchema;
 };
-export type TeamMemberWithTeamSchema = TeamMemberSchema & {
+export type TeamMemberWithTeamSchema = Omit<TeamMemberSchema, 'teamId'> & {
   teamId: TeamSchema;
 };
-export type TeamMemberWithTeamAndUserSchema = TeamMemberWithTeamSchema & {
+export type TeamMemberWithTeamAndUserSchema = Omit<TeamMemberWithTeamSchema, 'userId'> & {
   userId: UserModelSchema;
 };
 

packages/global/support/user/type.d.ts

@@ -29,4 +29,5 @@ export type UserType = {
   promotionRate: UserModelSchema['promotionRate'];
   openaiAccount: UserModelSchema['openaiAccount'];
   team: TeamItemType;
+  standardInfo?: standardInfoType;
 };

packages/global/support/wallet/bill/api.d.ts

@@ -1,25 +1,18 @@
-import { BillSourceEnum } from './constants';
-import { BillListItemCountType, BillListItemType } from './type';
-
-export type CreateTrainingBillProps = {
-  name: string;
-  datasetId: string;
-};
-
-export type ConcatBillProps = BillListItemCountType & {
-  teamId: string;
-  tmbId: string;
-  billId?: string;
-  total: number;
-  listIndex?: number;
-};
+import { BillTypeEnum } from './constants';
 
 export type CreateBillProps = {
-  teamId: string;
-  tmbId: string;
-  appName: string;
-  appId?: string;
-  total: number;
-  source: `${BillSourceEnum}`;
-  list: BillListItemType[];
+  type: `${BillTypeEnum}`;
+
+  // balance
+  balance?: number; // read
+
+  month?: number;
+  // extra dataset size
+  extraDatasetSize?: number; // 1k
+  extraPoints?: number; // 100w
+};
+export type CreateBillResponse = {
+  billId: string;
+  codeUrl: string;
+  readPrice: number;
 };

packages/global/support/wallet/bill/constants.ts

@@ -1,34 +1,57 @@
-// model price: xxx/1k tokens
-// ￥1 = 100000.
-export const PRICE_SCALE = 100000;
-
-export enum BillSourceEnum {
-  fastgpt = 'fastgpt',
-  api = 'api',
-  shareLink = 'shareLink',
-  training = 'training',
-
+export enum BillTypeEnum {
+  balance = 'balance',
   standSubPlan = 'standSubPlan',
-  extraDatasetSub = 'extraDatasetSub'
+  extraDatasetSub = 'extraDatasetSub',
+  extraPoints = 'extraPoints'
 }
-
-export const BillSourceMap = {
-  [BillSourceEnum.fastgpt]: {
-    label: '在线使用'
+export const billTypeMap = {
+  [BillTypeEnum.balance]: {
+    label: 'support.wallet.subscription.type.balance'
   },
-  [BillSourceEnum.api]: {
-    label: 'Api'
-  },
-  [BillSourceEnum.shareLink]: {
-    label: '免登录链接'
-  },
-  [BillSourceEnum.training]: {
-    label: 'dataset.Training Name'
-  },
-  [BillSourceEnum.standSubPlan]: {
+  [BillTypeEnum.standSubPlan]: {
     label: 'support.wallet.subscription.type.standard'
   },
-  [BillSourceEnum.extraDatasetSub]: {
+  [BillTypeEnum.extraDatasetSub]: {
     label: 'support.wallet.subscription.type.extraDatasetSize'
+  },
+  [BillTypeEnum.extraPoints]: {
+    label: 'support.wallet.subscription.type.extraPoints'
   }
 };
+
+export enum BillStatusEnum {
+  SUCCESS = 'SUCCESS',
+  REFUND = 'REFUND',
+  NOTPAY = 'NOTPAY',
+  CLOSED = 'CLOSED'
+}
+export const billStatusMap = {
+  [BillStatusEnum.SUCCESS]: {
+    label: 'support.wallet.bill.status.success'
+  },
+  [BillStatusEnum.REFUND]: {
+    label: 'support.wallet.bill.status.refund'
+  },
+  [BillStatusEnum.NOTPAY]: {
+    label: 'support.wallet.bill.status.notpay'
+  },
+  [BillStatusEnum.CLOSED]: {
+    label: 'support.wallet.bill.status.closed'
+  }
+};
+
+export enum BillPayWayEnum {
+  balance = 'balance',
+  wx = 'wx'
+}
+export const billPayWayMap = {
+  [BillPayWayEnum.balance]: {
+    label: 'support.wallet.bill.payWay.balance'
+  },
+  [BillPayWayEnum.wx]: {
+    label: 'support.wallet.bill.payWay.wx'
+  }
+};
+
+export const SUB_DATASET_SIZE_RATE = 1000;
+export const SUB_EXTRA_POINT_RATE = 1000000;

packages/global/support/wallet/bill/tools.ts

@@ -1,26 +0,0 @@
-/* bill common  */
-import { PRICE_SCALE } from './constants';
-import { BillSourceEnum } from './constants';
-import { AuthUserTypeEnum } from '../../permission/constant';
-
-/**
- * dataset price / PRICE_SCALE = real price
- */
-export const formatStorePrice2Read = (val = 0, multiple = 1) => {
-  return Number(((val / PRICE_SCALE) * multiple).toFixed(10));
-};
-export const formatModelPrice2Read = (val = 0) => {
-  return Number((val / 1000).toFixed(10));
-};
-
-export const getBillSourceByAuthType = ({
-  shareId,
-  authType
-}: {
-  shareId?: string;
-  authType?: `${AuthUserTypeEnum}`;
-}) => {
-  if (shareId) return BillSourceEnum.shareLink;
-  if (authType === AuthUserTypeEnum.apikey) return BillSourceEnum.api;
-  return BillSourceEnum.fastgpt;
-};

packages/global/support/wallet/bill/type.d.ts

@@ -1,35 +1,29 @@
-import { CreateBillProps } from './api';
-import { BillSourceEnum } from './constants';
+import { StandardSubLevelEnum, SubModeEnum, SubTypeEnum } from '../sub/constants';
+import { BillPayWayEnum, BillTypeEnum } from './constants';
 
-export type BillListItemCountType = {
-  inputTokens?: number;
-  outputTokens?: number;
-  charsLength?: number;
-  duration?: number;
-
-  // sub
-  datasetSize?: number;
-
-  // abandon
-  tokenLen?: number;
-};
-export type BillListItemType = BillListItemCountType & {
-  moduleName: string;
-  amount: number;
-  model?: string;
-};
-
-export type BillSchema = CreateBillProps & {
+export type BillSchemaType = {
   _id: string;
-  time: Date;
+  userId: string;
+  teamId: string;
+  tmbId: string;
+  createTime: Date;
+  orderId: string;
+  status: 'SUCCESS' | 'REFUND' | 'NOTPAY' | 'CLOSED';
+  type: `${BillTypeEnum}`;
+  price: number;
+  metadata: {
+    payWay: `${BillPayWayEnum}`;
+    subMode?: `${SubModeEnum}`;
+    standSubLevel?: `${StandardSubLevelEnum}`;
+    month?: number;
+    datasetSize?: number;
+    extraPoints?: number;
+  };
 };
 
-export type BillItemType = {
-  id: string;
-  // memberName: string;
-  time: Date;
-  appName: string;
-  source: BillSchema['source'];
-  total: number;
-  list: BillSchema['list'];
+export type ChatModuleBillType = {
+  totalPoints: number;
+  moduleName: string;
+  model: string;
+  charsLength: number;
 };

packages/global/support/wallet/constants.ts

@@ -0,0 +1,3 @@
+// model price: xxx/1k tokens
+// ￥1 = 100000.
+export const PRICE_SCALE = 100000;

packages/global/support/wallet/pay/constants.ts

@@ -1,41 +0,0 @@
-export enum PayTypeEnum {
-  balance = 'balance',
-  subStandard = 'subStandard',
-  subExtraDatasetSize = 'subExtraDatasetSize',
-  subExtraPoints = 'subExtraPoints'
-}
-export const payTypeMap = {
-  [PayTypeEnum.balance]: {
-    label: 'support.user.team.pay.type.balance'
-  },
-  [PayTypeEnum.subStandard]: {
-    label: 'support.wallet.subscription.type.standard'
-  },
-  [PayTypeEnum.subExtraDatasetSize]: {
-    label: 'support.wallet.subscription.type.extraDatasetSize'
-  },
-  [PayTypeEnum.subExtraPoints]: {
-    label: 'support.wallet.subscription.type.extraPoints'
-  }
-};
-
-export enum PayStatusEnum {
-  SUCCESS = 'SUCCESS',
-  REFUND = 'REFUND',
-  NOTPAY = 'NOTPAY',
-  CLOSED = 'CLOSED'
-}
-export const payStatusMap = {
-  [PayStatusEnum.SUCCESS]: {
-    label: 'support.user.team.pay.status.success'
-  },
-  [PayStatusEnum.REFUND]: {
-    label: 'support.user.team.pay.status.refund'
-  },
-  [PayStatusEnum.NOTPAY]: {
-    label: 'support.user.team.pay.status.notpay'
-  },
-  [PayStatusEnum.CLOSED]: {
-    label: 'support.user.team.pay.status.closed'
-  }
-};

packages/global/support/wallet/pay/type.d.ts

@@ -1,18 +0,0 @@
-import { SubModeEnum, SubTypeEnum } from '../sub/constants';
-import { PayTypeEnum } from './constants';
-
-export type PaySchema = {
-  _id: string;
-  userId: string;
-  teamId: string;
-  tmbId: string;
-  createTime: Date;
-  orderId: string;
-  status: 'SUCCESS' | 'REFUND' | 'NOTPAY' | 'CLOSED';
-  type: `${PayType}`;
-
-  price: number;
-  payWay: 'balance' | 'wx';
-
-  subMetadata: {};
-};

packages/global/support/wallet/sub/api.d.ts

@@ -1,26 +1,14 @@
 import { StandardSubLevelEnum, SubModeEnum } from './constants';
 import { TeamSubSchema } from './type.d';
 
-export type SubDatasetSizeParams = {
-  size: number;
-};
 export type StandardSubPlanParams = {
   level: `${StandardSubLevelEnum}`;
   mode: `${SubModeEnum}`;
 };
 
-export type SubDatasetSizePreviewCheckResponse = {
-  payForNewSub: boolean; // Does this change require payment
-  newSubSize: number; // new sub dataset size
-  alreadySubSize: number; // old sub dataset size
-  payPrice: number; // this change require payment
-  newPlanPrice: number; // the new sub price
-  newSubStartTime: Date;
-  newSubExpiredTime: Date;
-  balanceEnough: boolean; // team balance is enough
-};
 export type StandardSubPlanUpdateResponse = {
   balanceEnough: boolean; // team balance is enough
+  teamBalance: number;
   payPrice?: number;
   planPrice: number;
   planPointPrice: number;

packages/global/support/wallet/sub/constants.ts

@@ -1,5 +1,3 @@
-export const POINTS_SCALE = 10000;
-
 export enum SubTypeEnum {
   standard = 'standard',
   extraDatasetSize = 'extraDatasetSize',
@@ -19,20 +17,16 @@ export const subTypeMap = {
 
 export enum SubStatusEnum {
   active = 'active',
-  canceled = 'canceled'
+  expired = 'expired'
 }
 export const subStatusMap = {
   [SubStatusEnum.active]: {
     label: 'support.wallet.subscription.status.active'
   },
-  [SubStatusEnum.canceled]: {
+  [SubStatusEnum.expired]: {
     label: 'support.wallet.subscription.status.canceled'
   }
 };
-export const subSelectMap = {
-  true: SubStatusEnum.active,
-  false: SubStatusEnum.canceled
-};
 
 export enum SubModeEnum {
   month = 'month',
@@ -40,11 +34,11 @@ export enum SubModeEnum {
 }
 export const subModeMap = {
   [SubModeEnum.month]: {
-    label: 'support.wallet.subscription.mode.month',
+    label: 'support.wallet.subscription.mode.Month',
     durationMonth: 1
   },
   [SubModeEnum.year]: {
-    label: 'support.wallet.subscription.mode.year',
+    label: 'support.wallet.subscription.mode.Year',
     durationMonth: 12
   }
 };
@@ -63,7 +57,7 @@ export const standardSubLevelMap = {
   },
   [StandardSubLevelEnum.experience]: {
     label: 'support.wallet.subscription.standardSubLevel.experience',
-    desc: 'support.wallet.subscription.standardSubLevel.experience desc'
+    desc: ''
   },
   [StandardSubLevelEnum.team]: {
     label: 'support.wallet.subscription.standardSubLevel.team',

packages/global/support/wallet/sub/type.d.ts

@@ -2,19 +2,19 @@ import { StandardSubLevelEnum, SubModeEnum, SubStatusEnum, SubTypeEnum } from '.
 
 // Content of plan
 export type TeamStandardSubPlanItemType = {
-  price: number; // read price
-  pointPrice: number; // read price/ one ten thousand
+  price: number; // read price / month
+  pointPrice: number; // read price/ one thousand
+  totalPoints: number; // n
   maxTeamMember: number;
   maxAppAmount: number; // max app or plugin amount
   maxDatasetAmount: number;
   chatHistoryStoreDuration: number; // n day
   maxDatasetSize: number;
-  customApiKey: boolean;
-  customCopyright: boolean; // feature
-  websiteSyncInterval: number; // n hours
   trainingWeight: number; // 1~4
-  reRankWeight: number; // 1~4
-  totalPoints: number; // n ten thousand
+  permissionCustomApiKey: boolean;
+  permissionCustomCopyright: boolean; // feature
+  permissionWebsiteSync: boolean;
+  permissionReRank: boolean;
 };
 
 export type StandSubPlanLevelMapType = Record<
@@ -27,6 +27,9 @@ export type SubPlanType = {
   [SubTypeEnum.extraDatasetSize]: {
     price: number;
   };
+  [SubTypeEnum.extraPoints]: {
+    price: number;
+  };
 };
 
 export type TeamSubSchema = {
@@ -34,40 +37,32 @@ export type TeamSubSchema = {
   teamId: string;
   type: `${SubTypeEnum}`;
   status: `${SubStatusEnum}`;
-  currentMode: `${SubModeEnum}`;
-  nextMode: `${SubModeEnum}`;
   startTime: Date;
   expiredTime: Date;
   price: number;
 
+  currentMode: `${SubModeEnum}`;
+  nextMode: `${SubModeEnum}`;
   currentSubLevel: `${StandardSubLevelEnum}`;
   nextSubLevel: `${StandardSubLevelEnum}`;
+
   pointPrice: number;
   totalPoints: number;
-
-  currentExtraDatasetSize: number;
-  nextExtraDatasetSize: number;
-
-  currentExtraPoints: number;
-  nextExtraPoints: number;
-
   surplusPoints: number;
 
-  // abandon
-  datasetStoreAmount?: number;
-  renew?: boolean;
+  currentExtraDatasetSize: number;
 };
 
-export type FeTeamSubType = {
+export type FeTeamPlanStatusType = {
   [SubTypeEnum.standard]?: TeamSubSchema;
-  [SubTypeEnum.extraDatasetSize]?: TeamSubSchema;
-  [SubTypeEnum.extraPoints]?: TeamSubSchema;
+  standardConstants?: TeamStandardSubPlanItemType;
 
-  standardMaxDatasetSize: number;
   totalPoints: number;
   usedPoints: number;
+  standardMaxDatasetSize?: number;
+  standardMaxPoints?: number;
 
-  standardMaxPoints: number;
+  // standard + extra
   datasetMaxSize: number;
   usedDatasetSize: number;
 };

packages/global/support/wallet/usage/api.d.ts

@@ -0,0 +1,26 @@
+import { UsageSourceEnum } from './constants';
+import { UsageListItemCountType, UsageListItemType } from './type';
+
+export type CreateTrainingUsageProps = {
+  name: string;
+  datasetId: string;
+};
+
+export type ConcatUsageProps = UsageListItemCountType & {
+  teamId: string;
+  tmbId: string;
+  billId?: string;
+  totalPoints: number;
+  listIndex?: number;
+};
+
+export type CreateUsageProps = {
+  teamId: string;
+  tmbId: string;
+  appName: string;
+  appId?: string;
+  totalPoints: number;
+  // inputTokens: number;
+  source: `${UsageSourceEnum}`;
+  list: UsageListItemType[];
+};

packages/global/support/wallet/usage/constants.ts

@@ -0,0 +1,21 @@
+export enum UsageSourceEnum {
+  fastgpt = 'fastgpt',
+  api = 'api',
+  shareLink = 'shareLink',
+  training = 'training'
+}
+
+export const UsageSourceMap = {
+  [UsageSourceEnum.fastgpt]: {
+    label: '在线使用'
+  },
+  [UsageSourceEnum.api]: {
+    label: 'Api'
+  },
+  [UsageSourceEnum.shareLink]: {
+    label: '免登录链接'
+  },
+  [UsageSourceEnum.training]: {
+    label: 'dataset.Training Name'
+  }
+};

packages/global/support/wallet/usage/tools.ts

@@ -0,0 +1,23 @@
+/* bill common  */
+import { PRICE_SCALE } from '../constants';
+import { UsageSourceEnum } from './constants';
+import { AuthUserTypeEnum } from '../../permission/constant';
+
+/**
+ * dataset price / PRICE_SCALE = real price
+ */
+export const formatStorePrice2Read = (val = 0, multiple = 1) => {
+  return Number(((val / PRICE_SCALE) * multiple).toFixed(10));
+};
+
+export const getUsageSourceByAuthType = ({
+  shareId,
+  authType
+}: {
+  shareId?: string;
+  authType?: `${AuthUserTypeEnum}`;
+}) => {
+  if (shareId) return UsageSourceEnum.shareLink;
+  if (authType === AuthUserTypeEnum.apikey) return UsageSourceEnum.api;
+  return UsageSourceEnum.fastgpt;
+};

packages/global/support/wallet/usage/type.d.ts

@@ -0,0 +1,26 @@
+import { CreateUsageProps } from './api';
+import { UsageSourceEnum } from './constants';
+
+export type UsageListItemCountType = {
+  charsLength?: number;
+  duration?: number;
+};
+export type UsageListItemType = UsageListItemCountType & {
+  moduleName: string;
+  amount: number;
+  model?: string;
+};
+
+export type UsageSchemaType = CreateUsageProps & {
+  _id: string;
+  time: Date;
+};
+
+export type UsageItemType = {
+  id: string;
+  time: Date;
+  appName: string;
+  source: UsageSchemaType['source'];
+  totalPoints: number;
+  list: UsageSchemaType['list'];
+};