Merge branch 'dev' into new-civit-browser

Author: mohnjiles

CHANGELOG.md

@@ -12,14 +12,20 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added setting for Inference dimension step change - the value the dimensions increase or decrease by when using the step buttons or scroll wheel in Inference
 - Added "Install Nunchaku" option to the ComfyUI Package Commands menu
 - Added "Select All" button to the Installed Extensions page
+- Added experimental ROCm pytorch install for ComfyUI (non-Zluda) on Windows - requires a compatible AMD GPU
 ### Changed
 - Redesigned Civitai model details page
 - You can now select release versions when installing ComfyUI
 - You can no longer select branches when installing InvokeAI
 - Updated InvokeAI install to use pinned torch index from release tag
 - Updated ComfyUI installs for AMD users on Linux to use the latest rocm6.3 torch index
+- Updated ComfyUI-Zluda installs to use the newer install-n method (fixes [#1347](https://github.com/LykosAI/StabilityMatrix/issues/1347))
+- Updated uv to 0.8.4
+- Removed disclaimer from reForge since the author is now active again
 ### Fixed
 - Fixed Civitai-generated image parsing in Inference
+- Fixed some first-time setup crashes from missing prerequisites
+- Fixed one-click installer not using default preferred Python version
 
 ## v2.15.0-dev.2
 ### Added

StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs

@@ -27,15 +27,16 @@ namespace StabilityMatrix.Avalonia.Helpers;
 public class UnixPrerequisiteHelper(
     IDownloadService downloadService,
     ISettingsManager settingsManager,
-    IPyRunner pyRunner
+    IPyRunner pyRunner,
+    IPyInstallationManager pyInstallationManager
 ) : IPrerequisiteHelper
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
     private const string UvMacDownloadUrl =
-        "https://github.com/astral-sh/uv/releases/download/0.7.19/uv-aarch64-apple-darwin.tar.gz";
+        "https://github.com/astral-sh/uv/releases/download/0.8.4/uv-aarch64-apple-darwin.tar.gz";
     private const string UvLinuxDownloadUrl =
-        "https://github.com/astral-sh/uv/releases/download/0.7.19/uv-x86_64-unknown-linux-gnu.tar.gz";
+        "https://github.com/astral-sh/uv/releases/download/0.8.4/uv-x86_64-unknown-linux-gnu.tar.gz";
 
     private DirectoryPath HomeDir => settingsManager.LibraryDir;
     private DirectoryPath AssetsDir => HomeDir.JoinDir("Assets");
@@ -81,7 +82,7 @@ private bool IsPythonVersionInstalled(PyVersion version) =>
     private string UvExtractPath => Path.Combine(AssetsDir, "uv");
     public string UvExePath => Path.Combine(UvExtractPath, "uv");
     public bool IsUvInstalled => File.Exists(UvExePath);
-    private string ExpectedUvVersion => "0.7.19";
+    private string ExpectedUvVersion => "0.8.4";
 
     // Helper method to get Python download URL for a specific version
     private RemoteResource GetPythonDownloadResource(PyVersion version)
@@ -105,30 +106,38 @@ private async Task<bool> CheckIsGitInstalled()
         return isGitInstalled == true;
     }
 
-    public Task InstallPackageRequirements(BasePackage package, IProgress<ProgressReport>? progress = null) =>
-        InstallPackageRequirements(package.Prerequisites.ToList(), progress);
+    public Task InstallPackageRequirements(
+        BasePackage package,
+        PyVersion? pyVersion = null,
+        IProgress<ProgressReport>? progress = null
+    ) => InstallPackageRequirements(package.Prerequisites.ToList(), pyVersion, progress);
 
     public async Task InstallPackageRequirements(
         List<PackagePrerequisite> prerequisites,
+        PyVersion? pyVersion = null,
         IProgress<ProgressReport>? progress = null
     )
     {
         await UnpackResourcesIfNecessary(progress);
+        await InstallUvIfNecessary(progress);
 
         if (prerequisites.Contains(PackagePrerequisite.Python310))
         {
             await InstallPythonIfNecessary(PyInstallationManager.Python_3_10_11, progress);
             await InstallVirtualenvIfNecessary(PyInstallationManager.Python_3_10_11, progress);
         }
 
-        if (prerequisites.Contains(PackagePrerequisite.Python31017))
+        if (pyVersion is not null)
         {
-            await InstallPythonIfNecessary(PyInstallationManager.Python_3_10_17, progress);
-            await InstallVirtualenvIfNecessary(PyInstallationManager.Python_3_10_17, progress);
+            if (!await EnsurePythonVersion(pyVersion.Value))
+            {
+                throw new MissingPrerequisiteException(
+                    @"Python",
+                    @$"Python {pyVersion} was not found and/or failed to install. Please check the logs for more details."
+                );
+            }
         }
 
-        await InstallUvIfNecessary(progress);
-
         if (prerequisites.Contains(PackagePrerequisite.Git))
         {
             await InstallGitIfNecessary(progress);
@@ -186,7 +195,6 @@ public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = nu
     {
         await UnpackResourcesIfNecessary(progress);
         await InstallPythonIfNecessary(PyInstallationManager.Python_3_10_11, progress);
-        await InstallPythonIfNecessary(PyInstallationManager.Python_3_10_17, progress);
         await InstallUvIfNecessary(progress);
     }
 
@@ -686,6 +694,12 @@ private async Task<string> GetInstalledUvVersionAsync()
         }
     }
 
+    private async Task<bool> EnsurePythonVersion(PyVersion pyVersion)
+    {
+        var result = await pyInstallationManager.GetInstallationAsync(pyVersion);
+        return result.Exists();
+    }
+
     [UnsupportedOSPlatform("Linux")]
     [UnsupportedOSPlatform("macOS")]
     public Task InstallTkinterIfNecessary(IProgress<ProgressReport>? progress = null)

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -49,7 +49,7 @@ IPyInstallationManager pyInstallationManager
     private const string PythonLibsDownloadUrl = "https://cdn.lykos.ai/python_libs_for_sage.zip";
 
     private const string UvWindowsDownloadUrl =
-        "https://github.com/astral-sh/uv/releases/download/0.7.19/uv-x86_64-pc-windows-msvc.zip";
+        "https://github.com/astral-sh/uv/releases/download/0.8.4/uv-x86_64-pc-windows-msvc.zip";
 
     private string HomeDir => settingsManager.LibraryDir;
 
@@ -115,7 +115,7 @@ private string GetPythonLibraryZipPath(PyVersion version) =>
     private string UvExtractPath => Path.Combine(AssetsDir, "uv");
     public string UvExePath => Path.Combine(UvExtractPath, "uv.exe");
     public bool IsUvInstalled => File.Exists(UvExePath);
-    private string ExpectedUvVersion => "0.7.19";
+    private string ExpectedUvVersion => "0.8.4";
 
     public string GitBinPath => Path.Combine(PortableGitInstallDir, "bin");
     public bool IsVcBuildToolsInstalled => Directory.Exists(VcBuildToolsExistsPath);
@@ -191,8 +191,11 @@ public async Task RunNpm(
         onProcessOutput?.Invoke(ProcessOutput.FromStdErrLine(result.StandardError));
     }
 
-    public Task InstallPackageRequirements(BasePackage package, IProgress<ProgressReport>? progress = null) =>
-        InstallPackageRequirements(package.Prerequisites.ToList(), progress);
+    public Task InstallPackageRequirements(
+        BasePackage package,
+        PyVersion? pyVersion = null,
+        IProgress<ProgressReport>? progress = null
+    ) => InstallPackageRequirements(package.Prerequisites.ToList(), pyVersion, progress);
 
     public async Task InstallUvIfNecessary(IProgress<ProgressReport>? progress = null)
     {
@@ -245,6 +248,7 @@ public async Task InstallUvIfNecessary(IProgress<ProgressReport>? progress = nul
 
     public async Task InstallPackageRequirements(
         List<PackagePrerequisite> prerequisites,
+        PyVersion? pyVersion = null,
         IProgress<ProgressReport>? progress = null
     )
     {
@@ -262,6 +266,17 @@ public async Task InstallPackageRequirements(
             await InstallVirtualenvIfNecessary(PyInstallationManager.Python_3_10_11, progress);
         }
 
+        if (pyVersion is not null)
+        {
+            if (!await EnsurePythonVersion(pyVersion.Value))
+            {
+                throw new MissingPrerequisiteException(
+                    @"Python",
+                    @$"Python {pyVersion} was not found and/or failed to install. Please check the logs for more details."
+                );
+            }
+        }
+
         if (prerequisites.Contains(PackagePrerequisite.Git))
         {
             await InstallGitIfNecessary(progress);
@@ -287,10 +302,10 @@ public async Task InstallPackageRequirements(
             await InstallTkinterIfNecessary(PyInstallationManager.Python_3_10_11, progress);
         }
 
-        if (prerequisites.Contains(PackagePrerequisite.VcBuildTools))
-        {
-            await InstallVcBuildToolsIfNecessary(progress);
-        }
+        // if (prerequisites.Contains(PackagePrerequisite.VcBuildTools))
+        // {
+        //     await InstallVcBuildToolsIfNecessary(progress);
+        // }
     }
 
     public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = null)
@@ -1051,4 +1066,10 @@ private async Task<string> GetInstalledUvVersionAsync()
             return string.Empty;
         }
     }
+
+    private async Task<bool> EnsurePythonVersion(PyVersion pyVersion)
+    {
+        var result = await pyInstallationManager.GetInstallationAsync(pyVersion);
+        return result.Exists();
+    }
 }

StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs

@@ -115,15 +115,12 @@ private async Task InstallPackage(BasePackage selectedPackage)
         OnPrimaryButtonClick();
 
         var installLocation = Path.Combine(settingsManager.LibraryDir, "Packages", selectedPackage.Name);
+        var recommendedPython = selectedPackage.RecommendedPythonVersion;
 
         var steps = new List<IPackageStep>
         {
             new SetPackageInstallingStep(settingsManager, selectedPackage.Name),
-            new SetupPrerequisitesStep(
-                prerequisiteHelper,
-                selectedPackage,
-                PyInstallationManager.Python_3_10_17
-            )
+            new SetupPrerequisitesStep(prerequisiteHelper, selectedPackage, recommendedPython),
         };
 
         // get latest version & download & install
@@ -160,7 +157,8 @@ private async Task InstallPackage(BasePackage selectedPackage)
             LastUpdateCheck = DateTimeOffset.Now,
             PreferredTorchIndex = torchVersion,
             PreferredSharedFolderMethod = recommendedSharedFolderMethod,
-            PythonVersion = PyInstallationManager.Python_3_10_17.StringValue
+            UseSharedOutputFolder = selectedPackage.SharedOutputFolders is { Count: > 0 },
+            PythonVersion = recommendedPython.StringValue,
         };
 
         var downloadStep = new DownloadPackageVersionStep(
@@ -181,7 +179,7 @@ private async Task InstallPackage(BasePackage selectedPackage)
             {
                 SharedFolderMethod = recommendedSharedFolderMethod,
                 VersionOptions = downloadVersion,
-                PythonOptions = { TorchIndex = torchVersion }
+                PythonOptions = { TorchIndex = torchVersion, PythonVersion = recommendedPython },
             }
         );
         steps.Add(installStep);
