diff --git a/web/public/iconfont.js b/web/public/iconfont.js index 6b2c93e8f..178288a11 100644 --- a/web/public/iconfont.js +++ b/web/public/iconfont.js @@ -1,5 +1,76 @@ (window._iconfont_svg_string_4909832 = '' + + ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ` + '' + '' + '' + diff --git a/web/src/assets/svg/llm/ai302.svg b/web/src/assets/svg/llm/ai302.svg deleted file mode 100644 index 80a864ee9..000000000 --- a/web/src/assets/svg/llm/ai302.svg +++ /dev/null @@ -1 +0,0 @@ -302.AI \ No newline at end of file diff --git a/web/src/assets/svg/llm/anthropic.svg b/web/src/assets/svg/llm/anthropic.svg deleted file mode 100644 index 249c9503c..000000000 --- a/web/src/assets/svg/llm/anthropic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/azure.svg b/web/src/assets/svg/llm/azure.svg deleted file mode 100644 index b3281a5a5..000000000 --- a/web/src/assets/svg/llm/azure.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/baai.svg b/web/src/assets/svg/llm/baai.svg deleted file mode 100644 index 7e365e377..000000000 --- a/web/src/assets/svg/llm/baai.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/baichuan.svg b/web/src/assets/svg/llm/baichuan.svg deleted file mode 100644 index 6ea61b5b8..000000000 --- a/web/src/assets/svg/llm/baichuan.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/web/src/assets/svg/llm/bedrock.svg b/web/src/assets/svg/llm/bedrock.svg deleted file mode 100644 index 3b01a13a4..000000000 --- a/web/src/assets/svg/llm/bedrock.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - diff --git a/web/src/assets/svg/llm/cohere.svg b/web/src/assets/svg/llm/cohere.svg deleted file mode 100644 index cb1b2a591..000000000 --- a/web/src/assets/svg/llm/cohere.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/cometapi.svg b/web/src/assets/svg/llm/cometapi.svg deleted file mode 100644 index 8d9811864..000000000 --- a/web/src/assets/svg/llm/cometapi.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/web/src/assets/svg/llm/deepinfra.svg b/web/src/assets/svg/llm/deepinfra.svg deleted file mode 100644 index 565c8095b..000000000 --- a/web/src/assets/svg/llm/deepinfra.svg +++ /dev/null @@ -1 +0,0 @@ -DeepInfra \ No newline at end of file diff --git a/web/src/assets/svg/llm/deepseek.svg b/web/src/assets/svg/llm/deepseek.svg deleted file mode 100644 index 50a8eb318..000000000 --- a/web/src/assets/svg/llm/deepseek.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/deerapi.svg b/web/src/assets/svg/llm/deerapi.svg deleted file mode 100644 index 0655cd5ed..000000000 --- a/web/src/assets/svg/llm/deerapi.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/web/src/assets/svg/llm/fish-audio.svg b/web/src/assets/svg/llm/fish-audio.svg deleted file mode 100644 index ec44029a9..000000000 --- a/web/src/assets/svg/llm/fish-audio.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/gitee-ai.svg b/web/src/assets/svg/llm/gitee-ai.svg deleted file mode 100644 index 93a3cea67..000000000 --- a/web/src/assets/svg/llm/gitee-ai.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/github.svg b/web/src/assets/svg/llm/github.svg deleted file mode 100644 index 6f80a87ed..000000000 --- a/web/src/assets/svg/llm/github.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/web/src/assets/svg/llm/google-cloud.svg b/web/src/assets/svg/llm/google-cloud.svg deleted file mode 100644 index 2f7870552..000000000 --- a/web/src/assets/svg/llm/google-cloud.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/google.svg b/web/src/assets/svg/llm/google.svg deleted file mode 100644 index f0d10ecfd..000000000 --- a/web/src/assets/svg/llm/google.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/web/src/assets/svg/llm/gpustack.svg b/web/src/assets/svg/llm/gpustack.svg deleted file mode 100644 index 95a07f912..000000000 --- a/web/src/assets/svg/llm/gpustack.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - Combined Shape - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/grok.svg b/web/src/assets/svg/llm/grok.svg deleted file mode 100644 index 9201bbc9f..000000000 --- a/web/src/assets/svg/llm/grok.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/groq-next.svg b/web/src/assets/svg/llm/groq-next.svg deleted file mode 100644 index 5608a42e4..000000000 --- a/web/src/assets/svg/llm/groq-next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/huggingface.svg b/web/src/assets/svg/llm/huggingface.svg deleted file mode 100644 index 43c5d3c0c..000000000 --- a/web/src/assets/svg/llm/huggingface.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - diff --git a/web/src/assets/svg/llm/hunyuan.svg b/web/src/assets/svg/llm/hunyuan.svg deleted file mode 100644 index 43a78d007..000000000 --- a/web/src/assets/svg/llm/hunyuan.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/jina.svg b/web/src/assets/svg/llm/jina.svg deleted file mode 100644 index 6a241fc9a..000000000 --- a/web/src/assets/svg/llm/jina.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/web/src/assets/svg/llm/lepton-ai.svg b/web/src/assets/svg/llm/lepton-ai.svg deleted file mode 100644 index b7ccd3d26..000000000 --- a/web/src/assets/svg/llm/lepton-ai.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - diff --git a/web/src/assets/svg/llm/lm-studio.svg b/web/src/assets/svg/llm/lm-studio.svg deleted file mode 100644 index 98d4c1d99..000000000 --- a/web/src/assets/svg/llm/lm-studio.svg +++ /dev/null @@ -1,9704 +0,0 @@ - - - - diff --git a/web/src/assets/svg/llm/longcat.svg b/web/src/assets/svg/llm/longcat.svg deleted file mode 100644 index f123daf3a..000000000 --- a/web/src/assets/svg/llm/longcat.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/web/src/assets/svg/llm/mistral.svg b/web/src/assets/svg/llm/mistral.svg deleted file mode 100644 index b4a57ef79..000000000 --- a/web/src/assets/svg/llm/mistral.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/modelscope.svg b/web/src/assets/svg/llm/modelscope.svg deleted file mode 100644 index 8b3778fc4..000000000 --- a/web/src/assets/svg/llm/modelscope.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/web/src/assets/svg/llm/moonshot.svg b/web/src/assets/svg/llm/moonshot.svg deleted file mode 100644 index dbaf1f647..000000000 --- a/web/src/assets/svg/llm/moonshot.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/nomic-ai.svg b/web/src/assets/svg/llm/nomic-ai.svg deleted file mode 100644 index 26e624a88..000000000 --- a/web/src/assets/svg/llm/nomic-ai.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/web/src/assets/svg/llm/novita-ai.svg b/web/src/assets/svg/llm/novita-ai.svg deleted file mode 100644 index c44bd707b..000000000 --- a/web/src/assets/svg/llm/novita-ai.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/src/assets/svg/llm/nvidia.svg b/web/src/assets/svg/llm/nvidia.svg deleted file mode 100644 index 217afaac9..000000000 --- a/web/src/assets/svg/llm/nvidia.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/ollama.svg b/web/src/assets/svg/llm/ollama.svg deleted file mode 100644 index 6e9fb283c..000000000 --- a/web/src/assets/svg/llm/ollama.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/web/src/assets/svg/llm/open-router.svg b/web/src/assets/svg/llm/open-router.svg deleted file mode 100644 index e6130e73d..000000000 --- a/web/src/assets/svg/llm/open-router.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/openai-api.svg b/web/src/assets/svg/llm/openai-api.svg deleted file mode 100644 index a0ecf992f..000000000 --- a/web/src/assets/svg/llm/openai-api.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/openai.svg b/web/src/assets/svg/llm/openai.svg deleted file mode 100644 index 6114c7c7e..000000000 --- a/web/src/assets/svg/llm/openai.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/perfx-cloud.svg b/web/src/assets/svg/llm/perfx-cloud.svg deleted file mode 100644 index 3767a1e86..000000000 --- a/web/src/assets/svg/llm/perfx-cloud.svg +++ /dev/null @@ -1,10 +0,0 @@ - - logo - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/ppio.svg b/web/src/assets/svg/llm/ppio.svg deleted file mode 100755 index 49ab9a1f6..000000000 --- a/web/src/assets/svg/llm/ppio.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/src/assets/svg/llm/replicate.svg b/web/src/assets/svg/llm/replicate.svg deleted file mode 100644 index 31241923e..000000000 --- a/web/src/assets/svg/llm/replicate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/sentence-transformers.svg b/web/src/assets/svg/llm/sentence-transformers.svg deleted file mode 100644 index f777b3d26..000000000 --- a/web/src/assets/svg/llm/sentence-transformers.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/siliconflow.svg b/web/src/assets/svg/llm/siliconflow.svg deleted file mode 100644 index c67850628..000000000 --- a/web/src/assets/svg/llm/siliconflow.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/spark.svg b/web/src/assets/svg/llm/spark.svg deleted file mode 100644 index 30f6040f2..000000000 --- a/web/src/assets/svg/llm/spark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/tencent-cloud.svg b/web/src/assets/svg/llm/tencent-cloud.svg deleted file mode 100644 index b33a9701a..000000000 --- a/web/src/assets/svg/llm/tencent-cloud.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/together-ai.svg b/web/src/assets/svg/llm/together-ai.svg deleted file mode 100644 index 93e744c3d..000000000 --- a/web/src/assets/svg/llm/together-ai.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/token-pony.svg b/web/src/assets/svg/llm/token-pony.svg deleted file mode 100644 index a504e2224..000000000 --- a/web/src/assets/svg/llm/token-pony.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - logo2 - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/tongyi.svg b/web/src/assets/svg/llm/tongyi.svg deleted file mode 100644 index d7104d6d3..000000000 --- a/web/src/assets/svg/llm/tongyi.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/upstage.svg b/web/src/assets/svg/llm/upstage.svg deleted file mode 100644 index 09a7512ca..000000000 --- a/web/src/assets/svg/llm/upstage.svg +++ /dev/null @@ -1,255 +0,0 @@ - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/vllm.svg b/web/src/assets/svg/llm/vllm.svg deleted file mode 100644 index 6aca38486..000000000 --- a/web/src/assets/svg/llm/vllm.svg +++ /dev/null @@ -1,59 +0,0 @@ - - vllm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/volc_engine.svg b/web/src/assets/svg/llm/volc_engine.svg deleted file mode 100644 index 2c56cb00b..000000000 --- a/web/src/assets/svg/llm/volc_engine.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/voyage.svg b/web/src/assets/svg/llm/voyage.svg deleted file mode 100644 index 88ffbdff9..000000000 --- a/web/src/assets/svg/llm/voyage.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/xai.svg b/web/src/assets/svg/llm/xai.svg deleted file mode 100644 index a6808fb67..000000000 --- a/web/src/assets/svg/llm/xai.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/xinference.svg b/web/src/assets/svg/llm/xinference.svg deleted file mode 100644 index 8d2ab4f3e..000000000 --- a/web/src/assets/svg/llm/xinference.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/yi.svg b/web/src/assets/svg/llm/yi.svg deleted file mode 100644 index 83ebd22d9..000000000 --- a/web/src/assets/svg/llm/yi.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/web/src/assets/svg/llm/yiyan.svg b/web/src/assets/svg/llm/yiyan.svg deleted file mode 100644 index 4c571c34a..000000000 --- a/web/src/assets/svg/llm/yiyan.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/assets/svg/llm/youdao.svg b/web/src/assets/svg/llm/youdao.svg deleted file mode 100644 index 5af58851f..000000000 --- a/web/src/assets/svg/llm/youdao.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/web/src/assets/svg/llm/zhipu.svg b/web/src/assets/svg/llm/zhipu.svg deleted file mode 100644 index 5561830e6..000000000 --- a/web/src/assets/svg/llm/zhipu.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/web/src/components/parse-configuration/raptor-form-fields.tsx b/web/src/components/parse-configuration/raptor-form-fields.tsx index 2e03526c5..4f99ecadc 100644 --- a/web/src/components/parse-configuration/raptor-form-fields.tsx +++ b/web/src/components/parse-configuration/raptor-form-fields.tsx @@ -19,6 +19,7 @@ import { FormMessage, } from '../ui/form'; import { ExpandedInput } from '../ui/input'; +import { Radio } from '../ui/radio'; import { Textarea } from '../ui/textarea'; export const excludedParseMethods = [ @@ -111,6 +112,38 @@ const RaptorFormFields = ({ ); }} /> + { + return ( + +
+ + {t('generationScope')} + +
+ + +
+ {t('scopeDataset')} + {t('scopeSingleFile')} +
+ + +
+
+
+
+ +
+ + ); + }} + /> {useRaptor && (
{ @@ -61,15 +63,45 @@ export const LlmIcon = ({ size?: AvatarSize; imgClass?: string; }) => { - const icon = IconMap[name as keyof typeof IconMap]; + const isDark = useIsDarkTheme(); + const themeIcons = [ + LLMFactory.FishAudio, + LLMFactory.TogetherAI, + LLMFactory.Meituan, + ]; + let icon = useMemo(() => { + const icontemp = IconMap[name as keyof typeof IconMap]; + if (themeIcons.includes(name as LLMFactory)) { + if (isDark) { + return icontemp + '-dark'; + } else { + return icontemp + '-bright'; + } + } + return icontemp; + }, [name, isDark]); + + const svgIcons = [ + LLMFactory.LocalAI, + // LLMFactory.VolcEngine, + LLMFactory.MiniMax, + LLMFactory.Gemini, + LLMFactory.StepFun, + // LLMFactory.DeerAPI, + ]; + if (svgIcons.includes(name as LLMFactory)) { + return ( + + ); + } return icon ? ( - + ) : ( } /> ); diff --git a/web/src/constants/llm.ts b/web/src/constants/llm.ts index c5333fd3e..6282dd1ef 100644 --- a/web/src/constants/llm.ts +++ b/web/src/constants/llm.ts @@ -31,7 +31,6 @@ export enum LLMFactory { NovitaAI = 'NovitaAI', SILICONFLOW = 'SILICONFLOW', PPIO = 'PPIO', - ZeroOneAI = '01.AI', Replicate = 'Replicate', TencentHunYuan = 'Tencent Hunyuan', XunFeiSpark = 'XunFei Spark', @@ -58,11 +57,12 @@ export enum LLMFactory { Meituan = 'Meituan', CometAPI = 'CometAPI', DeerAPI = 'DeerAPI', + Builtin = 'Builtin', } // Please lowercase the file name export const IconMap = { - [LLMFactory.TongYiQianWen]: 'tongyi', + [LLMFactory.TongYiQianWen]: 'tongyi-qianwen', [LLMFactory.Moonshot]: 'moonshot', [LLMFactory.OpenAI]: 'openai', [LLMFactory.ZhipuAI]: 'zhipu', @@ -71,7 +71,7 @@ export const IconMap = { [LLMFactory.Xinference]: 'xinference', [LLMFactory.ModelScope]: 'modelscope', [LLMFactory.DeepSeek]: 'deepseek', - [LLMFactory.VolcEngine]: 'volc_engine', + [LLMFactory.VolcEngine]: 'volcengine', [LLMFactory.BaiChuan]: 'baichuan', [LLMFactory.Jina]: 'jina', [LLMFactory.MiniMax]: 'chat-minimax', @@ -87,18 +87,17 @@ export const IconMap = { [LLMFactory.LMStudio]: 'lm-studio', [LLMFactory.OpenAiAPICompatible]: 'openai-api', [LLMFactory.Cohere]: 'cohere', - [LLMFactory.LeptonAI]: 'lepton-ai', - [LLMFactory.TogetherAI]: 'together-ai', + [LLMFactory.LeptonAI]: 'lepton', + [LLMFactory.TogetherAI]: 'together', [LLMFactory.PerfXCloud]: 'perfx-cloud', [LLMFactory.Upstage]: 'upstage', [LLMFactory.NovitaAI]: 'novita-ai', [LLMFactory.SILICONFLOW]: 'siliconflow', [LLMFactory.PPIO]: 'ppio', - [LLMFactory.ZeroOneAI]: 'yi', [LLMFactory.Replicate]: 'replicate', [LLMFactory.TencentHunYuan]: 'hunyuan', [LLMFactory.XunFeiSpark]: 'spark', - [LLMFactory.BaiduYiYan]: 'yiyan', + [LLMFactory.BaiduYiYan]: 'wenxinyiyan', [LLMFactory.FishAudio]: 'fish-audio', [LLMFactory.TencentCloud]: 'tencent-cloud', [LLMFactory.Anthropic]: 'anthropic', @@ -117,8 +116,9 @@ export const IconMap = { [LLMFactory.DeepInfra]: 'deepinfra', [LLMFactory.Grok]: 'grok', [LLMFactory.XAI]: 'xai', - [LLMFactory.TokenPony]: 'token-pony', + [LLMFactory.TokenPony]: 'tokenpony', [LLMFactory.Meituan]: 'longcat', [LLMFactory.CometAPI]: 'cometapi', [LLMFactory.DeerAPI]: 'deerapi', + [LLMFactory.Builtin]: 'builtin', }; diff --git a/web/src/hooks/llm-hooks.tsx b/web/src/hooks/llm-hooks.tsx index 7ea9228c9..0da63f7b5 100644 --- a/web/src/hooks/llm-hooks.tsx +++ b/web/src/hooks/llm-hooks.tsx @@ -14,7 +14,6 @@ import { IDeleteLlmRequestBody, } from '@/interfaces/request/llm'; import userService from '@/services/user-service'; -import { sortLLmFactoryListBySpecifiedOrder } from '@/utils/common-util'; import { getLLMIconName, getRealModelName } from '@/utils/llm-util'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { DefaultOptionType } from 'antd/es/select'; @@ -239,7 +238,8 @@ export const useSelectLlmList = () => { const currentList = factoryList.filter((x) => Object.keys(myLlmList).every((y) => y !== x.name), ); - return sortLLmFactoryListBySpecifiedOrder(currentList); + return currentList; + // return sortLLmFactoryListBySpecifiedOrder(currentList); }, [factoryList, myLlmList]); return { diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts index cda6f2a08..08fdc690d 100644 --- a/web/src/locales/en.ts +++ b/web/src/locales/en.ts @@ -274,11 +274,16 @@ export default { reRankModelWaring: 'Re-rank model is very time consuming.', }, knowledgeConfiguration: { + generationScopeTip: + 'Determines whether RAPTOR is generated for the entire dataset or for a single file.', + scopeDataset: 'Dataset', + generationScope: 'Generation Scope', + scopeSingleFile: 'Single File', autoParse: 'Auto Parse', rebuildTip: 'Re-downloads files from the linked data source and parses them again.', baseInfo: 'Basic Info', - gobalIndex: 'Global Index', + globalIndex: 'Global Index', dataSource: 'Data Source', linkSourceSetTip: 'Manage data source linkage with this dataset', linkDataSource: 'Link Data Source', @@ -688,6 +693,12 @@ This auto-tagging feature enhances retrieval by adding another layer of domain-s tocEnhanceTip: ` During the parsing of the document, table of contents information was generated (see the 'Enable Table of Contents Extraction' option in the General method). This allows the large model to return table of contents items relevant to the user's query, thereby using these items to retrieve related chunks and apply weighting to these chunks during the sorting process. This approach is derived from mimicking the behavioral logic of how humans search for knowledge in books.`, }, setting: { + confluenceIsCloudTip: + 'Check if this is a Confluence Cloud instance, uncheck for Confluence Server/Data Center', + confluenceWikiBaseUrlTip: + 'The base URL of your Confluence instance (e.g., https://your-domain.atlassian.net/wiki)', + s3PrefixTip: `Specify the folder path within your S3 bucket to fetch files from. +Example: general/v2/`, addDataSourceModalTital: 'Create your {{name}} connector', deleteSourceModalTitle: 'Delete data source', deleteSourceModalContent: ` diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts index 4ba1f9623..98c0c19f6 100644 --- a/web/src/locales/zh.ts +++ b/web/src/locales/zh.ts @@ -260,10 +260,15 @@ export default { theDocumentBeingParsedCannotBeDeleted: '正在解析的文档不能被删除', }, knowledgeConfiguration: { + generationScopeTip: '选择 RAPTOR 的生成范围：整个知识库或单个文件。', + generationScope: '生成范围', + scopeSingleFile: '单文件', + scopeDataset: '整库', + autoParse: '自动解析', rebuildTip: '从所有已关联的数据源重新下载文件并再次解析。', baseInfo: '基础信息', - gobalIndex: '全局索引', + globalIndex: '全局索引', dataSource: '数据源', linkSourceSetTip: '管理与此数据集的数据源链接', linkDataSource: '链接数据源', @@ -677,6 +682,12 @@ General：实体和关系提取提示来自 GitHub - microsoft/graphrag：基于 tocEnhanceTip: `解析文档时生成了目录信息（见General方法的‘启用目录抽取’），让大模型返回和用户问题相关的目录项，从而利用目录项拿到相关chunk，对这些chunk在排序中进行加权。这种方法来源于模仿人类查询书本中知识的行为逻辑`, }, setting: { + confluenceIsCloudTip: + '检查这是否是 Confluence Cloud 实例，如果是 Confluence 服务/数据中心，则取消选中。', + confluenceWikiBaseUrlTip: + 'Confluence Wiki 的基础 URL（例如 https://your-domain.atlassian.net/wiki）', + s3PrefixTip: `指定 S3 存储桶内的文件夹路径，用于读取文件。 +示例：general/v2/`, addDataSourceModalTital: '创建你的 {{name}} 链接', deleteSourceModalTitle: '删除数据源链接', deleteSourceModalContent: ` diff --git a/web/src/pages/dataset/dataset-overview/hook.ts b/web/src/pages/dataset/dataset-overview/hook.ts index 62453a31e..a74dd947c 100644 --- a/web/src/pages/dataset/dataset-overview/hook.ts +++ b/web/src/pages/dataset/dataset-overview/hook.ts @@ -11,14 +11,14 @@ import { useQuery } from '@tanstack/react-query'; import { useCallback, useState } from 'react'; import { useParams, useSearchParams } from 'umi'; import { LogTabs } from './dataset-common'; -import { IFileLogList, IOverviewTital } from './interface'; +import { IFileLogList, IOverviewTotal } from './interface'; const useFetchOverviewTital = () => { const [searchParams] = useSearchParams(); const { id } = useParams(); const knowledgeBaseId = searchParams.get('id') || id; - const { data } = useQuery({ - queryKey: ['overviewTital'], + const { data } = useQuery({ + queryKey: ['overviewTotal'], queryFn: async () => { const { data: res = {} } = await kbService.getKnowledgeBasicInfo({ kb_id: knowledgeBaseId, diff --git a/web/src/pages/dataset/dataset-overview/index.tsx b/web/src/pages/dataset/dataset-overview/index.tsx index babc3b7d2..7da96a576 100644 --- a/web/src/pages/dataset/dataset-overview/index.tsx +++ b/web/src/pages/dataset/dataset-overview/index.tsx @@ -128,6 +128,10 @@ const FileLogsPage: FC = () => { setTopAllData((prev) => { return { ...prev, + downloads: { + ...prev.downloads, + success: topData?.downloaded || 0, + }, processing: { value: topData?.processing || 0, success: topData?.finished || 0, diff --git a/web/src/pages/dataset/dataset-overview/interface.ts b/web/src/pages/dataset/dataset-overview/interface.ts index 72991e4ac..795b50bbc 100644 --- a/web/src/pages/dataset/dataset-overview/interface.ts +++ b/web/src/pages/dataset/dataset-overview/interface.ts @@ -20,11 +20,12 @@ export interface FileLogsTableProps { active: (typeof LogTabs)[keyof typeof LogTabs]; } -export interface IOverviewTital { +export interface IOverviewTotal { cancelled: number; failed: number; finished: number; processing: number; + downloaded: number; } export interface IFileLogItem { diff --git a/web/src/pages/dataset/dataset-setting/form-schema.ts b/web/src/pages/dataset/dataset-setting/form-schema.ts index a306e8594..51d4afc3d 100644 --- a/web/src/pages/dataset/dataset-setting/form-schema.ts +++ b/web/src/pages/dataset/dataset-setting/form-schema.ts @@ -37,6 +37,7 @@ export const formSchema = z threshold: z.number().optional(), max_cluster: z.number().optional(), random_seed: z.number().optional(), + scope: z.string().optional(), }) .refine( (data) => { diff --git a/web/src/pages/dataset/dataset-setting/index.tsx b/web/src/pages/dataset/dataset-setting/index.tsx index 443cefaf1..5a9b5c4bc 100644 --- a/web/src/pages/dataset/dataset-setting/index.tsx +++ b/web/src/pages/dataset/dataset-setting/index.tsx @@ -73,6 +73,7 @@ export default function DatasetSettings() { threshold: 0.1, max_cluster: 64, random_seed: 0, + scope: 'file', prompt: t('knowledgeConfiguration.promptText'), }, graphrag: { @@ -252,7 +253,7 @@ export default function DatasetSettings() {
- {t('knowledgeConfiguration.gobalIndex')} + {t('knowledgeConfiguration.globalIndex')}
{ {/* */}
-
+
logo { - const [title, setTitle] = useState('login'); - const navigate = useNavigate(); - const { login, loading: signLoading } = useLogin(); - const { register, loading: registerLoading } = useRegister(); - const { channels, loading: channelsLoading } = useLoginChannels(); - const { login: loginWithChannel, loading: loginWithChannelLoading } = - useLoginWithChannel(); - const { t } = useTranslation('translation', { keyPrefix: 'login' }); - const loading = - signLoading || - registerLoading || - channelsLoading || - loginWithChannelLoading; - const { config } = useSystemConfig(); - const registerEnabled = config?.registerEnabled !== 0; - - const { isLogin } = useAuth(); - useEffect(() => { - if (isLogin) { - navigate('/'); - } - }, [isLogin, navigate]); - - const handleLoginWithChannel = async (channel: string) => { - await loginWithChannel(channel); - }; - - const changeTitle = () => { - if (title === 'login' && !registerEnabled) { - return; - } - setTitle((title) => (title === 'login' ? 'register' : 'login')); - }; - const [form] = Form.useForm(); - - useEffect(() => { - form.validateFields(['nickname']); - }, [form]); - - const onCheck = async () => { - try { - const params = await form.validateFields(); - - const rsaPassWord = rsaPsw(params.password) as string; - - if (title === 'login') { - const code = await login({ - email: `${params.email}`.trim(), - password: rsaPassWord, - }); - if (code === 0) { - navigate('/'); - } - } else { - const code = await register({ - nickname: params.nickname, - email: params.email, - password: rsaPassWord, - }); - if (code === 0) { - setTitle('login'); - } - } - } catch (errorInfo) { - console.log('Failed:', errorInfo); - } - }; - const formItemLayout = { - labelCol: { span: 6 }, - // wrapperCol: { span: 8 }, - }; - - return ( -
-
-
-
-
{title === 'login' ? t('login') : t('register')}
- - {title === 'login' - ? t('loginDescription') - : t('registerDescription')} - -
- -
- - - - {title === 'register' && ( - - - - )} - - - - {title === 'login' && ( - - {t('rememberMe')} - - )} -
- {title === 'login' && registerEnabled && ( -
- {t('signInTip')} - -
- )} - {title === 'register' && ( -
- {t('signUpTip')} - -
- )} -
- - {title === 'login' && channels && channels.length > 0 && ( -
- {channels.map((item) => ( - - ))} -
- )} -
-
-
-
- -
-
- ); -}; - -export default Login; diff --git a/web/src/pages/login/right-panel.tsx b/web/src/pages/login/right-panel.tsx deleted file mode 100644 index 820dd9b35..000000000 --- a/web/src/pages/login/right-panel.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { ReactComponent as Avatars } from '@/assets/svg/login-avatars.svg'; -import SvgIcon from '@/components/svg-icon'; -import { Flex, Rate, Space, Typography } from 'antd'; -import classNames from 'classnames'; - -import { useTranslate } from '@/hooks/common-hooks'; -import styles from './index.less'; - -const { Title, Text } = Typography; - -const LoginRightPanel = () => { - const { t } = useTranslate('login'); - return ( -
- - - - {t('title')} - - - {t('description')} - - - - - - - - 5.0 - - - - {t('review')} - - - - -
- ); -}; - -export default LoginRightPanel; diff --git a/web/src/pages/user-setting/data-source/contant.tsx b/web/src/pages/user-setting/data-source/contant.tsx index c631f40ee..ebb92619c 100644 --- a/web/src/pages/user-setting/data-source/contant.tsx +++ b/web/src/pages/user-setting/data-source/contant.tsx @@ -108,6 +108,7 @@ export const DataSourceFormFields = { name: 'config.prefix', type: FormFieldType.Text, required: false, + tooltip: t('setting.s3PrefixTip'), }, ], [DataSourceKey.NOTION]: [ @@ -164,16 +165,14 @@ export const DataSourceFormFields = { name: 'config.wiki_base', type: FormFieldType.Text, required: false, - tooltip: - 'The base URL of your Confluence instance (e.g., https://your-domain.atlassian.net/wiki)', + tooltip: t('setting.confluenceWikiBaseUrlTip'), }, { label: 'Is Cloud', name: 'config.is_cloud', type: FormFieldType.Checkbox, required: false, - tooltip: - 'Check if this is a Confluence Cloud instance, uncheck for Confluence Server/Data Center', + tooltip: t('setting.confluenceIsCloudTip'), }, ], [DataSourceKey.GOOGLE_DRIVE]: [ diff --git a/web/src/pages/user-setting/setting-model/components/un-add-model.tsx b/web/src/pages/user-setting/setting-model/components/un-add-model.tsx index a7a4425a3..5d5c99d8c 100644 --- a/web/src/pages/user-setting/setting-model/components/un-add-model.tsx +++ b/web/src/pages/user-setting/setting-model/components/un-add-model.tsx @@ -45,7 +45,7 @@ export const AvailableModels: FC<{ const [selectedTag, setSelectedTag] = useState(null); const filteredModels = useMemo(() => { - return factoryList.filter((model) => { + const models = factoryList.filter((model) => { const matchesSearch = model.name .toLowerCase() .includes(searchTerm.toLowerCase()); @@ -54,6 +54,7 @@ export const AvailableModels: FC<{ model.tags.split(',').some((tag) => tag.trim() === selectedTag); return matchesSearch && matchesTag; }); + return models; }, [factoryList, searchTerm, selectedTag]); const allTags = useMemo(() => { @@ -124,7 +125,7 @@ export const AvailableModels: FC<{ className=" border border-border-default rounded-lg p-3 hover:bg-bg-input transition-colors group" >
- +

{model.name}

diff --git a/web/src/pages/user-setting/sidebar/index.tsx b/web/src/pages/user-setting/sidebar/index.tsx index c1c1c1da1..20f20fdde 100644 --- a/web/src/pages/user-setting/sidebar/index.tsx +++ b/web/src/pages/user-setting/sidebar/index.tsx @@ -77,11 +77,11 @@ export function SideBar() { )} {item.label} - {item.key === Routes.System && ( + {/* {item.key === Routes.System && (
{version}
- )} + )} */} {/* {active && (
)} */} @@ -93,7 +93,10 @@ export function SideBar() {
-
+
+
+ {version} +