code format

This commit is contained in:
josc146 2023-05-22 10:52:06 +08:00
parent 035c6ab8de
commit bbad153ecb
28 changed files with 429 additions and 429 deletions

View File

@ -23,18 +23,18 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
import {FluentProvider, Tab, TabList, webDarkTheme, webLightTheme} from '@fluentui/react-components'; import { FluentProvider, Tab, TabList, webDarkTheme, webLightTheme } from '@fluentui/react-components';
import {FC, useEffect, useState} from 'react'; import { FC, useEffect, useState } from 'react';
import {Route, Routes, useLocation, useNavigate} from 'react-router'; import { Route, Routes, useLocation, useNavigate } from 'react-router';
import {pages} from './pages'; import { pages } from './pages';
import {useMediaQuery} from 'usehooks-ts'; import { useMediaQuery } from 'usehooks-ts';
import {ToastContainer} from 'react-toastify'; import { ToastContainer } from 'react-toastify';
import commonStore from './stores/commonStore'; import commonStore from './stores/commonStore';
import {observer} from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
const App: FC = observer(() => { const App: FC = observer(() => {
const {t} = useTranslation(); const { t } = useTranslation();
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation(); const location = useLocation();
const mq = useMediaQuery('(min-width: 640px)'); const mq = useMediaQuery('(min-width: 640px)');
@ -42,7 +42,7 @@ const App: FC = observer(() => {
const [path, setPath] = useState<string>(pages[0].path); const [path, setPath] = useState<string>(pages[0].path);
const selectTab = (selectedPath: unknown) => const selectTab = (selectedPath: unknown) =>
typeof selectedPath === 'string' ? navigate({pathname: selectedPath}) : null; typeof selectedPath === 'string' ? navigate({ pathname: selectedPath }) : null;
useEffect(() => setPath(location.pathname), [location]); useEffect(() => setPath(location.pathname), [location]);
@ -56,10 +56,10 @@ const App: FC = observer(() => {
size="large" size="large"
appearance="subtle" appearance="subtle"
selectedValue={path} selectedValue={path}
onTabSelect={(_, {value}) => selectTab(value)} onTabSelect={(_, { value }) => selectTab(value)}
vertical vertical
> >
{pages.filter(page => page.top).map(({label, path, icon}, index) => ( {pages.filter(page => page.top).map(({ label, path, icon }, index) => (
<Tab icon={icon} key={`${path}-${index}`} value={path}> <Tab icon={icon} key={`${path}-${index}`} value={path}>
{mq && t(label)} {mq && t(label)}
</Tab> </Tab>
@ -69,10 +69,10 @@ const App: FC = observer(() => {
size="large" size="large"
appearance="subtle" appearance="subtle"
selectedValue={path} selectedValue={path}
onTabSelect={(_, {value}) => selectTab(value)} onTabSelect={(_, { value }) => selectTab(value)}
vertical vertical
> >
{pages.filter(page => !page.top).map(({label, path, icon}, index) => ( {pages.filter(page => !page.top).map(({ label, path, icon }, index) => (
<Tab icon={icon} key={`${path}-${index}`} value={path}> <Tab icon={icon} key={`${path}-${index}`} value={path}>
{mq && t(label)} {mq && t(label)}
</Tab> </Tab>
@ -81,8 +81,8 @@ const App: FC = observer(() => {
</div> </div>
<div className="h-full w-full p-2 box-border overflow-y-hidden"> <div className="h-full w-full p-2 box-border overflow-y-hidden">
<Routes> <Routes>
{pages.map(({path, element}, index) => ( {pages.map(({ path, element }, index) => (
<Route key={`${path}-${index}`} path={path} element={element}/> <Route key={`${path}-${index}`} path={path} element={element} />
))} ))}
</Routes> </Routes>
</div> </div>

View File

@ -1,7 +1,7 @@
import i18n, {changeLanguage} from 'i18next'; import i18n, { changeLanguage } from 'i18next';
import {initReactI18next} from 'react-i18next'; import { initReactI18next } from 'react-i18next';
import {resources} from './resources'; import { resources } from './resources';
import {getUserLanguage} from '../utils'; import { getUserLanguage } from '../utils';
i18n.use(initReactI18next).init({ i18n.use(initReactI18next).init({
resources, resources,

View File

@ -1,6 +1,6 @@
import i18n, {changeLanguage} from 'i18next'; import i18n, { changeLanguage } from 'i18next';
import {resources} from './resources'; import { resources } from './resources';
import {getUserLanguage} from '../utils'; import { getUserLanguage } from '../utils';
i18n.init({ i18n.init({
resources resources

View File

@ -1,4 +1,4 @@
import zhHans from './zh-hans/main.json' import zhHans from './zh-hans/main.json';
export const resources = { export const resources = {
zh: { zh: {
@ -34,4 +34,4 @@ export const resources = {
// zhHant: { // zhHant: {
// translation: zhHant, // translation: zhHant,
// }, // },
} };

View File

@ -1,4 +1,4 @@
import commonStore, {ModelStatus} from '../stores/commonStore'; import commonStore, { ModelStatus } from '../stores/commonStore';
export const readRoot = async () => { export const readRoot = async () => {
const port = commonStore.getCurrentModelConfig().apiParameters.apiPort; const port = commonStore.getCurrentModelConfig().apiParameters.apiPort;
@ -11,7 +11,7 @@ export const exit = async (timeout?: number) => {
setTimeout(() => controller.abort(), timeout); setTimeout(() => controller.abort(), timeout);
const port = commonStore.getCurrentModelConfig().apiParameters.apiPort; const port = commonStore.getCurrentModelConfig().apiParameters.apiPort;
return fetch(`http://127.0.0.1:${port}/exit`, {method: 'POST', signal: controller.signal}); return fetch(`http://127.0.0.1:${port}/exit`, { method: 'POST', signal: controller.signal });
}; };
export const switchModel = async (body: any) => { export const switchModel = async (body: any) => {
@ -43,7 +43,7 @@ export const getStatus = async (timeout?: number): Promise<ModelStatus | undefin
const port = commonStore.getCurrentModelConfig().apiParameters.apiPort; const port = commonStore.getCurrentModelConfig().apiParameters.apiPort;
let ret: ModelStatus | undefined; let ret: ModelStatus | undefined;
await fetch(`http://127.0.0.1:${port}/status`, {signal: controller.signal}).then(r => r.json()).then(data => { await fetch(`http://127.0.0.1:${port}/status`, { signal: controller.signal }).then(r => r.json()).then(data => {
ret = data.status; ret = data.status;
}).catch(() => { }).catch(() => {
}); });

View File

@ -1,10 +1,10 @@
import {FC} from 'react'; import { FC } from 'react';
import {observer} from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import {Dropdown, Option} from '@fluentui/react-components'; import { Dropdown, Option } from '@fluentui/react-components';
import commonStore from '../stores/commonStore'; import commonStore from '../stores/commonStore';
export const ConfigSelector: FC<{ size?: 'small' | 'medium' | 'large' }> = observer(({size}) => { export const ConfigSelector: FC<{ size?: 'small' | 'medium' | 'large' }> = observer(({ size }) => {
return <Dropdown size={size} style={{minWidth: 0}} listbox={{style: {minWidth: 0}}} return <Dropdown size={size} style={{ minWidth: 0 }} listbox={{ style: { minWidth: 0 } }}
value={commonStore.getCurrentModelConfig().name} value={commonStore.getCurrentModelConfig().name}
selectedOptions={[commonStore.currentModelConfigIndex.toString()]} selectedOptions={[commonStore.currentModelConfigIndex.toString()]}
onOptionSelect={(_, data) => { onOptionSelect={(_, data) => {

View File

@ -1,11 +1,11 @@
import {FC, useState} from 'react'; import { FC, useState } from 'react';
import {CheckIcon, CopyIcon} from '@primer/octicons-react'; import { CheckIcon, CopyIcon } from '@primer/octicons-react';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {ClipboardSetText} from '../../wailsjs/runtime'; import { ClipboardSetText } from '../../wailsjs/runtime';
import {ToolTipButton} from './ToolTipButton'; import { ToolTipButton } from './ToolTipButton';
export const CopyButton: FC<{ content: string }> = ({content}) => { export const CopyButton: FC<{ content: string }> = ({ content }) => {
const {t} = useTranslation(); const { t } = useTranslation();
const [copied, setCopied] = useState(false); const [copied, setCopied] = useState(false);
const onClick = () => { const onClick = () => {
@ -19,7 +19,7 @@ export const CopyButton: FC<{ content: string }> = ({content}) => {
}; };
return ( return (
<ToolTipButton desc={t('Copy')} size="small" appearance="subtle" icon={copied ? <CheckIcon/> : <CopyIcon/>} <ToolTipButton desc={t('Copy')} size="small" appearance="subtle" icon={copied ? <CheckIcon /> : <CopyIcon />}
onClick={onClick}/> onClick={onClick} />
); );
}; };

View File

@ -1,5 +1,5 @@
import {FC, ReactElement} from 'react'; import { FC, ReactElement } from 'react';
import {Label, Tooltip} from '@fluentui/react-components'; import { Label, Tooltip } from '@fluentui/react-components';
import classnames from 'classnames'; import classnames from 'classnames';
export const Labeled: FC<{ export const Labeled: FC<{
@ -10,7 +10,7 @@ export const Labeled: FC<{
content, content,
flex, flex,
spaceBetween spaceBetween
}) => { }) => {
return ( return (
<div className={classnames( <div className={classnames(
'items-center', 'items-center',

View File

@ -3,14 +3,14 @@ import rehypeRaw from 'rehype-raw';
import rehypeHighlight from 'rehype-highlight'; import rehypeHighlight from 'rehype-highlight';
import remarkGfm from 'remark-gfm'; import remarkGfm from 'remark-gfm';
import remarkBreaks from 'remark-breaks'; import remarkBreaks from 'remark-breaks';
import {FC} from 'react'; import { FC } from 'react';
import {ReactMarkdownOptions} from 'react-markdown/lib/react-markdown'; import { ReactMarkdownOptions } from 'react-markdown/lib/react-markdown';
import {BrowserOpenURL} from '../../wailsjs/runtime'; import { BrowserOpenURL } from '../../wailsjs/runtime';
const Hyperlink: FC<any> = ({href, children}) => { const Hyperlink: FC<any> = ({ href, children }) => {
return ( return (
<span <span
style={{color: '#8ab4f8', cursor: 'pointer'}} style={{ color: '#8ab4f8', cursor: 'pointer' }}
onClick={() => { onClick={() => {
BrowserOpenURL(href); BrowserOpenURL(href);
}} }}

View File

@ -1,6 +1,6 @@
import React, {CSSProperties, FC} from 'react'; import React, { CSSProperties, FC } from 'react';
import {Input} from '@fluentui/react-components'; import { Input } from '@fluentui/react-components';
import {SliderOnChangeData} from '@fluentui/react-slider'; import { SliderOnChangeData } from '@fluentui/react-slider';
export const NumberInput: FC<{ export const NumberInput: FC<{
value: number, value: number,
@ -9,11 +9,11 @@ export const NumberInput: FC<{
step?: number, step?: number,
onChange?: (ev: React.ChangeEvent<HTMLInputElement>, data: SliderOnChangeData) => void onChange?: (ev: React.ChangeEvent<HTMLInputElement>, data: SliderOnChangeData) => void
style?: CSSProperties style?: CSSProperties
}> = ({value, min, max, step, onChange, style}) => { }> = ({ value, min, max, step, onChange, style }) => {
return ( return (
<Input type="number" style={style} value={value.toString()} min={min} max={max} step={step} <Input type="number" style={style} value={value.toString()} min={min} max={max} step={step}
onChange={(e, data) => { onChange={(e, data) => {
onChange?.(e, {value: Number(data.value)}); onChange?.(e, { value: Number(data.value) });
}} }}
onBlur={(e) => { onBlur={(e) => {
if (onChange) { if (onChange) {
@ -24,8 +24,8 @@ export const NumberInput: FC<{
+ offset) + offset)
.toFixed(2)); // avoid precision issues .toFixed(2)); // avoid precision issues
} }
onChange(e, {value: Math.max(Math.min(value, max), min)}); onChange(e, { value: Math.max(Math.min(value, max), min) });
} }
}}/> }} />
); );
}; };

View File

@ -1,11 +1,11 @@
import React, {FC, ReactElement} from 'react'; import React, { FC, ReactElement } from 'react';
import {Divider, Text} from '@fluentui/react-components'; import { Divider, Text } from '@fluentui/react-components';
export const Page: FC<{ title: string; content: ReactElement }> = ({title, content}) => { export const Page: FC<{ title: string; content: ReactElement }> = ({ title, content }) => {
return ( return (
<div className="flex flex-col gap-2 p-2 h-full"> <div className="flex flex-col gap-2 p-2 h-full">
<Text size={600}>{title}</Text> <Text size={600}>{title}</Text>
<Divider style={{flexGrow: 0}}/> <Divider style={{ flexGrow: 0 }} />
{content} {content}
</div> </div>
); );

View File

@ -1,14 +1,14 @@
import {FC, useState} from 'react'; import { FC, useState } from 'react';
import {MuteIcon, UnmuteIcon} from '@primer/octicons-react'; import { MuteIcon, UnmuteIcon } from '@primer/octicons-react';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {ToolTipButton} from './ToolTipButton'; import { ToolTipButton } from './ToolTipButton';
import commonStore from '../stores/commonStore'; import commonStore from '../stores/commonStore';
import {observer} from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
const synth = window.speechSynthesis; const synth = window.speechSynthesis;
export const ReadButton: FC<{ content: string }> = observer(({content}) => { export const ReadButton: FC<{ content: string }> = observer(({ content }) => {
const {t} = useTranslation(); const { t } = useTranslation();
const [speaking, setSpeaking] = useState(false); const [speaking, setSpeaking] = useState(false);
let lang: string = commonStore.settings.language; let lang: string = commonStore.settings.language;
if (lang === 'dev') if (lang === 'dev')
@ -46,7 +46,8 @@ export const ReadButton: FC<{ content: string }> = observer(({content}) => {
}; };
return ( return (
<ToolTipButton desc={t('Read Aloud')} size="small" appearance="subtle" icon={speaking ? <MuteIcon/> : <UnmuteIcon/>} <ToolTipButton desc={t('Read Aloud')} size="small" appearance="subtle"
onClick={speaking ? stopSpeak : startSpeak}/> icon={speaking ? <MuteIcon /> : <UnmuteIcon />}
onClick={speaking ? stopSpeak : startSpeak} />
); );
}); });

View File

@ -1,6 +1,12 @@
import React, { FC, MouseEventHandler, ReactElement } from 'react'; import React, { FC, MouseEventHandler, ReactElement } from 'react';
import commonStore, { ModelStatus } from '../stores/commonStore'; import commonStore, { ModelStatus } from '../stores/commonStore';
import { AddToDownloadList, DepCheck, FileExists, InstallPyDep, StartServer } from '../../wailsjs/go/backend_golang/App'; import {
AddToDownloadList,
DepCheck,
FileExists,
InstallPyDep,
StartServer
} from '../../wailsjs/go/backend_golang/App';
import { Button } from '@fluentui/react-components'; import { Button } from '@fluentui/react-components';
import { observer } from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import { exit, readRoot, switchModel, updateConfig } from '../apis'; import { exit, readRoot, switchModel, updateConfig } from '../apis';
@ -31,7 +37,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
= observer(({ = observer(({
onClickRun, onClickRun,
iconMode iconMode
}) => { }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const navigate = useNavigate(); const navigate = useNavigate();
@ -40,8 +46,8 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
commonStore.setModelStatus(ModelStatus.Starting); commonStore.setModelStatus(ModelStatus.Starting);
const modelConfig = commonStore.getCurrentModelConfig(); const modelConfig = commonStore.getCurrentModelConfig();
let modelName = '' let modelName = '';
let modelPath = '' let modelPath = '';
if (modelConfig && modelConfig.modelParameters) { if (modelConfig && modelConfig.modelParameters) {
modelName = modelConfig.modelParameters.modelName; modelName = modelConfig.modelParameters.modelName;
modelPath = `./${manifest.localModelDir}/${modelName}`; modelPath = `./${manifest.localModelDir}/${modelName}`;
@ -66,7 +72,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
} else if (depErrorMsg.includes('DepCheck Error')) { } else if (depErrorMsg.includes('DepCheck Error')) {
toastWithButton(t('Python dependencies are incomplete, would you like to install them?'), t('Install'), () => { toastWithButton(t('Python dependencies are incomplete, would you like to install them?'), t('Install'), () => {
InstallPyDep(commonStore.settings.cnMirror); InstallPyDep(commonStore.settings.cnMirror);
setTimeout(WindowShow, 1000) setTimeout(WindowShow, 1000);
}); });
} else { } else {
toast(depErrorMsg, { type: 'error' }); toast(depErrorMsg, { type: 'error' });
@ -103,7 +109,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
await exit(1000).catch(() => { await exit(1000).catch(() => {
}); });
StartServer(port); StartServer(port);
setTimeout(WindowShow, 1000) setTimeout(WindowShow, 1000);
let timeoutCount = 6; let timeoutCount = 6;
let loading = false; let loading = false;
@ -174,4 +180,4 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
{t(mainButtonText[commonStore.modelStatus])} {t(mainButtonText[commonStore.modelStatus])}
</Button> </Button>
); );
}); });

View File

@ -1,10 +1,10 @@
import {FC, ReactElement} from 'react'; import { FC, ReactElement } from 'react';
import {Card, Text} from '@fluentui/react-components'; import { Card, Text } from '@fluentui/react-components';
export const Section: FC<{ export const Section: FC<{
title: string; desc?: string | null, content: ReactElement, outline?: boolean title: string; desc?: string | null, content: ReactElement, outline?: boolean
}> = }> =
({title, desc, content, outline = true}) => { ({ title, desc, content, outline = true }) => {
return ( return (
<Card size="small" appearance={outline ? 'outline' : 'subtle'}> <Card size="small" appearance={outline ? 'outline' : 'subtle'}>
<div className="flex flex-col gap-5"> <div className="flex flex-col gap-5">

View File

@ -1,5 +1,5 @@
import React, {FC, MouseEventHandler, ReactElement} from 'react'; import React, { FC, MouseEventHandler, ReactElement } from 'react';
import {Button, Tooltip} from '@fluentui/react-components'; import { Button, Tooltip } from '@fluentui/react-components';
export const ToolTipButton: FC<{ export const ToolTipButton: FC<{
text?: string | null, text?: string | null,
@ -19,7 +19,7 @@ export const ToolTipButton: FC<{
appearance, appearance,
disabled, disabled,
onClick onClick
}) => { }) => {
return ( return (
<Tooltip content={desc} showDelay={0} hideDelay={0} relationship="label"> <Tooltip content={desc} showDelay={0} hideDelay={0} relationship="label">
<Button disabled={disabled} icon={icon} onClick={onClick} size={size} shape={shape} <Button disabled={disabled} icon={icon} onClick={onClick} size={size} shape={shape}

View File

@ -1,7 +1,7 @@
import React, {FC, useEffect, useRef} from 'react'; import React, { FC, useEffect, useRef } from 'react';
import {Slider, Text} from '@fluentui/react-components'; import { Slider, Text } from '@fluentui/react-components';
import {SliderOnChangeData} from '@fluentui/react-slider'; import { SliderOnChangeData } from '@fluentui/react-slider';
import {NumberInput} from './NumberInput'; import { NumberInput } from './NumberInput';
export const ValuedSlider: FC<{ export const ValuedSlider: FC<{
value: number, value: number,
@ -10,7 +10,7 @@ export const ValuedSlider: FC<{
step?: number, step?: number,
input?: boolean input?: boolean
onChange?: (ev: React.ChangeEvent<HTMLInputElement>, data: SliderOnChangeData) => void onChange?: (ev: React.ChangeEvent<HTMLInputElement>, data: SliderOnChangeData) => void
}> = ({value, min, max, step, input, onChange}) => { }> = ({ value, min, max, step, input, onChange }) => {
const sliderRef = useRef<HTMLInputElement>(null); const sliderRef = useRef<HTMLInputElement>(null);
useEffect(() => { useEffect(() => {
if (step && sliderRef.current && sliderRef.current.parentElement) { if (step && sliderRef.current && sliderRef.current.parentElement) {
@ -21,11 +21,11 @@ export const ValuedSlider: FC<{
return ( return (
<div className="flex items-center"> <div className="flex items-center">
<Slider ref={sliderRef} className="grow" style={{minWidth: '50%'}} value={value} min={min} <Slider ref={sliderRef} className="grow" style={{ minWidth: '50%' }} value={value} min={min}
max={max} step={step} max={max} step={step}
onChange={onChange}/> onChange={onChange} />
{input {input
? <NumberInput style={{minWidth: 0}} value={value} min={min} max={max} step={step} onChange={onChange}/> ? <NumberInput style={{ minWidth: 0 }} value={value} min={min} max={max} step={step} onChange={onChange} />
: <Text>{value}</Text>} : <Text>{value}</Text>}
</div> </div>
); );

View File

@ -1,10 +1,10 @@
import React from 'react'; import React from 'react';
import {createRoot} from 'react-dom/client'; import { createRoot } from 'react-dom/client';
import './style.scss'; import './style.scss';
import 'react-toastify/dist/ReactToastify.css'; import 'react-toastify/dist/ReactToastify.css';
import App from './App'; import App from './App';
import {HashRouter} from 'react-router-dom'; import { HashRouter } from 'react-router-dom';
import {startup} from './startup'; import { startup } from './startup';
import './_locales/i18n-react'; import './_locales/i18n-react';
startup().then(() => { startup().then(() => {
@ -14,7 +14,7 @@ startup().then(() => {
root.render( root.render(
<HashRouter> <HashRouter>
<App/> <App />
</HashRouter> </HashRouter>
); );
}); });

View File

@ -1,14 +1,14 @@
import React, {FC} from 'react'; import React, { FC } from 'react';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {Page} from '../components/Page'; import { Page } from '../components/Page';
import MarkdownRender from '../components/MarkdownRender'; import MarkdownRender from '../components/MarkdownRender';
import {observer} from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import commonStore from '../stores/commonStore'; import commonStore from '../stores/commonStore';
export type AboutContent = { [lang: string]: string } export type AboutContent = { [lang: string]: string }
export const About: FC = observer(() => { export const About: FC = observer(() => {
const {t} = useTranslation(); const { t } = useTranslation();
const lang: string = commonStore.settings.language; const lang: string = commonStore.settings.language;
return ( return (
@ -18,6 +18,6 @@ export const About: FC = observer(() => {
{lang in commonStore.about ? commonStore.about[lang] : commonStore.about['en']} {lang in commonStore.about ? commonStore.about[lang] : commonStore.about['en']}
</MarkdownRender> </MarkdownRender>
</div> </div>
}/> } />
); );
}); });

View File

@ -734,7 +734,7 @@ export const Configs: FC = observer(() => {
}).catch(e => { }).catch(e => {
toast(`${t('Convert Failed')} - ${e.message || e}`, { type: 'error' }); toast(`${t('Convert Failed')} - ${e.message || e}`, { type: 'error' });
}); });
setTimeout(WindowShow, 1000) setTimeout(WindowShow, 1000);
} else { } else {
toast(`${t('Model Not Found')} - ${modelPath}`, { type: 'error' }); toast(`${t('Model Not Found')} - ${modelPath}`, { type: 'error' });
} }

View File

@ -1,13 +1,13 @@
import React, {FC, useEffect} from 'react'; import React, { FC, useEffect } from 'react';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {Page} from '../components/Page'; import { Page } from '../components/Page';
import {observer} from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import commonStore from '../stores/commonStore'; import commonStore from '../stores/commonStore';
import {Divider, Field, ProgressBar} from '@fluentui/react-components'; import { Divider, Field, ProgressBar } from '@fluentui/react-components';
import {bytesToGb, bytesToKb, bytesToMb, refreshLocalModels} from '../utils'; import { bytesToGb, bytesToKb, bytesToMb, refreshLocalModels } from '../utils';
import {ToolTipButton} from '../components/ToolTipButton'; import { ToolTipButton } from '../components/ToolTipButton';
import {Folder20Regular, Pause20Regular, Play20Regular} from '@fluentui/react-icons'; import { Folder20Regular, Pause20Regular, Play20Regular } from '@fluentui/react-icons';
import {ContinueDownload, OpenFileFolder, PauseDownload} from '../../wailsjs/go/backend_golang/App'; import { ContinueDownload, OpenFileFolder, PauseDownload } from '../../wailsjs/go/backend_golang/App';
export type DownloadStatus = { export type DownloadStatus = {
name: string; name: string;
@ -22,11 +22,11 @@ export type DownloadStatus = {
} }
export const Downloads: FC = observer(() => { export const Downloads: FC = observer(() => {
const {t} = useTranslation(); const { t } = useTranslation();
const finishedModelsLen = commonStore.downloadList.filter((status) => status.done && status.name.endsWith('.pth')).length; const finishedModelsLen = commonStore.downloadList.filter((status) => status.done && status.name.endsWith('.pth')).length;
useEffect(() => { useEffect(() => {
if (finishedModelsLen > 0) if (finishedModelsLen > 0)
refreshLocalModels({models: commonStore.modelSourceList}, false); refreshLocalModels({ models: commonStore.modelSourceList }, false);
console.log('finishedModelsLen:', finishedModelsLen); console.log('finishedModelsLen:', finishedModelsLen);
}, [finishedModelsLen]); }, [finishedModelsLen]);
@ -51,26 +51,26 @@ export const Downloads: FC = observer(() => {
validationState={status.done ? 'success' : 'none'} validationState={status.done ? 'success' : 'none'}
> >
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<ProgressBar className="grow" value={status.progress} max={100}/> <ProgressBar className="grow" value={status.progress} max={100} />
{!status.done && {!status.done &&
<ToolTipButton desc={status.downloading ? t('Pause') : t('Continue')} <ToolTipButton desc={status.downloading ? t('Pause') : t('Continue')}
icon={status.downloading ? <Pause20Regular/> : <Play20Regular/>} icon={status.downloading ? <Pause20Regular /> : <Play20Regular />}
onClick={() => { onClick={() => {
if (status.downloading) if (status.downloading)
PauseDownload(status.url); PauseDownload(status.url);
else else
ContinueDownload(status.url); ContinueDownload(status.url);
}}/>} }} />}
<ToolTipButton desc={t('Open Folder')} icon={<Folder20Regular/>} onClick={() => { <ToolTipButton desc={t('Open Folder')} icon={<Folder20Regular />} onClick={() => {
OpenFileFolder(status.path); OpenFileFolder(status.path);
}}/> }} />
</div> </div>
</Field> </Field>
<Divider style={{flexGrow: 0}}/> <Divider style={{ flexGrow: 0 }} />
</div>; </div>;
}) })
} }
</div> </div>
}/> } />
); );
}); });

View File

@ -1,5 +1,5 @@
import {CompoundButton, Link, Text} from '@fluentui/react-components'; import { CompoundButton, Link, Text } from '@fluentui/react-components';
import React, {FC, ReactElement} from 'react'; import React, { FC, ReactElement } from 'react';
import banner from '../assets/images/banner.jpg'; import banner from '../assets/images/banner.jpg';
import { import {
Chat20Regular, Chat20Regular,
@ -7,13 +7,13 @@ import {
DocumentSettings20Regular, DocumentSettings20Regular,
Storage20Regular Storage20Regular
} from '@fluentui/react-icons'; } from '@fluentui/react-icons';
import {useNavigate} from 'react-router'; import { useNavigate } from 'react-router';
import {observer} from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import {RunButton} from '../components/RunButton'; import { RunButton } from '../components/RunButton';
import manifest from '../../../manifest.json'; import manifest from '../../../manifest.json';
import {BrowserOpenURL} from '../../wailsjs/runtime'; import { BrowserOpenURL } from '../../wailsjs/runtime';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {ConfigSelector} from '../components/ConfigSelector'; import { ConfigSelector } from '../components/ConfigSelector';
import MarkdownRender from '../components/MarkdownRender'; import MarkdownRender from '../components/MarkdownRender';
import commonStore from '../stores/commonStore'; import commonStore from '../stores/commonStore';
@ -31,40 +31,40 @@ const navCards: NavCard[] = [
label: 'Chat', label: 'Chat',
desc: 'Go to chat page', desc: 'Go to chat page',
path: '/chat', path: '/chat',
icon: <Chat20Regular/> icon: <Chat20Regular />
}, },
{ {
label: 'Configs', label: 'Configs',
desc: 'Manage your configs', desc: 'Manage your configs',
path: '/configs', path: '/configs',
icon: <DocumentSettings20Regular/> icon: <DocumentSettings20Regular />
}, },
{ {
label: 'Models', label: 'Models',
desc: 'Manage models', desc: 'Manage models',
path: '/models', path: '/models',
icon: <DataUsageSettings20Regular/> icon: <DataUsageSettings20Regular />
}, },
{ {
label: 'Train', label: 'Train',
desc: '', desc: '',
path: '/train', path: '/train',
icon: <Storage20Regular/> icon: <Storage20Regular />
} }
]; ];
export const Home: FC = observer(() => { export const Home: FC = observer(() => {
const {t} = useTranslation(); const { t } = useTranslation();
const navigate = useNavigate(); const navigate = useNavigate();
const lang: string = commonStore.settings.language; const lang: string = commonStore.settings.language;
const onClickNavCard = (path: string) => { const onClickNavCard = (path: string) => {
navigate({pathname: path}); navigate({ pathname: path });
}; };
return ( return (
<div className="flex flex-col justify-between h-full"> <div className="flex flex-col justify-between h-full">
<img className="rounded-xl select-none hidden sm:block" src={banner}/> <img className="rounded-xl select-none hidden sm:block" src={banner} />
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<Text size={600} weight="medium">{t('Introduction')}</Text> <Text size={600} weight="medium">{t('Introduction')}</Text>
<div className="h-40 overflow-y-auto overflow-x-hidden p-1"> <div className="h-40 overflow-y-auto overflow-x-hidden p-1">
@ -74,7 +74,7 @@ export const Home: FC = observer(() => {
</div> </div>
</div> </div>
<div className="grid grid-cols-2 sm:grid-cols-4 gap-5"> <div className="grid grid-cols-2 sm:grid-cols-4 gap-5">
{navCards.map(({label, path, icon, desc}, index) => ( {navCards.map(({ label, path, icon, desc }, index) => (
<CompoundButton icon={icon} secondaryContent={t(desc)} key={`${path}-${index}`} value={path} <CompoundButton icon={icon} secondaryContent={t(desc)} key={`${path}-${index}`} value={path}
size="large" onClick={() => onClickNavCard(path)}> size="large" onClick={() => onClickNavCard(path)}>
{t(label)} {t(label)}
@ -84,8 +84,8 @@ export const Home: FC = observer(() => {
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<div className="flex flex-row-reverse sm:fixed bottom-2 right-2"> <div className="flex flex-row-reverse sm:fixed bottom-2 right-2">
<div className="flex gap-3"> <div className="flex gap-3">
<ConfigSelector/> <ConfigSelector />
<RunButton/> <RunButton />
</div> </div>
</div> </div>
<div className="flex gap-4 items-end"> <div className="flex gap-4 items-end">

View File

@ -1,4 +1,4 @@
import React, {FC} from 'react'; import React, { FC } from 'react';
import { import {
createTableColumn, createTableColumn,
DataGrid, DataGrid,
@ -12,17 +12,17 @@ import {
Text, Text,
Textarea Textarea
} from '@fluentui/react-components'; } from '@fluentui/react-components';
import {ToolTipButton} from '../components/ToolTipButton'; import { ToolTipButton } from '../components/ToolTipButton';
import {ArrowClockwise20Regular, ArrowDownload20Regular, Folder20Regular, Open20Regular} from '@fluentui/react-icons'; import { ArrowClockwise20Regular, ArrowDownload20Regular, Folder20Regular, Open20Regular } from '@fluentui/react-icons';
import {observer} from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import commonStore from '../stores/commonStore'; import commonStore from '../stores/commonStore';
import {BrowserOpenURL} from '../../wailsjs/runtime'; import { BrowserOpenURL } from '../../wailsjs/runtime';
import {AddToDownloadList, OpenFileFolder} from '../../wailsjs/go/backend_golang/App'; import { AddToDownloadList, OpenFileFolder } from '../../wailsjs/go/backend_golang/App';
import manifest from '../../../manifest.json'; import manifest from '../../../manifest.json';
import {Page} from '../components/Page'; import { Page } from '../components/Page';
import {bytesToGb, refreshModels, saveConfigs, toastWithButton} from '../utils'; import { bytesToGb, refreshModels, saveConfigs, toastWithButton } from '../utils';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {useNavigate} from 'react-router'; import { useNavigate } from 'react-router';
export type ModelSourceItem = { export type ModelSourceItem = {
name: string; name: string;
@ -43,7 +43,7 @@ const columns: TableColumnDefinition<ModelSourceItem>[] = [
return a.name.localeCompare(b.name); return a.name.localeCompare(b.name);
}, },
renderHeaderCell: () => { renderHeaderCell: () => {
const {t} = useTranslation(); const { t } = useTranslation();
return t('File'); return t('File');
}, },
@ -69,7 +69,7 @@ const columns: TableColumnDefinition<ModelSourceItem>[] = [
return 0; return 0;
}, },
renderHeaderCell: () => { renderHeaderCell: () => {
const {t} = useTranslation(); const { t } = useTranslation();
return t('Desc'); return t('Desc');
}, },
@ -91,7 +91,7 @@ const columns: TableColumnDefinition<ModelSourceItem>[] = [
return a.size - b.size; return a.size - b.size;
}, },
renderHeaderCell: () => { renderHeaderCell: () => {
const {t} = useTranslation(); const { t } = useTranslation();
return t('Size'); return t('Size');
}, },
@ -113,7 +113,7 @@ const columns: TableColumnDefinition<ModelSourceItem>[] = [
return b.lastUpdatedMs - a.lastUpdatedMs; return b.lastUpdatedMs - a.lastUpdatedMs;
}, },
renderHeaderCell: () => { renderHeaderCell: () => {
const {t} = useTranslation(); const { t } = useTranslation();
return t('Last updated'); return t('Last updated');
}, },
@ -128,12 +128,12 @@ const columns: TableColumnDefinition<ModelSourceItem>[] = [
return a.isLocal ? -1 : 1; return a.isLocal ? -1 : 1;
}, },
renderHeaderCell: () => { renderHeaderCell: () => {
const {t} = useTranslation(); const { t } = useTranslation();
return t('Actions'); return t('Actions');
}, },
renderCell: (item) => { renderCell: (item) => {
const {t} = useTranslation(); const { t } = useTranslation();
const navigate = useNavigate(); const navigate = useNavigate();
return ( return (
@ -141,21 +141,21 @@ const columns: TableColumnDefinition<ModelSourceItem>[] = [
<div className="flex gap-1"> <div className="flex gap-1">
{ {
item.isLocal && item.isLocal &&
<ToolTipButton desc={t('Open Folder')} icon={<Folder20Regular/>} onClick={() => { <ToolTipButton desc={t('Open Folder')} icon={<Folder20Regular />} onClick={() => {
OpenFileFolder(`./${manifest.localModelDir}/${item.name}`); OpenFileFolder(`./${manifest.localModelDir}/${item.name}`);
}}/> }} />
} }
{item.downloadUrl && !item.isLocal && {item.downloadUrl && !item.isLocal &&
<ToolTipButton desc={t('Download')} icon={<ArrowDownload20Regular/>} onClick={() => { <ToolTipButton desc={t('Download')} icon={<ArrowDownload20Regular />} onClick={() => {
toastWithButton(`${t('Downloading')} ${item.name}`, t('Check'), () => { toastWithButton(`${t('Downloading')} ${item.name}`, t('Check'), () => {
navigate({pathname: '/downloads'}); navigate({ pathname: '/downloads' });
}, },
{autoClose: 3000}); { autoClose: 3000 });
AddToDownloadList(`./${manifest.localModelDir}/${item.name}`, item.downloadUrl!); AddToDownloadList(`./${manifest.localModelDir}/${item.name}`, item.downloadUrl!);
}}/>} }} />}
{item.url && <ToolTipButton desc={t('Open Url')} icon={<Open20Regular/>} onClick={() => { {item.url && <ToolTipButton desc={t('Open Url')} icon={<Open20Regular />} onClick={() => {
BrowserOpenURL(item.url!); BrowserOpenURL(item.url!);
}}/>} }} />}
</div> </div>
</TableCellLayout> </TableCellLayout>
); );
@ -164,7 +164,7 @@ const columns: TableColumnDefinition<ModelSourceItem>[] = [
]; ];
export const Models: FC = observer(() => { export const Models: FC = observer(() => {
const {t} = useTranslation(); const { t } = useTranslation();
return ( return (
<Page title={t('Models')} content={ <Page title={t('Models')} content={
@ -172,39 +172,39 @@ export const Models: FC = observer(() => {
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<Text weight="medium">{t('Model Source Manifest List')}</Text> <Text weight="medium">{t('Model Source Manifest List')}</Text>
<ToolTipButton desc={t('Refresh')} icon={<ArrowClockwise20Regular/>} onClick={() => { <ToolTipButton desc={t('Refresh')} icon={<ArrowClockwise20Regular />} onClick={() => {
refreshModels(false); refreshModels(false);
saveConfigs(); saveConfigs();
}}/> }} />
</div> </div>
<Text size={100}> <Text size={100}>
{t('Provide JSON file URLs for the models manifest. Separate URLs with semicolons. The "models" field in JSON files will be parsed into the following table.')} {t('Provide JSON file URLs for the models manifest. Separate URLs with semicolons. The "models" field in JSON files will be parsed into the following table.')}
</Text> </Text>
<Textarea size="large" resize="vertical" <Textarea size="large" resize="vertical"
value={commonStore.modelSourceManifestList} value={commonStore.modelSourceManifestList}
onChange={(e, data) => commonStore.setModelSourceManifestList(data.value)}/> onChange={(e, data) => commonStore.setModelSourceManifestList(data.value)} />
</div> </div>
<div className="flex grow overflow-hidden"> <div className="flex grow overflow-hidden">
<DataGrid <DataGrid
items={commonStore.modelSourceList} items={commonStore.modelSourceList}
columns={columns} columns={columns}
sortable={true} sortable={true}
defaultSortState={{sortColumn: 'actions', sortDirection: 'ascending'}} defaultSortState={{ sortColumn: 'actions', sortDirection: 'ascending' }}
style={{display: 'flex'}} style={{ display: 'flex' }}
className="flex-col w-full" className="flex-col w-full"
> >
<DataGridHeader> <DataGridHeader>
<DataGridRow> <DataGridRow>
{({renderHeaderCell}) => ( {({ renderHeaderCell }) => (
<DataGridHeaderCell>{renderHeaderCell()}</DataGridHeaderCell> <DataGridHeaderCell>{renderHeaderCell()}</DataGridHeaderCell>
)} )}
</DataGridRow> </DataGridRow>
</DataGridHeader> </DataGridHeader>
<div className="overflow-y-auto overflow-x-hidden"> <div className="overflow-y-auto overflow-x-hidden">
<DataGridBody<ModelSourceItem>> <DataGridBody<ModelSourceItem>>
{({item, rowId}) => ( {({ item, rowId }) => (
<DataGridRow<ModelSourceItem> key={rowId}> <DataGridRow<ModelSourceItem> key={rowId}>
{({renderCell}) => ( {({ renderCell }) => (
<DataGridCell>{renderCell(item)}</DataGridCell> <DataGridCell>{renderCell(item)}</DataGridCell>
)} )}
</DataGridRow> </DataGridRow>
@ -214,6 +214,6 @@ export const Models: FC = observer(() => {
</DataGrid> </DataGrid>
</div> </div>
</div> </div>
}/> } />
); );
}); });

View File

@ -1,9 +1,9 @@
import React, {FC} from 'react'; import React, { FC } from 'react';
import {Text} from '@fluentui/react-components'; import { Text } from '@fluentui/react-components';
import {useTranslation} from 'react-i18next'; import { useTranslation } from 'react-i18next';
export const Train: FC = () => { export const Train: FC = () => {
const {t} = useTranslation(); const { t } = useTranslation();
return ( return (
<div className="flex flex-col box-border gap-5 p-2"> <div className="flex flex-col box-border gap-5 p-2">

View File

@ -1,5 +1,5 @@
import {ReactElement} from 'react'; import { ReactElement } from 'react';
import {Configs} from './Configs'; import { Configs } from './Configs';
import { import {
ArrowDownload20Regular, ArrowDownload20Regular,
Chat20Regular, Chat20Regular,
@ -10,13 +10,13 @@ import {
Settings20Regular, Settings20Regular,
Storage20Regular Storage20Regular
} from '@fluentui/react-icons'; } from '@fluentui/react-icons';
import {Home} from './Home'; import { Home } from './Home';
import {Chat} from './Chat'; import { Chat } from './Chat';
import {Models} from './Models'; import { Models } from './Models';
import {Train} from './Train'; import { Train } from './Train';
import {Settings} from './Settings'; import { Settings } from './Settings';
import {About} from './About'; import { About } from './About';
import {Downloads} from './Downloads'; import { Downloads } from './Downloads';
type NavigationItem = { type NavigationItem = {
label: string; label: string;
@ -30,57 +30,57 @@ export const pages: NavigationItem[] = [
{ {
label: 'Home', label: 'Home',
path: '/', path: '/',
icon: <Home20Regular/>, icon: <Home20Regular />,
element: <Home/>, element: <Home />,
top: true top: true
}, },
{ {
label: 'Chat', label: 'Chat',
path: '/chat', path: '/chat',
icon: <Chat20Regular/>, icon: <Chat20Regular />,
element: <Chat/>, element: <Chat />,
top: true top: true
}, },
{ {
label: 'Configs', label: 'Configs',
path: '/configs', path: '/configs',
icon: <DocumentSettings20Regular/>, icon: <DocumentSettings20Regular />,
element: <Configs/>, element: <Configs />,
top: true top: true
}, },
{ {
label: 'Models', label: 'Models',
path: '/models', path: '/models',
icon: <DataUsageSettings20Regular/>, icon: <DataUsageSettings20Regular />,
element: <Models/>, element: <Models />,
top: true top: true
}, },
{ {
label: 'Downloads', label: 'Downloads',
path: '/downloads', path: '/downloads',
icon: <ArrowDownload20Regular/>, icon: <ArrowDownload20Regular />,
element: <Downloads/>, element: <Downloads />,
top: true top: true
}, },
{ {
label: 'Train', label: 'Train',
path: '/train', path: '/train',
icon: <Storage20Regular/>, icon: <Storage20Regular />,
element: <Train/>, element: <Train />,
top: true top: true
}, },
{ {
label: 'Settings', label: 'Settings',
path: '/settings', path: '/settings',
icon: <Settings20Regular/>, icon: <Settings20Regular />,
element: <Settings/>, element: <Settings />,
top: false top: false
}, },
{ {
label: 'About', label: 'About',
path: '/about', path: '/about',
icon: <Info20Regular/>, icon: <Info20Regular />,
element: <About/>, element: <About />,
top: false top: false
} }
]; ];

View File

@ -1,9 +1,9 @@
import commonStore from './stores/commonStore'; import commonStore from './stores/commonStore';
import {ReadJson} from '../wailsjs/go/backend_golang/App'; import { ReadJson } from '../wailsjs/go/backend_golang/App';
import {Cache, checkUpdate, downloadProgramFiles, LocalConfig, refreshModels, saveCache} from './utils'; import { Cache, checkUpdate, downloadProgramFiles, LocalConfig, refreshModels, saveCache } from './utils';
import {getStatus} from './apis'; import { getStatus } from './apis';
import {EventsOn} from '../wailsjs/runtime'; import { EventsOn } from '../wailsjs/runtime';
import {defaultModelConfigs} from './pages/Configs'; import { defaultModelConfigs } from './pages/Configs';
export async function startup() { export async function startup() {
downloadProgramFiles(); downloadProgramFiles();
@ -26,7 +26,7 @@ export async function startup() {
} }
async function initRemoteText() { async function initRemoteText() {
await fetch('https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/manifest.json', {cache: 'no-cache'}) await fetch('https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/manifest.json', { cache: 'no-cache' })
.then(r => r.json()).then((data) => { .then(r => r.json()).then((data) => {
if (data.introduction) if (data.introduction)
commonStore.setIntroduction(data.introduction); commonStore.setIntroduction(data.introduction);

View File

@ -19,32 +19,22 @@ export enum ModelStatus {
} }
class CommonStore { class CommonStore {
constructor() {
makeAutoObservable(this);
}
// global // global
modelStatus: ModelStatus = ModelStatus.Offline; modelStatus: ModelStatus = ModelStatus.Offline;
depComplete: boolean = false; depComplete: boolean = false;
// home // home
introduction: IntroductionContent = manifest.introduction; introduction: IntroductionContent = manifest.introduction;
// chat // chat
conversations: Conversations = {}; conversations: Conversations = {};
conversationsOrder: string[] = []; conversationsOrder: string[] = [];
// configs // configs
currentModelConfigIndex: number = 0; currentModelConfigIndex: number = 0;
modelConfigs: ModelConfig[] = []; modelConfigs: ModelConfig[] = [];
// models // models
modelSourceManifestList: string = 'https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/manifest.json;'; modelSourceManifestList: string = 'https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/manifest.json;';
modelSourceList: ModelSourceItem[] = []; modelSourceList: ModelSourceItem[] = [];
// downloads // downloads
downloadList: DownloadStatus[] = []; downloadList: DownloadStatus[] = [];
// settings // settings
settings: SettingsType = { settings: SettingsType = {
language: getUserLanguage(), language: getUserLanguage(),
@ -53,10 +43,13 @@ class CommonStore {
giteeUpdatesSource: getUserLanguage() === 'zh', giteeUpdatesSource: getUserLanguage() === 'zh',
cnMirror: getUserLanguage() === 'zh' cnMirror: getUserLanguage() === 'zh'
}; };
// about // about
about: AboutContent = manifest.about; about: AboutContent = manifest.about;
constructor() {
makeAutoObservable(this);
}
getCurrentModelConfig = () => { getCurrentModelConfig = () => {
return this.modelConfigs[this.currentModelConfigIndex]; return this.modelConfigs[this.currentModelConfigIndex];
}; };

View File

@ -18,8 +18,8 @@ export function getConversationPairs(records: Record[], isCompletion: boolean):
} else { } else {
pairs = []; pairs = [];
for (const record of records) { for (const record of records) {
pairs.push({role: 'user', content: record.question}); pairs.push({ role: 'user', content: record.question });
pairs.push({role: 'assistant', content: record.answer}); pairs.push({ role: 'assistant', content: record.answer });
} }
} }