Merge pull request #852 from ionite34/backport/main/pr-851

[dev to main] backport: Manually add comfy nf4 extension to manifest & update sampler/scheduler… (851)
LykosAI · Oct 7, 2024 · 0454237 · 0454237
2 parents 2412a34 + 8c593ee
commit 0454237
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,24 @@ 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).
 
+<<<<<<< HEAD
+=======
+## v2.13.0-dev.1
+### Added
+- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
+- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
+- Added InvokeAI model sharing option
+### Supporters
+#### Visionaries
+- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
+
+## v2.12.2
+### Added
+- Added Beta scheduler to the scheduler selector in Inference
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+
+>>>>>>> 8c9b456c (Merge pull request #851 from ionite34/fix-nf4-sorta)
 ## v2.12.1
 ### Fixed
 - Fixed [#916](https://github.com/LykosAI/StabilityMatrix/issues/916) - InvokeAI failing to install/update on macOS

diff --git a/StabilityMatrix.Core/Helper/GenerationParametersConverter.cs b/StabilityMatrix.Core/Helper/GenerationParametersConverter.cs
@@ -18,6 +18,7 @@ public static class GenerationParametersConverter
             ["Euler Simple"] = (ComfySampler.Euler, ComfyScheduler.Simple),
             ["LMS"] = (ComfySampler.LMS, ComfyScheduler.Normal),
             ["Heun"] = (ComfySampler.Heun, ComfyScheduler.Normal),
+            ["Heun Beta"] = (ComfySampler.Heun, ComfyScheduler.Beta),
             ["DPM2"] = (ComfySampler.Dpm2, ComfyScheduler.Normal),
             ["DPM2 Karras"] = (ComfySampler.Dpm2, ComfyScheduler.Karras),
             ["DPM2 a"] = (ComfySampler.Dpm2Ancestral, ComfyScheduler.Normal),
@@ -34,6 +35,7 @@ public static class GenerationParametersConverter
             ["DPM adaptive"] = (ComfySampler.DpmAdaptive, ComfyScheduler.Normal),
             ["LMS Karras"] = (ComfySampler.LMS, ComfyScheduler.Karras),
             ["DDIM"] = (ComfySampler.DDIM, ComfyScheduler.Normal),
+            ["DDIM Beta"] = (ComfySampler.DDIM, ComfyScheduler.Beta),
             ["UniPC"] = (ComfySampler.UniPC, ComfyScheduler.Normal),
         }.ToImmutableDictionary();
 

diff --git a/StabilityMatrix.Core/Models/Api/Comfy/ComfyScheduler.cs b/StabilityMatrix.Core/Models/Api/Comfy/ComfyScheduler.cs
@@ -9,6 +9,7 @@ public readonly record struct ComfyScheduler(string Name)
     public static ComfyScheduler Exponential { get; } = new("exponential");
     public static ComfyScheduler SDTurbo { get; } = new("sd_turbo");
     public static ComfyScheduler Simple { get; } = new("simple");
+    public static ComfyScheduler Beta { get; } = new("beta");
 
     private static Dictionary<string, string> ConvertDict { get; } =
         new()
@@ -19,7 +20,8 @@ public readonly record struct ComfyScheduler(string Name)
             ["sgm_uniform"] = "SGM Uniform",
             [Simple.Name] = "Simple",
             ["ddim_uniform"] = "DDIM Uniform",
-            [SDTurbo.Name] = "SD Turbo"
+            [SDTurbo.Name] = "SD Turbo",
+            [Beta.Name] = "Beta"
         };
 
     public static IReadOnlyList<ComfyScheduler> Defaults { get; } =

diff --git a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
@@ -500,13 +500,28 @@ public override async Task<IEnumerable<PackageExtension>> GetManifestExtensionsA
                     .DownloadService.GetContentAsync(manifest.Uri.ToString(), cancellationToken)
                     .ConfigureAwait(false);
 
+                // nf4 hack
+                var nf4Extension = new PackageExtension
+                {
+                    Author = "comfyanonymous",
+                    Files = [new Uri("https://github.com/comfyanonymous/ComfyUI_bitsandbytes_NF4")],
+                    Reference = new Uri("https://github.com/comfyanonymous/ComfyUI_bitsandbytes_NF4"),
+                    Title = "ComfyUI_bitsandbytes_NF4",
+                    InstallType = "git-clone"
+                };
+
                 // Parse json
                 var jsonManifest = JsonSerializer.Deserialize<ComfyExtensionManifest>(
                     content,
                     ComfyExtensionManifestSerializerContext.Default.Options
                 );
 
-                return jsonManifest?.GetPackageExtensions() ?? Enumerable.Empty<PackageExtension>();
+                if (jsonManifest == null)
+                    return [];
+
+                var extensions = jsonManifest.GetPackageExtensions().ToList();
+                extensions.Add(nf4Extension);
+                return extensions;
             }
             catch (Exception e)
             {