Merge branch 'dev' into fix-inference-inherit-addons

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Fixed
 - Fixed Inference HiresFix module "Inherit Primary Sampler Addons" setting not effectively disabling when unchecked
 - Fix model download location options for VAEs in the CivitAI Model Browser
+- Fixed model download location options for VAEs in the CivitAI Model Browser
+- Fixed crash on startup when library directory is not set
+- Fixed One-Click install progress dialog not disappearing after completion
+- Fixed ComfyUI with Inference pop-up during one-click install appearing below the visible scroll area
+- Fixed no packages being available for one-click install on PCs without a GPU
 
 ## v2.10.0-dev.2
 ### Added

StabilityMatrix.Avalonia/DesignData/DesignData.cs

@@ -417,7 +417,8 @@ public static class DesignData
                 new PackageInstallProgressItemViewModel(
                     new PackageModificationRunner
                     {
-                        CurrentProgress = new ProgressReport(0.5f, "Installing package...")
+                        CurrentProgress = new ProgressReport(0.5f, "Installing package..."),
+                        ModificationCompleteMessage = "Package installed successfully"
                     }
                 )
             }

StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs

@@ -75,7 +75,7 @@ public partial class NewOneClickInstallViewModel : ContentDialogViewModelBase
             .Connect()
             .DeferUntilLoaded()
             .Filter(incompatiblePredicate)
-            .Filter(p => p.OfferInOneClickInstaller || ShowIncompatiblePackages)
+            .Filter(p => p.OfferInOneClickInstaller)
             .Sort(
                 SortExpressionComparer<BasePackage>
                     .Ascending(p => p.InstallerSortOrder)
@@ -85,6 +85,10 @@ public partial class NewOneClickInstallViewModel : ContentDialogViewModelBase
             .Subscribe();
 
         AllPackagesCache.AddOrUpdate(packageFactory.GetAllAvailablePackages());
+        if (ShownPackages.Count > 0)
+            return;
+
+        ShowIncompatiblePackages = true;
     }
 
     [RelayCommand]
@@ -182,6 +186,7 @@ public partial class NewOneClickInstallViewModel : ContentDialogViewModelBase
                     {
                         ShowDialogOnStart = false,
                         HideCloseButton = false,
+                        ModificationCompleteMessage = $"{installedPackage.DisplayName} Install Complete",
                     };
 
                     runner

StabilityMatrix.Avalonia/ViewModels/Dialogs/OneClickInstallViewModel.cs

@@ -192,7 +192,12 @@ public partial class OneClickInstallViewModel : ContentDialogViewModelBase
         var addInstalledPackageStep = new AddInstalledPackageStep(settingsManager, installedPackage);
         steps.Add(addInstalledPackageStep);
 
-        var runner = new PackageModificationRunner { ShowDialogOnStart = true, HideCloseButton = true, };
+        var runner = new PackageModificationRunner
+        {
+            ShowDialogOnStart = true,
+            HideCloseButton = true,
+            ModificationCompleteMessage = "Install complete"
+        };
         EventManager.Instance.OnPackageInstallProgressAdded(runner);
         await runner.ExecuteSteps(steps);
 

StabilityMatrix.Avalonia/ViewModels/PackageManagerViewModel.cs

