mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-07 01:02:55 +08:00
V4.14.4 features (#6036)
* feat: add query optimize and bill (#6021) * add query optimize and bill * perf: query extension * fix: embe model * remove log * remove log * fix: test --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * feat: notice (#6013) * feat: record user's language * feat: notice points/dataset indexes; support count limit; update docker-compose.yml * fix: ts error * feat: send auth code i18n * chore: dataset notice limit * chore: adjust * fix: ts * fix: countLimit race condition; i18n en-prefix locale fallback to en --------- Co-authored-by: archer <545436317@qq.com> * perf: comment * perf: send inform code * fix: type error (#6029) * feat: add ip region for chat logs (#6010) * feat: add ip region for chat logs * refactor: use Geolite2.mmdb * fix: export chat logs * fix: return location directly * test: add unit test * perf: log show ip data * adjust commercial plans (#6008) * plan frontend * plan limit * coupon * discount coupon * fix * type * fix audit * type * plan name * legacy plan * track * feat: add discount coupon * fix * fix discount coupon * openapi * type * type * env * api type * fix * fix: simple agent plugin input & agent dashboard card (#6034) * refactor: remove gridfs (#6031) * fix: replace gridfs multer operations with s3 compatible ops * wip: s3 features * refactor: remove gridfs * fix * perf: mock test * doc * doc * doc * fix: test * fix: s3 * fix: mock s3 * remove invalid config * fix: init query extension * initv4144 (#6037) * chore: initv4144 * fix * version * fix: new plans (#6039) * fix: new plans * qr modal tip * fix: buffer raw text filename (#6040) * fix: initv4144 (#6041) * fix: pay refresh (#6042) * fix: migration shell * rename collection * clear timerlock * clear timerlock * perf: faq * perf: bill schema * fix: openapi * doc * fix: share var render * feat: delete dataset queue * plan usage display (#6043) * plan usage display * text * fix * fix: ts * perf: remove invalid code * perf: init shell * doc * perf: rename field * perf: avatar presign * init * custom plan text (#6045) * fix plans * fix * fixed * computed --------- Co-authored-by: archer <545436317@qq.com> * init shell * plan text & price page back button (#6046) * init * index * delete dataset * delete dataset * perf: delete dataset * init --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: Roy <whoeverimf5@gmail.com> Co-authored-by: heheer <heheer@sealos.io>
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
import z from 'zod';
|
||||
import { CountLimitTypeEnum } from './type';
|
||||
|
||||
export const CountLimitConfigType = z.record(
|
||||
CountLimitTypeEnum,
|
||||
z.object({ maxCount: z.number() })
|
||||
);
|
||||
|
||||
// 只会发送 n 次通知,如需自动发送,需要主动清除记录
|
||||
export const CountLimitConfig = {
|
||||
[CountLimitTypeEnum.enum['notice:30PercentPoints']]: {
|
||||
maxCount: 3
|
||||
},
|
||||
[CountLimitTypeEnum.enum['notice:10PercentPoints']]: {
|
||||
maxCount: 5
|
||||
},
|
||||
[CountLimitTypeEnum.enum['notice:LackOfPoints']]: {
|
||||
maxCount: 5
|
||||
},
|
||||
[CountLimitTypeEnum.enum['notice:30PercentDatasetIndexes']]: {
|
||||
maxCount: 3
|
||||
},
|
||||
[CountLimitTypeEnum.enum['notice:10PercentDatasetIndexes']]: {
|
||||
maxCount: 5
|
||||
},
|
||||
[CountLimitTypeEnum.enum['notice:NoDatasetIndexes']]: {
|
||||
maxCount: 5
|
||||
}
|
||||
} satisfies z.infer<typeof CountLimitConfigType>;
|
||||
@@ -0,0 +1,81 @@
|
||||
import type z from 'zod';
|
||||
import type { CountLimitTypeEnum } from './type';
|
||||
import { CountLimitConfig } from './const';
|
||||
import { MongoCountLimit } from './schema';
|
||||
import { mongoSessionRun } from '../../mongo/sessionRun';
|
||||
|
||||
/**
|
||||
* Update the count limit for a specific type and key.
|
||||
* @param param0 - The type, key, and update value.
|
||||
* @returns The updated count limit information.
|
||||
*/
|
||||
export const updateCountLimit = async ({
|
||||
type,
|
||||
key,
|
||||
update
|
||||
}: {
|
||||
type: z.infer<typeof CountLimitTypeEnum>;
|
||||
key: string;
|
||||
update: number;
|
||||
}) =>
|
||||
mongoSessionRun(async (session) => {
|
||||
const maxCount = CountLimitConfig[type].maxCount;
|
||||
const countLimit = await MongoCountLimit.findOne(
|
||||
{
|
||||
type,
|
||||
key
|
||||
},
|
||||
undefined,
|
||||
{
|
||||
session
|
||||
}
|
||||
).lean();
|
||||
|
||||
if (!countLimit) {
|
||||
// do not exist, create a new one
|
||||
await MongoCountLimit.create(
|
||||
[
|
||||
{
|
||||
type,
|
||||
key,
|
||||
count: update // 0 + update
|
||||
}
|
||||
],
|
||||
{
|
||||
session
|
||||
}
|
||||
);
|
||||
return {
|
||||
maxCount,
|
||||
nowCount: update,
|
||||
remain: maxCount - update
|
||||
};
|
||||
}
|
||||
|
||||
if (countLimit.count >= maxCount) {
|
||||
return Promise.reject(`Max Count Reached, type: ${type}, key: ${key}`);
|
||||
}
|
||||
|
||||
await MongoCountLimit.updateOne(
|
||||
{
|
||||
type,
|
||||
key
|
||||
},
|
||||
{
|
||||
$inc: { count: update }
|
||||
},
|
||||
{ session }
|
||||
);
|
||||
|
||||
return {
|
||||
maxCount,
|
||||
nowCount: countLimit.count + update,
|
||||
remain: maxCount - (countLimit.count + update)
|
||||
};
|
||||
});
|
||||
|
||||
/** Clean the Count limit, if no key provided, clean all the type */
|
||||
export const cleanCountLimit = async ({ teamId }: { teamId: string }) =>
|
||||
MongoCountLimit.deleteMany({
|
||||
key: teamId
|
||||
});
|
||||
@@ -0,0 +1,34 @@
|
||||
import { connectionMongo, getMongoModel } from '../../../common/mongo';
|
||||
import type { CountLimitType } from './type';
|
||||
|
||||
const { Schema } = connectionMongo;
|
||||
|
||||
const collectionName = 'system_count_limits';
|
||||
const CountLimitSchema = new Schema({
|
||||
key: {
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
type: {
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
count: {
|
||||
type: Number,
|
||||
required: true,
|
||||
default: 0
|
||||
},
|
||||
createTime: {
|
||||
type: Date,
|
||||
default: () => new Date()
|
||||
}
|
||||
});
|
||||
|
||||
try {
|
||||
CountLimitSchema.index({ type: 1, key: 1 }, { unique: true });
|
||||
CountLimitSchema.index({ createTime: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 30 }); // ttl 30天
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
|
||||
export const MongoCountLimit = getMongoModel<CountLimitType>(collectionName, CountLimitSchema);
|
||||
@@ -0,0 +1,19 @@
|
||||
import z from 'zod';
|
||||
|
||||
export const CountLimitTypeEnum = z.enum([
|
||||
'notice:30PercentPoints',
|
||||
'notice:10PercentPoints',
|
||||
'notice:LackOfPoints',
|
||||
'notice:30PercentDatasetIndexes',
|
||||
'notice:10PercentDatasetIndexes',
|
||||
'notice:NoDatasetIndexes'
|
||||
]);
|
||||
|
||||
export const CountLimitType = z.object({
|
||||
type: CountLimitTypeEnum,
|
||||
key: z.string(),
|
||||
count: z.number()
|
||||
});
|
||||
|
||||
export type CountLimitType = z.infer<typeof CountLimitType>;
|
||||
export type CountLimitTypeEnum = z.infer<typeof CountLimitTypeEnum>;
|
||||
@@ -9,7 +9,8 @@ export enum TimerIdEnum {
|
||||
|
||||
clearExpiredRawTextBuffer = 'clearExpiredRawTextBuffer',
|
||||
clearExpiredDatasetImage = 'clearExpiredDatasetImage',
|
||||
clearExpiredMinioFiles = 'clearExpiredMinioFiles'
|
||||
clearExpiredMinioFiles = 'clearExpiredMinioFiles',
|
||||
recordTeamQPM = 'recordTeamQPM'
|
||||
}
|
||||
|
||||
export enum LockNotificationEnum {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { connectionMongo, getMongoModel } from '../../mongo';
|
||||
const { Schema } = connectionMongo;
|
||||
import { type TimerLockSchemaType } from './type.d';
|
||||
|
||||
export const collectionName = 'systemtimerlocks';
|
||||
export const collectionName = 'system_timer_locks';
|
||||
|
||||
const TimerLockSchema = new Schema({
|
||||
timerId: {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { type ClientSession } from '../../mongo';
|
||||
import { MongoTimerLock } from './schema';
|
||||
import { addMinutes } from 'date-fns';
|
||||
|
||||
/*
|
||||
/*
|
||||
利用唯一健,使得同一时间只有一个任务在执行,后创建的锁,会因唯一健创建失败,从而无法继续执行任务
|
||||
*/
|
||||
export const checkTimerLock = async ({
|
||||
@@ -30,3 +30,19 @@ export const checkTimerLock = async ({
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
export const cleanTimerLock = async ({
|
||||
teamId,
|
||||
session
|
||||
}: {
|
||||
teamId: string;
|
||||
session?: ClientSession;
|
||||
}) => {
|
||||
// Match timerId pattern where lockId (last segment) equals teamId
|
||||
await MongoTimerLock.deleteMany(
|
||||
{
|
||||
timerId: new RegExp(`--${teamId}$`)
|
||||
},
|
||||
{ session }
|
||||
);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user