@@ -203,7 +201,7 @@ private async Task InstallPackage(BasePackage selectedPackage)
         {
             ShowDialogOnStart = false,
             HideCloseButton = false,
-            ModificationCompleteMessage = $"{selectedPackage.DisplayName} installed successfully"
+            ModificationCompleteMessage = $"{selectedPackage.DisplayName} installed successfully",
         };
 
         runner

StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs

@@ -522,8 +522,13 @@ public async Task ShowUpdateDialog()
 
     private async Task ShowMigrationTipIfNecessaryAsync()
     {
-        if (settingsManager.Settings.SeenTeachingTips.Contains(TeachingTip.SharedFolderMigrationTip))
+        if (
+            settingsManager.Settings.SeenTeachingTips.Contains(TeachingTip.SharedFolderMigrationTip)
+            || settingsManager.Settings.InstalledPackages.Count == 0
+        )
+        {
             return;
+        }
 
         var folderReference = DialogHelper.CreateMarkdownDialog(MarkdownSnippets.SharedFolderMigration);
         folderReference.CloseButtonText = Resources.Action_OK;

StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallDetailViewModel.cs

@@ -123,6 +123,7 @@ public override async Task OnLoadedAsync()
         SelectedSharedFolderMethod = SelectedPackage.RecommendedSharedFolderMethod;
 
         // Initialize Python versions
+        await prerequisiteHelper.UnpackResourcesIfNecessary();
         await prerequisiteHelper.InstallUvIfNecessary();
         var pythonVersions = await pyInstallationManager.GetAllAvailablePythonsAsync();
         AvailablePythonVersions = new ObservableCollection<UvPythonInfo>(pythonVersions);

StabilityMatrix.Core/Helper/HardwareInfo/GpuInfo.cs

@@ -60,9 +60,61 @@ public bool IsLegacyNvidiaGpu()
         return ComputeCapabilityValue < 7.5m;
     }
 
