diff --git a/frontend/src/_locales/ja/main.json b/frontend/src/_locales/ja/main.json index 7d776ae..5c0b9c0 100644 --- a/frontend/src/_locales/ja/main.json +++ b/frontend/src/_locales/ja/main.json @@ -353,5 +353,6 @@ "The name used internally by the model when processing AI message, changing this value helps improve the role-playing effect.": "AIメッセージを処理する際にモデルが内部で使用する名前、この値を変更することで、役割演技の効果を向上させることができます。", "Inside the model, there is a default prompt to improve the model's handling of common issues, but it may degrade the role-playing effect. You can disable this option to achieve a better role-playing effect.": "モデル内部には、一般的な問題の処理を改善するためのデフォルトのプロンプトがありますが、役割演技の効果を低下させる可能性があります。このオプションを無効にすることで、より良い役割演技効果を得ることができます。", "Exit without saving": "保存せずに終了", - "Content has been changed, are you sure you want to exit without saving?": "コンテンツが変更されています、保存せずに終了してもよろしいですか？" + "Content has been changed, are you sure you want to exit without saving?": "コンテンツが変更されています、保存せずに終了してもよろしいですか？", + "Don't forget to correctly fill in your Ollama API Chat Model Name.": "Ollama APIチャットモデル名を正しく記入するのを忘れないでください。" } \ No newline at end of file diff --git a/frontend/src/_locales/zh-hans/main.json b/frontend/src/_locales/zh-hans/main.json index 9f27111..8ed0e3f 100644 --- a/frontend/src/_locales/zh-hans/main.json +++ b/frontend/src/_locales/zh-hans/main.json @@ -353,5 +353,6 @@ "The name used internally by the model when processing AI message, changing this value helps improve the role-playing effect.": "模型内部处理AI发言时使用的名称, 更改此值有助于改善角色扮演效果", "Inside the model, there is a default prompt to improve the model's handling of common issues, but it may degrade the role-playing effect. You can disable this option to achieve a better role-playing effect.": "模型内部有一个默认提示来改善模型处理常规问题的效果, 但它可能会让角色扮演的效果变差, 你可以关闭此选项来获得更好的角色扮演效果", "Exit without saving": "退出而不保存", - "Content has been changed, are you sure you want to exit without saving?": "内容已经被修改, 你确定要退出而不保存吗?" + "Content has been changed, are you sure you want to exit without saving?": "内容已经被修改, 你确定要退出而不保存吗?", + "Don't forget to correctly fill in your Ollama API Chat Model Name.": "不要忘记正确填写你的Ollama API 聊天模型名" } \ No newline at end of file diff --git a/frontend/src/pages/AudiotrackManager/AudiotrackEditor.tsx b/frontend/src/pages/AudiotrackManager/AudiotrackEditor.tsx index dbd1869..d77d3fa 100644 --- a/frontend/src/pages/AudiotrackManager/AudiotrackEditor.tsx +++ b/frontend/src/pages/AudiotrackManager/AudiotrackEditor.tsx @@ -32,7 +32,7 @@ import { flushMidiRecordingContent, getMidiRawContentMainInstrument, getMidiRawContentTime, - getServerRoot, + getReqUrl, OpenFileDialog, refreshTracksTotalTime } from '../../utils'; @@ -474,8 +474,13 @@ const AudiotrackEditor: FC<{ setPrompt: (prompt: string) => void }> = observer(( OpenFileDialog('*.mid').then(async blob => { const bodyForm = new FormData(); bodyForm.append('file_data', blob); - fetch(getServerRoot(commonStore.getCurrentModelConfig().apiParameters.apiPort) + '/midi-to-text', { + const { + url, + headers + } = await getReqUrl(commonStore.getCurrentModelConfig().apiParameters.apiPort, '/midi-to-text'); + fetch(url, { method: 'POST', + headers, body: bodyForm }).then(async r => { if (r.status === 200) { diff --git a/frontend/src/pages/Chat.tsx b/frontend/src/pages/Chat.tsx index c651869..2cd05ed 100644 --- a/frontend/src/pages/Chat.tsx +++ b/frontend/src/pages/Chat.tsx @@ -41,7 +41,7 @@ import { OpenFileFolder, OpenOpenFileDialog, OpenSaveFileDialog } from '../../wa import { absPathAsset, bytesToReadable, - getServerRoot, + getReqUrl, newChatConversation, OpenFileDialog, setActivePreset, @@ -475,7 +475,7 @@ const ChatPanel: FC = observer(() => { // if answerId is not null, override the answer with new response; // if startUuid is null, start generating api body messages from first message; // if endUuid is null, generate api body messages until last message; - const onSubmit = useCallback((message: string | null = null, answerId: string | null = null, + const onSubmit = useCallback(async (message: string | null = null, answerId: string | null = null, startUuid: string | null = null, endUuid: string | null = null, includeEndUuid: boolean = false) => { if (message) { const newId = uuid(); @@ -557,13 +557,15 @@ const ChatPanel: FC = observer(() => { }; const chatSseController = new AbortController(); chatSseControllers[answerId] = chatSseController; + const { url, headers } = await getReqUrl(port, '/v1/chat/completions', true); fetchEventSource( // https://api.openai.com/v1/chat/completions || http://127.0.0.1:${port}/v1/chat/completions - getServerRoot(port, true) + '/v1/chat/completions', + url, { method: 'POST', headers: { 'Content-Type': 'application/json', - Authorization: `Bearer ${commonStore.settings.apiKey}` + Authorization: `Bearer ${commonStore.settings.apiKey}`, + ...headers }, body: JSON.stringify({ messages: messages.slice(-commonStore.chatParams.historyN), @@ -727,8 +729,10 @@ const ChatPanel: FC = observer(() => { const urlPath = `/file-to-text?file_name=${attachmentName}`; const bodyForm = new FormData(); bodyForm.append('file_data', blob, attachmentName); - fetch(getServerRoot(port) + urlPath, { + const { url, headers } = await getReqUrl(port, urlPath); + fetch(url, { method: 'POST', + headers, body: bodyForm }).then(async r => { if (r.status === 200) { diff --git a/frontend/src/pages/Completion.tsx b/frontend/src/pages/Completion.tsx index db7755d..1bc1bf1 100644 --- a/frontend/src/pages/Completion.tsx +++ b/frontend/src/pages/Completion.tsx @@ -14,7 +14,7 @@ import { ToolTipButton } from '../components/ToolTipButton'; import { ArrowSync20Regular } from '@fluentui/react-icons'; import { defaultPresets } from './defaultConfigs'; import { CompletionParams, CompletionPreset } from '../types/completion'; -import { getServerRoot } from '../utils'; +import { getReqUrl } from '../utils'; let completionSseController: AbortController | null = null; @@ -68,7 +68,7 @@ const CompletionPanel: FC = observer(() => { }); }; - const onSubmit = (prompt: string) => { + const onSubmit = async (prompt: string) => { commonStore.setCompletionSubmittedPrompt(prompt); if (commonStore.status.status === ModelStatus.Offline && !commonStore.settings.apiUrl && commonStore.platform !== 'web') { @@ -86,13 +86,15 @@ const CompletionPanel: FC = observer(() => { commonStore.setCompletionGenerating(false); }; completionSseController = new AbortController(); + const { url, headers } = await getReqUrl(port, '/v1/completions', true); fetchEventSource( // https://api.openai.com/v1/completions || http://127.0.0.1:${port}/v1/completions - getServerRoot(port, true) + '/v1/completions', + url, { method: 'POST', headers: { 'Content-Type': 'application/json', - Authorization: `Bearer ${commonStore.settings.apiKey}` + Authorization: `Bearer ${commonStore.settings.apiKey}`, + ...headers }, body: JSON.stringify({ prompt, diff --git a/frontend/src/pages/Composition.tsx b/frontend/src/pages/Composition.tsx index d523ed8..0a9030d 100644 --- a/frontend/src/pages/Composition.tsx +++ b/frontend/src/pages/Composition.tsx @@ -26,7 +26,7 @@ import { SaveFile, StartFile } from '../../wailsjs/go/backend_golang/App'; -import { getServerRoot, getSoundFont, toastWithButton } from '../utils'; +import { getReqUrl, getSoundFont, toastWithButton } from '../utils'; import { CompositionParams } from '../types/composition'; import { useMediaQuery } from 'usehooks-ts'; import { AudiotrackButton } from './AudiotrackManager/AudiotrackButton'; @@ -135,7 +135,7 @@ const CompositionPanel: FC = observer(() => { } }, [commonStore.midiPorts]); - const generateNs = (autoPlay: boolean) => { + const generateNs = async (autoPlay: boolean) => { if (commonStore.getCurrentModelConfig().modelParameters.modelName.toLowerCase().includes('abc')) { import('abcjs').then(ABCJS => { ABCJS.renderAbc('abc-paper', commonStore.compositionParams.prompt, { responsive: 'resize' }); @@ -143,10 +143,12 @@ const CompositionPanel: FC = observer(() => { return; } - fetch(getServerRoot(port) + '/text-to-midi', { + const { url, headers } = await getReqUrl(port, '/text-to-midi'); + fetch(url, { method: 'POST', headers: { - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', + ...headers }, body: JSON.stringify({ 'text': commonStore.compositionParams.prompt.replaceAll(/||/g, '').replaceAll(' ', ' ').trim() @@ -175,7 +177,7 @@ const CompositionPanel: FC = observer(() => { }); }; - const onSubmit = (prompt: string) => { + const onSubmit = async (prompt: string) => { commonStore.setCompositionSubmittedPrompt(prompt); if (commonStore.status.status === ModelStatus.Offline && !commonStore.settings.apiUrl && commonStore.platform !== 'web') { @@ -192,13 +194,15 @@ const CompositionPanel: FC = observer(() => { generateNs(commonStore.compositionParams.autoPlay); }; compositionSseController = new AbortController(); + const { url, headers } = await getReqUrl(port, '/v1/completions', true); fetchEventSource( // https://api.openai.com/v1/completions || http://127.0.0.1:${port}/v1/completions - getServerRoot(port, true) + '/v1/completions', + url, { method: 'POST', headers: { 'Content-Type': 'application/json', - Authorization: `Bearer ${commonStore.settings.apiKey}` + Authorization: `Bearer ${commonStore.settings.apiKey}`, + ...headers }, body: JSON.stringify({ prompt, diff --git a/frontend/src/pages/Settings.tsx b/frontend/src/pages/Settings.tsx index de725a3..2adb2d5 100644 --- a/frontend/src/pages/Settings.tsx +++ b/frontend/src/pages/Settings.tsx @@ -17,6 +17,7 @@ import { useTranslation } from 'react-i18next'; import { checkUpdate, toastWithButton } from '../utils'; import { RestartApp } from '../../wailsjs/go/backend_golang/App'; import { Language, Languages } from '../types/settings'; +import { toast } from 'react-toastify'; export const GeneralSettings: FC = observer(() => { const { t } = useTranslation(); @@ -113,11 +114,15 @@ export const AdvancedGeneralSettings: FC = observer(() => { commonStore.setSettings({ apiCompletionModelName: 'rwkv' }); + } else if (data.optionText === 'Ollama') { + toast(t('Don\'t forget to correctly fill in your Ollama API Chat Model Name.'), + { type: 'info' }); } }}> + } />