@@ -120,7 +120,7 @@ public partial class PackageManagerViewModel : PageViewModelBase
 
     public override async Task OnLoadedAsync()
     {
-        if (Design.IsDesignMode)
+        if (Design.IsDesignMode || !settingsManager.IsLibraryDirSet)
             return;
 
         installedPackages.EditDiff(settingsManager.Settings.InstalledPackages, InstalledPackage.Comparer);

StabilityMatrix.Avalonia/Views/Dialogs/NewOneClickInstallDialog.axaml

@@ -62,6 +62,27 @@
                                        VerticalAlignment="Top">
 
                                         <controls:Card.Styles>
+                                            <Style Selector="controls|Card[Tag=ReallyRecommended]">
+                                                <Setter Property="Background"
+                                                        Value="{DynamicResource ThemeGreenColorTransparent}" />
+                                                <Setter Property="BorderBrush"
+                                                        Value="{DynamicResource ThemeGreenColorTransparent}" />
+                                                <Style
+                                                    Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                                                    <Setter Property="Foreground"
+                                                            Value="{DynamicResource ButtonForeground}" />
+                                                </Style>
+                                                <Setter Property="Content">
+                                                    <Template>
+                                                        <TextBlock
+                                                            FontWeight="Medium"
+                                                            HorizontalAlignment="Center"
+                                                            Text="Recommended"
+                                                            TextAlignment="Center"
+                                                            VerticalAlignment="Center" />
+                                                    </Template>
+                                                </Setter>
+                                            </Style>
                                             <Style Selector="controls|Card[Tag=Recommended]">
                                                 <Setter Property="Background"
                                                         Value="{DynamicResource ThemeGreenColorTransparent}" />
@@ -117,6 +138,24 @@
                                                     </Template>
                                                 </Setter>
                                             </Style>
+                                            <Style Selector="controls|Card[Tag=InferenceCompatible]">
+                                                <Setter Property="Background"
+                                                        Value="{DynamicResource ThemePurpleColor}" />
+                                                <Setter Property="BorderBrush"
+                                                        Value="{DynamicResource ThemePurpleColor}" />
+                                                <Setter Property="Foreground"
+                                                        Value="White" />
+                                                <Setter Property="Content">
+                                                    <Template>
+                                                        <TextBlock
+                                                            FontWeight="Medium"
+                                                            HorizontalAlignment="Center"
+                                                            Text="Inference Compatible"
+                                                            TextAlignment="Center"
+                                                            VerticalAlignment="Center" />
+                                                    </Template>
+                                                </Setter>
+                                            </Style>
                                             <Style Selector="controls|Card">
                                                 <Setter Property="Background"
                                                         Value="{DynamicResource ThemeDarkRedColor}" />

StabilityMatrix.Avalonia/Views/MainWindow.axaml

@@ -14,8 +14,8 @@
                         d:DataContext="{x:Static mocks:DesignData.MainWindowViewModel}"
                         x:DataType="vm:MainWindowViewModel"
                         Icon="/Assets/Icon.ico"
-                        Width="1100"
-                        Height="750"
+                        Width="1300"
+                        Height="950"
                         BackRequested="TopLevel_OnBackRequested"
                         Title="Stability Matrix"
                         DockProperties.IsDragEnabled="True" 

StabilityMatrix.Core/Models/PackageDifficulty.cs

@@ -2,11 +2,13 @@
 
 public enum PackageDifficulty
 {
+    ReallyRecommended = -1,
     Recommended = 0,
-    Simple = 1,
-    Advanced = 2,
-    Expert = 3,
-    Nightmare = 4,
-    UltraNightmare = 5,
+    InferenceCompatible = 1,
+    Simple = 2,
+    Advanced = 3,
+    Expert = 4,
+    Nightmare = 5,
+    UltraNightmare = 6,
     Impossible = 999
 }

StabilityMatrix.Core/Models/PackageModification/IPackageModificationRunner.cs

@@ -32,7 +32,7 @@ public interface IPackageModificationRunner
 
     string? ModificationCompleteTitle { get; init; }
 
-    string? ModificationCompleteMessage { get; init; }
+    string ModificationCompleteMessage { get; init; }
 
     string? ModificationFailedTitle { get; init; }
 

StabilityMatrix.Core/Models/PackageModification/PackageModificationRunner.cs

@@ -80,7 +80,7 @@ public class PackageModificationRunner : IPackageModificationRunner
 
     public string? ModificationCompleteTitle { get; init; } = "Install Complete";
 
-    public string? ModificationCompleteMessage { get; init; }
+    public required string ModificationCompleteMessage { get; init; }
 
     public string? ModificationFailedTitle { get; init; } = "Install Failed";
 

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -43,7 +43,7 @@ public class ComfyUI(
     public override bool ShouldIgnoreReleases => true;
     public override bool IsInferenceCompatible => true;
     public override string OutputFolderName => "output";
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Advanced;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.InferenceCompatible;
 
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Configuration;
 

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -39,6 +39,8 @@ public class SDWebForge(
     public override bool ShouldIgnoreReleases => true;
     public override IPackageExtensionManager ExtensionManager => null;
     public override string OutputFolderName => "output";
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.ReallyRecommended;
+
     public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
         new()
         {