Merge branch 'main' into backport/main/pr-916

Author: mohnjiles

StabilityMatrix.Core/Models/Api/Comfy/Nodes/ComfyNodeBuilder.cs

@@ -551,7 +551,11 @@ public record LayeredDiffusionDecodeRgba : ComfyTypedNodeBase<ImageNodeConnectio
 
     [TypedNodeOptions(
         Name = "UltralyticsDetectorProvider",
-        RequiredExtensions = ["https://github.com/ltdrdata/ComfyUI-Impact-Pack"]
+        RequiredExtensions =
+        [
+            "https://github.com/ltdrdata/ComfyUI-Impact-Pack",
+            "https://github.com/ltdrdata/ComfyUI-Impact-Subpack"
+        ]
     )]
     public record UltralyticsDetectorProvider
         : ComfyTypedNodeBase<BboxDetectorNodeConnection, SegmDetectorNodeConnection>
@@ -561,7 +565,11 @@ public record UltralyticsDetectorProvider
 
     [TypedNodeOptions(
         Name = "SAMLoader",
-        RequiredExtensions = ["https://github.com/ltdrdata/ComfyUI-Impact-Pack"]
+        RequiredExtensions =
+        [
+            "https://github.com/ltdrdata/ComfyUI-Impact-Pack",
+            "https://github.com/ltdrdata/ComfyUI-Impact-Subpack"
+        ]
     )]
     public record SamLoader : ComfyTypedNodeBase<SamModelNodeConnection>
     {
@@ -575,7 +583,11 @@ public record SamLoader : ComfyTypedNodeBase<SamModelNodeConnection>
 
     [TypedNodeOptions(
         Name = "FaceDetailer",
-        RequiredExtensions = ["https://github.com/ltdrdata/ComfyUI-Impact-Pack"]
+        RequiredExtensions =
+        [
+            "https://github.com/ltdrdata/ComfyUI-Impact-Pack",
+            "https://github.com/ltdrdata/ComfyUI-Impact-Subpack"
+        ]
     )]
     public record FaceDetailer : ComfyTypedNodeBase<ImageNodeConnection>
     {

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -499,16 +499,6 @@ 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,
@@ -519,13 +509,12 @@ public override async Task<IEnumerable<PackageExtension>> GetManifestExtensionsA
                     return [];
 
                 var extensions = jsonManifest.GetPackageExtensions().ToList();
-                extensions.Add(nf4Extension);
                 return extensions;
             }
             catch (Exception e)
             {
                 Logger.Error(e, "Failed to get package extensions");
-                return Enumerable.Empty<PackageExtension>();
+                return [];
             }
         }
 
@@ -551,7 +540,13 @@ await base.UpdateExtensionAsync(
 
             var installedDirs = installedExtension.Paths.OfType<DirectoryPath>().Where(dir => dir.Exists);
 
-            await PostInstallAsync(installedPackage, installedDirs, progress, cancellationToken)
+            await PostInstallAsync(
+                    installedPackage,
+                    installedDirs,
+                    installedExtension.Definition!,
+                    progress,
+                    cancellationToken
+                )
                 .ConfigureAwait(false);
         }
 
@@ -583,7 +578,7 @@ await base.InstallExtensionAsync(
                 .Select(path => cloneRoot.JoinDir(path!))
                 .Where(dir => dir.Exists);
 
-            await PostInstallAsync(installedPackage, installedDirs, progress, cancellationToken)
+            await PostInstallAsync(installedPackage, installedDirs, extension, progress, cancellationToken)
                 .ConfigureAwait(false);
         }
 
@@ -593,10 +588,26 @@ await PostInstallAsync(installedPackage, installedDirs, progress, cancellationTo
         private async Task PostInstallAsync(
             InstalledPackage installedPackage,
             IEnumerable<DirectoryPath> installedDirs,
+            PackageExtension extension,
             IProgress<ProgressReport>? progress = null,
             CancellationToken cancellationToken = default
         )
         {
+            // do pip installs
+            if (extension.Pip != null)
+            {
+                await using var venvRunner = await package
+                    .SetupVenvPure(installedPackage.FullPath!)
+                    .ConfigureAwait(false);
+
+                var pipArgs = new PipInstallArgs();
+                pipArgs = extension.Pip.Aggregate(pipArgs, (current, pip) => current.AddArg(pip));
+
+                await venvRunner
+                    .PipInstall(pipArgs, progress?.AsProcessOutputHandler())
+                    .ConfigureAwait(false);
+            }
+
             foreach (var installedDir in installedDirs)
             {
                 cancellationToken.ThrowIfCancellationRequested();

StabilityMatrix.Core/Models/Packages/Extensions/ComfyExtensionManifest.cs

@@ -16,6 +16,7 @@ public IEnumerable<PackageExtension> GetPackageExtensions()
                     Title = x.Title,
                     Reference = x.Reference,
                     Files = x.Files,
+                    Pip = x.Pip,
                     Description = x.Description,
                     InstallType = x.InstallType
                 }
@@ -32,6 +33,8 @@ public record ManifestEntry
 
         public required IEnumerable<Uri> Files { get; init; }
 
+        public IEnumerable<string>? Pip { get; init; }
+
         public string? Description { get; init; }
 
         public string? InstallType { get; init; }

StabilityMatrix.Core/Models/Packages/Extensions/PackageExtension.cs

@@ -10,6 +10,8 @@ public record PackageExtension
 
     public required IEnumerable<Uri> Files { get; init; }
 
+    public IEnumerable<string>? Pip { get; init; }
+
     public string? Description { get; init; }
 
     public string? InstallType { get; init; }