+    public bool IsWindowsRocmSupportedGpu()
+    {
+        var gfx = GetAmdGfxArch();
+        if (gfx is null)
+            return false;
+
+        return gfx.StartsWith("gfx110") || gfx.StartsWith("gfx120") || gfx.Equals("gfx1151");
+    }
+
     public bool IsAmd => Name?.Contains("amd", StringComparison.OrdinalIgnoreCase) ?? false;
     public bool IsIntel => Name?.Contains("arc", StringComparison.OrdinalIgnoreCase) ?? false;
 
+    public string? GetAmdGfxArch()
+    {
+        if (!IsAmd || string.IsNullOrWhiteSpace(Name))
+            return null;
+
+        var name = Name.ToLowerInvariant();
+
+        if (name.Contains("9070") || name.Contains("R9700"))
+            return "gfx1201";
+
+        if (name.Contains("9060"))
+            return "gfx1200";
+
+        if (name.Contains("z2") || name.Contains("880m") || name.Contains("8050s") || name.Contains("8060s"))
+            return "gfx1151";
+
+        if (name.Contains("740m") || name.Contains("760m") || name.Contains("780m") || name.Contains("z1"))
+            return "gfx1103";
+
+        if (
+            name.Contains("w7400")
+            || name.Contains("w7500")
+            || name.Contains("w7600")
+            || name.Contains("7500 xt")
+            || name.Contains("7600")
+            || name.Contains("7650 gre")
+            || name.Contains("7700s")
+        )
+            return "gfx1102";
+
+        if (
+            name.Contains("v710")
+            || name.Contains("7700")
+            || (name.Contains("7800") && !name.Contains("w7800"))
+        )
+            return "gfx1101";
+
+        if (name.Contains("w7800") || name.Contains("7900") || name.Contains("7950") || name.Contains("7990"))
+            return "gfx1100";
+
+        return null;
+    }
+
     public virtual bool Equals(GpuInfo? other)
     {
         if (other is null)

StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs

@@ -281,13 +281,22 @@ public static bool HasAmdGpu()
         return IterGpuInfo().Any(gpu => gpu.IsAmd);
     }
 
+    public static bool HasWindowsRocmSupportedGpu() =>
+        IterGpuInfo().Any(gpu => gpu is { IsAmd: true, Name: not null } && gpu.IsWindowsRocmSupportedGpu());
+
+    public static GpuInfo? GetWindowsRocmSupportedGpu()
+    {
+        return IterGpuInfo().FirstOrDefault(gpu => gpu.IsWindowsRocmSupportedGpu());
+    }
+
     public static bool HasIntelGpu() => IterGpuInfo().Any(gpu => gpu.IsIntel);
 
     // Set ROCm for default if AMD and Linux
     public static bool PreferRocm() => !HasNvidiaGpu() && HasAmdGpu() && Compat.IsLinux;
 
     // Set DirectML for default if AMD and Windows
-    public static bool PreferDirectMLOrZluda() => !HasNvidiaGpu() && HasAmdGpu() && Compat.IsWindows;
+    public static bool PreferDirectMLOrZluda() =>
+        !HasNvidiaGpu() && HasAmdGpu() && Compat.IsWindows && !HasWindowsRocmSupportedGpu();
 
     private static readonly Lazy<bool> IsMemoryInfoAvailableLazy = new(() => TryGetMemoryInfo(out _));
     public static bool IsMemoryInfoAvailable => IsMemoryInfoAvailableLazy.Value;

StabilityMatrix.Core/Helper/IPrerequisiteHelper.cs

@@ -191,9 +191,14 @@ Task RunNpm(
         IReadOnlyDictionary<string, string>? envVars = null
     );
     Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = null);
-    Task InstallPackageRequirements(BasePackage package, IProgress<ProgressReport>? progress = null);
+    Task InstallPackageRequirements(
+        BasePackage package,
+        PyVersion? pyVersion = null,
+        IProgress<ProgressReport>? progress = null
+    );
     Task InstallPackageRequirements(
         List<PackagePrerequisite> prerequisites,
+        PyVersion? pyVersion = null,
         IProgress<ProgressReport>? progress = null
     );
 

StabilityMatrix.Core/Models/PackageModification/SetupPrerequisitesStep.cs

@@ -13,7 +13,9 @@ public class SetupPrerequisitesStep(
 {
     public async Task ExecuteAsync(IProgress<ProgressReport>? progress = null)
     {
-        await prerequisiteHelper.InstallPackageRequirements(package, progress).ConfigureAwait(false);
+        await prerequisiteHelper
+            .InstallPackageRequirements(package, pythonVersion, progress)
+            .ConfigureAwait(false);
     }
 
     public string ProgressTitle => "Installing prerequisites...";