Merge pull request LykosAI#1103 from ionite34/fix-invoke-and-kohya

mohnjiles · web-flow · commit dae982d2887f · 2025-07-07T23:00:44.000-04:00
Fix invoke and kohya
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,11 +13,13 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Inference is now able to load image metadata from Civitai generated images via drag & drop
 - Updated process tracking for ComfyUI to help mitigate restart issues when using Comfy Manager
 - Updated pre-selected download locations for certain model types in the Civitai model browser
+- Updated nodejs to v20.19.3 to support newer InvokeAI versions
 ### Fixed
 - Fixed missing .NET 8 dependency for SwarmUI installs in certain cases
 - Fixed ComfyUI-Zluda not being recognized as a valid Comfy install for the workflow browser
 - Fixed [#1291](https://github.com/LykosAI/StabilityMatrix/issues/1291) - Certain GPUs not being detected on Linux
 - Fixed [#1284](https://github.com/LykosAI/StabilityMatrix/issues/1284) - Output browser not ignoring InvokeAI thumbnails folders
+- Fixed [#1301](https://github.com/LykosAI/StabilityMatrix/issues/1301) - Error when installing kohya_ss
 - Fixed [#1305](https://github.com/LykosAI/StabilityMatrix/issues/1305) - FluxGym installing incorrect packages for Blackwell GPUs
 - Fixed [#1316](https://github.com/LykosAI/StabilityMatrix/issues/1316) - Errors when installing Triton & SageAttention
 
diff --git a/StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs b/StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs
@@ -148,7 +148,7 @@ public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = nu
     public async Task UnpackResourcesIfNecessary(IProgress<ProgressReport>? progress = null)
     {
         // Array of (asset_uri, extract_to)
-        var assets = new[] { (Assets.SevenZipExecutable, AssetsDir), (Assets.SevenZipLicense, AssetsDir), };
+        var assets = new[] { (Assets.SevenZipExecutable, AssetsDir), (Assets.SevenZipLicense, AssetsDir) };
 
         progress?.Report(new ProgressReport(0, message: "Unpacking resources", isIndeterminate: true));
 
@@ -176,10 +176,10 @@ public async Task InstallGitIfNecessary(IProgress<ProgressReport>? progress = nu
                 {
                     new TextBlock
                     {
-                        Text = "The current operation requires Git. Please install it to continue."
+                        Text = "The current operation requires Git. Please install it to continue.",
                     },
                     new SelectableTextBlock { Text = "$ sudo apt install git" },
-                }
+                },
             },
             PrimaryButtonText = Resources.Action_Retry,
             CloseButtonText = Resources.Action_Close,
@@ -351,6 +351,22 @@ public async Task RunNpm(
         );
     }
 
+    // NOTE TO FUTURE DEVS: if this is causing merge conflicts with dev, just nuke it we don't need anymore
+    private async Task<string> RunNode(
+        ProcessArgs args,
+        string? workingDirectory = null,
+        IReadOnlyDictionary<string, string>? envVars = null
+    )
+    {
+        var nodePath = Path.Combine(NodeDir, "bin", "node");
+        var result = await ProcessRunner
+            .GetProcessResultAsync(nodePath, args, workingDirectory, envVars)
+            .ConfigureAwait(false);
+
+        result.EnsureSuccessExitCode();
+        return result.StandardOutput ?? result.StandardError ?? string.Empty;
+    }
+
     [SupportedOSPlatform("Linux")]
     [SupportedOSPlatform("macOS")]
     public async Task<Process> RunDotnet(
@@ -395,17 +411,32 @@ public async Task<Process> RunDotnet(
     [SupportedOSPlatform("macOS")]
     public async Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = null)
     {
-        if (IsNodeInstalled)
+        // NOTE TO FUTURE DEVS: if this is causing merge conflicts with dev, just nuke it we don't need anymore
+        if (NodeDir.Exists)
         {
-            Logger.Info("node already installed");
-            return;
+            try
+            {
+                var result = await RunNode("-v");
+                if (result.Contains("20.19.3"))
+                {
+                    Logger.Debug("Node.js already installed at {NodeExistsPath}", NodeDir);
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+
+            Logger.Warn("Node.js version mismatch, reinstalling...");
+            await NodeDir.DeleteAsync(true);
         }
 
         Logger.Info("Downloading node");
 
         var downloadUrl = Compat.IsMacOS
-            ? "https://nodejs.org/dist/v20.11.0/node-v20.11.0-darwin-arm64.tar.gz"
-            : "https://nodejs.org/dist/v20.11.0/node-v20.11.0-linux-x64.tar.gz";
+            ? "https://nodejs.org/dist/v20.19.3/node-v20.19.3-darwin-arm64.tar.gz"
+            : "https://nodejs.org/dist/v20.19.3/node-v20.19.3-linux-x64.tar.gz";
 
         var nodeDownloadPath = AssetsDir.JoinFile(Path.GetFileName(downloadUrl));
 
@@ -425,8 +456,8 @@ public async Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = n
         await ArchiveHelper.Extract7ZAuto(nodeDownloadPath, AssetsDir);
 
         var nodeDir = Compat.IsMacOS
-            ? AssetsDir.JoinDir("node-v20.11.0-darwin-arm64")
-            : AssetsDir.JoinDir("node-v20.11.0-linux-x64");
+            ? AssetsDir.JoinDir("node-v20.19.3-darwin-arm64")
+            : AssetsDir.JoinDir("node-v20.19.3-linux-x64");
         Directory.Move(nodeDir, NodeDir);
 
         progress?.Report(
diff --git a/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs b/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs
@@ -32,7 +32,7 @@ IPyRunner pyRunner
     private const string TkinterDownloadUrl =
         "https://cdn.lykos.ai/tkinter-cpython-embedded-3.10.11-win-x64.zip";
 
-    private const string NodeDownloadUrl = "https://nodejs.org/dist/v20.11.0/node-v20.11.0-win-x64.zip";
+    private const string NodeDownloadUrl = "https://nodejs.org/dist/v20.19.3/node-v20.19.3-win-x64.zip";
 
     private const string Dotnet7DownloadUrl =
         "https://download.visualstudio.microsoft.com/download/pr/2133b143-9c4f-4daa-99b0-34fa6035d67b/193ede446d922eb833f1bfe0239be3fc/dotnet-sdk-7.0.405-win-x64.zip";
@@ -69,6 +69,7 @@ IPyRunner pyRunner
     private string TkinterExtractPath => PythonDir;
     private string TkinterExistsPath => Path.Combine(PythonDir, "tkinter");
     private string NodeExistsPath => Path.Combine(AssetsDir, "nodejs", "npm.cmd");
+    private string NodeExePath => Path.Combine(AssetsDir, "nodejs", "node.exe");
     private string NodeDownloadPath => Path.Combine(AssetsDir, "nodejs.zip");
     private string Dotnet7DownloadPath => Path.Combine(AssetsDir, "dotnet-sdk-7.0.405-win-x64.zip");
     private string Dotnet8DownloadPath => Path.Combine(AssetsDir, "dotnet-sdk-8.0.101-win-x64.zip");
@@ -109,7 +110,7 @@ public async Task RunGit(
             onProcessOutput,
             environmentVariables: new Dictionary<string, string>
             {
-                { "PATH", Compat.GetEnvPathWithExtensions(GitBinPath) }
+                { "PATH", Compat.GetEnvPathWithExtensions(GitBinPath) },
             }
         );
         await process.WaitForExitAsync().ConfigureAwait(false);
@@ -127,7 +128,7 @@ public Task<ProcessResult> GetGitOutput(ProcessArgs args, string? workingDirecto
             workingDirectory: workingDirectory,
             environmentVariables: new Dictionary<string, string>
             {
-                { "PATH", Compat.GetEnvPathWithExtensions(GitBinPath) }
+                { "PATH", Compat.GetEnvPathWithExtensions(GitBinPath) },
             }
         );
     }
@@ -148,6 +149,21 @@ public async Task RunNpm(
         onProcessOutput?.Invoke(ProcessOutput.FromStdErrLine(result.StandardError));
     }
 
+    // NOTE TO FUTURE DEVS: if this is causing merge conflicts with dev, just nuke it we don't need anymore
+    private async Task<string> RunNode(
+        ProcessArgs args,
+        string? workingDirectory = null,
+        IReadOnlyDictionary<string, string>? envVars = null
+    )
+    {
+        var result = await ProcessRunner
+            .GetProcessResultAsync(NodeExePath, args, workingDirectory, envVars)
+            .ConfigureAwait(false);
+
+        result.EnsureSuccessExitCode();
+        return result.StandardOutput ?? result.StandardError ?? string.Empty;
+    }
+
     public Task InstallPackageRequirements(BasePackage package, IProgress<ProgressReport>? progress = null) =>
         InstallPackageRequirements(package.Prerequisites.ToList(), progress);
 
@@ -214,7 +230,7 @@ public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = nu
     public async Task UnpackResourcesIfNecessary(IProgress<ProgressReport>? progress = null)
     {
         // Array of (asset_uri, extract_to)
-        var assets = new[] { (Assets.SevenZipExecutable, AssetsDir), (Assets.SevenZipLicense, AssetsDir), };
+        var assets = new[] { (Assets.SevenZipExecutable, AssetsDir), (Assets.SevenZipLicense, AssetsDir) };
 
         progress?.Report(new ProgressReport(0, message: "Unpacking resources", isIndeterminate: true));
 
@@ -487,12 +503,31 @@ await downloadService.DownloadToFileAsync(
     [SupportedOSPlatform("windows")]
     public async Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = null)
     {
-        if (File.Exists(NodeExistsPath))
-            return;
+        // NOTE TO FUTURE DEVS: if this is causing merge conflicts with dev, just nuke it we don't need anymore
+        var nodeFolder = new DirectoryPath(AssetsDir, "nodejs");
+        if (nodeFolder.Exists)
+        {
+            try
+            {
+                var result = await RunNode("-v");
+                if (result.Contains("20.19.3"))
+                {
+                    Logger.Debug("Node.js already installed at {NodeExistsPath}", NodeExistsPath);
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+
+            Logger.Warn("Node.js version mismatch, reinstalling...");
+            await nodeFolder.DeleteAsync(true);
+        }
 
         await DownloadAndExtractPrerequisite(progress, NodeDownloadUrl, NodeDownloadPath, AssetsDir);
 
-        var extractedNodeDir = Path.Combine(AssetsDir, "node-v20.11.0-win-x64");
+        var extractedNodeDir = Path.Combine(AssetsDir, "node-v20.19.3-win-x64");
         if (Directory.Exists(extractedNodeDir))
         {
             Directory.Move(extractedNodeDir, Path.Combine(AssetsDir, "nodejs"));
@@ -591,7 +626,7 @@ public async Task InstallHipSdkIfNecessary(IProgress<ProgressReport>? progress =
             Arguments = "-install -log hip_install.log",
             UseShellExecute = true,
             CreateNoWindow = true,
-            Verb = "runas"
+            Verb = "runas",
         };
 
         if (Process.Start(info) is { } process)
@@ -755,14 +790,14 @@ private async Task PatchHipSdkIfNecessary(IProgress<ProgressReport>? progress)
         {
             _ when downloadUrl.Contains("gfx1201") => null,
             _ when downloadUrl.Contains("gfx1150") => "rocm gfx1150 for hip skd 6.2.4",
-            _ when downloadUrl.Contains("gfx1103.AMD")
-                => "rocm gfx1103 AMD 780M phoenix V5.0 for hip skd 6.2.4",
+            _ when downloadUrl.Contains("gfx1103.AMD") =>
+                "rocm gfx1103 AMD 780M phoenix V5.0 for hip skd 6.2.4",
             _ when downloadUrl.Contains("gfx1034") => "rocm gfx1034-gfx1035-gfx1036 for hip sdk 6.2.4",
             _ when downloadUrl.Contains("gfx1032") => "rocm gfx1032 for hip skd 6.2.4(navi21 logic)",
             _ when downloadUrl.Contains("gfx1031") => "rocm gfx1031 for hip skd 6.2.4 (littlewu's logic)",
-            _ when downloadUrl.Contains("gfx1010")
-                => "rocm gfx1010-xnack-gfx1011-xnack-gfx1012-xnack- for hip sdk 6.2.4",
-            _ => null
+            _ when downloadUrl.Contains("gfx1010") =>
+                "rocm gfx1010-xnack-gfx1011-xnack-gfx1012-xnack- for hip sdk 6.2.4",
+            _ => null,
         };
 
         var librarySourceDir = rocmLibsExtractPath;
diff --git a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
@@ -214,20 +214,21 @@ private async Task SetupAndBuildInvokeFrontend(
         string installLocation,
         IProgress<ProgressReport>? progress,
         Action<ProcessOutput>? onConsoleOutput,
-        IReadOnlyDictionary<string, string>? envVars = null
+        IReadOnlyDictionary<string, string>? envVars = null,
+        InstallPackageOptions? installOptions = null
     )
     {
         await PrerequisiteHelper.InstallNodeIfNecessary(progress).ConfigureAwait(false);
+
+        var pnpmVersion = installOptions?.VersionOptions.VersionTag?.Contains("v5") == true ? "8" : "10";
+
         await PrerequisiteHelper
-            .RunNpm(["i", "pnpm@8"], installLocation, envVars: envVars)
+            .RunNpm(["i", $"pnpm@{pnpmVersion}"], installLocation, envVars: envVars)
             .ConfigureAwait(false);
 
-        if (Compat.IsMacOS || Compat.IsLinux)
-        {
-            await PrerequisiteHelper
-                .RunNpm(["i", "vite", "--ignore-scripts=true"], installLocation, envVars: envVars)
-                .ConfigureAwait(false);
-        }
+        await PrerequisiteHelper
+            .RunNpm(["i", "vite", "--ignore-scripts=true"], installLocation, envVars: envVars)
+            .ConfigureAwait(false);
 
         var pnpmPath = Path.Combine(
             installLocation,
@@ -257,7 +258,7 @@ await PrerequisiteHelper
 
         process = ProcessRunner.StartAnsiProcess(
             Compat.IsWindows ? pnpmPath : vitePath,
-            "build",
+            Compat.IsWindows ? "vite build" : "build",
             invokeFrontendPath,
             onConsoleOutput,
             envVars
diff --git a/StabilityMatrix.Core/Models/Packages/KohyaSs.cs b/StabilityMatrix.Core/Models/Packages/KohyaSs.cs
@@ -49,51 +49,51 @@ IPyRunner runner
                 Name = "Listen Address",
                 Type = LaunchOptionType.String,
                 DefaultValue = "127.0.0.1",
-                Options = ["--listen"]
+                Options = ["--listen"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Port",
                 Type = LaunchOptionType.String,
-                Options = ["--port"]
+                Options = ["--port"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Username",
                 Type = LaunchOptionType.String,
-                Options = ["--username"]
+                Options = ["--username"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Password",
                 Type = LaunchOptionType.String,
-                Options = ["--password"]
+                Options = ["--password"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Auto-Launch Browser",
                 Type = LaunchOptionType.Bool,
-                Options = ["--inbrowser"]
+                Options = ["--inbrowser"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Share",
                 Type = LaunchOptionType.Bool,
-                Options = ["--share"]
+                Options = ["--share"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Headless",
                 Type = LaunchOptionType.Bool,
-                Options = ["--headless"]
+                Options = ["--headless"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Language",
                 Type = LaunchOptionType.String,
-                Options = ["--language"]
+                Options = ["--language"],
             },
-            LaunchOptionDefinition.Extras
+            LaunchOptionDefinition.Extras,
         ];
 
     public override async Task InstallPackage(
@@ -143,7 +143,7 @@ await PrerequisiteHelper
             .WithTorch()
             .WithTorchVision()
             .WithTorchAudio()
-            .WithXFormers()
+            .WithXFormers(">=0.0.30")
             .WithTorchExtraIndex(torchExtraIndex)
             .AddArg("--force-reinstall");
 
@@ -215,7 +215,7 @@ void HandleConsoleOutput(ProcessOutput s)
         }
 
         VenvRunner.RunDetached(
-            [Path.Combine(installLocation, options.Command ?? LaunchCommand), ..options.Arguments],
+            [Path.Combine(installLocation, options.Command ?? LaunchCommand), .. options.Arguments],
             HandleConsoleOutput,
             OnExit
         );
