Merge branch 'main' into backport/main/pr-1099

Author: mohnjiles

CHANGELOG.md

@@ -6,13 +6,20 @@ 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 (when the Civitai API gets fixed)
 ### 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
 ### 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 [#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
 
 ## v2.14.2
 ### Changed

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CheckpointBrowserCardViewModel.cs

@@ -147,30 +147,26 @@ private void CheckIfInstalled()
 
         var latestVersionInstalled =
             latestVersion.Files != null
-            && latestVersion.Files.Any(
-                file =>
-                    file is { Type: CivitFileType.Model, Hashes.BLAKE3: not null }
-                    && installedModels.Contains(file.Hashes.BLAKE3)
+            && latestVersion.Files.Any(file =>
+                file is { Type: CivitFileType.Model, Hashes.BLAKE3: not null }
+                && installedModels.Contains(file.Hashes.BLAKE3)
             );
 
         // check if any of the ModelVersion.Files.Hashes.BLAKE3 hashes are in the installedModels list
         var anyVersionInstalled =
             latestVersionInstalled
-            || CivitModel.ModelVersions.Any(
-                version =>
-                    version.Files != null
-                    && version.Files.Any(
-                        file =>
-                            file is { Type: CivitFileType.Model, Hashes.BLAKE3: not null }
-                            && installedModels.Contains(file.Hashes.BLAKE3)
-                    )
+            || CivitModel.ModelVersions.Any(version =>
+                version.Files != null
+                && version.Files.Any(file =>
+                    file is { Type: CivitFileType.Model, Hashes.BLAKE3: not null }
+                    && installedModels.Contains(file.Hashes.BLAKE3)
+                )
             );
 
-        UpdateCardText = latestVersionInstalled
-            ? "Installed"
-            : anyVersionInstalled
-                ? "Update Available"
-                : string.Empty;
+        UpdateCardText =
+            latestVersionInstalled ? "Installed"
+            : anyVersionInstalled ? "Update Available"
+            : string.Empty;
 
         ShowUpdateCard = anyVersionInstalled;
     }
@@ -179,15 +175,15 @@ private void UpdateImage()
     {
         var nsfwEnabled = settingsManager.Settings.ModelBrowserNsfwEnabled;
         var hideEarlyAccessModels = settingsManager.Settings.HideEarlyAccessModels;
-        var version = CivitModel.ModelVersions?.FirstOrDefault(
-            v => !hideEarlyAccessModels || !v.IsEarlyAccess
+        var version = CivitModel.ModelVersions?.FirstOrDefault(v =>
+            !hideEarlyAccessModels || !v.IsEarlyAccess
         );
         var images = version?.Images;
 
         // Try to find a valid image
         var image = images
-            ?.Where(
-                img => LocalModelFile.SupportedImageExtensions.Any(img.Url.Contains) && img.Type == "image"
+            ?.Where(img =>
+                LocalModelFile.SupportedImageExtensions.Any(img.Url.Contains) && img.Type == "image"
             )
             .FirstOrDefault(image => nsfwEnabled || image.NsfwLevel <= 1);
         if (image != null)
@@ -351,6 +347,9 @@ private async Task ShowVersionDialog(CivitModel model)
             if (
                 model.BaseModelType == CivitBaseModelType.Flux1D.GetStringValue()
                 || model.BaseModelType == CivitBaseModelType.Flux1S.GetStringValue()
+                || model.BaseModelType == CivitBaseModelType.WanVideo.GetStringValue()
+                || model.BaseModelType == CivitBaseModelType.HunyuanVideo.GetStringValue()
+                || selectedFile?.Metadata.Format is CivitModelFormat.GGUF
             )
             {
                 sharedFolder = SharedFolderType.DiffusionModels.GetStringValue();

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs

@@ -640,6 +640,29 @@ private async Task SearchModels(bool isInfiniteScroll = false)
                 modelRequest.Sort = CivitSortMode.HighestRated;
             }
         }
+        else if (SearchQuery.StartsWith("https://civitai.com/models/"))
+        {
+            /* extract model ID from URL, could be one of:
+                https://civitai.com/models/443821?modelVersionId=1957537
+                https://civitai.com/models/443821/cyberrealistic-pony
+                https://civitai.com/models/443821
+            */
+            var modelId = SearchQuery
+                .Replace("https://civitai.com/models/", string.Empty)
+                .Split(['?', '/'], StringSplitOptions.RemoveEmptyEntries)
+                .FirstOrDefault();
+
+            modelRequest.Period = CivitPeriod.AllTime;
+            modelRequest.BaseModels = null;
+            modelRequest.Types = null;
+            modelRequest.CommaSeparatedModelIds = modelId;
+
+            if (modelRequest.Sort is CivitSortMode.Favorites or CivitSortMode.Installed)
+            {
+                SortMode = CivitSortMode.HighestRated;
+                modelRequest.Sort = CivitSortMode.HighestRated;
+            }
+        }
         else
         {
             modelRequest.Query = SearchQuery;

StabilityMatrix.Avalonia/ViewModels/Dialogs/SelectModelVersionViewModel.cs

@@ -314,7 +314,7 @@ private void LoadInstallLocations()
 
         var downloadDirectory = GetSharedFolderPath(
             rootModelsDirectory,
-            SelectedFile?.CivitFile.Type,
+            SelectedFile?.CivitFile,
             CivitModel.Type,
             CivitModel.BaseModelType
         );
@@ -356,12 +356,12 @@ var directory in downloadDirectory.EnumerateDirectories(
 
     private static DirectoryPath GetSharedFolderPath(
         DirectoryPath rootModelsDirectory,
-        CivitFileType? fileType,
+        CivitFile? civitFile,
         CivitModelType modelType,
         string? baseModelType
     )
     {
-        if (fileType is CivitFileType.VAE)
+        if (civitFile?.Type is CivitFileType.VAE)
         {
             return rootModelsDirectory.JoinDir(SharedFolderType.VAE.GetStringValue());
         }
@@ -371,17 +371,15 @@ modelType is CivitModelType.Checkpoint
             && (
                 baseModelType == CivitBaseModelType.Flux1D.GetStringValue()
                 || baseModelType == CivitBaseModelType.Flux1S.GetStringValue()
+                || baseModelType == CivitBaseModelType.WanVideo.GetStringValue()
+                || baseModelType == CivitBaseModelType.HunyuanVideo.GetStringValue()
+                || civitFile?.Metadata.Format == CivitModelFormat.GGUF
             )
         )
         {
             return rootModelsDirectory.JoinDir(SharedFolderType.DiffusionModels.GetStringValue());
         }
 
-        if (modelType is CivitModelType.Checkpoint && baseModelType == "Wan Video")
-        {
-            return rootModelsDirectory.JoinDir(SharedFolderType.DiffusionModels.GetStringValue());
-        }
-
         return rootModelsDirectory.JoinDir(modelType.ConvertTo<SharedFolderType>().GetStringValue());
     }
 }

StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs

@@ -460,7 +460,7 @@ public async Task ConsolidateImages()
             {
                 Text = Resources.Label_ConsolidateExplanation,
                 TextWrapping = TextWrapping.Wrap,
-                Margin = new Thickness(0, 8, 0, 16)
+                Margin = new Thickness(0, 8, 0, 16),
             }
         );
         foreach (var category in Categories)
@@ -476,7 +476,7 @@ public async Task ConsolidateImages()
                     Content = $"{category.Name} ({category.Path})",
                     IsChecked = true,
                     Margin = new Thickness(0, 8, 0, 0),
-                    Tag = category.Path
+                    Tag = category.Path,
                 }
             );
         }
