Merge pull request LykosAI#993 from ionite34/fixes-n-stuf

update to avalonia 11.2.5 and some packages fixes n stuff

(cherry picked from commit 17f068b)

# Conflicts:
#	CHANGELOG.md
#	StabilityMatrix.Core/Models/Packages/SDWebForge.cs

Author: mohnjiles

CHANGELOG.md

@@ -7,16 +7,94 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 
 ## v2.13.4
 ### Added
+<<<<<<< HEAD
 - Added support for RTX 5000-series GPUs in ComfyUI
 ### Changed
 - Upgraded ComfyUI CUDA torch to 12.6
+=======
+- Added new package - [Stable Diffusion WebUI AMDGPU Forge](https://github.com/lshqqytiger/stable-diffusion-webui-amdgpu-forge)
+- 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
+- (Internal) Updated Avalonia to 11.2.5
+>>>>>>> 17f068b3 (Merge pull request #993 from ionite34/fixes-n-stuf)
 ### 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
+<<<<<<< HEAD
+=======
+- 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
+### Supporters
+#### Visionaries
+- Many thanks to our amazing Visionary-tier Patreon supporters, **Waterclouds**, **TheTekknician**, and **Corey T**! Your unwavering support is very much appreciated!
+
+## v2.14.0-dev.2
+### Added
+- Added Align Your Steps scheduler to Inference
+- Added wildcards to Inference prompts, e.g. `{blue|green|red}` will randomly select one of the colors
+- Added Safetensor Metadata viewer to the Checkpoint Manager context menu - thanks to @genteure!
+### Changed
+- Updated the Civitai Model Browser base model selector to match the new Checkpoint Manager filter UI 
+- FaceDetailers in Inference will now inherit the primary sampler/scheduler/etc. by default. You can still manually set these by enabling the options via the ⚙️ button on the FaceDetailer card
+- Slightly rearranged the FaceDetailer card layout due to the above change
+- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
+- Inference "Extra Networks" selector now filters extra networks based on the selected base model
+- Updated Japanese, Brazilian Portuguese, Chinese, and Russian translations
+### Fixed
+- Fixed crash when dragging & dropping images in Inference (hopefully)
+- Fixed HiresFix Inference addon not inheriting sampler/scheduler properly
+- Fixed some plus (+) buttons getting cut off in the Inference UI
+- Fixed CFG Rescale addon interfering with refiner model in Inference
+- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
+- Fixed issue when parsing index URLs in Python Dependencies Override menu
+- Fixed ComfyUI-Zluda not respecting pip user overrides
+- Fixed issue with Checkpoint Manager not displaying any models
+- (dev.2 re-release) Fixed autocomplete not showing in certain cases when using wildcards
+- (dev.2 re-release) Fixed package restart button not working 
+- (dev.2 re-release) Fixed [#1120](https://github.com/LykosAI/StabilityMatrix/issues/1120) - crash when right clicking in the console after restarting a package
+### Supporters
+#### Visionaries
+- A huge thank you to our incredible Visionary-tier Patreon supporters, **Waterclouds**, **TheTekknician**, and our newest Visionary, **Corey**! Your generous support is greatly appreciated!
+
+## v2.14.0-dev.1
+### Added
+- Added Rescale CFG addon to Inference
+- Added Swap Dimensions button between the width/height input in Inference
+- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
+- Added OpenModelDB tab to the Model Browser
+### Changed
+- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
+- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
+- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
+- Improved image metadata parsing - thanks to @Genteure!
+### Fixed
+- Fixed Inference image selector card buttons taking up the whole height of the card
+- Fixed Inference mask editor failing to paint to the right-most edge on large images
+- Fixed Inference mask editor not showing the entire image in certain circumstances
+- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
+- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
+- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
+### Supporters
+#### Visionaries
+- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
+
+## v2.13.4
+### Changed
+- Upgraded ComfyUI CUDA torch to 12.6
+### 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
+>>>>>>> 17f068b3 (Merge pull request #993 from ionite34/fixes-n-stuf)
 
 ## v2.13.3
 ### Changed

Directory.Build.props

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <AvaloniaVersion>11.2.2</AvaloniaVersion>
+        <AvaloniaVersion>11.2.5</AvaloniaVersion>
     </PropertyGroup>
 
     <PropertyGroup>

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>

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;

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)

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}"

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; }
+}

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,

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -146,10 +146,25 @@ 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();
+<<<<<<< HEAD
         if (torchVersion is TorchIndex.DirectMl)
         {
             pipArgs = pipArgs.WithTorchDirectML();
+=======
+
+        if (isBlackwell && torchVersion is TorchIndex.Cuda)
+        {
+            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"
+                );
+>>>>>>> 17f068b3 (Merge pull request #993 from ionite34/fixes-n-stuf)
         }
         else
         {