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-02-05 00:10:47 +08:00
parent c393002f1d
commit db2c0a0bdb
496 changed files with 9031 additions and 4726 deletions
--- a/projects/app/src/service/common/system/index.ts
+++ b/projects/app/src/service/common/system/index.ts
@@ -1,17 +1,16 @@
 import { initHttpAgent } from '@fastgpt/service/common/middle/httpAgent';
-import fs, { existsSync, readdirSync } from 'fs';
+import fs, { existsSync } from 'fs';
 import type { FastGPTFeConfigsType } from '@fastgpt/global/common/system/types/index.d';
 import type { FastGPTConfigFileType } from '@fastgpt/global/common/system/types/index.d';
-import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
 import { getFastGPTConfigFromDB } from '@fastgpt/service/common/system/config/controller';
 import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 import { isProduction } from '@fastgpt/global/common/system/constants';
 import { initFastGPTConfig } from '@fastgpt/service/common/system/tools';
 import json5 from 'json5';
-import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type';
 import { defaultGroup, defaultTemplateTypes } from '@fastgpt/web/core/workflow/constants';
 import { MongoPluginGroups } from '@fastgpt/service/core/app/plugin/pluginGroupSchema';
 import { MongoTemplateTypes } from '@fastgpt/service/core/app/templates/templateTypeSchema';