@@ -602,7 +602,14 @@ private void GetOutputs(string directory)
 
             var files = Directory
                 .EnumerateFiles(directory, "*", EnumerationOptionConstants.AllDirectories)
-                .Where(file => allowedExtensions.Contains(new FilePath(file).Extension))
+                .Where(file =>
+                    allowedExtensions.Contains(new FilePath(file).Extension)
+                    && new FilePath(file).Info.DirectoryName?.EndsWith(
+                        "thumbnails",
+                        StringComparison.OrdinalIgnoreCase
+                    )
+                        is false
+                )
                 .Select(file => LocalImageFile.FromPath(file))
                 .ToList();
 
@@ -647,24 +654,17 @@ private void RefreshCategories()
             .Settings.InstalledPackages.Where(x => !x.UseSharedOutputFolder)
             .Select(packageFactory.GetPackagePair)
             .WhereNotNull()
-            .Where(
-                p =>
-                    p.BasePackage.SharedOutputFolders is { Count: > 0 } && p.InstalledPackage.FullPath != null
-            )
-            .Select(
-                pair =>
-                    new TreeViewDirectory
-                    {
-                        Path = Path.Combine(
-                            pair.InstalledPackage.FullPath!,
-                            pair.BasePackage.OutputFolderName
-                        ),
-                        Name = pair.InstalledPackage.DisplayName ?? "",
-                        SubDirectories = GetSubfolders(
-                            Path.Combine(pair.InstalledPackage.FullPath!, pair.BasePackage.OutputFolderName)
-                        )
-                    }
+            .Where(p =>
+                p.BasePackage.SharedOutputFolders is { Count: > 0 } && p.InstalledPackage.FullPath != null
             )
+            .Select(pair => new TreeViewDirectory
+            {
+                Path = Path.Combine(pair.InstalledPackage.FullPath!, pair.BasePackage.OutputFolderName),
+                Name = pair.InstalledPackage.DisplayName ?? "",
+                SubDirectories = GetSubfolders(
+                    Path.Combine(pair.InstalledPackage.FullPath!, pair.BasePackage.OutputFolderName)
+                ),
+            })
             .ToList();
 
         packageCategories.Insert(
@@ -673,7 +673,7 @@ private void RefreshCategories()
             {
                 Path = settingsManager.ImagesDirectory,
                 Name = "Shared Output Folder",
-                SubDirectories = GetSubfolders(settingsManager.ImagesDirectory)
+                SubDirectories = GetSubfolders(settingsManager.ImagesDirectory),
             }
         );
 

StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs

@@ -70,7 +70,7 @@ private static IEnumerable<GpuInfo> IterGpuInfoWindows()
     [SupportedOSPlatform("linux")]
     private static IEnumerable<GpuInfo> IterGpuInfoLinux()
     {
-        var output = RunBashCommand("lspci | grep VGA");
+        var output = RunBashCommand("lspci | grep -E \"(VGA|3D)\"");
         var gpuLines = output.Split("\n");
 
         var gpuIndex = 0;
@@ -153,15 +153,26 @@ public static IEnumerable<GpuInfo> IterGpuInfo(bool forceRefresh = false)
                 return cachedGpuInfos;
             }
 
-            if (Compat.IsWindows)
+            if (Compat.IsMacOS)
+            {
+                return cachedGpuInfos = IterGpuInfoMacos().ToList();
+            }
+
+            if (Compat.IsLinux || Compat.IsWindows)
             {
                 try
                 {
                     var smi = IterGpuInfoNvidiaSmi()?.ToList();
+                    var fallback = Compat.IsLinux
+                        ? IterGpuInfoLinux().ToList()
+                        : IterGpuInfoWindows().ToList();
+
                     if (smi is null)
-                        return cachedGpuInfos = IterGpuInfoWindows().ToList();
+                    {
+                        return cachedGpuInfos = fallback;
+                    }
 
-                    var newList = smi.Concat(IterGpuInfoWindows().Where(gpu => !gpu.IsNvidia))
+                    var newList = smi.Concat(fallback.Where(gpu => !gpu.IsNvidia))
                         .Select(
                             (gpu, index) =>
                                 new GpuInfo
@@ -177,22 +188,15 @@ public static IEnumerable<GpuInfo> IterGpuInfo(bool forceRefresh = false)
                 catch (Exception e)
                 {
                     Logger.Error(e, "Failed to get GPU info using nvidia-smi, falling back to registry");
-                    return cachedGpuInfos = IterGpuInfoWindows().ToList();
-                }
-            }
 
-            if (Compat.IsLinux)
-            {
-                return cachedGpuInfos = IterGpuInfoLinux().ToList();
-            }
-
-            if (Compat.IsMacOS)
-            {
-                return cachedGpuInfos = IterGpuInfoMacos().ToList();
+                    var fallback = Compat.IsLinux
+                        ? IterGpuInfoLinux().ToList()
+                        : IterGpuInfoWindows().ToList();
+                    return cachedGpuInfos = fallback;
+                }
             }
 
             Logger.Error("Unknown OS, returning empty GPU info list");
-
             return cachedGpuInfos = [];
         }
     }

