add webui entry

This commit is contained in:
josc146 2023-11-07 22:24:06 +08:00
parent e734fce64f
commit 3ddcf9f62e
8 changed files with 27 additions and 10 deletions

View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
) )
func (a *App) StartServer(python string, port int, host string, rwkvBeta bool) (string, error) { func (a *App) StartServer(python string, port int, host string, webui bool, rwkvBeta bool) (string, error) {
var err error var err error
if python == "" { if python == "" {
python, err = GetPython() python, err = GetPython()
@ -19,6 +19,9 @@ func (a *App) StartServer(python string, port int, host string, rwkvBeta bool) (
return "", err return "", err
} }
args := []string{python, "./backend-python/main.py"} args := []string{python, "./backend-python/main.py"}
if webui {
args = append(args, "--webui")
}
if rwkvBeta { if rwkvBeta {
args = append(args, "--rwkv-beta") args = append(args, "--rwkv-beta")
} }

View File

@ -264,5 +264,6 @@
"The file name is: ": "ファイル名は次のとおりです: ", "The file name is: ": "ファイル名は次のとおりです: ",
"Port is occupied. Change it in Configs page or close the program that occupies the port.": "ポートが占有されています。設定ページで変更するか、ポートを占有しているプログラムを終了してください。", "Port is occupied. Change it in Configs page or close the program that occupies the port.": "ポートが占有されています。設定ページで変更するか、ポートを占有しているプログラムを終了してください。",
"Loading...": "読み込み中...", "Loading...": "読み込み中...",
"Hello, what can I do for you?": "こんにちは、何かお手伝いできますか?" "Hello, what can I do for you?": "こんにちは、何かお手伝いできますか?",
"Enable WebUI": "WebUIを有効化"
} }

View File

@ -264,5 +264,6 @@
"The file name is: ": "文件名是:", "The file name is: ": "文件名是:",
"Port is occupied. Change it in Configs page or close the program that occupies the port.": "端口被占用。请在配置页面更改端口,或关闭占用端口的程序", "Port is occupied. Change it in Configs page or close the program that occupies the port.": "端口被占用。请在配置页面更改端口,或关闭占用端口的程序",
"Loading...": "加载中...", "Loading...": "加载中...",
"Hello, what can I do for you?": "你好,有什么要我帮忙的吗?" "Hello, what can I do for you?": "你好,有什么要我帮忙的吗?",
"Enable WebUI": "启用WebUI"
} }

View File

@ -129,7 +129,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
const isUsingCudaBeta = modelConfig.modelParameters.device === 'CUDA-Beta'; const isUsingCudaBeta = modelConfig.modelParameters.device === 'CUDA-Beta';
startServer(commonStore.settings.customPythonPath, port, commonStore.settings.host !== '127.0.0.1' ? '0.0.0.0' : '127.0.0.1', startServer(commonStore.settings.customPythonPath, port, commonStore.settings.host !== '127.0.0.1' ? '0.0.0.0' : '127.0.0.1',
isUsingCudaBeta !!modelConfig.enableWebUI, isUsingCudaBeta
).catch((e) => { ).catch((e) => {
const errMsg = e.message || e; const errMsg = e.message || e;
if (errMsg.includes('path contains space')) if (errMsg.includes('path contains space'))

View File

@ -441,7 +441,18 @@ const Configs: FC = observer(() => {
/> />
</div> </div>
<div className="flex flex-row-reverse sm:fixed bottom-2 right-2"> <div className="flex flex-row-reverse sm:fixed bottom-2 right-2">
<RunButton onClickRun={onClickSave} /> <div className="flex gap-2">
<Checkbox className="select-none"
size="large" label={t('Enable WebUI')}
checked={selectedConfig.enableWebUI}
onChange={(_, data) => {
setSelectedConfig({
...selectedConfig,
enableWebUI: data.checked as boolean
});
}} />
<RunButton onClickRun={onClickSave} />
</div>
</div> </div>
</div> </div>
} /> } />

View File

@ -23,6 +23,7 @@ export type ModelParameters = {
export type ModelConfig = { export type ModelConfig = {
// different configs can have the same name // different configs can have the same name
name: string; name: string;
apiParameters: ApiParameters apiParameters: ApiParameters;
modelParameters: ModelParameters modelParameters: ModelParameters;
enableWebUI?: boolean;
} }

View File

@ -52,7 +52,7 @@ export function RestartApp():Promise<void>;
export function SaveJson(arg1:string,arg2:any):Promise<void>; export function SaveJson(arg1:string,arg2:any):Promise<void>;
export function StartServer(arg1:string,arg2:number,arg3:string,arg4:boolean):Promise<string>; export function StartServer(arg1:string,arg2:number,arg3:string,arg4:boolean,arg5:boolean):Promise<string>;
export function StartWebGPUServer(arg1:number,arg2:string):Promise<string>; export function StartWebGPUServer(arg1:number,arg2:string):Promise<string>;

View File

@ -102,8 +102,8 @@ export function SaveJson(arg1, arg2) {
return window['go']['backend_golang']['App']['SaveJson'](arg1, arg2); return window['go']['backend_golang']['App']['SaveJson'](arg1, arg2);
} }
export function StartServer(arg1, arg2, arg3, arg4) { export function StartServer(arg1, arg2, arg3, arg4, arg5) {
return window['go']['backend_golang']['App']['StartServer'](arg1, arg2, arg3, arg4); return window['go']['backend_golang']['App']['StartServer'](arg1, arg2, arg3, arg4, arg5);
} }
export function StartWebGPUServer(arg1, arg2) { export function StartWebGPUServer(arg1, arg2) {