V4.6.9-first commit (#899)

* 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>

* sub plan page (#23)

* 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

* feat 新增套餐详情弹窗代码 (#24)

* merge 合并代码

* fix 新增套餐详情弹框

* fix 修复pr问题

* feat: change http node input to prompt editor (#21)

* feat: change http node input to prompt editor

* fix

* split PromptEditor to HttpInput

* Team plans (#25)

* perf: pay check

* perf: team plan test

* plan limit check

* replace sensitive text

* perf: fix some null

* collection null check

* perf: plans modal

* perf: http module

* pacakge (#26)

* individuation page and pay modal amount (#27)

* feat: individuation page

* team chat config

* pay modal

* plan count and replace invalid chars (#29)

* fix: user oneapi

* fix: training queue

* fix: qa queue

* perf: remove space chars

* replace invalid chars

* change httpinput dropdown menu (#28)

* perf: http

* reseet free plan

* perf: plan code to packages

* remove llm config to package

* perf: code

* perf: faq

* fix: get team plan

---------

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

packages/service/support/openapi/auth.ts

@@ -19,14 +19,15 @@ export async function authOpenApiKey({ apikey }: { apikey: string }) {
     // auth limit
     // @ts-ignore
     if (global.feConfigs?.isPlus) {
-      await POST('/support/openapi/authLimit', { openApi } as AuthOpenApiLimitProps);
+      await POST('/support/openapi/authLimit', {
+        openApi: openApi.toObject()
+      } as AuthOpenApiLimitProps);
     }
 
     updateApiKeyUsedTime(openApi._id);
 
     return {
       apikey,
-      userId: String(openApi.userId),
       teamId: String(openApi.teamId),
       tmbId: String(openApi.tmbId),
       appId: openApi.appId || ''

packages/service/support/openapi/schema.ts

@@ -1,8 +1,6 @@
 import { connectionMongo, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import type { OpenApiSchema } from '@fastgpt/global/support/openapi/type';
-import { PRICE_SCALE } from '@fastgpt/global/support/wallet/bill/constants';
-import { formatStorePrice2Read } from '@fastgpt/global/support/wallet/bill/tools';
 import {
   TeamCollectionName,
   TeamMemberCollectionName
@@ -10,10 +8,6 @@ import {
 
 const OpenApiSchema = new Schema(
   {
-    userId: {
-      type: Schema.Types.ObjectId,
-      ref: 'user'
-    },
     teamId: {
       type: Schema.Types.ObjectId,
       ref: TeamCollectionName,
@@ -44,22 +38,17 @@ const OpenApiSchema = new Schema(
       type: String,
       default: 'Api Key'
     },
-    usage: {
-      // total usage. value from bill total
+    usagePoints: {
       type: Number,
-      default: 0,
-      get: (val: number) => formatStorePrice2Read(val)
+      default: 0
     },
     limit: {
       expiredTime: {
         type: Date
       },
-      credit: {
-        // value from user settings
+      maxUsagePoints: {
         type: Number,
-        default: -1,
-        set: (val: number) => val * PRICE_SCALE,
-        get: (val: number) => formatStorePrice2Read(val)
+        default: -1
       }
     }
   },

packages/service/support/openapi/tools.ts

@@ -8,15 +8,21 @@ export function updateApiKeyUsedTime(id: string) {
   });
 }
 
-export function updateApiKeyUsage({ apikey, usage }: { apikey: string; usage: number }) {
+export function updateApiKeyUsage({
+  apikey,
+  totalPoints
+}: {
+  apikey: string;
+  totalPoints: number;
+}) {
   MongoOpenApi.findOneAndUpdate(
     { apiKey: apikey },
     {
       $inc: {
-        usage
+        usagePoints: totalPoints
       }
     }
   ).catch((err) => {
-    console.log('update apiKey usage error', err);
+    console.log('update apiKey totalPoints error', err);
   });
 }