V4.8.15 feature (#3331)

* feat: add customize toolkit (#3205) * chaoyang * fix-auth * add toolkit * add order * plugin usage * fix * delete console: * Fix: Fix fullscreen preview top positioning and improve Markdown rendering logic (#3247) * 完成任务：修复全屏预览顶部固定问题，优化 Markdown 渲染逻辑 * 有问题修改 * 问题再修改 * 修正问题 * fix: plugin standalone display issue (#3254) * 4.8.15 test (#3246) * o1 config * perf: system plugin code * 调整系统插件代码。增加html 渲染安全配置。 (#3258) * perf: base64 picker * perf: list app or dataset * perf: plugin config code * 小窗适配等问题 (#3257) * 小窗适配等问题 * git问题 * 小窗剩余问题 * feat: system plugin auth and lock version (#3265) * feat: system plugin auth and lock version * update comment * 4.8.15 test (#3267) * tmp log * perf: login direct * perf: iframe html code * remove log * fix: plugin standalone display (#3277) * refactor: 页面拆分&i18n拆分 (#3281) * refactor: account组件拆成独立页面 * script: 新增i18n json文件创建脚本 * refactor: 页面i18n拆分 * i18n: add en&hant * 4.8.15 test (#3285) * tmp log * remove log * fix: watch avatar refresh * perf: i18n code * fix(plugin): use intro instead of userguide (#3290) * Universal SSO (#3292) * tmp log * remove log * feat: common oauth * readme * perf: sso provider * remove sso code * perf: refresh plugins * feat: add api dataset (#3272) * add api-dataset * fix api-dataset * fix api dataset * fix ts * perf: create collection code (#3301) * tmp log * remove log * perf: i18n change * update version doc * feat: question guide from chatId * perf: create collection code * fix: request api * fix: request api * fix: tts auth and response type (#3303) * perf: md splitter * fix: tts auth and response type * fix: api file dataset (#3307) * perf: api dataset init (#3310) * perf: collection schema * perf: api dataset init * refactor: 团队管理独立页面 (#3302) * ui: 团队管理独立页面 * 代码优化 * fix * perf: sync collection and ui check (#3314) * perf: sync collection * remove script * perf: update api server * perf: api dataset parent * perf: team ui * perf: team 18n * update team ui * perf: ui check * perf: i18n * fix: debug variables & cronjob & system plugin callback load (#3315) * fix: debug variables & cronjob & system plugin callback load * fix type * fix * fix * fix: plugin dataset quote;perf: system variables init (#3316) * fix: plugin dataset quote * perf: system variables init * perf: node templates ui;fix: dataset import ui (#3318) * fix: dataset import ui * perf: node templates ui * perf: ui refresh * feat:套餐改名和套餐跳转配置 (#3309) * fixing:except Sidebar * 去除了多余的代码 * 修正了套餐说明的代码 * 修正了误删除的show_git代码 * 修正了名字部分等代码 * 修正了问题,遗留了其他和ui讨论不一致的部分 * 4.8.15 test (#3319) * remove log * pref: bill ui * pref: bill ui * perf: log * html渲染文档 (#3270) * html渲染文档 * 文档有点小问题 * feat: doc (#3322) * 集合重训练 (#3282) * rebaser * 一点补充 * 小问题 * 其他问题修正，删除集合保留文件的参数还没找到... * reTraining * delete uesless * 删除了一行错误代码 * 集合重训练部分 * fixing * 删除console代码 * feat: navbar item config (#3326) * perf: custom navbar code;perf: retraining code;feat: api dataset and dataset api doc (#3329) * feat: api dataset and dataset api doc * perf: retraining code * perf: custom navbar code * fix: ts (#3330) * fix: ts * fix: ts * retraining ui * perf: api collection filter * perf: retrining button --------- Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Jiangween <145003935+Jiangween@users.noreply.github.com> Co-authored-by: papapatrick <109422393+Patrickill@users.noreply.github.com>
2024-12-06 10:56:53 +08:00
parent b188544386
commit 1aebe5f185
307 changed files with 7383 additions and 3981 deletions
--- a/projects/app/src/components/core/app/DatasetParamsModal.tsx
+++ b/projects/app/src/components/core/app/DatasetParamsModal.tsx
@@ -29,6 +29,7 @@ import SelectAiModel from '@/components/Select/AIModelSelector';
 import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
 import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
 import MyTextarea from '@/components/common/Textarea/MyTextarea';
+import { defaultDatasetMaxTokens } from '@fastgpt/global/core/app/constants';

 export type DatasetParamsProps = {
  searchMode: `${DatasetSearchModeEnum}`;
@@ -52,7 +53,7 @@ const DatasetParamsModal = ({
  limit,
  similarity,
  usingReRank,
-  maxTokens = 3000,
+  maxTokens = defaultDatasetMaxTokens,
  datasetSearchUsingExtensionQuery,
  datasetSearchExtensionModel,
  datasetSearchExtensionBg,
@@ -117,6 +118,12 @@ const DatasetParamsModal = ({
    }
  }, [chatModelSelectList, datasetSearchUsingCfrForm, queryExtensionModel, setValue]);

+  // 保证只有 80 左右个刻度。
+  const maxTokenStep = useMemo(() => {
+    if (maxTokens < 8000) return 80;
+    return Math.ceil(maxTokens / 80 / 100) * 100;
+  }, [maxTokens]);
+
  return (
    <MyModal
      isOpen={true}
@@ -232,7 +239,7 @@ const DatasetParamsModal = ({
                    ]}
                    min={100}
                    max={maxTokens}
-                    step={50}
+                    step={maxTokenStep}
                    value={getValues(NodeInputKeyEnum.datasetMaxTokens) ?? 1000}
                    onChange={(val) => {
                      setValue(NodeInputKeyEnum.datasetMaxTokens, val);
--- a/projects/app/src/components/core/app/ScheduledTriggerConfig.tsx
+++ b/projects/app/src/components/core/app/ScheduledTriggerConfig.tsx
@@ -8,35 +8,19 @@ import {
  Textarea,
  HStack
 } from '@chakra-ui/react';
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useTranslation } from 'next-i18next';
 import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import { AppScheduledTriggerConfigType } from '@fastgpt/global/core/app/type';
 import MyModal from '@fastgpt/web/components/common/MyModal';
-import dynamic from 'next/dynamic';
-import type { MultipleSelectProps } from '@fastgpt/web/components/common/MySelect/type.d';
-import { cronParser2Fields } from '@fastgpt/global/common/string/time';
 import TimezoneSelect from '@fastgpt/web/components/common/MySelect/TimezoneSelect';
+import ScheduleTimeSelect, {
+  cronString2Label,
+  defaultCronString
+} from '@fastgpt/web/components/common/MySelect/CronSelector';
 import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
-const MultipleRowSelect = dynamic(
-  () => import('@fastgpt/web/components/common/MySelect/MultipleRowSelect')
-);
-
-// options type:
-enum CronJobTypeEnum {
-  month = 'month',
-  week = 'week',
-  day = 'day',
-  interval = 'interval'
-}
-type CronType = 'month' | 'week' | 'day' | 'interval';
-
-const defaultValue = ['day', 0, 0];
-const defaultCronString = '0 0 * * *';
-
-type CronFieldType = [CronType, number, number];

 const ScheduledTriggerConfig = ({
  value,
@@ -49,106 +33,8 @@ const ScheduledTriggerConfig = ({
  const { isOpen, onOpen, onClose } = useDisclosure();

  const timezone = value?.timezone;
-  const cronString = value?.cronString;
  const defaultPrompt = value?.defaultPrompt;
-
-  const get24HoursOptions = () => {
-    return Array.from({ length: 24 }, (_, i) => ({
-      label: `${i < 10 ? '0' : ''}${i}:00`,
-      value: i
-    }));
-  };
-
-  const getRoute = (i: number) => {
-    const { t } = useTranslation();
-    switch (i) {
-      case 0:
-        return t('app:week.Sunday');
-      case 1:
-        return t('app:week.Monday');
-      case 2:
-        return t('app:week.Tuesday');
-      case 3:
-        return t('app:week.Wednesday');
-      case 4:
-        return t('app:week.Thursday');
-      case 5:
-        return t('app:week.Friday');
-      case 6:
-        return t('app:week.Saturday');
-      default:
-        return t('app:week.Sunday');
-    }
-  };
-
-  const getWeekOptions = () => {
-    return Array.from({ length: 7 }, (_, i) => {
-      return {
-        label: getRoute(i),
-        value: i,
-        children: get24HoursOptions()
-      };
-    });
-  };
-  const getMonthOptions = () => {
-    return Array.from({ length: 28 }, (_, i) => ({
-      label: `${i + 1}` + t('app:month.unit'),
-      value: i,
-      children: get24HoursOptions()
-    }));
-  };
-  const getInterValOptions = () => {
-    // 每n小时
-    return [
-      {
-        label: t('app:interval.per_hour'),
-        value: 1
-      },
-      {
-        label: t('app:interval.2_hours'),
-        value: 2
-      },
-      {
-        label: t('app:interval.3_hours'),
-        value: 3
-      },
-      {
-        label: t('app:interval.4_hours'),
-        value: 4
-      },
-      {
-        label: t('app:interval.6_hours'),
-        value: 6
-      },
-      {
-        label: t('app:interval.12_hours'),
-        value: 12
-      }
-    ];
-  };
-
-  const cronSelectList = useRef<MultipleSelectProps['list']>([
-    {
-      label: t('app:cron.every_day'),
-      value: CronJobTypeEnum.day,
-      children: get24HoursOptions()
-    },
-    {
-      label: t('app:cron.every_week'),
-      value: CronJobTypeEnum.week,
-      children: getWeekOptions()
-    },
-    {
-      label: t('app:cron.every_month'),
-      value: CronJobTypeEnum.month,
-      children: getMonthOptions()
-    },
-    {
-      label: t('app:cron.interval'),
-      value: CronJobTypeEnum.interval,
-      children: getInterValOptions()
-    }
-  ]);
+  const isOpenSchedule = value?.cronString !== '';

  const onUpdate = useCallback(
    ({
@@ -169,95 +55,6 @@ const ScheduledTriggerConfig = ({
    [onChange, value]
  );

-  /* cron string to config field */
-  const cronConfig = useMemo(() => {
-    if (!cronString) {
-      return;
-    }
-    const cronField = cronParser2Fields(cronString);
-
-    if (!cronField) {
-      return;
-    }
-
-    if (cronField.dayOfMonth.length !== 31) {
-      return {
-        isOpen: true,
-        cronField: [CronJobTypeEnum.month, cronField.dayOfMonth[0], cronField.hour[0]]
-      };
-    }
-    if (cronField.dayOfWeek.length !== 8) {
-      return {
-        isOpen: true,
-        cronField: [CronJobTypeEnum.week, cronField.dayOfWeek[0], cronField.hour[0]]
-      };
-    }
-    if (cronField.hour.length === 1) {
-      return {
-        isOpen: true,
-        cronField: [CronJobTypeEnum.day, cronField.hour[0], 0]
-      };
-    }
-    return {
-      isOpen: true,
-      cronField: [CronJobTypeEnum.interval, 24 / cronField.hour.length, 0]
-    };
-  }, [cronString]);
-  const isOpenSchedule = cronConfig?.isOpen ?? false;
-  const cronField = (cronConfig?.cronField || defaultValue) as CronFieldType;
-
-  const cronConfig2cronString = useCallback(
-    (e: CronFieldType) => {
-      const str = (() => {
-        if (e[0] === CronJobTypeEnum.month) {
-          return `0 ${e[2]} ${e[1]} * *`;
-        } else if (e[0] === CronJobTypeEnum.week) {
-          return `0 ${e[2]} * * ${e[1]}`;
-        } else if (e[0] === CronJobTypeEnum.day) {
-          return `0 ${e[1]} * * *`;
-        } else if (e[0] === CronJobTypeEnum.interval) {
-          return `0 */${e[1]} * * *`;
-        } else {
-          return '';
-        }
-      })();
-      onUpdate({ cronString: str });
-    },
-    [onUpdate]
-  );
-
-  // cron config to show label
-  const formatLabel = useMemo(() => {
-    if (!isOpenSchedule) {
-      return t('common:common.Not open');
-    }
-
-    if (cronField[0] === 'month') {
-      return t('common:core.app.schedule.Every month', {
-        day: cronField[1],
-        hour: cronField[2]
-      });
-    }
-    if (cronField[0] === 'week') {
-      return t('common:core.app.schedule.Every week', {
-        day: cronField[1] === 0 ? t('app:day') : cronField[1],
-        hour: cronField[2]
-      });
-    }
-    if (cronField[0] === 'day') {
-      return t('common:core.app.schedule.Every day', {
-        hour: cronField[1]
-      });
-    }
-    if (cronField[0] === 'interval') {
-      return t('common:core.app.schedule.Interval', {
-        interval: cronField[1]
-      });
-    }
-
-    return t('common:common.Not open');
-  }, [cronField, isOpenSchedule, t]);
-
  useEffect(() => {
    if (!value?.timezone) {
      onUpdate({ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone });
@@ -282,7 +79,7 @@ const ScheduledTriggerConfig = ({
              color={'myGray.600'}
              onClick={onOpen}
            >
-              {formatLabel}
+              {cronString2Label(value?.cronString ?? '', t)}
            </Button>
          </MyTooltip>
        </Flex>
@@ -313,12 +110,10 @@ const ScheduledTriggerConfig = ({
                <Flex alignItems={'center'} mt={5}>
                  <FormLabel flex={'0 0 80px'}>{t('app:execute_time')}</FormLabel>
                  <Box flex={'1 0 0'}>
-                    <MultipleRowSelect
-                      label={formatLabel}
-                      value={cronField}
-                      list={cronSelectList.current}
-                      onSelect={(e) => {
-                        cronConfig2cronString(e as CronFieldType);
+                    <ScheduleTimeSelect
+                      cronString={value?.cronString}
+                      onChange={(e) => {
+                        onUpdate({ cronString: e });
                      }}
                    />
                  </Box>
@@ -353,17 +148,15 @@ const ScheduledTriggerConfig = ({
      </>
    );
  }, [
-    cronConfig2cronString,
-    cronField,
    defaultPrompt,
-    formatLabel,
    isOpen,
    isOpenSchedule,
    onClose,
    onOpen,
    onUpdate,
    t,
-    timezone
+    timezone,
+    value?.cronString
  ]);

  return Render;
--- a/projects/app/src/components/core/app/TTSSelect.tsx
+++ b/projects/app/src/components/core/app/TTSSelect.tsx
@@ -14,6 +14,8 @@ import { defaultTTSConfig } from '@fastgpt/global/core/app/constants';
 import ChatFunctionTip from './Tip';
 import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
 import MyImage from '@fastgpt/web/components/common/Image/MyImage';
+import { useContextSelector } from 'use-context-selector';
+import { AppContext } from '@/pages/app/detail/components/context';

 const TTSSelect = ({
  value = defaultTTSConfig,
@@ -26,6 +28,8 @@ const TTSSelect = ({
  const { audioSpeechModelList } = useSystemStore();
  const { isOpen, onOpen, onClose } = useDisclosure();

+  const appId = useContextSelector(AppContext, (v) => v.appId);
+
  const list = useMemo(
    () => [
      { label: t('common:core.app.tts.Close'), value: TTSTypeEnum.none },
@@ -50,6 +54,7 @@ const TTSSelect = ({
  );

  const { playAudioByText, cancelAudio, audioLoading, audioPlaying } = useAudioPlay({
+    appId,
    ttsConfig: value
  });

--- a/projects/app/src/components/core/app/plugin/CostTooltip.tsx
+++ b/projects/app/src/components/core/app/plugin/CostTooltip.tsx
@@ -2,20 +2,32 @@ import { Box, Flex, Divider } from '@chakra-ui/react';
 import React from 'react';
 import { useTranslation } from 'next-i18next';

-const CostTooltip = ({ cost }: { cost?: number }) => {
+const CostTooltip = ({ cost, hasTokenFee }: { cost?: number; hasTokenFee?: boolean }) => {
  const { t } = useTranslation();
+
+  const getCostText = () => {
+    if (hasTokenFee && cost && cost > 0) {
+      return `${t('app:plugin_cost_per_times', {
+        cost: cost
+      })} + ${t('app:plugin_cost_by_token')}`;
+    }
+    if (hasTokenFee) {
+      return t('app:plugin_cost_by_token');
+    }
+    if (cost && cost > 0) {
+      return t('app:plugin_cost_per_times', {
+        cost: cost
+      });
+    }
+    return t('common:core.plugin.Free');
+  };
+
  return (
    <>
      <Divider mt={4} mb={2} />
      <Flex>
        <Box>{t('common:core.plugin.cost')}</Box>
-        <Box color={'myGray.600'}>
-          {cost && cost > 0
-            ? t('app:plugin_cost_per_times', {
-                cost: cost
-              })
-            : t('common:core.plugin.Free')}
-        </Box>
+        <Box color={'myGray.600'}>{getCostText()}</Box>
      </Flex>
    </>
  );
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Provider.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Provider.tsx
@@ -179,6 +179,7 @@ const Provider = ({
    finishSegmentedAudio,
    splitText2Audio
  } = useAudioPlay({
+    appId,
    ttsConfig,
    ...outLinkAuthData
  });
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/VariableInput.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/VariableInput.tsx
@@ -64,7 +64,6 @@ export const VariableInputItem = ({
          maxLength={item.maxLength || 4000}
        />
      )}
-
      {item.type === VariableInputEnum.select && (
        <Controller
          key={`variables.${item.key}`}
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/index.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/index.tsx
@@ -334,31 +334,28 @@ const ChatBox = ({
  });

  // create question guide
-  const createQuestionGuide = useCallback(
-    async ({ histories }: { histories: ChatSiteItemType[] }) => {
-      if (!questionGuide || chatController.current?.signal?.aborted) return;
-      try {
-        const abortSignal = new AbortController();
-        questionGuideController.current = abortSignal;
+  const createQuestionGuide = useCallback(async () => {
+    if (!questionGuide || chatController.current?.signal?.aborted) return;
+    try {
+      const abortSignal = new AbortController();
+      questionGuideController.current = abortSignal;

-        const result = await postQuestionGuide(
-          {
-            appId,
-            messages: chats2GPTMessages({ messages: histories, reserveId: false }).slice(-6),
-            ...outLinkAuthData
-          },
-          abortSignal
-        );
-        if (Array.isArray(result)) {
-          setQuestionGuide(result);
-          setTimeout(() => {
-            scrollToBottom();
-          }, 100);
-        }
-      } catch (error) {}
-    },
-    [questionGuide, appId, outLinkAuthData, scrollToBottom]
-  );
+      const result = await postQuestionGuide(
+        {
+          appId,
+          chatId,
+          ...outLinkAuthData
+        },
+        abortSignal
+      );
+      if (Array.isArray(result)) {
+        setQuestionGuide(result);
+        setTimeout(() => {
+          scrollToBottom();
+        }, 100);
+      }
+    } catch (error) {}
+  }, [questionGuide, appId, outLinkAuthData, scrollToBottom]);

  /* Abort chat completions, questionGuide */
  const abortRequest = useMemoizedFn((signal: string = 'stop') => {
@@ -407,7 +404,12 @@ const ChatBox = ({
          // Only declared variables are kept
          const requestVariables: Record<string, any> = {};
          allVariableList?.forEach((item) => {
-            requestVariables[item.key] = variables[item.key];
+            requestVariables[item.key] =
+              variables[item.key] === '' ||
+              variables[item.key] === undefined ||
+              variables[item.key] === null
+                ? item.defaultValue
+                : variables[item.key];
          });

          const responseChatId = getNanoid(24);
@@ -525,9 +527,7 @@ const ChatBox = ({

            setTimeout(() => {
              if (!checkIsInteractiveByHistories(newChatHistories)) {
-                createQuestionGuide({
-                  histories: newChatHistories
-                });
+                createQuestionGuide();
              }

              generatingScroll(true);