From 4e73f14c20411d0fec3e9854ca295ea7992b973e Mon Sep 17 00:00:00 2001 From: filtered <176114999+webfiltered@users.noreply.github.com> Date: Sat, 25 Jan 2025 04:13:20 +1100 Subject: [PATCH 1/3] nit --- src/main-process/comfyDesktopApp.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main-process/comfyDesktopApp.ts b/src/main-process/comfyDesktopApp.ts index 6471d03a..0bea30ff 100644 --- a/src/main-process/comfyDesktopApp.ts +++ b/src/main-process/comfyDesktopApp.ts @@ -126,7 +126,8 @@ export class ComfyDesktopApp implements HasTelemetry { // Restart core ipcMain.handle(IPC_CHANNELS.RESTART_CORE, async (): Promise => { if (!this.comfyServer) return false; - await this.comfyServer?.kill(); + + await this.comfyServer.kill(); await this.comfyServer.start(); return true; }); @@ -134,9 +135,7 @@ export class ComfyDesktopApp implements HasTelemetry { async startComfyServer(serverArgs: ServerArgs) { app.on('before-quit', () => { - if (!this.comfyServer) { - return; - } + if (!this.comfyServer) return; log.info('Before-quit: Killing Python server'); this.comfyServer.kill().catch((error) => { From e88f679569edabc1a9d5aa8a457a115674c72413 Mon Sep 17 00:00:00 2001 From: filtered <176114999+webfiltered@users.noreply.github.com> Date: Wed, 29 Jan 2025 09:43:36 +1100 Subject: [PATCH 2/3] nit - Remove export from internal functions --- src/virtualEnvironment.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/virtualEnvironment.ts b/src/virtualEnvironment.ts index 74a171b6..66f3fbdc 100644 --- a/src/virtualEnvironment.ts +++ b/src/virtualEnvironment.ts @@ -17,7 +17,7 @@ export type ProcessCallbacks = { onStderr?: (data: string) => void; }; -export type PipInstallConfig = { +type PipInstallConfig = { packages: string[]; indexUrl?: string; extraIndexUrl?: string; @@ -27,7 +27,7 @@ export type PipInstallConfig = { indexStrategy?: 'compatible' | 'unsafe-best-match'; }; -export function getPyTorchConfig(selectedDevice: TorchDeviceType, platform: string): PipInstallConfig { +function getPyTorchConfig(selectedDevice: TorchDeviceType, platform: string): PipInstallConfig { const basePackages = ['torch', 'torchvision', 'torchaudio']; // CPU-only configuration @@ -59,7 +59,7 @@ export function getPyTorchConfig(selectedDevice: TorchDeviceType, platform: stri return { packages: basePackages }; } -export function getPipInstallArgs(config: PipInstallConfig): string[] { +function getPipInstallArgs(config: PipInstallConfig): string[] { const installArgs = ['pip', 'install']; if (config.upgradePackages) { From aacd5411595de895e2617f004760037ef77275ae Mon Sep 17 00:00:00 2001 From: filtered <176114999+webfiltered@users.noreply.github.com> Date: Wed, 29 Jan 2025 09:47:34 +1100 Subject: [PATCH 3/3] nit - Prefer TS interface over type --- src/virtualEnvironment.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/virtualEnvironment.ts b/src/virtualEnvironment.ts index 66f3fbdc..a1b8bf50 100644 --- a/src/virtualEnvironment.ts +++ b/src/virtualEnvironment.ts @@ -17,7 +17,7 @@ export type ProcessCallbacks = { onStderr?: (data: string) => void; }; -type PipInstallConfig = { +interface PipInstallConfig { packages: string[]; indexUrl?: string; extraIndexUrl?: string; @@ -25,7 +25,7 @@ type PipInstallConfig = { upgradePackages?: boolean; requirementsFile?: string; indexStrategy?: 'compatible' | 'unsafe-best-match'; -}; +} function getPyTorchConfig(selectedDevice: TorchDeviceType, platform: string): PipInstallConfig { const basePackages = ['torch', 'torchvision', 'torchaudio'];