gitea/FastGPT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "sub plan page (#885)" (#886)

Browse Source 
This reverts commit 443ad37b6a.
This commit is contained in:
Archer
2024-02-23 17:48:15 +08:00
committed by GitHub
parent 443ad37b6a
commit fd9b6291af
246 changed files with 4281 additions and 6286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/app/src/service/support/permission/auth/bill.ts Normal file
View File

@@ -0,0 +1,9 @@
import { GET } from '@fastgpt/service/common/api/plusRequest';
import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
export const authTeamBalance = async (teamId: string) => {
if (FastGPTProUrl) {
return GET('/support/permission/authBalance', { teamId });
}
return true;
};

1
projects/app/src/service/support/permission/auth/dataset.ts
View File

@@ -24,7 +24,6 @@ export async function authDatasetData({
const data: DatasetDataItemType = {
id: String(datasetData._id),
teamId: datasetData.teamId,
q: datasetData.q,
a: datasetData.a,
chunkIndex: datasetData.chunkIndex,

10
projects/app/src/service/support/permission/auth/outLink.ts
View File

@@ -6,7 +6,7 @@ import type {
AuthOutLinkResponse
} from '@fastgpt/global/support/outLink/api.d';
import { authOutLinkValid } from '@fastgpt/service/support/permission/auth/outLink';
import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
import { getUserAndAuthBalance } from '@fastgpt/service/support/user/controller';
import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
import { OutLinkErrEnum } from '@fastgpt/global/common/error/code/outLink';
import { OutLinkSchema } from '@fastgpt/global/support/outLink/type';
@@ -58,15 +58,13 @@ export async function authOutLinkChatStart({
// get outLink and app
const { shareChat, appId } = await authOutLinkValid({ shareId });
// check ai points and chat limit
const [{ user }, { uid }] = await Promise.all([
getUserChatInfoAndAuthTeamPoints(shareChat.tmbId),
// check balance and chat limit
const [user, { uid }] = await Promise.all([
getUserAndAuthBalance({ tmbId: shareChat.tmbId, minBalance: 0 }),
authOutLinkChatLimit({ outLink: shareChat, ip, outLinkUid, question })
]);
return {
teamId: shareChat.teamId,
tmbId: shareChat.tmbId,
authType: AuthUserTypeEnum.token,
responseDetail: shareChat.responseDetail,
user,

18
projects/app/src/service/support/permission/auth/team.ts
View File

@@ -1,18 +0,0 @@
import { UserErrEnum } from '@fastgpt/global/common/error/code/user';
import { TeamMemberWithUserSchema } from '@fastgpt/global/support/user/team/type';
import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
import { checkTeamAIPoints } from '../teamLimit';
export async function getUserChatInfoAndAuthTeamPoints(tmbId: string) {
const tmb = (await MongoTeamMember.findById(tmbId, 'teamId userId').populate(
'userId',
'timezone openaiAccount'
)) as TeamMemberWithUserSchema;
if (!tmb) return Promise.reject(UserErrEnum.unAuthUser);
await checkTeamAIPoints(tmb.teamId);
return {
user: tmb.userId
};
}

44
projects/app/src/service/support/permission/auth/teamChat.ts
View File

@@ -1,44 +0,0 @@
import { POST } from '@fastgpt/service/common/api/plusRequest';
import type {
AuthOutLinkChatProps,
AuthOutLinkLimitProps,
AuthOutLinkInitProps,
AuthOutLinkResponse
} from '@fastgpt/global/support/outLink/api.d';
import { getUserChatInfoAndAuthTeamPoints } from './team';
import { MongoTeam } from '@fastgpt/service/support/user/team/teamSchema';
import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
export function authOutLinkInit(data: AuthOutLinkInitProps): Promise<AuthOutLinkResponse> {
if (!global.feConfigs?.isPlus) return Promise.resolve({ uid: data.outLinkUid });
return POST<AuthOutLinkResponse>('/support/outLink/authInit', data);
}
export function authOutLinkChatLimit(data: AuthOutLinkLimitProps): Promise<AuthOutLinkResponse> {
if (!global.feConfigs?.isPlus) return Promise.resolve({ uid: data.outLinkUid });
return POST<AuthOutLinkResponse>('/support/outLink/authChatStart', data);
}
export async function authTeamShareChatStart({
teamId,
ip,
outLinkUid,
question
}: AuthOutLinkChatProps & {
teamId: string;
}) {
// get outLink and app
const res: any = await MongoTeam.findById(teamId);
// check balance and chat limit
const tmb = await MongoTeamMember.findOne({ teamId, userId: String(res.ownerId) });
if (!tmb) {
throw new Error('can not find it');
}
const { user } = await getUserChatInfoAndAuthTeamPoints(String(tmb._id));
return {
user,
uid: outLinkUid
};
}

102
projects/app/src/service/support/permission/teamLimit.ts
View File

@@ -1,102 +0,0 @@
import { getVectorCountByTeamId } from '@fastgpt/service/common/vectorStore/controller';
import { getTeamSubPlans, getTeamStandPlan } from '@fastgpt/service/support/wallet/sub/utils';
import { getStandardSubPlan } from '../wallet/sub/utils';
import { MongoApp } from '@fastgpt/service/core/app/schema';
import { MongoPlugin } from '@fastgpt/service/core/plugin/schema';
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { TeamErrEnum } from '@fastgpt/global/common/error/code/team';
export const checkDatasetLimit = async ({
teamId,
insertLen = 0
}: {
teamId: string;
insertLen?: number;
}) => {
const [{ totalPoints, usedPoints, datasetMaxSize }, usedSize] = await Promise.all([
getTeamSubPlans({ teamId, standardPlans: getStandardSubPlan() }),
getVectorCountByTeamId(teamId)
]);
if (usedSize + insertLen >= datasetMaxSize) {
return Promise.reject(TeamErrEnum.datasetSizeNotEnough);
}
if (usedPoints >= totalPoints) {
return Promise.reject(TeamErrEnum.aiPointsNotEnough);
}
return;
};
export const checkTeamAIPoints = async (teamId: string) => {
const { totalPoints, usedPoints } = await getTeamSubPlans({
teamId,
standardPlans: getStandardSubPlan()
});
if (usedPoints >= totalPoints) {
return Promise.reject(TeamErrEnum.aiPointsNotEnough);
}
return {
totalPoints,
usedPoints
};
};
export const checkTeamDatasetLimit = async (teamId: string) => {
const [{ standardConstants }, datasetCount] = await Promise.all([
getTeamStandPlan({ teamId, standardPlans: getStandardSubPlan() }),
MongoDataset.countDocuments({
teamId,
type: DatasetTypeEnum.dataset
})
]);
if (standardConstants && datasetCount >= standardConstants.maxDatasetAmount) {
return Promise.reject(TeamErrEnum.datasetAmountNotEnough);
}
};
export const checkTeamAppLimit = async (teamId: string) => {
const [{ standardConstants }, appCount] = await Promise.all([
getTeamStandPlan({ teamId, standardPlans: getStandardSubPlan() }),
MongoApp.count({ teamId })
]);
if (standardConstants && appCount >= standardConstants.maxAppAmount) {
return Promise.reject(TeamErrEnum.appAmountNotEnough);
}
};
export const checkTeamPluginLimit = async (teamId: string) => {
const [{ standardConstants }, pluginCount] = await Promise.all([
getTeamStandPlan({ teamId, standardPlans: getStandardSubPlan() }),
MongoPlugin.count({ teamId })
]);
if (standardConstants && pluginCount >= standardConstants.maxAppAmount) {
return Promise.reject(TeamErrEnum.pluginAmountNotEnough);
}
};
export const checkTeamReRankPermission = async (teamId: string) => {
const { standardConstants } = await getTeamStandPlan({
teamId,
standardPlans: getStandardSubPlan()
});
if (standardConstants && !standardConstants?.permissionReRank) {
return false;
}
return true;
};
export const checkTeamWebSyncPermission = async (teamId: string) => {
const { standardConstants } = await getTeamStandPlan({
teamId,
standardPlans: getStandardSubPlan()
});
if (standardConstants && !standardConstants?.permissionWebsiteSync) {
return Promise.reject(TeamErrEnum.websiteSyncNotEnough);
}
};