diff --git a/src/main/preprocess/MineruPreprocessProvider.ts b/src/main/preprocess/MineruPreprocessProvider.ts index 11f9ceecd..579a42f35 100644 --- a/src/main/preprocess/MineruPreprocessProvider.ts +++ b/src/main/preprocess/MineruPreprocessProvider.ts @@ -42,6 +42,8 @@ type ExtractResultResponse = { export default class MineruPreprocessProvider extends BasePreprocessProvider { constructor(provider: PreprocessProvider) { super(provider) + // todo:免费期结束后删除 + this.provider.apiKey = this.provider.apiKey || import.meta.env.VITE_MINERU_API_KEY } public async parseFile(sourceId: string, file: FileMetadata): Promise<{ processedFile: FileMetadata }> { diff --git a/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx b/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx index 09809fb13..14b4205e9 100644 --- a/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx +++ b/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx @@ -95,7 +95,10 @@ const PopupContainer: React.FC = ({ title, resolve }) => { const preprocessOptions = { label: t('settings.tool.preprocess.provider'), title: t('settings.tool.preprocess.provider'), - options: preprocessProviders.filter((p) => p.apiKey !== '').map((p) => ({ value: p.id, label: p.name })) + options: preprocessProviders + // todo: 免费期结束后删除 + .filter((p) => p.apiKey !== '' || p.id === 'mineru') + .map((p) => ({ value: p.id, label: p.name })) } const ocrOptions = { label: t('settings.tool.ocr.provider'), diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx index d82f4be48..b453dbc9c 100644 --- a/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx +++ b/src/renderer/src/pages/knowledge/components/KnowledgeSettings.tsx @@ -73,7 +73,10 @@ const PopupContainer: React.FC = ({ base: _base, resolve }) => { const preprocessOptions = { label: t('settings.tool.preprocess.provider'), title: t('settings.tool.preprocess.provider'), - options: preprocessProviders.filter((p) => p.apiKey !== '').map((p) => ({ value: p.id, label: p.name })) + options: preprocessProviders + // todo: 免费期结束后删除 + .filter((p) => p.apiKey !== '' || p.id === 'mineru') + .map((p) => ({ value: p.id, label: p.name })) } const ocrOptions = { label: t('settings.tool.ocr.provider'), diff --git a/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/PreprocessSettings.tsx b/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/PreprocessSettings.tsx index 95ef161f0..aee88865c 100644 --- a/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/PreprocessSettings.tsx +++ b/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/PreprocessSettings.tsx @@ -6,7 +6,7 @@ import { PreprocessProvider } from '@renderer/types' import { hasObjectKey } from '@renderer/utils' import { Avatar, Divider, Flex, Input, InputNumber, Segmented } from 'antd' import Link from 'antd/es/typography/Link' -import { FC, useEffect, useRef, useState } from 'react' +import { FC, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' @@ -31,8 +31,6 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { const [apiKey, setApiKey] = useState(preprocessProvider.apiKey || '') const [apiHost, setApiHost] = useState(preprocessProvider.apiHost || '') const [options, setOptions] = useState(preprocessProvider.options || {}) - // todo: remove this after the next release - const hasSetDefaultApiKey = useRef(false) const preprocessProviderConfig = PREPROCESS_PROVIDER_CONFIG[preprocessProvider.id] const apiKeyWebsite = preprocessProviderConfig?.websites?.apiKey @@ -40,12 +38,6 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { useEffect(() => { setApiKey(preprocessProvider.apiKey ?? '') - // todo: remove this after the next release - if (preprocessProvider.id === 'mineru' && !preprocessProvider.apiKey && !hasSetDefaultApiKey.current) { - setApiKey(import.meta.env.RENDERER_VITE_MINERU_KEY) - console.log('Using default Mineru API key from environment variable.') - hasSetDefaultApiKey.current = true - } setApiHost(preprocessProvider.apiHost ?? '') setOptions(preprocessProvider.options ?? {}) }, [preprocessProvider.apiKey, preprocessProvider.apiHost, preprocessProvider.options])