StabilityMatrix.Core/Models/Api/CivitModelFpType.cs

@@ -10,5 +10,7 @@ public enum CivitModelFpType
     bf16,
     fp16,
     fp32,
-    tf32
+    tf32,
+    fp8,
+    nf4,
 }

StabilityMatrix.Core/Models/PackageModification/InstallSageAttentionStep.cs

@@ -60,6 +60,16 @@ public async Task ExecuteAsync(IProgress<ProgressReport>? progress = null)
             sageWheelUrl =
                 "https://github.com/woct0rdho/SageAttention/releases/download/v2.1.1-windows/sageattention-2.1.1+cu128torch2.7.0-cp310-cp310-win_amd64.whl";
         }
+        else if (torchInfo.Version.Contains("2.7.1") && torchInfo.Version.Contains("cu128"))
+        {
+            sageWheelUrl =
+                $"https://github.com/woct0rdho/SageAttention/releases/download/v2.2.0-windows/sageattention-2.2.0+cu128torch2.7.1-cp310-cp310-win_amd64.whl";
+        }
+        else if (torchInfo.Version.Contains("2.8.0") && torchInfo.Version.Contains("cu128"))
+        {
+            sageWheelUrl =
+                $"https://github.com/woct0rdho/SageAttention/releases/download/v2.2.0-windows/sageattention-2.2.0+cu128torch2.8.0-cp310-cp310-win_amd64.whl";
+        }
 
         var pipArgs = new PipInstallArgs();
         if (IsBlackwellGpu)

