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>

projects/app/src/web/common/api/fetch.ts

@@ -34,7 +34,7 @@ export const streamFetch = ({
 
     // response data
     let responseText = '';
-    let remainText = '';
+    let remainTextList: string[] = [];
     let errMsg = '';
     let responseData: ChatHistoryItemResType[] = [];
     let finished = false;
@@ -60,22 +60,23 @@ export const streamFetch = ({
     function animateResponseText() {
       // abort message
       if (abortCtrl.signal.aborted) {
+        const remainText = remainTextList.join('');
         onMessage({ text: remainText });
         responseText += remainText;
         return finish();
       }
 
-      if (remainText) {
-        const fetchCount = Math.max(1, Math.round(remainText.length / 60));
-        const fetchText = remainText.slice(0, fetchCount);
+      if (remainTextList.length > 0) {
+        const fetchCount = Math.max(1, Math.round(remainTextList.length / 60));
+        const fetchText = remainTextList.slice(0, fetchCount).join('');
 
         onMessage({ text: fetchText });
 
         responseText += fetchText;
-        remainText = remainText.slice(fetchCount);
+        remainTextList = remainTextList.slice(fetchCount);
       }
 
-      if (finished && !remainText) {
+      if (finished && remainTextList.length === 0) {
         return finish();
       }
 
@@ -125,7 +126,10 @@ export const streamFetch = ({
             try {
               failedFinish(await res.clone().json());
             } catch {
-              failedFinish(await res.clone().text());
+              const errText = await res.clone().text();
+              if (!errText.startsWith('event: error')) {
+                failedFinish();
+              }
             }
           }
         },
@@ -145,11 +149,13 @@ export const streamFetch = ({
 
           if (event === sseResponseEventEnum.answer) {
             const text: string = parseJson?.choices?.[0]?.delta?.content || '';
-            remainText += text;
+
+            for (const item of text) {
+              remainTextList.push(item);
+            }
           } else if (event === sseResponseEventEnum.response) {
             const text: string = parseJson?.choices?.[0]?.delta?.content || '';
-            onMessage({ text });
-            responseText += text;
+            remainTextList.push(text);
           } else if (
             event === sseResponseEventEnum.moduleStatus &&
             parseJson?.name &&

projects/app/src/web/core/app/api.ts

@@ -15,6 +15,7 @@ export const getMyApps = () => GET<AppListItemType[]>('/core/app/list');
  */
 export const postCreateApp = (data: CreateAppParams) => POST<string>('/core/app/create', data);
 
+export const getMyAppsByTags = (data: {}) => POST(`/proApi/core/chat/team/getApps`, data);
 /**
  * 根据 ID 删除模型
  */
@@ -30,7 +31,12 @@ export const getModelById = (id: string) => GET<AppDetailType>(`/core/app/detail
  */
 export const putAppById = (id: string, data: AppUpdateParams) =>
   PUT(`/core/app/update?appId=${id}`, data);
+export const replaceAppById = (id: string, data: AppUpdateParams) =>
+  PUT(`/core/app/updateTeamTasg?appId=${id}`, data);
 
+// updateTeamTasg
+export const putAppTagsById = (id: string, data: AppUpdateParams) =>
+  PUT(`/core/app/updateTeamTasg?appId=${id}`, data);
 /* 共享市场 */
 /**
  * 获取共享市场模型

projects/app/src/web/core/app/store/useAppStore.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
-import { getMyApps, getModelById, putAppById } from '@/web/core/app/api';
+import { getMyApps, getModelById, putAppById, replaceAppById } from '@/web/core/app/api';
 import { defaultApp } from '@/constants/app';
 import type { AppUpdateParams } from '@fastgpt/global/core/app/api.d';
 import { AppDetailType, AppListItemType } from '@fastgpt/global/core/app/type.d';
@@ -12,6 +12,7 @@ type State = {
   appDetail: AppDetailType;
   loadAppDetail: (id: string, init?: boolean) => Promise<AppDetailType>;
   updateAppDetail(appId: string, data: AppUpdateParams): Promise<void>;
+  replaceAppDetail(appId: string, data: AppUpdateParams): Promise<void>;
   clearAppModules(): void;
 };
 
@@ -47,6 +48,15 @@ export const useAppStore = create<State>()(
             };
           });
         },
+        async replaceAppDetail(appId: string, data: AppUpdateParams) {
+          await replaceAppById(appId, { ...get().appDetail, ...data });
+          set((state) => {
+            state.appDetail = {
+              ...state.appDetail,
+              ...data
+            };
+          });
+        },
         clearAppModules() {
           set((state) => {
             state.appDetail = {

projects/app/src/web/core/app/templates.ts

@@ -121,13 +121,13 @@ export const appTemplates: (AppItemType & {
           },
           {
             key: 'model',
-            type: 'selectChatModel',
+            type: 'selectLLMModel',
             label: 'core.module.input.label.aiModel',
             required: true,
             valueType: 'string',
             showTargetInApp: false,
             showTargetInPlugin: false,
-            value: 'gpt-3.5-turbo-16k',
+            value: 'gpt-3.5-turbo',
             connected: false
           },
           {
@@ -569,7 +569,7 @@ export const appTemplates: (AppItemType & {
           },
           {
             key: 'model',
-            type: 'selectChatModel',
+            type: 'selectLLMModel',
             label: 'core.module.input.label.aiModel',
             required: true,
             valueType: 'string',
@@ -882,13 +882,13 @@ export const appTemplates: (AppItemType & {
           },
           {
             key: 'model',
-            type: 'selectChatModel',
+            type: 'selectLLMModel',
             label: 'core.module.input.label.aiModel',
             required: true,
             valueType: 'string',
             showTargetInApp: false,
             showTargetInPlugin: false,
-            value: 'gpt-3.5-turbo-16k',
+            value: 'gpt-3.5-turbo',
             connected: false
           },
           {
@@ -1115,7 +1115,7 @@ export const appTemplates: (AppItemType & {
           },
           {
             key: 'model',
-            type: 'selectCQModel',
+            type: 'selectLLMModel',
             valueType: 'string',
             label: 'core.module.input.label.Classify model',
             required: true,
@@ -1345,7 +1345,7 @@ export const appTemplates: (AppItemType & {
           },
           {
             key: 'model',
-            type: 'selectChatModel',
+            type: 'selectLLMModel',
             label: 'core.module.input.label.aiModel',
             required: true,
             valueType: 'string',

projects/app/src/web/core/chat/api.ts

@@ -1,5 +1,6 @@
 import { GET, POST, DELETE, PUT } from '@/web/common/api/request';
-import type { ChatHistoryItemType } from '@fastgpt/global/core/chat/type.d';
+import type { ChatHistoryItemType, chatAppListSchema } from '@fastgpt/global/core/chat/type.d';
+
 import type {
   CloseCustomFeedbackParams,
   InitChatProps,
@@ -16,13 +17,31 @@ import type {
 } from '@/global/core/chat/api.d';
 import { UpdateChatFeedbackProps } from '@fastgpt/global/core/chat/api';
 
+/**
+ * 根据队伍ID和获取
+ */
+export const getChatListById = (data: { shareTeamId: string; authToken: string }) =>
+  POST<chatAppListSchema>(`/proApi/core/chat/init`, data);
+
+/**
+ * 获取团队分享的对话列表 initTeamChat
+ * @param data
+ * @returns
+ */
+export const getinitTeamChat = (data: { teamId: string; authToken: string; appId: string }) =>
+  GET(`/proApi/core/chat/initTeamChat`, data);
+
 /**
  * 获取初始化聊天内容
  */
 export const getInitChatInfo = (data: InitChatProps) =>
   GET<InitChatResponse>(`/core/chat/init`, data);
+export const getInitChatInfoTeam = (data: InitChatProps) =>
+  GET<InitChatResponse>(`/core/chat/init`, data);
 export const getInitOutLinkChatInfo = (data: InitOutLinkChatProps) =>
   GET<InitChatResponse>(`/core/chat/outLink/init`, data);
+export const getTeamChatInfo = (data: { appId: string; chatId: string; outLinkUid?: string }) =>
+  GET<InitChatResponse>(`/core/chat/team/init`, data);
 
 /**
  * get current window history(appid or shareId)

projects/app/src/web/core/chat/storeTeamChat.ts

@@ -0,0 +1,42 @@
+import { create } from 'zustand';
+import { devtools, persist } from 'zustand/middleware';
+import { immer } from 'zustand/middleware/immer';
+import type { ChatHistoryItemType } from '@fastgpt/global/core/chat/type.d';
+import { customAlphabet } from 'nanoid';
+const nanoid = customAlphabet(
+  'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWSYZ1234567890_',
+  24
+);
+
+type State = {
+  localUId: string;
+  teamShareChatHistory: (ChatHistoryItemType & { delete?: boolean })[];
+  clearLocalHistory: (shareId?: string) => void;
+};
+
+export const useTeamShareChatStore = create<State>()(
+  devtools(
+    persist(
+      immer((set, get) => ({
+        localUId: `shareChat-${Date.now()}-${nanoid()}`,
+        teamShareChatHistory: [], // old version field
+        clearLocalHistory() {
+          // abandon
+          set((state) => {
+            state.teamShareChatHistory = state.teamShareChatHistory.map((item) => ({
+              ...item,
+              delete: true
+            }));
+          });
+        }
+      })),
+      {
+        name: 'shareChatStore',
+        partialize: (state) => ({
+          localUId: state.localUId,
+          shareChatHistory: state.teamShareChatHistory
+        })
+      }
+    )
+  )
+);

projects/app/src/web/core/dataset/store/dataset.ts

@@ -12,7 +12,7 @@ import {
 import { defaultDatasetDetail } from '@/constants/dataset';
 import type { DatasetUpdateBody } from '@fastgpt/global/core/dataset/api.d';
 import { DatasetStatusEnum } from '@fastgpt/global/core/dataset/constants';
-import { postCreateTrainingBill } from '@/web/support/wallet/bill/api';
+import { postCreateTrainingUsage } from '@/web/support/wallet/usage/api';
 import { checkTeamWebSyncLimit } from '@/web/support/user/team/api';
 
 type State = {
@@ -89,19 +89,17 @@ export const useDatasetStore = create<State>()(
         async startWebsiteSync() {
           await checkTeamWebSyncLimit();
 
-          const [_, billId] = await Promise.all([
+          const billId = await postCreateTrainingUsage({
+            name: 'core.dataset.training.Website Sync',
+            datasetId: get().datasetDetail._id
+          });
+
+          return postWebsiteSync({ datasetId: get().datasetDetail._id, billId }).then(() => {
             get().updateDataset({
               id: get().datasetDetail._id,
               status: DatasetStatusEnum.syncing
-            }),
-            postCreateTrainingBill({
-              name: 'core.dataset.training.Website Sync',
-              datasetId: get().datasetDetail._id
-            })
-          ]);
-          try {
-            postWebsiteSync({ datasetId: get().datasetDetail._id, billId });
-          } catch (error) {}
+            });
+          });
         }
       })),
       {

projects/app/src/web/core/dataset/utils.ts

@@ -68,12 +68,6 @@ export async function chunksUpload({
     });
   }
 
-  // add chunk index
-  chunks = chunks.map((chunk) => ({
-    ...chunk,
-    chunkIndex: chunk.chunkIndex
-  }));
-
   let successInsert = 0;
   let retryTimes = 10;
   for (let i = 0; i < chunks.length; i += rate) {

projects/app/src/web/core/modules/template/system.ts

@@ -13,7 +13,7 @@ import { RunAppModule } from '@fastgpt/global/core/module/template/system/runApp
 import { PluginInputModule } from '@fastgpt/global/core/module/template/system/pluginInput';
 import { PluginOutputModule } from '@fastgpt/global/core/module/template/system/pluginOutput';
 import { RunPluginModule } from '@fastgpt/global/core/module/template/system/runPlugin';
-import { AiCFR } from '@fastgpt/global/core/module/template/system/coreferenceResolution';
+import { AiQueryExtension } from '@fastgpt/global/core/module/template/system/queryExtension';
 
 import type {
   FlowModuleTemplateType,
@@ -31,7 +31,8 @@ export const appSystemModuleTemplates: FlowModuleTemplateType[] = [
   RunAppModule,
   ClassifyQuestionModule,
   ContextExtractModule,
-  HttpModule468
+  HttpModule468,
+  AiQueryExtension
 ];
 export const pluginSystemModuleTemplates: FlowModuleTemplateType[] = [
   PluginInputModule,
@@ -43,7 +44,8 @@ export const pluginSystemModuleTemplates: FlowModuleTemplateType[] = [
   RunAppModule,
   ClassifyQuestionModule,
   ContextExtractModule,
-  HttpModule468
+  HttpModule468,
+  AiQueryExtension
 ];
 
 export const moduleTemplatesFlat: FlowModuleTemplateType[] = [
@@ -61,7 +63,7 @@ export const moduleTemplatesFlat: FlowModuleTemplateType[] = [
   PluginInputModule,
   PluginOutputModule,
   RunPluginModule,
-  AiCFR
+  AiQueryExtension
 ];
 
 export const moduleTemplatesList: moduleTemplateListType = [

projects/app/src/web/styles/theme.ts

@@ -217,7 +217,7 @@ const Button = defineStyleConfig({
 
 const Input: ComponentStyleConfig = {
   baseStyle: {
-    fontsize: '14px'
+    fontsize: '1rem'
   },
   sizes: {
     sm: defineStyle({
@@ -368,12 +368,11 @@ export const theme = extendTheme({
   styles: {
     global: {
       'html, body': {
+        fontSize: '14px',
         color: 'myGray.900',
-        fontSize: 'md',
         fontWeight: 400,
         height: '100%',
         overflow: 'hidden'
-        // lineHeight: 'unset'
       },
       a: {
         color: 'primary.600'
@@ -472,16 +471,16 @@ export const theme = extendTheme({
     body: 'PingFang,Noto Sans,-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"'
   },
   fontSizes: {
-    xs: '12px',
-    sm: '13px',
-    md: '14px',
-    lg: '16px',
-    xl: '18px',
-    '2xl': '20px',
-    '3xl': '24px',
-    '4xl': '28px',
-    '5xl': '32px',
-    '6xl': '36px'
+    xs: '0.8rem',
+    sm: '0.93rem',
+    md: '1rem',
+    lg: '1.15rem',
+    xl: '1.3rem',
+    '2xl': '1.45rem',
+    '3xl': '1.6rem',
+    '4xl': '1.75rem',
+    '5xl': '1.9rem',
+    '6xl': '2.05rem'
   },
   borders: {
     sm: '1px solid #E8EBF0',

projects/app/src/web/support/user/team/api.ts

@@ -8,11 +8,13 @@ import {
   UpdateTeamMemberProps,
   UpdateTeamProps
 } from '@fastgpt/global/support/user/team/controller.d';
+import type { TeamTagsSchema } from '@fastgpt/global/support/user/team/type';
 import {
   TeamItemType,
   TeamMemberItemType,
   TeamMemberSchema
 } from '@fastgpt/global/support/user/team/type.d';
+import { FeTeamPlanStatusType, TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type';
 
 /* --------------- team  ---------------- */
 export const getTeamList = (status: `${TeamMemberSchema['status']}`) =>
@@ -23,6 +25,14 @@ export const putUpdateTeam = (data: UpdateTeamProps) =>
   PUT(`/proApi/support/user/team/update`, data);
 export const putSwitchTeam = (teamId: string) =>
   PUT<string>(`/proApi/support/user/team/switch`, { teamId });
+export const updateTags = (teamId: string, tagsUrl: string) =>
+  POST<TeamTagsSchema[]>(`/proApi/support/user/team/tags/asyncTags`, { teamId, tagsUrl });
+export const getTeamsTags = (teamId: string) =>
+  GET(`/proApi/support/user/team/tags/list`, { teamId });
+export const putUpdateTeamTags = (data: any) =>
+  PUT(`/proApi/support/user/team/tags/updateUrl`, data);
+export const insertTeamsTags = (tags: Array<any>) =>
+  POST(`/proApi/support/user/team/tags/create`, tags);
 
 /* --------------- team member ---------------- */
 export const getTeamMembers = (teamId: string) =>
@@ -46,3 +56,9 @@ export const checkTeamExportDatasetLimit = (datasetId: string) =>
 export const checkTeamWebSyncLimit = () => GET(`/support/user/team/limit/webSyncLimit`);
 export const checkTeamDatasetSizeLimit = (size: number) =>
   GET(`/support/user/team/limit/datasetSizeLimit`, { size });
+
+/* plans */
+export const getTeamPlanStatus = () =>
+  GET<FeTeamPlanStatusType>(`/support/user/team/plan/getTeamPlanStatus`, { maxQuantity: 1 });
+export const getTeamPlans = () =>
+  GET<TeamSubSchema[]>(`/proApi/support/user/team/plan/getTeamPlans`);

projects/app/src/web/support/user/useUserStore.ts

@@ -3,14 +3,18 @@ import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import type { UserUpdateParams } from '@/types/user';
 import type { UserType } from '@fastgpt/global/support/user/type.d';
-import { formatStorePrice2Read } from '@fastgpt/global/support/wallet/bill/tools';
 import { getTokenLogin, putUserInfo } from '@/web/support/user/api';
+import { FeTeamPlanStatusType } from '@fastgpt/global/support/wallet/sub/type';
+import { getTeamPlanStatus } from './team/api';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 
 type State = {
   userInfo: UserType | null;
   initUserInfo: () => Promise<UserType>;
   setUserInfo: (user: UserType | null) => void;
   updateUserInfo: (user: UserUpdateParams) => Promise<void>;
+  teamPlanStatus: FeTeamPlanStatusType | null;
+  initTeamPlanStatus: () => Promise<any>;
 };
 
 export const useUserStore = create<State>()(
@@ -19,19 +23,22 @@ export const useUserStore = create<State>()(
       immer((set, get) => ({
         userInfo: null,
         async initUserInfo() {
+          get().initTeamPlanStatus();
+
           const res = await getTokenLogin();
           get().setUserInfo(res);
 
+          //设置html的fontsize
+          const html = document?.querySelector('html');
+          if (html) {
+            // html.style.fontSize = '16px';
+          }
+
           return res;
         },
         setUserInfo(user: UserType | null) {
           set((state) => {
-            state.userInfo = user
-              ? {
-                  ...user,
-                  balance: formatStorePrice2Read(user.balance)
-                }
-              : null;
+            state.userInfo = user ? user : null;
           });
         },
         async updateUserInfo(user: UserUpdateParams) {
@@ -51,6 +58,15 @@ export const useUserStore = create<State>()(
             });
             return Promise.reject(error);
           }
+        },
+        teamPlanStatus: null,
+        initTeamPlanStatus() {
+          return getTeamPlanStatus().then((res) => {
+            set((state) => {
+              state.teamPlanStatus = res;
+            });
+            return res;
+          });
         }
       })),
       {

projects/app/src/web/support/wallet/bill/api.ts

@@ -1,10 +1,22 @@
+import { RequestPaging } from '@/types';
 import { GET, POST } from '@/web/common/api/request';
-import { CreateTrainingBillProps } from '@fastgpt/global/support/wallet/bill/api.d';
-import type { PagingData, RequestPaging } from '@/types';
-import type { BillItemType } from '@fastgpt/global/support/wallet/bill/type';
+import { CreateBillProps, CreateBillResponse } from '@fastgpt/global/support/wallet/bill/api';
+import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
+import type { BillSchemaType } from '@fastgpt/global/support/wallet/bill/type.d';
 
-export const getUserBills = (data: RequestPaging) =>
-  POST<PagingData<BillItemType>>(`/proApi/support/wallet/bill/getBill`, data);
+export const getBills = (
+  data: RequestPaging & {
+    type?: `${BillTypeEnum}`;
+  }
+) => POST<BillSchemaType[]>(`/proApi/support/wallet/bill/list`, data);
 
-export const postCreateTrainingBill = (data: CreateTrainingBillProps) =>
-  POST<string>(`/support/wallet/bill/createTrainingBill`, data);
+export const getWxPayQRCode = (data: CreateBillProps) =>
+  POST<CreateBillResponse>(`/proApi/support/wallet/bill/create`, data);
+
+export const checkBalancePayResult = (payId: string) =>
+  GET<string>(`/proApi/support/wallet/bill/checkPayResult`, { payId }).then((data) => {
+    try {
+      GET('/common/system/unlockTask');
+    } catch (error) {}
+    return data;
+  });

projects/app/src/web/support/wallet/pay/api.ts

@@ -1,17 +0,0 @@
-import { GET } from '@/web/common/api/request';
-import type { PaySchema } from '@fastgpt/global/support/wallet/pay/type.d';
-export const getPayOrders = () => GET<PaySchema[]>(`/proApi/support/wallet/pay/getPayOrders`);
-
-export const getPayCode = (amount: number) =>
-  GET<{
-    codeUrl: string;
-    payId: string;
-  }>(`/proApi/support/wallet/pay/getPayCode`, { amount });
-
-export const checkPayResult = (payId: string) =>
-  GET<string>(`/proApi/support/wallet/pay/checkPayResult`, { payId }).then((data) => {
-    try {
-      GET('/common/system/unlockTask');
-    } catch (error) {}
-    return data;
-  });

projects/app/src/web/support/wallet/sub/api.ts

@@ -1,30 +1,16 @@
 import { GET, POST, PUT, DELETE } from '@/web/common/api/request';
 import {
   StandardSubPlanParams,
-  StandardSubPlanUpdateResponse,
-  SubDatasetSizeParams,
-  SubDatasetSizePreviewCheckResponse
+  StandardSubPlanUpdateResponse
 } from '@fastgpt/global/support/wallet/sub/api';
 import { SubStatusEnum, SubTypeEnum } from '@fastgpt/global/support/wallet/sub/constants';
-import { FeTeamSubType } from '@fastgpt/global/support/wallet/sub/type';
 
 export const putTeamDatasetSubStatus = (data: {
   status: `${SubStatusEnum}`;
   type: `${SubTypeEnum}`;
 }) => POST('/proApi/support/wallet/sub/updateStatus', data);
 
-export const getTeamDatasetValidSub = () =>
-  GET<FeTeamSubType>(`/support/wallet/sub/getTeamSubStatus`);
-
 export const postCheckStandardSub = (data: StandardSubPlanParams) =>
   POST<StandardSubPlanUpdateResponse>('/proApi/support/wallet/sub/standard/preCheck', data);
 export const postUpdateStandardSub = (data: StandardSubPlanParams) =>
   POST<StandardSubPlanUpdateResponse>('/proApi/support/wallet/sub/standard/update', data);
-
-export const posCheckTeamDatasetSizeSub = (data: SubDatasetSizeParams) =>
-  POST<SubDatasetSizePreviewCheckResponse>(
-    '/proApi/support/wallet/sub/extraDatasetSize/preCheck',
-    data
-  );
-export const postUpdateTeamDatasetSizeSub = (data: SubDatasetSizeParams) =>
-  POST('/proApi/support/wallet/sub/extraDatasetSize/update', data);

projects/app/src/web/support/wallet/sub/constants.ts

@@ -0,0 +1,2 @@
+export const AI_POINT_USAGE_CARD_ROUTE = '/price#point-card';
+export const EXTRA_PLAN_CARD_ROUTE = '/price#extra-plan';

projects/app/src/web/support/wallet/usage/api.ts

@@ -0,0 +1,10 @@
+import { GET, POST } from '@/web/common/api/request';
+import { CreateTrainingUsageProps } from '@fastgpt/global/support/wallet/usage/api.d';
+import type { PagingData, RequestPaging } from '@/types';
+import type { UsageItemType } from '@fastgpt/global/support/wallet/usage/type';
+
+export const getUserUsages = (data: RequestPaging) =>
+  POST<PagingData<UsageItemType>>(`/proApi/support/wallet/usage/getUsage`, data);
+
+export const postCreateTrainingUsage = (data: CreateTrainingUsageProps) =>
+  POST<string>(`/support/wallet/usage/createTrainingUsage`, data);