diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9c42f553d..4cfc70e2a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -462,6 +462,9 @@ importers: '@fortaine/fetch-event-source': specifier: ^3.0.6 version: 3.0.6 + '@node-rs/jieba': + specifier: 2.0.1 + version: 2.0.1 '@tanstack/react-query': specifier: ^4.24.10 version: 4.36.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) diff --git a/projects/app/next.config.js b/projects/app/next.config.js index ecbb5a273..bc191f87e 100644 --- a/projects/app/next.config.js +++ b/projects/app/next.config.js @@ -80,7 +80,12 @@ const nextConfig = { transpilePackages: ['@fastgpt/global', '@fastgpt/web', 'ahooks'], experimental: { // 优化 Server Components 的构建和运行,避免不必要的客户端打包。 - serverComponentsExternalPackages: ['mongoose', 'pg', '@zilliz/milvus2-sdk-node', 'tiktoken'], + serverComponentsExternalPackages: [ + 'mongoose', + 'pg', + '@zilliz/milvus2-sdk-node', + "tiktoken", + ], outputFileTracingRoot: path.join(__dirname, '../../'), instrumentationHook: true } diff --git a/projects/app/package.json b/projects/app/package.json index f16d642fd..cb4d25ba0 100644 --- a/projects/app/package.json +++ b/projects/app/package.json @@ -64,6 +64,7 @@ "request-ip": "^3.3.0", "sass": "^1.58.3", "use-context-selector": "^1.4.4", + "@node-rs/jieba": "2.0.1", "zustand": "^4.3.5" }, "devDependencies": { diff --git a/projects/app/src/pageComponents/app/list/TypeTag.tsx b/projects/app/src/pageComponents/app/list/TypeTag.tsx index 6885762a8..377cdaff2 100644 --- a/projects/app/src/pageComponents/app/list/TypeTag.tsx +++ b/projects/app/src/pageComponents/app/list/TypeTag.tsx @@ -3,30 +3,32 @@ import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; import { useI18n } from '@/web/context/I18n'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { Box, Flex } from '@chakra-ui/react'; -import { i18nT } from '@fastgpt/web/i18n/utils'; +import { useTranslation } from 'next-i18next'; const AppTypeTag = ({ type }: { type: AppTypeEnum }) => { + const { t } = useTranslation(); + const map = useRef({ [AppTypeEnum.simple]: { - label: i18nT('app:type.Simple bot'), + label: t('app:type.Simple bot'), icon: 'core/app/type/simple', bg: '#DBF3FF', color: '#0884DD' }, [AppTypeEnum.workflow]: { - label: i18nT('app:type.Workflow bot'), + label: t('app:type.Workflow bot'), icon: 'core/app/type/workflow', bg: '#E4E1FC', color: '#6F5DD7' }, [AppTypeEnum.plugin]: { - label: i18nT('app:type.Plugin'), + label: t('app:type.Plugin'), icon: 'core/app/type/plugin', bg: '#D0F5EE', color: '#007E7C' }, [AppTypeEnum.httpPlugin]: { - label: i18nT('app:type.Http plugin'), + label: t('app:type.Http plugin'), icon: 'core/app/type/httpPlugin', bg: '#FFE4EE', color: '#E82F72' diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteItem.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteItem.tsx index 5c33b27b2..af6a81a48 100644 --- a/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteItem.tsx +++ b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteItem.tsx @@ -2,7 +2,7 @@ import Markdown from '@/components/Markdown'; import { Box, Flex } from '@chakra-ui/react'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; import { Dispatch, MutableRefObject, SetStateAction, useState } from 'react'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from 'next-i18next'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useCopyData } from '@fastgpt/web/hooks/useCopyData'; import InputDataModal from '@/pageComponents/dataset/detail/InputDataModal'; diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx index 5f23d88b0..b3002ee06 100644 --- a/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx +++ b/projects/app/src/pageComponents/chat/ChatQuoteList/CollectionQuoteReader.tsx @@ -3,7 +3,7 @@ import { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type'; import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useRouter } from 'next/router'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from 'next-i18next'; import DownloadButton from './DownloadButton'; import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; import { downloadFetch } from '@/web/common/system/utils'; diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/DownloadButton.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/DownloadButton.tsx index 27d962deb..322975333 100644 --- a/projects/app/src/pageComponents/chat/ChatQuoteList/DownloadButton.tsx +++ b/projects/app/src/pageComponents/chat/ChatQuoteList/DownloadButton.tsx @@ -1,5 +1,5 @@ import MyMenu from '@fastgpt/web/components/common/MyMenu'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from 'next-i18next'; import MyIconButton from '@fastgpt/web/components/common/Icon/button'; const DownloadButton = ({ diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteItem.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteItem.tsx index 6f2730bfc..b917ea5be 100644 --- a/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteItem.tsx +++ b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteItem.tsx @@ -4,7 +4,7 @@ import MyIcon from '@fastgpt/web/components/common/Icon'; import ScoreTag from './ScoreTag'; import Markdown from '@/components/Markdown'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from 'next-i18next'; import { useCopyData } from '@fastgpt/web/hooks/useCopyData'; const QuoteItem = ({ diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteReader.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteReader.tsx index be0e25261..95af0e63f 100644 --- a/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteReader.tsx +++ b/projects/app/src/pageComponents/chat/ChatQuoteList/QuoteReader.tsx @@ -2,7 +2,7 @@ import { Box, Flex } from '@chakra-ui/react'; import { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type'; import MyIcon from '@fastgpt/web/components/common/Icon'; import MyBox from '@fastgpt/web/components/common/MyBox'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from 'next-i18next'; import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; import QuoteItem from './QuoteItem'; import { useMemo } from 'react'; diff --git a/projects/app/src/pageComponents/chat/ChatQuoteList/ScoreTag.tsx b/projects/app/src/pageComponents/chat/ChatQuoteList/ScoreTag.tsx index 702992d59..32c1f0de3 100644 --- a/projects/app/src/pageComponents/chat/ChatQuoteList/ScoreTag.tsx +++ b/projects/app/src/pageComponents/chat/ChatQuoteList/ScoreTag.tsx @@ -2,7 +2,7 @@ import { ScoreItemType, scoreTheme } from '@/components/core/dataset/QuoteItem'; import { Box, Flex, Progress } from '@chakra-ui/react'; import { SearchScoreTypeMap } from '@fastgpt/global/core/dataset/constants'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from 'next-i18next'; const ScoreTag = (score: { primaryScore?: ScoreItemType; secondaryScore: ScoreItemType[] }) => { const { t } = useTranslation(); diff --git a/projects/app/src/pageComponents/dataset/detail/Import/commonProgress/DataProcess.tsx b/projects/app/src/pageComponents/dataset/detail/Import/commonProgress/DataProcess.tsx index 800513b8a..898a2297b 100644 --- a/projects/app/src/pageComponents/dataset/detail/Import/commonProgress/DataProcess.tsx +++ b/projects/app/src/pageComponents/dataset/detail/Import/commonProgress/DataProcess.tsx @@ -36,19 +36,19 @@ import MyNumberInput from '@fastgpt/web/components/common/Input/NumberInput'; import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; import { shadowLight } from '@fastgpt/web/styles/theme'; import { DatasetPageContext } from '@/web/core/dataset/context/datasetPageContext'; -import { useToast } from '@fastgpt/web/hooks/useToast'; function DataProcess() { const { t } = useTranslation(); const { feConfigs } = useSystemStore(); - const { toast } = useToast(); const { goToNext, processParamsForm, chunkSizeField, minChunkSize, maxChunkSize } = useContextSelector(DatasetImportContext, (v) => v); const datasetDetail = useContextSelector(DatasetPageContext, (v) => v.datasetDetail); - const { getValues, setValue, register, watch } = processParamsForm; + const { setValue, register, watch } = processParamsForm; + const trainingType = watch('trainingType'); const chunkSettingMode = watch('chunkSettingMode'); + const qaPrompt = watch('qaPrompt'); const { isOpen: isOpenCustomPrompt, @@ -65,7 +65,7 @@ function DataProcess() { value: key as DatasetCollectionDataProcessModeEnum, tooltip: t(value.tooltip as any) })); - }, []); + }, [t]); const Title = useCallback(({ title }: { title: string }) => { return ( @@ -284,7 +284,7 @@ function DataProcess() { } }} > - {getValues('qaPrompt')} + {qaPrompt} - {/* - - <AccordionPanel p={2} fontSize={'sm'}> - <Box> - <Box>{t('common:core.ai.model.Dataset Agent Model')}</Box> - <Box mt={1}> - <AIModelSelector - w={'100%'} - value={llmModel} - list={datasetModelList.map((item) => ({ - label: item.name, - value: item.model - }))} - onChange={(e) => { - setValue('llmModel', e); - }} - /> - </Box> - </Box> - <Box pt={5}> - <Box>{t('dataset:vllm_model')}</Box> - <Box mt={1}> - <AIModelSelector - w={'100%'} - value={vlmModel} - list={vllmModelList.map((item) => ({ - label: item.name, - value: item.model - }))} - onChange={(e) => { - setValue('vlmModel', e); - }} - /> - </Box> - </Box> - </AccordionPanel> - </AccordionItem> */} - <Flex mt={5} gap={3} justifyContent={'flex-end'}> <Button onClick={() => { @@ -385,7 +347,7 @@ function DataProcess() { {isOpenCustomPrompt && ( <PromptTextarea - defaultValue={getValues('qaPrompt')} + defaultValue={qaPrompt} onChange={(e) => { setValue('qaPrompt', e); }} diff --git a/projects/app/src/pages/_error.tsx b/projects/app/src/pages/_error.tsx index 2faad8eae..1b20247d3 100644 --- a/projects/app/src/pages/_error.tsx +++ b/projects/app/src/pages/_error.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; import { useRouter } from 'next/router'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { Box } from '@chakra-ui/react'; import { TrackEventName } from '@/web/common/system/constants'; diff --git a/projects/app/src/pages/account/apikey.tsx b/projects/app/src/pages/account/apikey.tsx index de8e53b72..0ef824a3a 100644 --- a/projects/app/src/pages/account/apikey.tsx +++ b/projects/app/src/pages/account/apikey.tsx @@ -3,7 +3,7 @@ import ApiKeyTable from '@/components/support/apikey/Table'; import { useTranslation } from 'next-i18next'; import { Box } from '@chakra-ui/react'; import AccountContainer, { TabEnum } from '@/pageComponents/account/AccountContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; const ApiKey = () => { const { t } = useTranslation(); diff --git a/projects/app/src/pages/account/bill/index.tsx b/projects/app/src/pages/account/bill/index.tsx index e94465e7c..f848a09c1 100644 --- a/projects/app/src/pages/account/bill/index.tsx +++ b/projects/app/src/pages/account/bill/index.tsx @@ -6,7 +6,7 @@ import { useTranslation } from 'next-i18next'; import ApplyInvoiceModal from '@/pageComponents/account/bill/ApplyInvoiceModal'; import { useRouter } from 'next/router'; import AccountContainer from '@/pageComponents/account/AccountContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; export enum InvoiceTabEnum { bill = 'bill', diff --git a/projects/app/src/pages/account/info/index.tsx b/projects/app/src/pages/account/info/index.tsx index b9a6ab99a..f145cd9e2 100644 --- a/projects/app/src/pages/account/info/index.tsx +++ b/projects/app/src/pages/account/info/index.tsx @@ -39,7 +39,7 @@ import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; import { useSystem } from '@fastgpt/web/hooks/useSystem'; import { getWebReqUrl } from '@fastgpt/web/common/system/utils'; import AccountContainer from '@/pageComponents/account/AccountContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useRouter } from 'next/router'; import TeamSelector from '@/pageComponents/account/TeamSelector'; import { getWorkorderURL } from '@/web/common/workorder/api'; diff --git a/projects/app/src/pages/account/inform.tsx b/projects/app/src/pages/account/inform.tsx index 553a2dba4..be787576d 100644 --- a/projects/app/src/pages/account/inform.tsx +++ b/projects/app/src/pages/account/inform.tsx @@ -7,7 +7,7 @@ import { useLoading } from '@fastgpt/web/hooks/useLoading'; import { useTranslation } from 'next-i18next'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; import AccountContainer from '@/pageComponents/account/AccountContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; const InformTable = () => { const { t } = useTranslation(); diff --git a/projects/app/src/pages/account/model/index.tsx b/projects/app/src/pages/account/model/index.tsx index 01416f0e4..877088b34 100644 --- a/projects/app/src/pages/account/model/index.tsx +++ b/projects/app/src/pages/account/model/index.tsx @@ -1,4 +1,4 @@ -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import React, { useMemo, useState } from 'react'; import AccountContainer from '@/pageComponents/account/AccountContainer'; import { Box, Flex } from '@chakra-ui/react'; diff --git a/projects/app/src/pages/account/promotion.tsx b/projects/app/src/pages/account/promotion.tsx index e6307f699..c5ea2d9b2 100644 --- a/projects/app/src/pages/account/promotion.tsx +++ b/projects/app/src/pages/account/promotion.tsx @@ -26,7 +26,7 @@ import { useLoading } from '@fastgpt/web/hooks/useLoading'; import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; import AccountContainer from '@/pageComponents/account/AccountContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; const Promotion = () => { const { t } = useTranslation(); diff --git a/projects/app/src/pages/account/setting.tsx b/projects/app/src/pages/account/setting.tsx index 6a3579b58..df0e21aa2 100644 --- a/projects/app/src/pages/account/setting.tsx +++ b/projects/app/src/pages/account/setting.tsx @@ -10,7 +10,7 @@ import { UserUpdateParams } from '@/types/user'; import TimezoneSelect from '@fastgpt/web/components/common/MySelect/TimezoneSelect'; import I18nLngSelector from '@/components/Select/I18nLngSelector'; import AccountContainer from '@/pageComponents/account/AccountContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; const Individuation = () => { const { t } = useTranslation(); diff --git a/projects/app/src/pages/account/team/index.tsx b/projects/app/src/pages/account/team/index.tsx index 02e6abad4..a23c32c6f 100644 --- a/projects/app/src/pages/account/team/index.tsx +++ b/projects/app/src/pages/account/team/index.tsx @@ -1,4 +1,4 @@ -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import AccountContainer from '@/pageComponents/account/AccountContainer'; import { Box, Flex } from '@chakra-ui/react'; import Icon from '@fastgpt/web/components/common/Icon'; diff --git a/projects/app/src/pages/account/thirdParty/index.tsx b/projects/app/src/pages/account/thirdParty/index.tsx index f25abf39e..cfaeb9490 100644 --- a/projects/app/src/pages/account/thirdParty/index.tsx +++ b/projects/app/src/pages/account/thirdParty/index.tsx @@ -9,7 +9,7 @@ import dynamic from 'next/dynamic'; import { useState, useMemo } from 'react'; import WorkflowVariableModal from '@/pageComponents/account/thirdParty/WorkflowVariableModal'; import { useToast } from '@fastgpt/web/hooks/useToast'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; import { GET } from '@/web/common/api/request'; import type { checkUsageResponse } from '@/pages/api/support/user/team/thirtdParty/checkUsage'; diff --git a/projects/app/src/pages/account/usage/index.tsx b/projects/app/src/pages/account/usage/index.tsx index 6d81369a5..bd885013b 100644 --- a/projects/app/src/pages/account/usage/index.tsx +++ b/projects/app/src/pages/account/usage/index.tsx @@ -9,7 +9,7 @@ import { useTranslation } from 'next-i18next'; import { useUserStore } from '@/web/support/user/useUserStore'; import Avatar from '@fastgpt/web/components/common/Avatar'; import AccountContainer from '@/pageComponents/account/AccountContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination'; import { getTeamMembers } from '@/web/support/user/team/api'; import FillRowTabs from '@fastgpt/web/components/common/Tabs/FillRowTabs'; diff --git a/projects/app/src/pages/api/admin/initv491.ts b/projects/app/src/pages/api/admin/initv491.ts index 07c431655..10ee3c815 100644 --- a/projects/app/src/pages/api/admin/initv491.ts +++ b/projects/app/src/pages/api/admin/initv491.ts @@ -26,7 +26,7 @@ const updateData = async () => { console.log('更新分词完成'); break; } - console.log('读取数据完成', Date.now() - time); + const dataTextOps: AnyBulkWriteOperation<DatasetDataTextSchemaType>[] = []; const datasetDataIds: string[] = []; @@ -46,7 +46,6 @@ const updateData = async () => { console.log(`分词处理错误: ${item._id}`, error); } } - console.log('分词处理完成', Date.now() - time); await mongoSessionRun(async (session) => { if (dataTextOps.length > 0) { @@ -62,7 +61,6 @@ const updateData = async () => { ); } }); - console.log('保存完成', Date.now() - time); success += dataTextOps.length; console.log(`成功 ${success}`); diff --git a/projects/app/src/pages/app/detail/index.tsx b/projects/app/src/pages/app/detail/index.tsx index 6272e6063..9391299a4 100644 --- a/projects/app/src/pages/app/detail/index.tsx +++ b/projects/app/src/pages/app/detail/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import { Box } from '@chakra-ui/react'; import dynamic from 'next/dynamic'; import Loading from '@fastgpt/web/components/common/MyLoading'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import NextHead from '@/components/common/NextHead'; import { useContextSelector } from 'use-context-selector'; import AppContextProvider, { AppContext } from '@/pageComponents/app/detail/context'; diff --git a/projects/app/src/pages/app/list/index.tsx b/projects/app/src/pages/app/list/index.tsx index 645ec71f6..56b05f1bb 100644 --- a/projects/app/src/pages/app/list/index.tsx +++ b/projects/app/src/pages/app/list/index.tsx @@ -1,7 +1,7 @@ import React, { useMemo, useState } from 'react'; import { Box, Flex, Button, useDisclosure, Input, InputGroup } from '@chakra-ui/react'; import { AddIcon } from '@chakra-ui/icons'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useUserStore } from '@/web/support/user/useUserStore'; import { useTranslation } from 'next-i18next'; import dynamic from 'next/dynamic'; diff --git a/projects/app/src/pages/chat/index.tsx b/projects/app/src/pages/chat/index.tsx index c23372f28..62d4d3813 100644 --- a/projects/app/src/pages/chat/index.tsx +++ b/projects/app/src/pages/chat/index.tsx @@ -15,7 +15,7 @@ import ChatHistorySlider from '@/pageComponents/chat/ChatHistorySlider'; import SliderApps from '@/pageComponents/chat/SliderApps'; import ChatHeader from '@/pageComponents/chat/ChatHeader'; import { useUserStore } from '@/web/support/user/useUserStore'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { getChatTitleFromChatMessage } from '@fastgpt/global/core/chat/utils'; import { GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt'; import { getMyApps } from '@/web/core/app/api'; diff --git a/projects/app/src/pages/chat/share.tsx b/projects/app/src/pages/chat/share.tsx index 98720d0a8..0d8e8f1e9 100644 --- a/projects/app/src/pages/chat/share.tsx +++ b/projects/app/src/pages/chat/share.tsx @@ -11,7 +11,7 @@ import type { StartChatFnProps } from '@/components/core/chat/ChatContainer/type import PageContainer from '@/components/PageContainer'; import ChatHeader from '@/pageComponents/chat/ChatHeader'; import ChatHistorySlider from '@/pageComponents/chat/ChatHistorySlider'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useTranslation } from 'next-i18next'; import { getInitOutLinkChatInfo } from '@/web/core/chat/api'; import { getChatTitleFromChatMessage } from '@fastgpt/global/core/chat/utils'; diff --git a/projects/app/src/pages/chat/team.tsx b/projects/app/src/pages/chat/team.tsx index 4b76cc362..f5e8c617d 100644 --- a/projects/app/src/pages/chat/team.tsx +++ b/projects/app/src/pages/chat/team.tsx @@ -8,7 +8,7 @@ import PageContainer from '@/components/PageContainer'; import { getMyTokensApps } from '@/web/core/chat/api'; import ChatHistorySlider from '@/pageComponents/chat/ChatHistorySlider'; import ChatHeader from '@/pageComponents/chat/ChatHeader'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useTranslation } from 'next-i18next'; import ChatBox from '@/components/core/chat/ChatContainer/ChatBox'; import type { StartChatFnProps } from '@/components/core/chat/ChatContainer/type'; diff --git a/projects/app/src/pages/dataset/detail/index.tsx b/projects/app/src/pages/dataset/detail/index.tsx index 519d64fd7..aa0a33a94 100644 --- a/projects/app/src/pages/dataset/detail/index.tsx +++ b/projects/app/src/pages/dataset/detail/index.tsx @@ -5,7 +5,7 @@ import { useToast } from '@fastgpt/web/hooks/useToast'; import { getErrText } from '@fastgpt/global/common/error/utils'; import dynamic from 'next/dynamic'; import PageContainer from '@/components/PageContainer'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useTranslation } from 'next-i18next'; import MetaDataCard from '@/pageComponents/dataset/detail/MetaDataCard'; import NavBar from '@/pageComponents/dataset/detail/NavBar'; diff --git a/projects/app/src/pages/dataset/list/index.tsx b/projects/app/src/pages/dataset/list/index.tsx index f8ba22b92..0a959f870 100644 --- a/projects/app/src/pages/dataset/list/index.tsx +++ b/projects/app/src/pages/dataset/list/index.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useMemo, useState } from 'react'; import { Box, Flex, Button, InputGroup, InputLeftElement, Input } from '@chakra-ui/react'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import ParentPaths from '@/components/common/folder/Path'; import List from '@/pageComponents/dataset/list/List'; import { DatasetsContext } from './context'; diff --git a/projects/app/src/pages/index.tsx b/projects/app/src/pages/index.tsx index 380cc434c..c96f598f7 100644 --- a/projects/app/src/pages/index.tsx +++ b/projects/app/src/pages/index.tsx @@ -1,4 +1,4 @@ -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import React, { useEffect } from 'react'; import Loading from '@fastgpt/web/components/common/MyLoading'; import { useRouter } from 'next/router'; diff --git a/projects/app/src/pages/login/fastlogin.tsx b/projects/app/src/pages/login/fastlogin.tsx index 020caeaaf..7ec6cb3b8 100644 --- a/projects/app/src/pages/login/fastlogin.tsx +++ b/projects/app/src/pages/login/fastlogin.tsx @@ -6,7 +6,7 @@ import { clearToken } from '@/web/support/user/auth'; import { postFastLogin } from '@/web/support/user/api'; import { useToast } from '@fastgpt/web/hooks/useToast'; import Loading from '@fastgpt/web/components/common/MyLoading'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { getErrText } from '@fastgpt/global/common/error/utils'; import { useTranslation } from 'next-i18next'; const FastLogin = ({ diff --git a/projects/app/src/pages/login/index.tsx b/projects/app/src/pages/login/index.tsx index a0fa287b4..3977f7def 100644 --- a/projects/app/src/pages/login/index.tsx +++ b/projects/app/src/pages/login/index.tsx @@ -17,7 +17,7 @@ import { useRouter } from 'next/router'; import { useUserStore } from '@/web/support/user/useUserStore'; import { useChatStore } from '@/web/core/chat/context/useChatStore'; import dynamic from 'next/dynamic'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { clearToken } from '@/web/support/user/auth'; import Script from 'next/script'; import Loading from '@fastgpt/web/components/common/MyLoading'; diff --git a/projects/app/src/pages/login/provider.tsx b/projects/app/src/pages/login/provider.tsx index ffce5922b..21f217479 100644 --- a/projects/app/src/pages/login/provider.tsx +++ b/projects/app/src/pages/login/provider.tsx @@ -7,7 +7,7 @@ import { clearToken } from '@/web/support/user/auth'; import { oauthLogin } from '@/web/support/user/api'; import { useToast } from '@fastgpt/web/hooks/useToast'; import Loading from '@fastgpt/web/components/common/MyLoading'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { getErrText } from '@fastgpt/global/common/error/utils'; import { useTranslation } from 'next-i18next'; import { OAuthEnum } from '@fastgpt/global/support/user/constant'; diff --git a/projects/app/src/pages/more/index.tsx b/projects/app/src/pages/more/index.tsx index 86fc4ba1a..4fc916375 100644 --- a/projects/app/src/pages/more/index.tsx +++ b/projects/app/src/pages/more/index.tsx @@ -4,7 +4,7 @@ import { ChevronRightIcon } from '@chakra-ui/icons'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useRouter } from 'next/router'; import { useSystemStore } from '@/web/common/system/useSystemStore'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { useTranslation } from 'next-i18next'; import { getDocPath } from '@/web/common/system/doc'; diff --git a/projects/app/src/pages/price/index.tsx b/projects/app/src/pages/price/index.tsx index 9171e8484..e58cd6ee0 100644 --- a/projects/app/src/pages/price/index.tsx +++ b/projects/app/src/pages/price/index.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { Box, Flex, HStack, VStack } from '@chakra-ui/react'; import { useUserStore } from '@/web/support/user/useUserStore'; import { getTeamPlanStatus } from '@/web/support/user/team/api'; diff --git a/projects/app/src/pages/toolkit/index.tsx b/projects/app/src/pages/toolkit/index.tsx index 8fe13508e..33f0b584c 100644 --- a/projects/app/src/pages/toolkit/index.tsx +++ b/projects/app/src/pages/toolkit/index.tsx @@ -1,4 +1,4 @@ -import { serviceSideProps } from '@/web/common/system/nextjs'; +import { serviceSideProps } from '@/web/common/i18n/utils'; import { getPluginGroups, getSystemPlugTemplates } from '@/web/core/app/api/plugin'; import { Box, Flex, Grid, useDisclosure } from '@chakra-ui/react'; import Avatar from '@fastgpt/web/components/common/Avatar'; diff --git a/projects/app/src/web/common/system/nextjs.ts b/projects/app/src/web/common/i18n/utils.ts similarity index 85% rename from projects/app/src/web/common/system/nextjs.ts rename to projects/app/src/web/common/i18n/utils.ts index 14d44baab..44cd299f8 100644 --- a/projects/app/src/web/common/system/nextjs.ts +++ b/projects/app/src/web/common/i18n/utils.ts @@ -9,7 +9,7 @@ export const serviceSideProps = async (content: any, ns: I18nNsType = []) => { const deviceSize = content.req?.cookies?.NEXT_DEVICE_SIZE || null; return { - ...(await serverSideTranslations(lang, ['common', ...ns], null, extraLng)), + ...(await serverSideTranslations(lang, ['common', ...ns], undefined, extraLng)), deviceSize }; };