Merge pull request LykosAI#995 from ionite34/backport/main/pr-993

mohnjiles · web-flow · commit 8351c0356797 · 2025-03-02T17:09:38.000-08:00
[dev to main] backport: update to avalonia 11.2.5 and some packages fixes n stuff (993)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,17 +7,22 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
   
 ## v2.13.4
 ### Added
-- Added support for RTX 5000-series GPUs in ComfyUI
+- Added support for RTX 5000-series GPUs in ComfyUI, Forge, and reForge
+- Added "Rebuild .NET Project" command to SwarmUI installs - available via the 3-dots menu -> Package Commands -> Rebuild .NET Project
 ### Changed
 - Upgraded ComfyUI CUDA torch to 12.6
-- Upgraded Lykos account connection to use OAuth 2.0 device flow 
+- Upgraded Lykos account connection to use OAuth 2.0 device flow
+- (Internal) Updated Avalonia to 11.2.5
 ### Fixed
 - Fixed [#1128](https://github.com/LykosAI/StabilityMatrix/issues/1128) - overwriting models when downloading multiple with the same name
 - Fixed ROCm torch indexes for ComfyUI & Forge
 - Fixed model browser sometimes downloading to `ModelsLora` or `ModelsStableDiffusion` folders instead of the correct folder
 - Fixed incorrect Unet folder path for ComfyUI users on Linux/macOS
 - Fixed [#1157](https://github.com/LykosAI/StabilityMatrix/issues/1157) - crash when broken symlinks exist in model directories
 - Fixed [#1154](https://github.com/LykosAI/StabilityMatrix/issues/1154) - increased width for package name on the package cards
+- Fixed ComfyUI-Zluda not being recognized as an option for Inference or SwarmUI
+- Fixed SwarmUI showing Python options in the 3-dots menu
+- Fixed SD.Next install failures in certain cases when using Zluda
 
 ## v2.13.3
 ### Changed
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
     </PropertyGroup>
     
     <PropertyGroup>
-        <AvaloniaVersion>11.2.2</AvaloniaVersion>
+        <AvaloniaVersion>11.2.5</AvaloniaVersion>
     </PropertyGroup>
     
     <PropertyGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -127,4 +127,4 @@
     <PackageVersion Include="xunit" Version="2.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/InferenceConnectionHelpViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/InferenceConnectionHelpViewModel.cs
@@ -70,7 +70,7 @@ RunningPackageService runningPackageService
 
         // Get comfy type installed packages
         var comfyPackages = this.settingsManager.Settings.InstalledPackages.Where(
-            p => p.PackageName == "ComfyUI"
+            p => p.PackageName is "ComfyUI" or "ComfyUI-Zluda"
         )
             .ToImmutableArray();
 
@@ -88,7 +88,7 @@ RunningPackageService runningPackageService
             // Use active package if its comfy, otherwise use the first comfy type
             if (
                 this.settingsManager.Settings.ActiveInstalledPackage is
-                { PackageName: "ComfyUI" } activePackage
+                { PackageName: "ComfyUI" or "ComfyUI-Zluda" } activePackage
             )
             {
                 SelectedPackage = activePackage;
diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs
@@ -102,6 +102,15 @@ RunningPackageService runningPackageService
     [ObservableProperty]
     private bool dontCheckForUpdates;
 
+    [ObservableProperty]
+    private bool usesVenv;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowExtraCommands))]
+    private List<ExtraPackageCommand>? extraCommands;
+
+    public bool ShowExtraCommands => ExtraCommands is { Count: > 0 };
+
     private void RunningPackagesOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
         if (runningPackageService.RunningPackages.Select(x => x.Value) is not { } runningPackages)
@@ -141,7 +150,7 @@ partial void OnPackageChanged(InstalledPackage? value)
         {
             IsUnknownPackage = false;
 
-            var basePackage = packageFactory[value.PackageName];
+            var basePackage = packageFactory[value.PackageName!];
             CardImageSource = basePackage?.PreviewImageUri ?? Assets.NoImage;
             InstalledVersion = value.Version?.DisplayVersion ?? "Unknown";
             CanUseConfigMethod =
@@ -152,6 +161,11 @@ partial void OnPackageChanged(InstalledPackage? value)
             CanUseSharedOutput = basePackage?.SharedOutputFolders != null;
             CanUseExtensions = basePackage?.SupportsExtensions ?? false;
             DontCheckForUpdates = Package?.DontCheckForUpdates ?? false;
+            UsesVenv = basePackage?.UsesVenv ?? true;
+
+            // Set the extra commands if available from the package
+            var packageExtraCommands = basePackage?.GetExtraCommands();
+            ExtraCommands = packageExtraCommands?.Count > 0 ? packageExtraCommands : null;
 
             runningPackageService.RunningPackages.CollectionChanged += RunningPackagesOnCollectionChanged;
             EventManager.Instance.PackageRelaunchRequested += InstanceOnPackageRelaunchRequested;
@@ -787,6 +801,39 @@ private async Task ShowLaunchOptions()
         }
     }
 
