{item.name}
diff --git a/web/src/pages/user-setting/setting-model/components/used-model.tsx b/web/src/pages/user-setting/setting-model/components/used-model.tsx
index 3973f6fb6..91c7bc066 100644
--- a/web/src/pages/user-setting/setting-model/components/used-model.tsx
+++ b/web/src/pages/user-setting/setting-model/components/used-model.tsx
@@ -9,7 +9,7 @@ export const UsedModel = ({
handleAddModel: (factory: string) => void;
handleEditModel: (model: any, factory: LlmItem) => void;
}) => {
- const { factoryList, myLlmList: llmList, loading } = useSelectLlmList();
+ const { myLlmList: llmList } = useSelectLlmList();
return (
diff --git a/web/src/pages/user-setting/setting-model/hooks.tsx b/web/src/pages/user-setting/setting-model/hooks.tsx
index edc31fa2a..9fc620d3d 100644
--- a/web/src/pages/user-setting/setting-model/hooks.tsx
+++ b/web/src/pages/user-setting/setting-model/hooks.tsx
@@ -17,6 +17,7 @@ import { getRealModelName } from '@/utils/llm-util';
import { useQueryClient } from '@tanstack/react-query';
import { useCallback, useState } from 'react';
import { ApiKeyPostBody } from '../interface';
+import { MinerUFormValues } from './modal/mineru-modal';
type SavingParamsState = Omit;
@@ -461,15 +462,6 @@ export const useHandleDeleteFactory = (llmFactory: string) => {
return { handleDeleteFactory, deleteFactory };
};
-type MinerUFormValues = {
- llm_name: string;
- mineru_apiserver?: string;
- mineru_output_dir?: string;
- mineru_backend?: string;
- mineru_server_url?: string;
- mineru_delete_output?: boolean;
-};
-
export const useSubmitMinerU = () => {
const { addLlm, loading } = useAddLlm();
const {
@@ -477,18 +469,12 @@ export const useSubmitMinerU = () => {
hideModal: hideMineruModal,
showModal: showMineruModal,
} = useSetModalState();
- const [initialValues, setInitialValues] = useState<
- Partial | undefined
- >();
const onMineruOk = useCallback(
async (payload: MinerUFormValues) => {
const cfg = {
- MINERU_APISERVER: payload.mineru_apiserver || '',
- MINERU_OUTPUT_DIR: payload.mineru_output_dir || '',
- MINERU_BACKEND: payload.mineru_backend || 'pipeline',
- MINERU_SERVER_URL: payload.mineru_server_url || '',
- MINERU_DELETE_OUTPUT: payload.mineru_delete_output ?? true ? '1' : '0',
+ ...payload,
+ mineru_delete_output: payload.mineru_delete_output ?? true ? '1' : '0',
};
const req: IAddLlmRequestBody = {
llm_factory: LLMFactory.MinerU,
@@ -501,23 +487,16 @@ export const useSubmitMinerU = () => {
const ret = await addLlm(req);
if (ret === 0) {
hideMineruModal();
- setInitialValues(undefined);
}
},
[addLlm, hideMineruModal],
);
- const handleShowMineruModal = (values?: Partial) => {
- setInitialValues(values);
- showMineruModal();
- };
-
return {
mineruVisible,
hideMineruModal,
- showMineruModal: handleShowMineruModal,
+ showMineruModal,
onMineruOk,
mineruLoading: loading,
- mineruInitialValues: initialValues,
};
};
diff --git a/web/src/pages/user-setting/setting-model/index.tsx b/web/src/pages/user-setting/setting-model/index.tsx
index 1ba713bbf..af7907bb0 100644
--- a/web/src/pages/user-setting/setting-model/index.tsx
+++ b/web/src/pages/user-setting/setting-model/index.tsx
@@ -136,7 +136,6 @@ const ModelProviders = () => {
showMineruModal,
onMineruOk,
mineruLoading,
- mineruInitialValues,
} = useSubmitMinerU();
const ModalMap = useMemo(
@@ -156,12 +155,13 @@ const ModelProviders = () => {
showBedrockAddingModal,
showVolcAddingModal,
showHunyuanAddingModal,
- showTencentCloudAddingModal,
showSparkAddingModal,
showyiyanAddingModal,
showFishAudioAddingModal,
+ showTencentCloudAddingModal,
showGoogleAddingModal,
showAzureAddingModal,
+ showMineruModal,
],
);
@@ -306,7 +306,6 @@ const ModelProviders = () => {
hideModal={hideMineruModal}
onOk={onMineruOk}
loading={mineruLoading}
- initialValues={mineruInitialValues}
>
);
diff --git a/web/src/pages/user-setting/setting-model/modal/mineru-modal/index.tsx b/web/src/pages/user-setting/setting-model/modal/mineru-modal/index.tsx
index aad5df724..7833467db 100644
--- a/web/src/pages/user-setting/setting-model/modal/mineru-modal/index.tsx
+++ b/web/src/pages/user-setting/setting-model/modal/mineru-modal/index.tsx
@@ -9,19 +9,21 @@ import {
} from '@/components/ui/dialog';
import { Form } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
-import { RAGFlowSelect, RAGFlowSelectOptionType } from '@/components/ui/select';
+import { RAGFlowSelect } from '@/components/ui/select';
import { Switch } from '@/components/ui/switch';
-import { useTranslate } from '@/hooks/common-hooks';
+import { LLMFactory } from '@/constants/llm';
import { IModalProps } from '@/interfaces/common';
+import { buildOptions } from '@/utils/form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { useEffect } from 'react';
+import { t } from 'i18next';
import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
import { z } from 'zod';
import { LLMHeader } from '../../components/llm-header';
const FormSchema = z.object({
llm_name: z.string().min(1, {
- message: 'Model name is required',
+ message: t('setting.mineru.modelNameRequired'),
}),
mineru_apiserver: z.string().optional(),
mineru_output_dir: z.string().optional(),
@@ -35,25 +37,22 @@ const FormSchema = z.object({
mineru_delete_output: z.boolean(),
});
-type MinerUFormValues = z.infer
;
-
-const backendOptions: RAGFlowSelectOptionType[] = [
- { value: 'pipeline', label: 'pipeline' },
- { value: 'vlm-transformers', label: 'vlm-transformers' },
- { value: 'vlm-vllm-engine', label: 'vlm-vllm-engine' },
- { value: 'vlm-http-client', label: 'vlm-http-client' },
-];
+export type MinerUFormValues = z.infer;
const MinerUModal = ({
visible,
hideModal,
onOk,
loading,
- initialValues,
-}: IModalProps & {
- initialValues?: Partial;
-}) => {
- const { t } = useTranslate('setting');
+}: IModalProps) => {
+ const { t } = useTranslation();
+
+ const backendOptions = buildOptions([
+ 'pipeline',
+ 'vlm-transformers',
+ 'vlm-vllm-engine',
+ 'vlm-http-client',
+ ]);
const form = useForm({
resolver: zodResolver(FormSchema),
@@ -70,25 +69,12 @@ const MinerUModal = ({
}
};
- useEffect(() => {
- if (visible) {
- form.reset();
- if (initialValues) {
- form.reset({
- mineru_backend: 'pipeline',
- mineru_delete_output: true,
- ...initialValues,
- });
- }
- }
- }, [visible, initialValues, form]);
-
return (