theluyuan/RWKV-Runner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix startup status detect

Browse Source
This commit is contained in:
josc146
2023-05-25 00:51:45 +08:00
parent 5729d9fc62
commit 6f629dbc55
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/src/components/RunButton.tsx
View File

@@ -43,8 +43,8 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
const navigate = useNavigate();
const onClickMainButton = async () => {
if (commonStore.status.modelStatus === ModelStatus.Offline) {
commonStore.setStatus({ modelStatus: ModelStatus.Starting });
if (commonStore.status.status === ModelStatus.Offline) {
commonStore.setStatus({ status: ModelStatus.Starting });
const modelConfig = commonStore.getCurrentModelConfig();
let modelName = '';
@@ -54,7 +54,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
modelPath = `./${manifest.localModelDir}/${modelName}`;
} else {
toast(t('Model Config Exception'), { type: 'error' });
commonStore.setStatus({ modelStatus: ModelStatus.Offline });
commonStore.setStatus({ status: ModelStatus.Offline });
return;
}
@@ -80,7 +80,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
}
});
if (depErrorMsg) {
commonStore.setStatus({ modelStatus: ModelStatus.Offline });
commonStore.setStatus({ status: ModelStatus.Offline });
return;
}
commonStore.setDepComplete(true);
@@ -102,7 +102,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
}
});
commonStore.setStatus({ modelStatus: ModelStatus.Offline });
commonStore.setStatus({ status: ModelStatus.Offline });
return;
}
@@ -125,7 +125,7 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
if (status)
commonStore.setStatus(status);
});
commonStore.setStatus({ modelStatus: ModelStatus.Loading });
commonStore.setStatus({ status: ModelStatus.Loading });
toast(t('Loading Model'), { type: 'info' });
updateConfig({
max_tokens: modelConfig.apiParameters.maxResponseToken,
@@ -161,51 +161,51 @@ export const RunButton: FC<{ onClickRun?: MouseEventHandler, iconMode?: boolean
customCuda: customCudaFile !== ''
}).then((r) => {
if (r.ok) {
commonStore.setStatus({ modelStatus: ModelStatus.Working });
commonStore.setStatus({ status: ModelStatus.Working });
toastWithButton(t('Startup Completed'), t('Chat'), () => {
navigate({ pathname: '/chat' });
}, { type: 'success', autoClose: 3000 });
} else if (r.status === 304) {
toast(t('Loading Model'), { type: 'info' });
} else {
commonStore.setStatus({ modelStatus: ModelStatus.Offline });
commonStore.setStatus({ status: ModelStatus.Offline });
toast(t('Failed to switch model'), { type: 'error' });
}
}).catch(() => {
commonStore.setStatus({ modelStatus: ModelStatus.Offline });
commonStore.setStatus({ status: ModelStatus.Offline });
toast(t('Failed to switch model'), { type: 'error' });
});
}
}).catch(() => {
if (timeoutCount <= 0) {
clearInterval(intervalId);
commonStore.setStatus({ modelStatus: ModelStatus.Offline });
commonStore.setStatus({ status: ModelStatus.Offline });
}
});
timeoutCount--;
}, 1000);
} else {
commonStore.setStatus({ modelStatus: ModelStatus.Offline });
commonStore.setStatus({ status: ModelStatus.Offline });
exit();
}
};
const onClick = async (e: any) => {
if (commonStore.status.modelStatus === ModelStatus.Offline)
if (commonStore.status.status === ModelStatus.Offline)
await onClickRun?.(e);
await onClickMainButton();
};
return (iconMode ?
<ToolTipButton disabled={commonStore.status.modelStatus === ModelStatus.Starting}
icon={iconModeButtonIcon[commonStore.status.modelStatus]}
desc={t(mainButtonText[commonStore.status.modelStatus])}
<ToolTipButton disabled={commonStore.status.status === ModelStatus.Starting}
icon={iconModeButtonIcon[commonStore.status.status]}
desc={t(mainButtonText[commonStore.status.status])}
size="small" onClick={onClick} />
:
<Button disabled={commonStore.status.modelStatus === ModelStatus.Starting} appearance="primary" size="large"
<Button disabled={commonStore.status.status === ModelStatus.Starting} appearance="primary" size="large"
onClick={onClick}>
{t(mainButtonText[commonStore.status.modelStatus])}
{t(mainButtonText[commonStore.status.status])}
</Button>
);
});

4
frontend/src/components/WorkHeader.tsx
View File

@@ -29,8 +29,8 @@ export const WorkHeader: FC = observer(() => {
<div className="flex flex-col gap-1">
<div className="flex justify-between items-center">
<div className="flex items-center gap-2">
<PresenceBadge status={badgeStatus[commonStore.status.modelStatus]} />
<Text size={100}>{t('Model Status') + ': ' + t(statusText[commonStore.status.modelStatus])}</Text>
<PresenceBadge status={badgeStatus[commonStore.status.status]} />
<Text size={100}>{t('Model Status') + ': ' + t(statusText[commonStore.status.status])}</Text>
</div>
<div className="flex items-center gap-2">
<ConfigSelector size="small" />