+    [RelayCommand]
+    private async Task ExecuteExtraCommand(string commandName)
+    {
+        var command = ExtraCommands?.FirstOrDefault(cmd => cmd.CommandName == commandName);
+        if (command == null)
+            return;
+
+        Text = $"Executing {commandName}...";
+        IsIndeterminate = true;
+        Value = -1;
+
+        try
+        {
+            await command.Command(Package!);
+            notificationService.Show("Command executed successfully", commandName, NotificationType.Success);
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Error executing command {CommandName}", commandName);
+            notificationService.ShowPersistent(
+                $"Error during {commandName} operation",
+                ex.Message,
+                NotificationType.Error
+            );
+        }
+        finally
+        {
+            Text = "";
+            IsIndeterminate = false;
+            Value = 0;
+        }
+    }
+
     private async Task<bool> HasUpdate()
     {
         if (Package == null || IsUnknownPackage || Design.IsDesignMode || Package.DontCheckForUpdates)
diff --git a/StabilityMatrix.Avalonia/Views/PackageManager/MainPackageManagerView.axaml b/StabilityMatrix.Avalonia/Views/PackageManager/MainPackageManagerView.axaml
@@ -6,10 +6,13 @@
     xmlns:converters="clr-namespace:StabilityMatrix.Avalonia.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:designData="clr-namespace:StabilityMatrix.Avalonia.DesignData"
+    xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Runtime"
     xmlns:icons="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
+    xmlns:input="clr-namespace:FluentAvalonia.UI.Input;assembly=FluentAvalonia"
     xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
     xmlns:markupExtensions="clr-namespace:StabilityMatrix.Avalonia.MarkupExtensions"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
     xmlns:packageManager="clr-namespace:StabilityMatrix.Avalonia.ViewModels.PackageManager"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:vendorLabs="clr-namespace:StabilityMatrix.Avalonia.Controls.VendorLabs"
@@ -160,15 +163,15 @@
                                                 <MenuItem
                                                     Command="{Binding OpenPythonPackagesDialogCommand}"
                                                     Header="{x:Static lang:Resources.Label_PythonPackages}"
-                                                    IsVisible="{Binding !IsUnknownPackage}">
+                                                    IsVisible="{Binding UsesVenv}">
                                                     <MenuItem.Icon>
                                                         <icons:Icon Value="fa-brands fa-python" />
                                                     </MenuItem.Icon>
                                                 </MenuItem>
                                                 <MenuItem
                                                     Command="{Binding OpenPythonDependenciesOverrideDialogCommand}"
                                                     Header="{x:Static lang:Resources.Label_PythonDependenciesOverride_Title}"
-                                                    IsVisible="{Binding !IsUnknownPackage}">
+                                                    IsVisible="{Binding UsesVenv}">
                                                     <MenuItem.Icon>
                                                         <icons:Icon Value="fa-solid fa-bandage" />
                                                     </MenuItem.Icon>
@@ -268,6 +271,34 @@
 
                                                 <Separator IsVisible="{Binding !IsUnknownPackage}" />
 
+                                                <!--  Package-specific extra commands section  -->
+                                                <MenuItem
+                                                    Classes="SubItems"
+                                                    Header="Package Commands"
+                                                    IsVisible="{Binding ShowExtraCommands}">
+                                                    <MenuItem.Resources>
+                                                        <input:StandardUICommand x:Key="ExecuteExtraCommandCommand" Command="{Binding ExecuteExtraCommandCommand}" />
+                                                    </MenuItem.Resources>
+
+                                                    <MenuItem.Icon>
+                                                        <icons:Icon Value="fa-solid fa-toolbox" />
+                                                    </MenuItem.Icon>
+
+                                                    <MenuItem.ItemsSource>
+                                                        <Binding Path="ExtraCommands" />
+                                                    </MenuItem.ItemsSource>
+
+                                                    <MenuItem.Styles>
+                                                        <Style x:DataType="models:ExtraPackageCommand" Selector="MenuItem.SubItems MenuItem">
+                                                            <Setter Property="Header" Value="{Binding CommandName}" />
+                                                            <Setter Property="Command" Value="{StaticResource ExecuteExtraCommandCommand}" />
+                                                            <Setter Property="CommandParameter" Value="{Binding CommandName}" />
+                                                        </Style>
+                                                    </MenuItem.Styles>
+                                                </MenuItem>
+
+                                                <Separator IsVisible="{Binding ShowExtraCommands}" />
+
                                                 <MenuItem
                                                     Command="{Binding Uninstall}"
                                                     Header="{x:Static lang:Resources.Action_Uninstall}"
diff --git a/StabilityMatrix.Core/Models/ExtraPackageCommand.cs b/StabilityMatrix.Core/Models/ExtraPackageCommand.cs
@@ -0,0 +1,7 @@
+﻿namespace StabilityMatrix.Core.Models;
+
+public class ExtraPackageCommand
+{
+    public required string CommandName { get; set; }
+    public required Func<InstalledPackage, Task> Command { get; set; }
+}
diff --git a/StabilityMatrix.Core/Models/Packages/BasePackage.cs b/StabilityMatrix.Core/Models/Packages/BasePackage.cs
@@ -53,6 +53,13 @@ public abstract class BasePackage(ISettingsManager settingsManager)
     public abstract PackageDifficulty InstallerSortOrder { get; }
 
     public virtual PackageType PackageType => PackageType.SdInference;
+    public virtual bool UsesVenv => true;
+
+    /// <summary>
+    /// Returns a list of extra commands that can be executed for this package.
+    /// The function takes an InstalledPackage parameter to operate on a specific installation.
+    /// </summary>
+    public virtual List<ExtraPackageCommand> GetExtraCommands() => [];
 
     public abstract Task DownloadPackage(
         string installLocation,
diff --git a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs
@@ -146,10 +146,19 @@ public override async Task InstallPackage(
 
         var pipArgs = new PipInstallArgs("setuptools==69.5.1");
 
+        var isBlackwell =
+            SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu();
         var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
-        if (torchVersion is TorchIndex.DirectMl)
+
+        if (isBlackwell && torchVersion is TorchIndex.Cuda)
         {
-            pipArgs = pipArgs.WithTorchDirectML();
+            pipArgs = pipArgs
+                .AddArg(
+                    "https://huggingface.co/w-e-w/torch-2.6.0-cu128.nv/resolve/main/torch-2.6.0%2Bcu128.nv-cp310-cp310-win_amd64.whl"
+                )
+                .AddArg(
+                    "https://huggingface.co/w-e-w/torch-2.6.0-cu128.nv/resolve/main/torchvision-0.20.0a0%2Bcu128.nv-cp310-cp310-win_amd64.whl"
+                );
         }
         else
         {
diff --git a/StabilityMatrix.Core/Models/Packages/StableSwarm.cs b/StabilityMatrix.Core/Models/Packages/StableSwarm.cs
@@ -42,6 +42,32 @@ IPrerequisiteHelper prerequisiteHelper
         [SharedFolderMethod.Symlink, SharedFolderMethod.Configuration, SharedFolderMethod.None];
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Configuration;
     public override bool OfferInOneClickInstaller => false;
+    public override bool UsesVenv => false;
+
+    public override List<ExtraPackageCommand> GetExtraCommands() =>
+        [
+            new()
+            {
+                CommandName = "Rebuild .NET Project",
+                Command = async installedPackage =>
+                {
+                    if (installedPackage == null || string.IsNullOrEmpty(installedPackage.FullPath))
+                    {
+                        throw new InvalidOperationException("Package not found or not installed correctly");
+                    }
+
+                    var srcFolder = Path.Combine(installedPackage.FullPath, "src");
+                    var csprojName = "StableSwarmUI.csproj";
+                    if (File.Exists(Path.Combine(srcFolder, "SwarmUI.csproj")))
+                    {
+                        csprojName = "SwarmUI.csproj";
+                    }
+
+                    await RebuildDotnetProject(installedPackage.FullPath, csprojName, null)
+                        .ConfigureAwait(false);
+                }
+            }
+        ];
 
     public override List<LaunchOptionDefinition> LaunchOptions =>
         [
@@ -135,7 +161,7 @@ public override async Task InstallPackage(
         progress?.Report(new ProgressReport(-1f, "Installing SwarmUI...", isIndeterminate: true));
 
         var comfy = settingsManager.Settings.InstalledPackages.FirstOrDefault(
-            x => x.PackageName == nameof(ComfyUI)
+            x => x.PackageName is nameof(ComfyUI) or "ComfyUI-Zluda"
         );
 
         if (comfy == null)
@@ -233,16 +259,45 @@ await prerequisiteHelper
                     .Where(arg => !string.IsNullOrWhiteSpace(arg))
             );
 
-            dataSection.Set(
-                "settings",
-                new ComfyUiSelfStartSettings
-                {
-                    StartScript = $"../{comfy.DisplayName}/main.py",
-                    DisableInternalArgs = false,
-                    AutoUpdate = false,
-                    ExtraArgs = comfyArgs
-                }.Save(true)
-            );
+            if (comfy.PackageName == "ComfyUI-Zluda")
+            {
+                var fullComfyZludaPath = Path.Combine(SettingsManager.LibraryDir, comfy.LibraryPath);
+                var zludaPath = Path.Combine(fullComfyZludaPath, "zluda", "zluda.exe");
+                var comfyVenvPath = Path.Combine(
+                    fullComfyZludaPath,
+                    "venv",
+                    Compat.Switch(
+                        (PlatformKind.Windows, Path.Combine("Scripts", "python.exe")),
+                        (PlatformKind.Unix, Path.Combine("bin", "python3"))
+                    )
+                );
+
+                ProcessArgs args = ["--", comfyVenvPath, "main.py", comfyArgs];
+
+                dataSection.Set(
+                    "settings",
+                    new ComfyUiSelfStartSettings
+                    {
+                        StartScript = zludaPath,
+                        DisableInternalArgs = false,
+                        AutoUpdate = false,
+                        ExtraArgs = args
+                    }.Save(true)
+                );
+            }
+            else
+            {
+                dataSection.Set(
+                    "settings",
+                    new ComfyUiSelfStartSettings
+                    {
+                        StartScript = $"../{comfy.DisplayName}/main.py",
+                        DisableInternalArgs = false,
+                        AutoUpdate = false,
+                        ExtraArgs = comfyArgs
+                    }.Save(true)
+                );
+            }
 
             backendsFile.Set("0", dataSection);
             backendsFile.SaveToFile(GetBackendsPath(installLocation));
@@ -385,6 +440,29 @@ await dotnetProcess
         GC.SuppressFinalize(this);
     }
 
+    public async Task RebuildDotnetProject(
+        string installLocation,
+        string csprojName,
+        Action<ProcessOutput>? onConsoleOutput
+    )
+    {
+        await prerequisiteHelper
+            .RunDotnet(
+                [
+                    "build",
+                    $"src/{csprojName}",
+                    "--no-incremental",
+                    "--configuration",
+                    "Release",
+                    "-o",
+                    "src/bin/live_release"
+                ],
+                workingDirectory: installLocation,
+                onProcessOutput: onConsoleOutput
+            )
+            .ConfigureAwait(false);
+    }
+
     private Task SetupModelFoldersConfig(DirectoryPath installDirectory)
     {
         var settingsPath = GetSettingsPath(installDirectory);
diff --git a/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs b/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs
@@ -201,6 +201,8 @@ public override async Task InstallPackage(
         // Setup venv
         await using var venvRunner = await SetupVenvPure(installLocation).ConfigureAwait(false);
 
+        await venvRunner.PipInstall("numpy==1.26.4").ConfigureAwait(false);
+
         if (installedPackage.PipOverrides != null)
         {
             var pipArgs = new PipInstallArgs().WithUserOverrides(installedPackage.PipOverrides);

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ RunningPackageService runningPackageService`
`70`	`70`
`71`	`71`	`// Get comfy type installed packages`
`72`	`72`	`var comfyPackages = this.settingsManager.Settings.InstalledPackages.Where(`
`73`		`- p => p.PackageName == "ComfyUI"`
	`73`	`+ p => p.PackageName is "ComfyUI" or "ComfyUI-Zluda"`
`74`	`74`	`)`
`75`	`75`	`.ToImmutableArray();`
`76`	`76`
`@@ -88,7 +88,7 @@ RunningPackageService runningPackageService`
`88`	`88`	`// Use active package if its comfy, otherwise use the first comfy type`
`89`	`89`	`if (`
`90`	`90`	`this.settingsManager.Settings.ActiveInstalledPackage is`
`91`		`- { PackageName: "ComfyUI" } activePackage`
	`91`	`+ { PackageName: "ComfyUI" or "ComfyUI-Zluda" } activePackage`
`92`	`92`	`)`
`93`	`93`	`{`
`94`	`94`	`SelectedPackage = activePackage;`