update requirements and /status

This commit is contained in:
josc146 2023-05-23 12:13:12 +08:00
parent 524d9e78e6
commit 1d08719645
4 changed files with 16 additions and 6 deletions

Binary file not shown.

View File

@ -6,6 +6,7 @@ from langchain.llms import RWKV
from utils.rwkv import * from utils.rwkv import *
from utils.torch import * from utils.torch import *
import global_var import global_var
import GPUtil
router = APIRouter() router = APIRouter()
@ -25,8 +26,8 @@ def switch_model(body: SwitchModelBody, response: Response):
global_var.set(global_var.Model_Status, global_var.ModelStatus.Offline) global_var.set(global_var.Model_Status, global_var.ModelStatus.Offline)
global_var.set(global_var.Model, None) global_var.set(global_var.Model, None)
torch_gc() torch_gc()
os.environ["RWKV_CUDA_ON"] = '1' if body.customCuda else '0' os.environ["RWKV_CUDA_ON"] = "1" if body.customCuda else "0"
global_var.set(global_var.Model_Status, global_var.ModelStatus.Loading) global_var.set(global_var.Model_Status, global_var.ModelStatus.Loading)
try: try:
@ -66,4 +67,13 @@ def update_config(body: ModelConfigBody):
@router.get("/status") @router.get("/status")
def status(): def status():
return {"status": global_var.get(global_var.Model_Status)} gpus = GPUtil.getGPUs()
if len(gpus) == 0:
device_name = "CPU"
else:
device_name = gpus[0].name
return {
"status": global_var.get(global_var.Model_Status),
"pid": os.getpid(),
"device_name": device_name,
}

View File

@ -189,9 +189,9 @@ export function forceDownloadProgramFiles() {
}); });
} }
export function deletePythonProgramFiles() { export function deleteDynamicProgramFiles() {
manifest.programFiles.forEach(({ path }) => { manifest.programFiles.forEach(({ path }) => {
if (path.endsWith('.py') && !path.includes('get-pip.py')) if ((path.endsWith('.py') && !path.includes('get-pip.py')) || path.includes('requirements'))
DeleteFile(path); DeleteFile(path);
}); });
} }
@ -223,7 +223,7 @@ export async function checkUpdate(notifyEvenLatest: boolean = false) {
`https://github.com/josStorer/RWKV-Runner/releases/download/${versionTag}/RWKV-Runner_windows_x64.exe` : `https://github.com/josStorer/RWKV-Runner/releases/download/${versionTag}/RWKV-Runner_windows_x64.exe` :
`https://gitee.com/josc146/RWKV-Runner/releases/download/${versionTag}/RWKV-Runner_windows_x64.exe`; `https://gitee.com/josc146/RWKV-Runner/releases/download/${versionTag}/RWKV-Runner_windows_x64.exe`;
toastWithButton(t('New Version Available') + ': ' + versionTag, t('Update'), () => { toastWithButton(t('New Version Available') + ': ' + versionTag, t('Update'), () => {
deletePythonProgramFiles(); deleteDynamicProgramFiles();
setTimeout(() => { setTimeout(() => {
UpdateApp(updateUrl).catch((e) => { UpdateApp(updateUrl).catch((e) => {
toast(t('Update Error, Please restart this program') + ' - ' + e.message || e, { toast(t('Update Error, Please restart this program') + ' - ' + e.message || e, {