Merge pull request #1326 from LykosAI/main

v2.14.3

Author: mohnjiles

.github/workflows/release.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Install PupNet
         run: |
           sudo apt-get -y install libfuse2
-          dotnet tool install -g KuiperZone.PupNet
+          dotnet tool install -g KuiperZone.PupNet --version 1.8.0
       
       - name: PupNet Build
         env:

CHANGELOG.md

@@ -5,6 +5,31 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.14.3
+### Added
+- Added the ability to search by pasting an entire Civitai model URL into the search bar in the Civitai model browser
+### Changed
+- The main sidebar now remembers whether it was collapsed or expanded between restarts.
+- 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
+- Fixed "directory is not empty" error when updating packages with symlinks
+- Fixed missing base model types in the Checkpoint Manager & Civitai Model Browser
+### Supporters
+#### 🌟 Visionaries
+Big heartfelt thanks to our stellar Visionary-tier Patrons: **Waterclouds**, **Corey T**, **bluepopsicle**, **Bob S**, **Ibixat**, and **whudunit**! 🌟 Your extraordinary generosity continues to fuel Stability Matrix’s journey toward innovation and excellence. We appreciate you immensely!
+#### 🚀 Pioneers
+Massive thanks to our fantastic Pioneer-tier Patrons: **tankfox**, **Mr. Unknown**, **Szir777**, **Tigon**, **Noah M**, **USATechDude**, **Thom**, and **SeraphOfSalem**! Your unwavering support keeps our community thriving and inspires us to push even further. You’re all awesome!
+
 ## v2.14.2
 ### Changed
 - Changed Nvidia GPU detection to use compute capability level instead of the GPU name for certain feature gates / torch indexes

Directory.Build.props

@@ -1,6 +1,7 @@
 <Project>
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
+        <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

Directory.Packages.props

@@ -10,7 +10,7 @@
     <PackageVersion Include="Blake3" Version="1.1.0" />
     <PackageVersion Include="CompiledExpressions" Version="1.1.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Crc32.NET" Version="1.2.0" />
     <PackageVersion Include="CSharpDiscriminatedUnion" Version="2.0.1" />
     <PackageVersion Include="DeviceId" Version="6.7.0" />

StabilityMatrix.Avalonia/Helpers/PngDataHelper.cs

@@ -42,7 +42,7 @@ InferenceProjectDocument projectDocument
         while (position < inputImage.Length)
         {
             var chunkLength = BitConverter.ToInt32(
-                inputImage[position..(position + 4)].Reverse().ToArray(),
+                inputImage[position..(position + 4)].AsEnumerable().Reverse().ToArray(),
                 0
             );
             var chunkType = Encoding.ASCII.GetString(inputImage[(position + 4)..(position + 8)]);
@@ -53,8 +53,10 @@ InferenceProjectDocument projectDocument
                 {
                     var imageWidthBytes = inputImage[(position + 8)..(position + 12)];
                     var imageHeightBytes = inputImage[(position + 12)..(position + 16)];
-                    var imageWidth = BitConverter.ToInt32(imageWidthBytes.Reverse().ToArray());
-                    var imageHeight = BitConverter.ToInt32(imageHeightBytes.Reverse().ToArray());
+                    var imageWidth = BitConverter.ToInt32(imageWidthBytes.AsEnumerable().Reverse().ToArray());
+                    var imageHeight = BitConverter.ToInt32(
+                        imageHeightBytes.AsEnumerable().Reverse().ToArray()
+                    );
 
                     generationParameters.Width = imageWidth;
                     generationParameters.Height = imageHeight;
@@ -102,7 +104,7 @@ public static byte[] RemoveMetadata(byte[] inputImage)
         while (position < inputImage.Length)
         {
             var chunkLength = BitConverter.ToInt32(
-                inputImage[position..(position + 4)].Reverse().ToArray(),
+                inputImage[position..(position + 4)].AsEnumerable().Reverse().ToArray(),
                 0
             );
             var chunkType = Encoding.ASCII.GetString(inputImage[(position + 4)..(position + 8)]);
@@ -124,9 +126,13 @@ private static byte[] BuildTextChunk(string key, string value)
     {
         var textData = $"{key}\0{value}";
         var dataBytes = Encoding.UTF8.GetBytes(textData);
-        var textDataLength = BitConverter.GetBytes(dataBytes.Length).Reverse();
+        var textDataLength = BitConverter.GetBytes(dataBytes.Length).AsEnumerable().Reverse().ToArray();
         var textDataBytes = Text.Concat(dataBytes).ToArray();
-        var crc = BitConverter.GetBytes(Crc32Algorithm.Compute(textDataBytes)).Reverse();
+        var crc = BitConverter
+            .GetBytes(Crc32Algorithm.Compute(textDataBytes))
+            .AsEnumerable()
+            .Reverse()
+            .ToArray();
 
         return textDataLength.Concat(textDataBytes).Concat(crc).ToArray();
     }

StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs

@@ -46,7 +46,8 @@ IPyRunner pyRunner
 
     private DirectoryPath DotnetDir => AssetsDir.JoinDir("dotnet");
     private string DotnetPath => Path.Combine(DotnetDir, "dotnet");
-    private bool IsDotnetInstalled => File.Exists(DotnetPath);
+    private string Dotnet7SdkExistsPath => Path.Combine(DotnetDir, "sdk", "7.0.405");
+    private string Dotnet8SdkExistsPath => Path.Combine(DotnetDir, "sdk", "8.0.101");
     private string Dotnet7DownloadUrlMacOs =>
         "https://download.visualstudio.microsoft.com/download/pr/5bb0e0e4-2a8d-4aba-88ad-232e1f65c281/ee6d35f762d81965b4cf336edde1b318/dotnet-sdk-7.0.405-osx-arm64.tar.gz";
     private string Dotnet8DownloadUrlMacOs =>
@@ -103,19 +104,17 @@ public async Task InstallPackageRequirements(
 
     public async Task InstallDotnetIfNecessary(IProgress<ProgressReport>? progress = null)
     {
-        if (IsDotnetInstalled)
-            return;
+        var downloadUrl = Compat.IsMacOS ? Dotnet8DownloadUrlMacOs : Dotnet8DownloadUrlLinux;
 
-        if (Compat.IsMacOS)
-        {
-            await DownloadAndExtractPrerequisite(progress, Dotnet7DownloadUrlMacOs, DotnetDir);
-            await DownloadAndExtractPrerequisite(progress, Dotnet8DownloadUrlMacOs, DotnetDir);
-        }
-        else
+        var dotnet8SdkExists = Directory.Exists(Dotnet8SdkExistsPath);
+
+        if (dotnet8SdkExists && Directory.Exists(DotnetDir))
         {
-            await DownloadAndExtractPrerequisite(progress, Dotnet7DownloadUrlLinux, DotnetDir);
-            await DownloadAndExtractPrerequisite(progress, Dotnet8DownloadUrlLinux, DotnetDir);
+            Logger.Info("Dotnet 8 SDK already installed at {DotnetDir}", DotnetDir);
+            return;
         }
+
+        await DownloadAndExtractPrerequisite(progress, downloadUrl, DotnetDir);
     }
 
     private async Task InstallVirtualenvIfNecessary(IProgress<ProgressReport>? progress = null)
@@ -149,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));
 
@@ -177,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,
@@ -352,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(
@@ -396,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));
 
@@ -426,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(