V4.8.20 feature (#3686)

* Aiproxy (#3649) * model config * feat: model config ui * perf: rename variable * feat: custom request url * perf: model buffer * perf: init model * feat: json model config * auto login * fix: ts * update packages * package * fix: dockerfile * feat: usage filter & export & dashbord (#3538) * feat: usage filter & export & dashbord * adjust ui * fix tmb scroll * fix code & selecte all * merge * perf: usages list；perf: move components (#3654) * perf: usages list * team sub plan load * perf: usage dashboard code * perf: dashboard ui * perf: move components * add default model config (#3653) * 4.8.20 test (#3656) * provider * perf: model config * model perf (#3657) * fix: model * dataset quote * perf: model config * model tag * doubao model config * perf: config model * feat: model test * fix: POST 500 error on dingtalk bot (#3655) * feat: default model (#3662) * move model config * feat: default model * fix: false triggerd org selection (#3661) * export usage csv i18n (#3660) * export usage csv i18n * fix build * feat: markdown extension (#3663) * feat: markdown extension * media cros * rerank test * default price * perf: default model * fix: cannot custom provider * fix: default model select * update bg * perf: default model selector * fix: usage export * i18n * fix: rerank * update init extension * perf: ip limit check * doubao model order * web default modle * perf: tts selector * perf: tts error * qrcode package * reload buffer (#3665) * reload buffer * reload buffer * tts selector * fix: err tip (#3666) * fix: err tip * perf: training queue * doc * fix interactive edge (#3659) * fix interactive edge * fix * comment * add gemini model * fix: chat model select * perf: supplement assistant empty response (#3669) * perf: supplement assistant empty response * check array * perf: max_token count;feat: support resoner output;fix: member scroll (#3681) * perf: supplement assistant empty response * check array * perf: max_token count * feat: support resoner output * member scroll * update provider order * i18n * fix: stream response (#3682) * perf: supplement assistant empty response * check array * fix: stream response * fix: model config cannot set to null * fix: reasoning response (#3684) * perf: supplement assistant empty response * check array * fix: reasoning response * fix: reasoning response * doc (#3685) * perf: supplement assistant empty response * check array * doc * lock * animation * update doc * update compose * doc * doc --------- Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: a.e. <49438478+I-Info@users.noreply.github.com>
2025-07-23 05:12:39 +00:00 · 2025-02-05 00:10:47 +08:00
parent c393002f1d
commit db2c0a0bdb
496 changed files with 9031 additions and 4726 deletions
--- a/packages/service/common/file/image/controller.ts
+++ b/packages/service/common/file/image/controller.ts
@@ -40,7 +40,7 @@ export async function uploadMongoImg({
    expiredTime: forever ? undefined : addHours(new Date(), 1)
  });

-  return `${process.env.FE_DOMAIN || ''}${process.env.NEXT_PUBLIC_BASE_URL || ''}${imageBaseUrl}${String(_id)}.${extension}`;
+  return `${process.env.NEXT_PUBLIC_BASE_URL || ''}${imageBaseUrl}${String(_id)}.${extension}`;
 }

 const getIdFromPath = (path?: string) => {
--- a/packages/service/common/middle/reqFrequencyLimit.ts
+++ b/packages/service/common/middle/reqFrequencyLimit.ts
@@ -1,6 +1,5 @@
 import { ApiRequestProps } from '../../type/next';
 import requestIp from 'request-ip';
-import { ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
 import { authFrequencyLimit } from '../system/frequencyLimit/utils';
 import { addSeconds } from 'date-fns';
 import { NextApiResponse } from 'next';
@@ -9,7 +8,17 @@ import { jsonRes } from '../response';
 // unit: times/s
 // how to use?
 // export default NextAPI(useQPSLimit(10), handler); // limit 10 times per second for a ip
-export function useReqFrequencyLimit(seconds: number, limit: number, force = false) {
+export function useIPFrequencyLimit({
+  id,
+  seconds,
+  limit,
+  force = false
+}: {
+  id: string;
+  seconds: number;
+  limit: number;
+  force?: boolean;
+}) {
  return async (req: ApiRequestProps, res: NextApiResponse) => {
    const ip = requestIp.getClientIp(req);
    if (!ip || (process.env.USE_IP_LIMIT !== 'true' && !force)) {
@@ -17,14 +26,14 @@ export function useReqFrequencyLimit(seconds: number, limit: number, force = fal
    }
    try {
      await authFrequencyLimit({
-        eventId: 'ip-qps-limit' + ip,
+        eventId: `ip-qps-limit-${id}-` + ip,
        maxAmount: limit,
        expiredTime: addSeconds(new Date(), seconds)
      });
    } catch (_) {
      jsonRes(res, {
        code: 429,
-        error: ERROR_ENUM.tooManyRequest
+        error: `Too many request, request ${limit} times every ${seconds} seconds`
      });
    }
  };
--- a/packages/service/common/response/index.ts
+++ b/packages/service/common/response/index.ts
@@ -33,7 +33,15 @@ export const jsonRes = <T = any>(

    addLog.error(`Api response error: ${url}`, ERROR_RESPONSE[errResponseKey]);

-    return res.status(code).json(ERROR_RESPONSE[errResponseKey]);
+    res.status(code);
+
+    if (message) {
+      res.send(message);
+    } else {
+      res.json(ERROR_RESPONSE[errResponseKey]);
+    }
+
+    return;
  }

  // another error
--- a/packages/service/common/system/config/controller.ts
+++ b/packages/service/common/system/config/controller.ts
@@ -6,8 +6,7 @@ import { FastGPTProUrl } from '../constants';
 export const getFastGPTConfigFromDB = async () => {
  if (!FastGPTProUrl) {
    return {
-      config: {} as FastGPTConfigFileType,
-      configId: undefined
+      config: {} as FastGPTConfigFileType
    };
  }

@@ -18,9 +17,35 @@ export const getFastGPTConfigFromDB = async () => {
  });

  const config = res?.value || {};
+  // 利用配置文件的创建时间（更新时间）来做缓存，如果前端命中缓存，则不需要再返回配置文件
+  global.systemInitBufferId = res ? res.createTime.getTime().toString() : undefined;

  return {
-    configId: res ? String(res._id) : undefined,
    config: config as FastGPTConfigFileType
  };
 };
+
+export const updateFastGPTConfigBuffer = async () => {
+  const res = await MongoSystemConfigs.findOne({
+    type: SystemConfigsTypeEnum.fastgpt
+  }).sort({
+    createTime: -1
+  });
+
+  if (!res) return;
+
+  res.createTime = new Date();
+  await res.save();
+
+  global.systemInitBufferId = res.createTime.getTime().toString();
+};
+
+export const reloadFastGPTConfigBuffer = async () => {
+  const res = await MongoSystemConfigs.findOne({
+    type: SystemConfigsTypeEnum.fastgpt
+  }).sort({
+    createTime: -1
+  });
+  if (!res) return;
+  global.systemInitBufferId = res.createTime.getTime().toString();
+};
--- a/packages/service/common/system/tools.ts
+++ b/packages/service/common/system/tools.ts
@@ -13,15 +13,6 @@ export const initFastGPTConfig = (config?: FastGPTConfigFileType) => {
  global.feConfigs = config.feConfigs;
  global.systemEnv = config.systemEnv;
  global.subPlans = config.subPlans;
-
-  global.llmModels = config.llmModels;
-  global.llmModelPriceType = global.llmModels.some((item) => typeof item.inputPrice === 'number')
-    ? 'IO'
-    : 'Tokens';
-  global.vectorModels = config.vectorModels;
-  global.audioSpeechModels = config.audioSpeechModels;
-  global.whisperModel = config.whisperModel;
-  global.reRankModels = config.reRankModels;
 };

 export const systemStartCb = () => {
--- a/packages/service/common/vectorStore/controller.ts
+++ b/packages/service/common/vectorStore/controller.ts
@@ -2,7 +2,7 @@
 import { PgVectorCtrl } from './pg/class';
 import { getVectorsByText } from '../../core/ai/embedding';
 import { InsertVectorProps } from './controller.d';
-import { VectorModelItemType } from '@fastgpt/global/core/ai/model.d';
+import { EmbeddingModelItemType } from '@fastgpt/global/core/ai/model.d';
 import { MILVUS_ADDRESS, PG_ADDRESS } from './constants';
 import { MilvusCtrl } from './milvus/class';

@@ -28,7 +28,7 @@ export const insertDatasetDataVector = async ({
  ...props
 }: InsertVectorProps & {
  query: string;
-  model: VectorModelItemType;
+  model: EmbeddingModelItemType;
 }) => {
  const { vectors, tokens } = await getVectorsByText({
    model,