Merge pull request #553 from ionite34/downmerge

Downmerge

CHANGELOG.md

@@ -22,6 +22,15 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Removed
 - Removed the main Launch page, as it is no longer needed with the new Packages page
 
+## v2.9.1
+### Added
+- Fixed [#498](https://github.com/LykosAI/StabilityMatrix/issues/498) - Added "Pony" category to CivitAI Model Browser
+### 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
+
 ## v2.9.0
 ### Added
 - Added new package: [StableSwarmUI](https://github.com/Stability-AI/StableSwarmUI) by Stability AI

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFile.cs

@@ -120,6 +120,7 @@ public partial class CheckpointFile : ViewModelBase
         if (File.Exists(FilePath))
         {
             IsLoading = true;
+            Progress = new ProgressReport(0f, "Deleting...");
             try
             {
                 await using var delay = new MinimumDelay(200, 500);

StabilityMatrix.Core/Models/Api/CivitBaseModelType.cs

@@ -8,6 +8,9 @@ public enum CivitBaseModelType
 {
     All,
 
+    [StringValue("Pony")]
+    Pony,
+
     [StringValue("SD 1.5")]
     Sd15,
 
@@ -32,13 +35,14 @@ public enum CivitBaseModelType
     [StringValue("SDXL Lightning")]
     SdxlLightning,
 
+    [StringValue("SDXL Turbo")]
+    SdxlTurbo,
+
     [StringValue("SVD")]
     SVD,
 
     [StringValue("Stable Cascade")]
     StableCascade,
 
-    [StringValue("SDXL Turbo")]
-    SdxlTurbo,
     Other,
 }

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -97,6 +97,13 @@ public class A3WebUI(
                 DefaultValue = "7860",
                 Options = ["--port"]
             },
+            new LaunchOptionDefinition
+            {
+                Name = "Share",
+                Type = LaunchOptionType.Bool,
+                Description = "Set whether to share on Gradio",
+                Options = { "--share" }
+            },
             new()
             {
                 Name = "VRAM",

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using NLog;
 using StabilityMatrix.Core.Attributes;
@@ -221,7 +220,7 @@ public class ComfyUI(
                         {
                             TorchVersion.Cpu => "cpu",
                             TorchVersion.Cuda => "cu121",
-                            TorchVersion.Rocm => "rocm5.6",
+                            TorchVersion.Rocm => "rocm5.7",
                             _
                                 => throw new ArgumentOutOfRangeException(
                                     nameof(torchVersion),
@@ -232,9 +231,14 @@ public class ComfyUI(
                     )
         };
 
-        if (torchVersion == TorchVersion.Cuda)
+        switch (torchVersion)
         {
-            pipArgs = pipArgs.WithXFormers("==0.0.22.post4");
+            case TorchVersion.Cuda:
+                pipArgs = pipArgs.WithXFormers("==0.0.22.post4");
+                break;
+            case TorchVersion.Mps:
+                pipArgs = pipArgs.AddArg("mpmath==1.3.0");
+                break;
         }
 
         var requirements = new FilePath(installLocation, "requirements.txt");

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -52,6 +52,27 @@ public class SDWebForge(
 
     public override List<LaunchOptionDefinition> LaunchOptions =>
         [
+            new LaunchOptionDefinition
+            {
+                Name = "Host",
+                Type = LaunchOptionType.String,
+                DefaultValue = "localhost",
+                Options = ["--server-name"]
+            },
+            new LaunchOptionDefinition
+            {
+                Name = "Port",
+                Type = LaunchOptionType.String,
+                DefaultValue = "7860",
+                Options = ["--port"]
+            },
+            new LaunchOptionDefinition
+            {
+                Name = "Share",
+                Type = LaunchOptionType.Bool,
+                Description = "Set whether to share on Gradio",
+                Options = { "--share" }
+            },
             new LaunchOptionDefinition
             {
                 Name = "Always Offload from VRAM",
@@ -155,4 +176,9 @@ public class SDWebForge(
         await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
         progress?.Report(new ProgressReport(1f, "Install complete", isIndeterminate: false));
     }
+
+    public override string? ExtraLaunchArguments { get; set; } =
+        settingsManager.IsLibraryDirSet
+            ? $"--gradio-allowed-path \"{settingsManager.ImagesDirectory}\""
+            : string.Empty;
 }