diff --git a/README.md b/README.md index 803326e..ef786d3 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ - 支持火山引擎翻译 - 支持百度翻译 - 支持 deeplx 翻译 （批量翻译容易存在被限流的情况） +- 支持本地模型 ollama 翻译 - 自定义字幕文件名，方便兼容不同的播放器挂载字幕识别 - 自定义翻译后的字幕文件内容，纯翻译结果，原字幕+翻译结果 - 项目集成 `whisper.cpp`， 它对 apple silicon 进行了优化，有较快的生成速度 diff --git a/main/helpers/fileProcessor.ts b/main/helpers/fileProcessor.ts index c6b8e00..546998a 100644 --- a/main/helpers/fileProcessor.ts +++ b/main/helpers/fileProcessor.ts @@ -6,7 +6,7 @@ import { extractAudio } from './ffmpeg'; import translate from './translate'; import { renderTemplate, isWin32, getExtraResourcesPath } from './utils'; -export async function processFile(event, file, formData, hasOpenAiWhisper, translationProviders) { +export async function processFile(event, file, formData, hasOpenAiWhisper, provider) { const { model, sourceLanguage, @@ -81,7 +81,6 @@ export async function processFile(event, file, formData, hasOpenAiWhisper, trans "translateSubtitle", "loading", ); - const provider = translationProviders.find(p => p.id === translateProvider); await translate( event, directory, diff --git a/main/helpers/storeManager.ts b/main/helpers/storeManager.ts index 66553d7..4e676c4 100644 --- a/main/helpers/storeManager.ts +++ b/main/helpers/storeManager.ts @@ -9,9 +9,16 @@ type StoreType = { } const defaultTranslationProviders = [ - { id: 'baidu', name: '百度', apiKey: '', apiSecret: '' }, - { id: 'volc', name: '火山', apiKey: '', apiSecret: '' }, - { id: 'deeplx', name: 'DeepLX', apiKey: '', apiSecret: '' }, + { id: 'baidu', name: '百度', type: 'api', apiKey: '', apiSecret: '' }, + { id: 'volc', name: '火山', type: 'api', apiKey: '', apiSecret: '' }, + { id: 'deeplx', name: 'DeepLX', type: 'api', apiKey: '', apiSecret: '' }, + { + id: 'ollama', + name: 'Ollama', + type: 'local', + apiUrl: 'http://localhost:11434', + modelName: 'llama2', + prompt: 'Please translate the following content from ${sourceLanguage} to ${targetLanguage}, only return the translation result can be. \n ${content}' }, ]; export const store = new Store({ @@ -27,13 +34,23 @@ export function setupStoreHandlers() { }); ipcMain.handle('getTranslationProviders', async () => { - let providers = store.get('translationProviders'); - if (!providers || providers.length === 0) { - providers = defaultTranslationProviders; - store.set('translationProviders', providers); - } - console.log(providers, 'translationProviders'); - return providers; + let storedProviders = store.get('translationProviders'); + + // 合并存储的提供商和默认提供商 + const mergedProviders = defaultTranslationProviders.map(defaultProvider => { + const storedProvider = storedProviders.find(p => p.id === defaultProvider.id); + if (storedProvider) { + // 如果存储的提供商存在，合并默认值和存储的值 + return { ...defaultProvider, ...storedProvider }; + } + // 如果存储中不存在该提供商，使用默认值 + return defaultProvider; + }); + + // 更新存储 + store.set('translationProviders', mergedProviders); + + return mergedProviders; }); ipcMain.on('setUserConfig', async (event, config) => { diff --git a/main/helpers/taskProcessor.ts b/main/helpers/taskProcessor.ts index 3bb5285..b4b88e3 100644 --- a/main/helpers/taskProcessor.ts +++ b/main/helpers/taskProcessor.ts @@ -60,7 +60,10 @@ async function processNextTasks(event) { const translationProviders = store.get('translationProviders'); try { - await Promise.all(tasks.map(task => processFile(event, task.file, task.formData, hasOpenAiWhisper, translationProviders))); + await Promise.all(tasks.map(task => { + const provider = translationProviders.find(p => p.id === task.formData.translateProvider); + return processFile(event, task.file, task.formData, hasOpenAiWhisper, provider); + })); } catch (error) { event.sender.send("message", error); } diff --git a/main/helpers/translate.ts b/main/helpers/translate.ts index fe78337..4d14040 100644 --- a/main/helpers/translate.ts +++ b/main/helpers/translate.ts @@ -1,6 +1,10 @@ import path from 'path'; import fs from 'fs'; import { renderTemplate } from './utils'; +import volcTranslator from '../service/volc'; +import baiduTranslator from '../service/baidu'; +import deeplxTranslator from '../service/deeplx'; +import ollamaTranslator from '../service/ollama'; const contentTemplate = { onlyTranslate: '${targetContent}\n\n', @@ -33,13 +37,16 @@ export default async function translate( let translator; switch (translateProvider) { case 'volc': - translator = (await import('../service/volc')).default; + translator = volcTranslator; break; case 'baidu': - translator = (await import('../service/baidu')).default; + translator = baiduTranslator; break; case 'deeplx': - translator = (await import('../service/deeplx')).default; + translator = deeplxTranslator; + break; + case 'ollama': + translator = (text) => ollamaTranslator(text, proof, sourceLanguage, targetLanguage); break; default: translator = (val) => val; diff --git a/main/service/ollama.ts b/main/service/ollama.ts new file mode 100644 index 0000000..cd5c7b5 --- /dev/null +++ b/main/service/ollama.ts @@ -0,0 +1,39 @@ +import axios from 'axios'; +import { renderTemplate } from '../helpers/utils'; + +interface OllamaConfig { + apiUrl: string; + modelName: string; + prompt: string; +} + +export default async function translateWithOllama( + text: string, + config: OllamaConfig, + sourceLanguage: string, + targetLanguage: string +) { + const { apiUrl, modelName, prompt } = config; + + const renderedPrompt = renderTemplate(prompt, { + sourceLanguage, + targetLanguage, + content: text + }); + + try { + const response = await axios.post(`${apiUrl}/api/generate`, { + model: modelName, + prompt: renderedPrompt, + stream: false + }); + + if (response.data && response.data.response) { + return response.data.response.trim(); + } else { + throw new Error(response?.data?.error || 'Unexpected response from Ollama'); + } + } catch (error) { + throw error; + } +} \ No newline at end of file diff --git a/package.json b/package.json index e5d5e17..df1dddc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "name": "video-subtitle-master", "description": "视频转字幕，字幕翻译软件", - "version": "1.0.17", + "version": "1.0.18", "author": "buxuku ", "main": "app/background.js", "scripts": { diff --git a/renderer/components/TaskConfigForm.tsx b/renderer/components/TaskConfigForm.tsx index a4ec11c..962d431 100644 --- a/renderer/components/TaskConfigForm.tsx +++ b/renderer/components/TaskConfigForm.tsx @@ -149,6 +149,7 @@ const TaskConfigForm = ({ 百度 火山 deepLx + ollama diff --git a/renderer/pages/translateControl.tsx b/renderer/pages/translateControl.tsx index aec2acf..aef66b0 100644 --- a/renderer/pages/translateControl.tsx +++ b/renderer/pages/translateControl.tsx @@ -10,23 +10,25 @@ import { import { Input } from '@/components/ui/input'; import { Button } from '@/components/ui/button'; import { Eye, EyeOff } from 'lucide-react'; +import { Textarea } from '@/components/ui/textarea'; -// 定义翻译服务提供商类型 -type TranslationProvider = { +// 定义统一的服务提供商类型 +type Provider = { id: string; name: string; - apiKey: string; - apiSecret: string; + type: 'api' | 'local'; + apiKey?: string; + apiSecret?: string; + apiUrl?: string; + modelName?: string; + prompt?: string; }; const TranslateControl: React.FC = () => { - const [providers, setProviders] = useState([]); - const [showPassword, setShowPassword] = useState<{ [key: string]: boolean }>( - {} - ); + const [providers, setProviders] = useState([]); + const [showPassword, setShowPassword] = useState<{ [key: string]: boolean }>({}); useEffect(() => { - // 组件加载时获取存储的配置 loadProviders(); }, []); @@ -37,31 +39,32 @@ const TranslateControl: React.FC = () => { const handleInputChange = async ( id: string, - field: 'apiKey' | 'apiSecret', + field: keyof Provider, value: string ) => { const updatedProviders = providers.map((provider) => provider.id === id ? { ...provider, [field]: value } : provider ); setProviders(updatedProviders); - // 保存更新后的配置 window?.ipc?.send('setTranslationProviders', updatedProviders); }; - const togglePasswordVisibility = ( - id: string, - field: 'apiKey' | 'apiSecret' - ) => { + const togglePasswordVisibility = (id: string, field: 'apiKey' | 'apiSecret') => { setShowPassword((prev) => ({ ...prev, [`${id}_${field}`]: !prev[`${id}_${field}`], })); }; + const apiProviders = providers.filter(p => p.type === 'api'); + const localProviders = providers.filter(p => p.type === 'local'); + return (

翻译服务管理

- + +

API 服务提供商

+
翻译服务提供商 @@ -70,68 +73,40 @@ const TranslateControl: React.FC = () => { - {providers.map((provider) => ( + {apiProviders.map((provider) => ( {provider.name}
- handleInputChange(provider.id, 'apiKey', e.target.value) - } + onChange={(e) => handleInputChange(provider.id, 'apiKey', e.target.value)} className="mr-2" />
- handleInputChange( - provider.id, - 'apiSecret', - e.target.value - ) - } + onChange={(e) => handleInputChange(provider.id, 'apiSecret', e.target.value)} className="mr-2" />
@@ -139,6 +114,44 @@ const TranslateControl: React.FC = () => { ))}
+ +

本地模型配置

+ + + + 模型名称 + API 地址 + 模型名 + Prompt + + + + {localProviders.map((provider) => ( + + {provider.name} + + handleInputChange(provider.id, 'apiUrl', e.target.value)} + /> + + + handleInputChange(provider.id, 'modelName', e.target.value)} + /> + + +