Merge branch 'main' into text-input-change

backend/src/dependencies/install_server_deps.py

@@ -92,6 +92,12 @@
         "version": "23.2.0",
         "from_file": "chainner_pip-23.2.0-py3-none-any.whl",
     },
+    {
+        "package_name": "psutil",
+        "display_name": "psutil",
+        "version": "5.9.5",
+        "from_file": None,
+    },
 ]
 
 install_dependencies_sync(deps)

backend/src/gpu.py

@@ -45,6 +45,10 @@ def __init__(self):
     def __del__(self):
         nv.nvmlShutdown()
 
+    @property
+    def num_gpus(self):
+        return self.__num_gpus
+
     def list_gpus(self) -> List[str]:
         return [gpu.name for gpu in self.__gpus]
 

backend/src/server.py

@@ -6,9 +6,11 @@
 import sys
 import traceback
 from concurrent.futures import ThreadPoolExecutor
+from dataclasses import asdict, dataclass
 from json import dumps as stringify
 from typing import Dict, List, Optional, TypedDict, Union
 
+import psutil
 from sanic import Sanic
 from sanic.log import access_logger, logger
 from sanic.request import Request
@@ -23,6 +25,7 @@
 from custom_types import UpdateProgressFn
 from dependencies.store import DependencyInfo, install_dependencies, installed_packages
 from events import EventQueue, ExecutionErrorData
