mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-06 01:02:54 +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:
@@ -15,6 +15,13 @@ const getCurrentTenMinuteBoundary = () => {
|
||||
return boundary;
|
||||
};
|
||||
|
||||
const getCurrentMinuteBoundary = () => {
|
||||
const now = new Date();
|
||||
const boundary = new Date(now);
|
||||
boundary.setSeconds(0, 0);
|
||||
return boundary;
|
||||
};
|
||||
|
||||
export const trackTimerProcess = async () => {
|
||||
while (true) {
|
||||
await countTrackTimer();
|
||||
@@ -31,7 +38,8 @@ export const countTrackTimer = async () => {
|
||||
global.countTrackQueue = new Map();
|
||||
|
||||
try {
|
||||
const currentBoundary = getCurrentTenMinuteBoundary();
|
||||
const currentTenMinuteBoundary = getCurrentTenMinuteBoundary();
|
||||
const currentMinuteBoundary = getCurrentMinuteBoundary();
|
||||
|
||||
const bulkOps = queuedItems
|
||||
.map(({ event, count, data }) => {
|
||||
@@ -44,7 +52,7 @@ export const countTrackTimer = async () => {
|
||||
filter: {
|
||||
event,
|
||||
teamId,
|
||||
createTime: currentBoundary,
|
||||
createTime: currentTenMinuteBoundary,
|
||||
'data.datasetId': datasetId
|
||||
},
|
||||
update: [
|
||||
@@ -52,7 +60,7 @@ export const countTrackTimer = async () => {
|
||||
$set: {
|
||||
event,
|
||||
teamId,
|
||||
createTime: { $ifNull: ['$createTime', currentBoundary] },
|
||||
createTime: { $ifNull: ['$createTime', currentTenMinuteBoundary] },
|
||||
data: {
|
||||
datasetId,
|
||||
count: { $add: [{ $ifNull: ['$data.count', 0] }, count] }
|
||||
@@ -65,6 +73,36 @@ export const countTrackTimer = async () => {
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
if (event === TrackEnum.teamChatQPM) {
|
||||
const { teamId } = data;
|
||||
|
||||
return [
|
||||
{
|
||||
updateOne: {
|
||||
filter: {
|
||||
event,
|
||||
teamId,
|
||||
createTime: currentMinuteBoundary
|
||||
},
|
||||
update: [
|
||||
{
|
||||
$set: {
|
||||
event,
|
||||
teamId,
|
||||
createTime: { $ifNull: ['$createTime', currentMinuteBoundary] },
|
||||
data: {
|
||||
requestCount: { $add: [{ $ifNull: ['$data.requestCount', 0] }, count] }
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
upsert: true
|
||||
}
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
return [];
|
||||
})
|
||||
.flat();
|
||||
|
||||
Reference in New Issue
Block a user