Update torch index for final/release/public/whatever cu128 branch & rearrange some difficulties & fix some api cache thing

mohnjiles · mohnjiles · commit 37ee6d11c8dc · 2025-04-22T19:37:53.000-07:00
diff --git a/StabilityMatrix.Core/Helper/Cache/GithubApiCache.cs b/StabilityMatrix.Core/Helper/Cache/GithubApiCache.cs
@@ -7,20 +7,14 @@
 namespace StabilityMatrix.Core.Helper.Cache;
 
 [RegisterSingleton<IGithubApiCache, GithubApiCache>]
-public class GithubApiCache : IGithubApiCache
+public class GithubApiCache(
+    ILiteDbContext dbContext,
+    IGitHubClient githubApi,
+    ILogger<IGithubApiCache> logger
+) : IGithubApiCache
 {
-    private readonly ILiteDbContext dbContext;
-    private readonly IGitHubClient githubApi;
-    private readonly ILogger<IGithubApiCache> logger;
     private readonly TimeSpan cacheDuration = TimeSpan.FromMinutes(15);
 
-    public GithubApiCache(ILiteDbContext dbContext, IGitHubClient githubApi, ILogger<IGithubApiCache> logger)
-    {
-        this.dbContext = dbContext;
-        this.githubApi = githubApi;
-        this.logger = logger;
-    }
-
     public async Task<IEnumerable<Release>> GetAllReleases(string username, string repository)
     {
         var cacheKey = $"Releases-{username}-{repository}";
@@ -49,7 +43,7 @@ public async Task<IEnumerable<Release>> GetAllReleases(string username, string r
 
             return newCacheEntry.AllReleases;
         }
-        catch (ApiException ex)
+        catch (Exception ex)
         {
             logger.LogWarning(ex, "Failed to get releases from Github API.");
             return cacheEntry?.AllReleases.OrderByDescending(x => x.CreatedAt) ?? Enumerable.Empty<Release>();
@@ -80,10 +74,10 @@ public async Task<IEnumerable<Branch>> GetAllBranches(string username, string re
 
             return newCacheEntry.Branches;
         }
-        catch (ApiException ex)
+        catch (Exception ex)
         {
             logger.LogWarning(ex, "Failed to get branches from Github API.");
-            return cacheEntry?.Branches ?? Enumerable.Empty<Branch>();
+            return cacheEntry?.Branches ?? [];
         }
     }
 
@@ -132,10 +126,10 @@ public async Task<IEnumerable<Branch>> GetAllBranches(string username, string re
 
             return newCacheEntry.Commits;
         }
-        catch (ApiException ex)
+        catch (Exception ex)
         {
             logger.LogWarning(ex, "Failed to get commits from Github API.");
-            return cacheEntry?.Commits ?? Enumerable.Empty<GitCommit>();
+            return cacheEntry?.Commits ?? [];
         }
     }
 
diff --git a/StabilityMatrix.Core/Models/Packages/Cogstudio.cs b/StabilityMatrix.Core/Models/Packages/Cogstudio.cs
@@ -41,7 +41,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string MainBranch => "main";
     public override bool ShouldIgnoreReleases => true;
     public override string OutputFolderName => "output";
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Advanced;
 
     public override async Task InstallPackage(
         string installLocation,
diff --git a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
@@ -347,66 +347,37 @@ public override async Task InstallPackage(
 
         var pipArgs = new PipInstallArgs();
 
-        var isBlackwell =
-            SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu();
-
-        if (isBlackwell && torchVersion is TorchIndex.Cuda)
-        {
-            pipArgs = pipArgs
-                .AddArg("--pre")
-                .WithTorch()
-                .WithTorchVision()
-                .WithTorchAudio()
-                .WithTorchExtraIndex("nightly/cu128")
-                .AddArg("--upgrade");
-
-            if (installedPackage.PipOverrides != null)
-            {
-                pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
-            }
-            progress?.Report(
-                new ProgressReport(-1f, "Installing Torch for your shiny new GPU...", isIndeterminate: true)
-            );
-            await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
-        }
-        else
+        pipArgs = torchVersion switch
         {
-            pipArgs = torchVersion switch
-            {
-                TorchIndex.DirectMl => pipArgs.WithTorchDirectML(),
-                _
-                    => pipArgs
-                        .AddArg("--upgrade")
-                        .WithTorch()
-                        .WithTorchVision()
-                        .WithTorchExtraIndex(
-                            torchVersion switch
-                            {
-                                TorchIndex.Cpu => "cpu",
-                                TorchIndex.Cuda => "cu126",
-                                TorchIndex.Rocm => "rocm6.2.4",
-                                TorchIndex.Mps => "cpu",
-                                _
-                                    => throw new ArgumentOutOfRangeException(
-                                        nameof(torchVersion),
-                                        torchVersion,
-                                        null
-                                    )
-                            }
-                        )
-            };
-        }
-
-        if (isBlackwell && torchVersion is TorchIndex.Cuda)
-        {
-            pipArgs = new PipInstallArgs();
-        }
+            TorchIndex.DirectMl => pipArgs.WithTorchDirectML(),
+            _
+                => pipArgs
+                    .AddArg("--upgrade")
+                    .WithTorch()
+                    .WithTorchVision()
+                    .WithTorchAudio()
+                    .WithTorchExtraIndex(
+                        torchVersion switch
+                        {
+                            TorchIndex.Cpu => "cpu",
+                            TorchIndex.Cuda => "cu128",
+                            TorchIndex.Rocm => "rocm6.2.4",
+                            TorchIndex.Mps => "cpu",
+                            _
+                                => throw new ArgumentOutOfRangeException(
+                                    nameof(torchVersion),
+                                    torchVersion,
+                                    null
+                                )
+                        }
+                    )
+        };
 
         var requirements = new FilePath(installLocation, "requirements.txt");
 
         pipArgs = pipArgs.WithParsedFromRequirementsTxt(
             await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false),
-            excludePattern: isBlackwell ? "torch$|torchvision$|torchaudio$|numpy" : "torch$|numpy"
+            excludePattern: "torch$|numpy"
         );
 
         // https://github.com/comfyanonymous/ComfyUI/pull/4121
diff --git a/StabilityMatrix.Core/Models/Packages/Fooocus.cs b/StabilityMatrix.Core/Models/Packages/Fooocus.cs
@@ -272,6 +272,8 @@ public override async Task InstallPackage(
         // Pip version 24.1 deprecated numpy requirement spec used by torchsde 0.2.5
         await venvRunner.PipInstall(["pip==23.3.2"], onConsoleOutput).ConfigureAwait(false);
 
+        var isBlackwell =
+            SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu();
         var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
 
         var pipArgs = new PipInstallArgs();
@@ -283,12 +285,13 @@ public override async Task InstallPackage(
         else
         {
             pipArgs = pipArgs
-                .WithTorch("==2.1.0")
-                .WithTorchVision("==0.16.0")
+                .WithTorch(isBlackwell ? string.Empty : "==2.1.0")
+                .WithTorchVision(isBlackwell ? string.Empty : "==0.16.0")
                 .WithTorchExtraIndex(
                     torchVersion switch
                     {
                         TorchIndex.Cpu => "cpu",
+                        TorchIndex.Cuda when isBlackwell => "cu128",
                         TorchIndex.Cuda => "cu121",
                         TorchIndex.Rocm => "rocm5.6",
                         TorchIndex.Mps => "cpu",
diff --git a/StabilityMatrix.Core/Models/Packages/ForgeClassic.cs b/StabilityMatrix.Core/Models/Packages/ForgeClassic.cs
@@ -153,40 +153,12 @@ public override async Task InstallPackage(
             .ReadAllTextAsync(cancellationToken)
             .ConfigureAwait(false);
 
-        var pipArgs = new PipInstallArgs();
-
-        var isBlackwell =
-            SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu();
-        var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
-
-        if (isBlackwell && torchVersion is TorchIndex.Cuda)
-        {
-            pipArgs = pipArgs
-                .AddArg("--pre")
-                .WithTorch()
-                .WithTorchVision()
-                .WithTorchAudio()
-                .WithTorchExtraIndex("nightly/cu128")
-                .AddArg("--upgrade");
-
-            if (installedPackage.PipOverrides != null)
-            {
-                pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
-            }
-            progress?.Report(
-                new ProgressReport(-1f, "Installing Torch for your shiny new GPU...", isIndeterminate: true)
-            );
-            await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
-        }
-        else
-        {
-            pipArgs = pipArgs.WithTorch().WithTorchVision().WithTorchExtraIndex("cu126");
-        }
-
-        if (isBlackwell && torchVersion is TorchIndex.Cuda)
-        {
-            pipArgs = new PipInstallArgs();
-        }
+        var pipArgs = new PipInstallArgs()
+            .AddArg("--upgrade")
+            .WithTorch()
+            .WithTorchVision()
+            .WithTorchAudio()
+            .WithTorchExtraIndex("cu128");
 
         pipArgs = pipArgs.WithParsedFromRequirementsTxt(requirementsContent, excludePattern: "torch");
 
diff --git a/StabilityMatrix.Core/Models/Packages/KohyaSs.cs b/StabilityMatrix.Core/Models/Packages/KohyaSs.cs
@@ -159,11 +159,10 @@ await venvRunner
         if (isBlackwell)
         {
             pipArgs = new PipInstallArgs()
-                .AddArg("--pre")
                 .WithTorch()
                 .WithTorchVision()
                 .WithTorchAudio()
-                .WithTorchExtraIndex("nightly/cu128")
+                .WithTorchExtraIndex("cu128")
                 .AddArg("--force-reinstall");
 
             if (installedPackage.PipOverrides != null)
diff --git a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs
@@ -143,46 +143,20 @@ public override async Task InstallPackage(
             SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu();
         var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
 
-        if (isBlackwell && torchVersion is TorchIndex.Cuda)
-        {
-            pipArgs = pipArgs
-                .AddArg("--pre")
-                .WithTorch()
-                .WithTorchVision()
-                .WithTorchAudio()
-                .WithTorchExtraIndex("nightly/cu128")
-                .AddArg("--upgrade");
-
-            if (installedPackage.PipOverrides != null)
-            {
-                pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
-            }
-            progress?.Report(
-                new ProgressReport(-1f, "Installing Torch for your shiny new GPU...", isIndeterminate: true)
+        pipArgs = pipArgs
+            .WithTorch(isBlackwell ? string.Empty : "==2.3.1")
+            .WithTorchVision(isBlackwell ? string.Empty : "==0.18.1")
+            .WithTorchExtraIndex(
+                torchVersion switch
+                {
+                    TorchIndex.Cpu => "cpu",
+                    TorchIndex.Cuda when isBlackwell => "cu128",
+                    TorchIndex.Cuda => "cu121",
+                    TorchIndex.Rocm => "rocm5.7",
+                    TorchIndex.Mps => "cpu",
+                    _ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null)
+                }
             );
-            await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
-        }
-        else
-        {
-            pipArgs = pipArgs
-                .WithTorch("==2.3.1")
-                .WithTorchVision("==0.18.1")
-                .WithTorchExtraIndex(
-                    torchVersion switch
-                    {
-                        TorchIndex.Cpu => "cpu",
-                        TorchIndex.Cuda => "cu121",
-                        TorchIndex.Rocm => "rocm5.7",
-                        TorchIndex.Mps => "cpu",
-                        _ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null)
-                    }
-                );
-        }
-
-        if (isBlackwell && torchVersion is TorchIndex.Cuda)
-        {
-            pipArgs = new PipInstallArgs();
-        }
 
         pipArgs = pipArgs.WithParsedFromRequirementsTxt(requirementsContent, excludePattern: "torch");
 
diff --git a/StabilityMatrix.Core/Models/Packages/StableSwarm.cs b/StabilityMatrix.Core/Models/Packages/StableSwarm.cs
@@ -172,7 +172,7 @@ await RebuildDotnetProject(installedPackage.FullPath, csprojName, null)
     public override bool ShouldIgnoreReleases => true;
     public override IEnumerable<TorchIndex> AvailableTorchIndices =>
         [TorchIndex.Cpu, TorchIndex.Cuda, TorchIndex.DirectMl, TorchIndex.Rocm, TorchIndex.Mps];
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Advanced;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
     public override IEnumerable<PackagePrerequisite> Prerequisites =>
         [
             PackagePrerequisite.Git,
diff --git a/StabilityMatrix.Core/Models/Packages/VoltaML.cs b/StabilityMatrix.Core/Models/Packages/VoltaML.cs
@@ -27,8 +27,9 @@ IPrerequisiteHelper prerequisiteHelper
     public override string LaunchCommand => "main.py";
 
     public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/voltaml/preview.webp");
-
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
+    public override string Disclaimer => "This package may no longer be actively maintained";
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.UltraNightmare;
+    public override bool OfferInOneClickInstaller => false;
 
     // There are releases but the manager just downloads the latest commit anyways,
     // so we'll just limit to commit mode to be more consistent
diff --git a/StabilityMatrix.Core/Models/Settings/NotificationKey.cs b/StabilityMatrix.Core/Models/Settings/NotificationKey.cs
@@ -1,6 +1,7 @@
 ﻿using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using StabilityMatrix.Core.Converters.Json;
+using StabilityMatrix.Core.Helper;
 
 namespace StabilityMatrix.Core.Models.Settings;
 
@@ -20,47 +21,47 @@ public record NotificationKey(string Value) : StringValue(Value), IParsable<Noti
     public static NotificationKey Inference_PromptCompleted =>
         new("Inference_PromptCompleted")
         {
-            DefaultOption = NotificationOption.NativePush,
+            DefaultOption = Compat.IsLinux ? NotificationOption.AppToast : NotificationOption.NativePush,
             Level = NotificationLevel.Success,
             DisplayName = "Inference Prompt Completed"
         };
 
     public static NotificationKey Download_Completed =>
         new("Download_Completed")
         {
-            DefaultOption = NotificationOption.NativePush,
+            DefaultOption = Compat.IsLinux ? NotificationOption.AppToast : NotificationOption.NativePush,
             Level = NotificationLevel.Success,
             DisplayName = "Download Completed"
         };
 
     public static NotificationKey Download_Failed =>
         new("Download_Failed")
         {
-            DefaultOption = NotificationOption.NativePush,
+            DefaultOption = Compat.IsLinux ? NotificationOption.AppToast : NotificationOption.NativePush,
             Level = NotificationLevel.Error,
             DisplayName = "Download Failed"
         };
 
     public static NotificationKey Download_Canceled =>
         new("Download_Canceled")
         {
-            DefaultOption = NotificationOption.NativePush,
+            DefaultOption = Compat.IsLinux ? NotificationOption.AppToast : NotificationOption.NativePush,
             Level = NotificationLevel.Warning,
             DisplayName = "Download Canceled"
         };
 
     public static NotificationKey Package_Install_Completed =>
         new("Package_Install_Completed")
         {
-            DefaultOption = NotificationOption.NativePush,
+            DefaultOption = Compat.IsLinux ? NotificationOption.AppToast : NotificationOption.NativePush,
             Level = NotificationLevel.Success,
             DisplayName = "Package Install Completed"
         };
 
     public static NotificationKey Package_Install_Failed =>
         new("Package_Install_Failed")
         {
-            DefaultOption = NotificationOption.NativePush,
+            DefaultOption = Compat.IsLinux ? NotificationOption.AppToast : NotificationOption.NativePush,
             Level = NotificationLevel.Error,
             DisplayName = "Package Install Failed"
         };

Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,14 @@`
`7`	`7`	`namespace StabilityMatrix.Core.Helper.Cache;`
`8`	`8`
`9`	`9`	`[RegisterSingleton<IGithubApiCache, GithubApiCache>]`
`10`		`-public class GithubApiCache : IGithubApiCache`
	`10`	`+public class GithubApiCache(`
	`11`	`+ ILiteDbContext dbContext,`
	`12`	`+ IGitHubClient githubApi,`
	`13`	`+ ILogger<IGithubApiCache> logger`
	`14`	`+) : IGithubApiCache`
`11`	`15`	`{`
`12`		`- private readonly ILiteDbContext dbContext;`
`13`		`- private readonly IGitHubClient githubApi;`
`14`		`- private readonly ILogger<IGithubApiCache> logger;`
`15`	`16`	`private readonly TimeSpan cacheDuration = TimeSpan.FromMinutes(15);`
`16`	`17`
`17`		`- public GithubApiCache(ILiteDbContext dbContext, IGitHubClient githubApi, ILogger<IGithubApiCache> logger)`
`18`		`- {`
`19`		`- this.dbContext = dbContext;`
`20`		`- this.githubApi = githubApi;`
`21`		`- this.logger = logger;`
`22`		`- }`
`23`		`-`
`24`	`18`	`public async Task<IEnumerable<Release>> GetAllReleases(string username, string repository)`
`25`	`19`	`{`
`26`	`20`	`var cacheKey = $"Releases-{username}-{repository}";`
`@@ -49,7 +43,7 @@ public async Task<IEnumerable<Release>> GetAllReleases(string username, string r`
`49`	`43`
`50`	`44`	`return newCacheEntry.AllReleases;`
`51`	`45`	`}`
`52`		`- catch (ApiException ex)`
	`46`	`+ catch (Exception ex)`
`53`	`47`	`{`
`54`	`48`	`logger.LogWarning(ex, "Failed to get releases from Github API.");`
`55`	`49`	`return cacheEntry?.AllReleases.OrderByDescending(x => x.CreatedAt) ?? Enumerable.Empty<Release>();`
`@@ -80,10 +74,10 @@ public async Task<IEnumerable<Branch>> GetAllBranches(string username, string re`
`80`	`74`
`81`	`75`	`return newCacheEntry.Branches;`
`82`	`76`	`}`
`83`		`- catch (ApiException ex)`
	`77`	`+ catch (Exception ex)`
`84`	`78`	`{`
`85`	`79`	`logger.LogWarning(ex, "Failed to get branches from Github API.");`
`86`		`- return cacheEntry?.Branches ?? Enumerable.Empty<Branch>();`
	`80`	`+ return cacheEntry?.Branches ?? [];`
`87`	`81`	`}`
`88`	`82`	`}`
`89`	`83`
`@@ -132,10 +126,10 @@ public async Task<IEnumerable<Branch>> GetAllBranches(string username, string re`
`132`	`126`
`133`	`127`	`return newCacheEntry.Commits;`
`134`	`128`	`}`
`135`		`- catch (ApiException ex)`
	`129`	`+ catch (Exception ex)`
`136`	`130`	`{`
`137`	`131`	`logger.LogWarning(ex, "Failed to get commits from Github API.");`
`138`		`- return cacheEntry?.Commits ?? Enumerable.Empty<GitCommit>();`
	`132`	`+ return cacheEntry?.Commits ?? [];`
`139`	`133`	`}`
`140`	`134`	`}`
`141`	`135`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ await RebuildDotnetProject(installedPackage.FullPath, csprojName, null)`
`172`	`172`	`public override bool ShouldIgnoreReleases => true;`
`173`	`173`	`public override IEnumerable<TorchIndex> AvailableTorchIndices =>`
`174`	`174`	`[TorchIndex.Cpu, TorchIndex.Cuda, TorchIndex.DirectMl, TorchIndex.Rocm, TorchIndex.Mps];`
`175`		`- public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Advanced;`
	`175`	`+ public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;`
`176`	`176`	`public override IEnumerable<PackagePrerequisite> Prerequisites =>`
`177`	`177`	`[`
`178`	`178`	`PackagePrerequisite.Git,`