+from gpu import get_nvidia_helper
 from nodes.group import Group
 from nodes.utils.exec_options import (
     JsonExecutionOptions,
@@ -378,9 +381,6 @@ async def list_nvidia_gpus(_request: Request):
     """Lists the available GPUs for NCNN"""
     await nodes_available()
     try:
-        # pylint: disable=import-outside-toplevel
-        from gpu import get_nvidia_helper
-
         nv = get_nvidia_helper()
 
         if nv is None:
@@ -401,6 +401,32 @@ async def python_info(_request: Request):
     return json({"python": sys.executable, "version": version})
 
 
+@dataclass
+class SystemStat:
+    label: str
+    percent: float
+
+
+@app.route("/system-usage", methods=["GET"])
+async def system_usage(_request: Request):
+    stats_list = []
+    cpu_usage = psutil.cpu_percent()
+    mem_usage = psutil.virtual_memory().percent
+    stats_list.append(SystemStat("CPU", cpu_usage))
+    stats_list.append(SystemStat("RAM", mem_usage))
+    nv = get_nvidia_helper()
+    if nv is not None:
+        for i in range(nv.num_gpus):
+            total, used, _ = nv.get_current_vram_usage(i)
+            stats_list.append(
+                SystemStat(
+                    f"VRAM {i}" if nv.num_gpus > 1 else "VRAM",
+                    used / total * 100,
+                )
+            )
+    return json([asdict(x) for x in stats_list])
+
+
 @app.route("/dependencies", methods=["GET"])
 async def get_dependencies(_request: Request):
     await nodes_available()

src/common/Backend.ts

@@ -215,6 +215,10 @@ export class Backend {
         return this.fetchJson('/python-info', 'GET');
     }
 
+    systemUsage(): Promise<{ label: string; percent: number }[]> {
+        return this.fetchJson('/system-usage', 'GET');
+    }
+
     dependencies(): Promise<Package[]> {
         return this.fetchJson('/dependencies', 'GET');
     }

src/common/safeIpc.ts

@@ -8,7 +8,6 @@ import {
     ipcMain as unsafeIpcMain,
     ipcRenderer as unsafeIpcRenderer,
 } from 'electron';
-import { Systeminformation } from 'systeminformation';
 import { FileOpenResult, FileSaveResult, PythonInfo, Version } from './common-types';
 import { ParsedSaveData, SaveData } from './SaveFile';
 import { Progress } from './ui/progress';
@@ -20,15 +19,11 @@ interface ChannelInfo<ReturnType, Args extends unknown[] = []> {
 type SendChannelInfo<Args extends unknown[] = []> = ChannelInfo<void, Args>;
 
 export interface InvokeChannels {
-    'get-nvidia-gpu-name': ChannelInfo<string | null>;
-    'get-nvidia-gpus': ChannelInfo<string[] | null>;
-    'get-gpu-info': ChannelInfo<Systeminformation.GraphicsData>;
     'get-python': ChannelInfo<PythonInfo>;
     'get-port': ChannelInfo<number>;
     'get-localstorage-location': ChannelInfo<string>;
     'refresh-nodes': ChannelInfo<boolean>;
     'get-app-version': ChannelInfo<Version>;
-    'get-vram-usage': ChannelInfo<number | null>;
     'dir-select': ChannelInfo<Electron.OpenDialogReturnValue, [dirPath: string]>;
     'file-select': ChannelInfo<
         Electron.OpenDialogReturnValue,

src/common/util.ts

@@ -282,3 +282,5 @@ export const getInputValue = <T extends NonNullable<InputValue>>(
 
 export const isAutoInput = (input: Input): boolean =>
     input.kind === 'generic' && input.optional && !input.hasHandle;
+
+export const escapeRegExp = (string: string) => string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

src/main/backend/setup.ts

@@ -181,7 +181,6 @@ const setupOwnedBackend = async (
     token: ProgressToken,
     useSystemPython: boolean,
     systemPythonLocation: string | undefined | null,
-    hasNvidia: () => Promise<boolean>,
     rootDir: string
 ): Promise<OwnedBackendProcess> => {
     token.submitProgress({
@@ -226,15 +225,14 @@ export const setupBackend = async (
     token: ProgressToken,
     useSystemPython: boolean,
     systemPythonLocation: string | undefined | null,
-    hasNvidia: () => Promise<boolean>,
     rootDir: string,
     noOwnedBackend: boolean
 ): Promise<BackendProcess> => {
     token.submitProgress({ totalProgress: 0 });
 
     const backend = noOwnedBackend
         ? await setupBorrowedBackend(token, 8000)
-        : await setupOwnedBackend(token, useSystemPython, systemPythonLocation, hasNvidia, rootDir);
+        : await setupOwnedBackend(token, useSystemPython, systemPythonLocation, rootDir);
 
     token.submitProgress({ totalProgress: 1 });
     return backend;

src/main/cli/run.ts

@@ -26,7 +26,6 @@ import { assertNever, delay } from '../../common/util';
 import { RunArguments } from '../arguments';
 import { BackendProcess } from '../backend/process';
 import { setupBackend } from '../backend/setup';
-import { getNvidiaGpuNames, getNvidiaSmi } from '../nvidiaSmi';
 import { getRootDirSync } from '../platform';
 import { settingStorage } from '../setting-storage';
 import { Exit } from './exit';
@@ -67,30 +66,14 @@ const addProgressListeners = (monitor: ProgressMonitor) => {
     });
 };
 
-const getNvidiaGPUs = async () => {
-    const nvidiaSmi = await getNvidiaSmi();
-
-    if (nvidiaSmi) {
-        try {
-            return await getNvidiaGpuNames(nvidiaSmi);
-        } catch (error) {
-            log.error(error);
-        }
-    }
-    return undefined;
-};
-
 const createBackend = async (token: ProgressToken, args: RunArguments) => {
     const useSystemPython = settingStorage.getItem('use-system-python') === 'true';
     const systemPythonLocation = settingStorage.getItem('system-python-location');
 
-    const hasNvidia = getNvidiaGPUs().then((gpus) => gpus !== undefined);
-
     return setupBackend(
         token,
         useSystemPython,
         systemPythonLocation,
-        () => hasNvidia,
         getRootDirSync(),
         args.noBackend
     );

src/main/gui/main-window.ts

@@ -1,4 +1,3 @@
-import { ChildProcessWithoutNullStreams } from 'child_process';
 import { BrowserWindow, app, dialog, nativeTheme, powerSaveBlocker, shell } from 'electron';
 import EventSource from 'eventsource';
 import { t } from 'i18next';
@@ -12,10 +11,8 @@ import { ProgressController, ProgressToken, SubProgress } from '../../common/ui/
 import { OpenArguments, parseArgs } from '../arguments';
 import { BackendProcess } from '../backend/process';
 import { setupBackend } from '../backend/setup';
-import { createNvidiaSmiVRamChecker, getNvidiaGpuNames, getNvidiaSmi } from '../nvidiaSmi';
 import { getRootDirSync } from '../platform';
 import { settingStorage, settingStorageLocation } from '../setting-storage';
-import { getGpuInfo } from '../systemInfo';
 import { MenuData, setMainMenu } from './menu';
 import { addSplashScreen } from './splash';
 
@@ -27,7 +24,6 @@ const registerEventHandlerPreSetup = (
 ) => {
     ipcMain.handle('get-app-version', () => version);
     ipcMain.handle('get-appdata', () => getRootDirSync());
-    ipcMain.handle('get-gpu-info', getGpuInfo);
     ipcMain.handle('get-localstorage-location', () => settingStorageLocation);
     ipcMain.handle('refresh-nodes', () => args.refresh);
 
@@ -230,56 +226,14 @@ const registerEventHandlerPostSetup = (
     });
 };
 
-const checkNvidiaSmi = async () => {
-    const registerEmptyGpuEvents = () => {
-        ipcMain.handle('get-nvidia-gpu-name', () => null);
-        ipcMain.handle('get-nvidia-gpus', () => null);
-        ipcMain.handle('get-vram-usage', () => null);
-    };
-
-    const registerNvidiaSmiEvents = async (nvidiaSmi: string) => {
-        const nvidiaGpus = await getNvidiaGpuNames(nvidiaSmi);
-        ipcMain.handle('get-nvidia-gpu-name', () => nvidiaGpus[0].trim());
-        ipcMain.handle('get-nvidia-gpus', () => nvidiaGpus.map((gpu) => gpu.trim()));
-
-        let vramChecker: ChildProcessWithoutNullStreams | undefined;
-        let lastVRam: number | null = null;
-        ipcMain.handle('get-vram-usage', () => {
-            if (!vramChecker) {
-                vramChecker = createNvidiaSmiVRamChecker(nvidiaSmi, 1000, (usage) => {
-                    lastVRam = usage;
-                });
-            }
-
-            return lastVRam;
-        });
-    };
-
-    const nvidiaSmi = await getNvidiaSmi();
-
-    if (nvidiaSmi) {
-        try {
-            await registerNvidiaSmiEvents(nvidiaSmi);
-            return true;
-        } catch (error) {
-            log.error(error);
-        }
-    }
-    registerEmptyGpuEvents();
-    return false;
-};
-
 const createBackend = async (token: ProgressToken, args: OpenArguments) => {
     const useSystemPython = settingStorage.getItem('use-system-python') === 'true';
     const systemPythonLocation = settingStorage.getItem('system-python-location');
 
-    const nvidiaSmiPromise = checkNvidiaSmi();
-
     return setupBackend(
         token,
         useSystemPython,
         systemPythonLocation,
-        () => nvidiaSmiPromise,
         getRootDirSync(),
         args.noBackend
     );