+import { loadSystemModels } from '@fastgpt/service/core/ai/config/utils';

 export const readConfigData = async (name: string) => {
  const splitName = name.split('.');
@@ -47,13 +46,7 @@ export function initGlobalVariables() {

 /* Init system data(Need to connected db). It only needs to run once */
 export async function getInitConfig() {
-  return Promise.all([
-    initSystemConfig(),
-    getSystemVersion(),
-
-    // abandon
-    getSystemPlugin()
-  ]);
+  return Promise.all([initSystemConfig(), getSystemVersion(), loadSystemModels()]);
 }

 const defaultFeConfigs: FastGPTFeConfigsType = {
@@ -78,7 +71,7 @@ const defaultFeConfigs: FastGPTFeConfigsType = {

 export async function initSystemConfig() {
  // load config
-  const [{ config: dbConfig, configId }, fileConfig] = await Promise.all([
+  const [{ config: dbConfig }, fileConfig] = await Promise.all([
    getFastGPTConfigFromDB(),
    readConfigData('config.json')
  ]);
@@ -96,27 +89,16 @@ export async function initSystemConfig() {
      ...fileRes.systemEnv,
      ...(dbConfig.systemEnv || {})
    },
-    subPlans: dbConfig.subPlans || fileRes.subPlans,
-    llmModels: dbConfig.llmModels || fileRes.llmModels || [],
-    vectorModels: dbConfig.vectorModels || fileRes.vectorModels || [],
-    reRankModels: dbConfig.reRankModels || fileRes.reRankModels || [],
-    audioSpeechModels: dbConfig.audioSpeechModels || fileRes.audioSpeechModels || [],
-    whisperModel: dbConfig.whisperModel || fileRes.whisperModel
+    subPlans: dbConfig.subPlans || fileRes.subPlans
  };

  // set config
-  global.systemInitBufferId = configId;
  initFastGPTConfig(config);

  console.log({
    feConfigs: global.feConfigs,
    systemEnv: global.systemEnv,
-    subPlans: global.subPlans,
-    llmModels: global.llmModels,
-    vectorModels: global.vectorModels,
-    reRankModels: global.reRankModels,
-    audioSpeechModels: global.audioSpeechModels,
-    whisperModel: global.whisperModel
+    subPlans: global.subPlans
  });
 }

@@ -138,34 +120,6 @@ async function getSystemVersion() {
  }
 }

-async function getSystemPlugin() {
-  if (global.communityPlugins && global.communityPlugins.length > 0) return;
-
-  const basePath =
-    process.env.NODE_ENV === 'development' ? 'data/pluginTemplates' : '/app/data/pluginTemplates';
-  // read data/pluginTemplates directory, get all json file
-  const files = readdirSync(basePath);
-  // filter json file
-  const filterFiles = files.filter((item) => item.endsWith('.json'));
-
-  // read json file
-  const fileTemplates = await Promise.all(
-    filterFiles.map<Promise<SystemPluginTemplateItemType>>(async (filename) => {
-      const content = await fs.promises.readFile(`${basePath}/${filename}`, 'utf-8');
-      return {
-        ...json5.parse(content),
-        originCost: 0,
-        currentCost: 0,
-        id: `${PluginSourceEnum.community}-${filename.replace('.json', '')}`
-      };
-    })
-  );
-
-  fileTemplates.sort((a, b) => (b.weight || 0) - (a.weight || 0));
-
-  global.communityPlugins = fileTemplates;
-}
-
 export async function initSystemPluginGroups() {
  try {
    const { groupOrder, ...restDefaultGroup } = defaultGroup;
--- a/projects/app/src/service/common/system/volumnMongoWatch.ts
+++ b/projects/app/src/service/common/system/volumnMongoWatch.ts
@@ -6,12 +6,14 @@ import { MongoSystemPlugin } from '@fastgpt/service/core/app/plugin/systemPlugin
 import { debounce } from 'lodash';
 import { MongoAppTemplate } from '@fastgpt/service/core/app/templates/templateSchema';
 import { getAppTemplatesAndLoadThem } from '@fastgpt/templates/register';
+import { watchSystemModelUpdate } from '@fastgpt/service/core/ai/config/utils';

 export const startMongoWatch = async () => {
  reloadConfigWatch();
  refetchSystemPlugins();
  createDatasetTrainingMongoWatch();
  refetchAppTemplates();
+  watchSystemModelUpdate();
 };

 const reloadConfigWatch = () => {
--- a/projects/app/src/service/core/app/workflow.ts
+++ b/projects/app/src/service/core/app/workflow.ts
@@ -1,13 +1,15 @@
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node.d';
+import { getLLMModel } from '@fastgpt/service/core/ai/model';

 export const getChatModelNameListByModules = (nodes: StoreNodeItemType[]): string[] => {
  const modelList = nodes
    .map((item) => {
      const model = item.inputs.find((input) => input.key === NodeInputKeyEnum.aiModel)?.value;
-      return global.llmModels.find((item) => item.model === model)?.name || '';
+      return model ? getLLMModel(model)?.name : '';
    })
    .filter(Boolean);
-
+  console.log(JSON.stringify(nodes, null, 2), '---=');
+  console.log(modelList, '---=');
  return Array.from(new Set(modelList));
 };
--- a/projects/app/src/service/core/dataset/data/controller.ts
+++ b/projects/app/src/service/core/dataset/data/controller.ts
@@ -9,7 +9,7 @@ import { getDefaultIndex } from '@fastgpt/global/core/dataset/utils';
 import { jiebaSplit } from '@fastgpt/service/common/string/jieba';
 import { deleteDatasetDataVector } from '@fastgpt/service/common/vectorStore/controller';
 import { DatasetDataItemType } from '@fastgpt/global/core/dataset/type';
-import { getVectorModel } from '@fastgpt/service/core/ai/model';
+import { getEmbeddingModel } from '@fastgpt/service/core/ai/model';
 import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
 import { ClientSession } from '@fastgpt/service/common/mongo';
 import { MongoDatasetDataText } from '@fastgpt/service/core/dataset/data/dataTextSchema';
@@ -71,7 +71,7 @@ export async function insertData2Dataset({
    indexes.map((item) =>
      insertDatasetDataVector({
        query: item.text,
-        model: getVectorModel(model),
+        model: getEmbeddingModel(model),
        teamId,
        datasetId,
        collectionId
@@ -219,7 +219,7 @@ export async function updateData2Dataset({
      if (item.type === 'create' || item.type === 'update') {
        const result = await insertDatasetDataVector({
          query: item.index.text,
-          model: getVectorModel(model),
+          model: getEmbeddingModel(model),
          teamId: mongoData.teamId,
          datasetId: mongoData.datasetId,
          collectionId: mongoData.collectionId
--- a/projects/app/src/service/events/generateQA.ts
+++ b/projects/app/src/service/events/generateQA.ts
@@ -18,7 +18,7 @@ import {
 } from '@fastgpt/service/common/string/tiktoken/index';
 import { pushDataListToTrainingQueueByCollectionId } from '@fastgpt/service/core/dataset/training/controller';
 import { loadRequestMessages } from '@fastgpt/service/core/chat/utils';
-import { llmCompletionsBodyFormat } from '@fastgpt/service/core/ai/utils';
+import { llmCompletionsBodyFormat, llmStreamResponseToText } from '@fastgpt/service/core/ai/utils';

 const reduceQueue = () => {
  global.qaQueueLen = global.qaQueueLen > 0 ? global.qaQueueLen - 1 : 0;
@@ -44,7 +44,7 @@ export async function generateQA(): Promise<any> {
        {
          mode: TrainingModeEnum.qa,
          retryCount: { $gte: 0 },
-          lockTime: { $lte: addMinutes(new Date(), -6) }
+          lockTime: { $lte: addMinutes(new Date(), -10) }
        },
        {
          lockTime: new Date(),
@@ -120,12 +120,12 @@ ${replaceVariable(Prompt_AgentQA.fixedText, { text })}`;
          model: modelData.model,
          temperature: 0.3,
          messages: await loadRequestMessages({ messages, useVision: false }),
-          stream: false
+          stream: true
        },
        modelData
      )
    });
-    const answer = chatResponse.choices?.[0].message?.content || '';
+    const answer = await llmStreamResponseToText(chatResponse);

    const qaArr = formatSplitText(answer, text); // 格式化后的QA对

--- a/projects/app/src/service/events/generateVector.ts
+++ b/projects/app/src/service/events/generateVector.ts
@@ -11,7 +11,7 @@ import {
  deleteDatasetDataVector,
  insertDatasetDataVector
 } from '@fastgpt/service/common/vectorStore/controller';
-import { getVectorModel } from '@fastgpt/service/core/ai/model';
+import { getEmbeddingModel } from '@fastgpt/service/core/ai/model';
 import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
 import { DatasetTrainingSchemaType } from '@fastgpt/global/core/dataset/type';
 import { Document } from '@fastgpt/service/common/mongo';
@@ -40,7 +40,7 @@ export async function generateVector(): Promise<any> {
        {
          mode: TrainingModeEnum.chunk,
          retryCount: { $gte: 0 },
-          lockTime: { $lte: addMinutes(new Date(), -6) }
+          lockTime: { $lte: addMinutes(new Date(), -3) }
        },
        {
          lockTime: new Date(),
@@ -207,7 +207,7 @@ const rebuildData = async ({
    mongoData.indexes.map(async (index, i) => {
      const result = await insertDatasetDataVector({
        query: index.text,
-        model: getVectorModel(trainingData.model),
+        model: getEmbeddingModel(trainingData.model),
        teamId: mongoData.teamId,
        datasetId: mongoData.datasetId,
        collectionId: mongoData.collectionId
--- a/projects/app/src/service/support/wallet/usage/push.ts
+++ b/projects/app/src/service/support/wallet/usage/push.ts
@@ -1,10 +1,11 @@
 import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
-import { ModelTypeEnum } from '@fastgpt/service/core/ai/model';
 import { addLog } from '@fastgpt/service/common/system/log';
 import { createUsage, concatUsage } from './controller';
 import { formatModelChars2Points } from '@fastgpt/service/support/wallet/usage/utils';
 import { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type';
 import { i18nT } from '@fastgpt/web/i18n/utils';
+import { ModelTypeEnum } from '@fastgpt/global/core/ai/model';
+import { getDefaultTTSModel } from '@fastgpt/service/core/ai/model';

 export const pushChatUsage = ({
  appName,
@@ -108,7 +109,7 @@ export const pushGenerateVectorUsage = ({
  extensionOutputTokens?: number;
 }) => {
  const { totalPoints: totalVector, modelName: vectorModelName } = formatModelChars2Points({
-    modelType: ModelTypeEnum.vector,
+    modelType: ModelTypeEnum.embedding,
    model,
    inputTokens
  });
@@ -175,21 +176,22 @@ export const pushGenerateVectorUsage = ({
 };

 export const pushQuestionGuideUsage = ({
+  model,
  inputTokens,
  outputTokens,
  teamId,
  tmbId
 }: {
+  model: string;
  inputTokens: number;
  outputTokens: number;
  teamId: string;
  tmbId: string;
 }) => {
-  const qgModel = global.llmModels[0];
  const { totalPoints, modelName } = formatModelChars2Points({
    inputTokens,
    outputTokens,
-    model: qgModel.model,
+    model,
    modelType: ModelTypeEnum.llm
  });

@@ -229,7 +231,7 @@ export function pushAudioSpeechUsage({
  const { totalPoints, modelName } = formatModelChars2Points({
    model,
    inputTokens: charsLength,
-    modelType: ModelTypeEnum.audioSpeech
+    modelType: ModelTypeEnum.tts
  });

  createUsage({
@@ -258,14 +260,14 @@ export function pushWhisperUsage({
  tmbId: string;
  duration: number;
 }) {
-  const whisperModel = global.whisperModel;
+  const whisperModel = getDefaultTTSModel();

  if (!whisperModel) return;

  const { totalPoints, modelName } = formatModelChars2Points({
    model: whisperModel.model,
    inputTokens: duration,
-    modelType: ModelTypeEnum.whisper,
+    modelType: ModelTypeEnum.stt,
    multiple: 60
  });