StabilityMatrix.Core/Models/Packages/FluxGym.cs

@@ -47,19 +47,19 @@ IPrerequisiteHelper prerequisiteHelper
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.TextEncoders],
-                    TargetRelativePaths = ["models/clip"]
+                    TargetRelativePaths = ["models/clip"],
                 },
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.DiffusionModels],
-                    TargetRelativePaths = ["models/unet"]
+                    TargetRelativePaths = ["models/unet"],
                 },
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.VAE],
                     TargetRelativePaths = ["models/vae"],
-                }
-            ]
+                },
+            ],
         };
 
     public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders => null;
@@ -115,16 +115,20 @@ await sdsRequirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false),
         await venvRunner.PipInstall(sdsPipArgs, onConsoleOutput).ConfigureAwait(false);
 
         progress?.Report(new ProgressReport(-1f, "Installing requirements", isIndeterminate: true));
+
+        var isLegacyNvidiaGpu =
+            SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu();
+
         var requirements = new FilePath(installLocation, "requirements.txt");
         var pipArgs = new PipInstallArgs()
-            .AddArg("--pre")
             .WithTorch()
             .WithTorchVision()
             .WithTorchAudio()
-            .WithTorchExtraIndex("cu121")
+            .WithTorchExtraIndex(isLegacyNvidiaGpu ? "cu126" : "cu128")
+            .AddArg("bitsandbytes>=0.46.0")
             .WithParsedFromRequirementsTxt(
                 await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false),
-                "torch"
+                "torch$|bitsandbytes"
             );
 
         if (installedPackage.PipOverrides != null)
@@ -163,7 +167,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
         );