Merge pull request #512 from LykosAI/main

v2.9.1

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.9.1
+### Added
+- Fixed [#498](https://github.com/LykosAI/StabilityMatrix/issues/498) Added "Pony" category to CivitAI Model Browser
+### Changed
+- Changed package deletion warning dialog to require additional confirmation
+### Fixed
+- Fixed [#502](https://github.com/LykosAI/StabilityMatrix/issues/502) - missing launch options for Forge
+- Fixed [#500](https://github.com/LykosAI/StabilityMatrix/issues/500) - missing output images in Forge when using output sharing
+- Fixed [#490](https://github.com/LykosAI/StabilityMatrix/issues/490) - `mpmath has no attribute 'rational'` error on macOS
+- Fixed incorrect progress text when deleting a checkpoint from the Checkpoints page
+- Fixed incorrect icon colors on macOS
+
 ## v2.9.0
 ### Added
 - Added new package: [StableSwarmUI](https://github.com/Stability-AI/StableSwarmUI) by Stability AI

StabilityMatrix.Avalonia/Languages/Resources.resx

@@ -975,4 +975,49 @@
   <data name="Label_Config" xml:space="preserve">
     <value>Config</value>
   </data>
+  <data name="Action_PreviewPreprocessor" xml:space="preserve">
+    <value>Preview Preprocessor</value>
+  </data>
+  <data name="Label_ToggleAutoScrolling" xml:space="preserve">
+    <value>Auto-Scroll to End</value>
+  </data>
+  <data name="Label_ConfirmExit" xml:space="preserve">
+    <value>Confirm Exit</value>
+  </data>
+  <data name="Label_ConfirmExitDetail" xml:space="preserve">
+    <value>Are you sure you want to exit? This will also close any currently running packages.</value>
+  </data>
+  <data name="Label_Console" xml:space="preserve">
+    <value>Console</value>
+  </data>
+  <data name="Label_WebUi" xml:space="preserve">
+    <value>Web UI</value>
+  </data>
+  <data name="Label_Packages" xml:space="preserve">
+    <value>Packages</value>
+  </data>
+  <data name="Label_ActionCannotBeUndone" xml:space="preserve">
+    <value>This action cannot be undone.</value>
+  </data>
+  <data name="Label_AreYouSureDeleteImages" xml:space="preserve">
+    <value>Are you sure you want to delete {0} images?</value>
+  </data>
+  <data name="Label_CheckingHardware" xml:space="preserve">
+    <value>We're checking some hardware specifications to determine compatibility.</value>
+  </data>
+  <data name="Label_EverythingLooksGood" xml:space="preserve">
+    <value>Everything looks good!</value>
+  </data>
+  <data name="Label_NvidiaGpuRecommended" xml:space="preserve">
+    <value>We recommend a GPU with CUDA support for the best experience. You can continue without one, but some packages may not work, and inference may be slower.</value>
+  </data>
+  <data name="Label_Checkpoints" xml:space="preserve">
+    <value>Checkpoints</value>
+  </data>
+  <data name="Label_ModelBrowser" xml:space="preserve">
+    <value>Model Browser</value>
+  </data>
+  <data name="TeachingTip_WebUiButtonMoved" xml:space="preserve">
+    <value>The 'Open Web UI' button has moved to the command bar</value>
+  </data>
 </root>

StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj

@@ -65,8 +65,8 @@
         <PackageReference Include="Exceptionless.DateTimeExtensions" Version="3.4.3" />
         <PackageReference Include="FluentAvalonia.BreadcrumbBar" Version="2.0.2" />
         <PackageReference Include="FluentAvaloniaUI" Version="2.0.5" />
-        <PackageReference Include="FluentIcons.Avalonia" Version="1.1.230" />
-        <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.230" />
+        <PackageReference Include="FluentIcons.Avalonia" Version="1.1.228" />
+        <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.228" />
         <PackageReference Include="FuzzySharp" Version="2.0.2" />
         <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
         <PackageReference Include="Markdown.Avalonia" Version="11.0.2" />

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFile.cs

@@ -120,6 +120,7 @@ private async Task DeleteAsync()
         if (File.Exists(FilePath))
         {
             IsLoading = true;
+            Progress = new ProgressReport(0f, "Deleting...");
             try
             {
                 await using var delay = new MinimumDelay(200, 500);

StabilityMatrix.Avalonia/ViewModels/Dialogs/ConfirmPackageDeleteDialogViewModel.cs

@@ -0,0 +1,21 @@
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using StabilityMatrix.Avalonia.ViewModels.Base;
+using StabilityMatrix.Avalonia.Views.Dialogs;
+using StabilityMatrix.Core.Attributes;
+
+namespace StabilityMatrix.Avalonia.ViewModels.Dialogs;
+
+[View(typeof(ConfirmPackageDeleteDialog))]
+[ManagedService]
+[Transient]
+public partial class ConfirmPackageDeleteDialogViewModel : ContentDialogViewModelBase
+{
+    public required string ExpectedPackageName { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsValid))]
+    private string packageName = string.Empty;
+
+    public bool IsValid => ExpectedPackageName.Equals(PackageName, StringComparison.Ordinal);
+}

StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs

@@ -181,13 +181,17 @@ public async Task Uninstall()
             return;
         }
 
-        var dialog = new ContentDialog
+        var dialogViewModel = vmFactory.Get<ConfirmPackageDeleteDialogViewModel>(vm =>
         {
-            Title = Resources.Label_ConfirmDelete,
-            Content = Resources.Text_PackageUninstall_Details,
-            PrimaryButtonText = Resources.Action_OK,
-            CloseButtonText = Resources.Action_Cancel,
-            DefaultButton = ContentDialogButton.Primary
+            vm.ExpectedPackageName = Package?.DisplayName;
+        });
+
+        var dialog = new BetterContentDialog
+        {
+            Content = dialogViewModel,
+            IsPrimaryButtonEnabled = false,
+            IsSecondaryButtonEnabled = false,
+            IsFooterVisible = false,
         };
         var result = await dialog.ShowAsync();