Merge pull request LykosAI#911 from ionite34/fix-face-detailer-extension-install

Handle pip installs in manifests & add subpack as required for FaceDetailer stuff

(cherry picked from commit 9dc2657)

# Conflicts:
#	CHANGELOG.md

Author: mohnjiles

CHANGELOG.md

@@ -5,6 +5,87 @@ 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-pre.1
+### Added
+- Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
+- Added file sizes to the Checkpoint Manager tab
+- Added more formatting options for Inference output filenames - thanks to @yansigit!
+  Added the Discrete Model Sampling addon for Inference samplers, allows selecting different sampling methods, such as v_prediction, lcm, or x0, and optionally adjusts the model’s noise reduction strategy with the zero-shot noise ratio (ZSNR) toggle.
+### Changed
+- Improved Packages Page grid layout to dynamically stretch to fill available space
+### Fixed
+- Fixed a typo in the Japanese translation - thanks to @mattyatea!
+- Fixed missing package thumbnails due to moved or inaccessible urls
+- Fixed an issue with ComfyUI-Impact-Subpack not being installed when using FaceDetailer in Inference
+### Supporters
+#### Visionaries
+- Huge thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your unwavering support is very much appreciated!
+
+## v2.13.0-dev.3
+### Added
+- Added support for SD3.5 in Inference
+- Added CLIP_G to HuggingFace model browser
+- Added search bar to the Installed Workflows tab
+- Added "Search with Google" and "Search with ChatGPT" to the package console output & install progress console output context menus
+- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
+### Changed
+- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
+- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
+- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
+- Updated Civitai model descriptions to properly render the interactive elements
+- Updated Russian translations thanks to @vanja-san
+- Updated Simplified Chinese translations thanks to @QL-boy
+- (Internal) Updated to Avalonia 11.2.0
+### Fixed
+- Fixed some instances of Civitai model browser not loading new results
+- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
+- Fixed crash when clicking "Remind me Later" on the update dialog
+- Fixed some cases of crashing when GitHub API rate limits are exceeded
+- Fixed Git missing from env vars when running SwarmUI
+### Supporters
+#### Visionaries
+- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
+
+## v2.13.0-dev.2
+### Added
+- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
+- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
+- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
+- Added "Search by Creator" command to Civitai browser context menu
+- Added Beta scheduler to the scheduler selector in Inference
+- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
+- Added max concurrent downloads option & download queueing for most downloads
+### Changed
+- (Internal) Updated to Avalonia 11.1.4
+- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
+- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
+- Fixed minimize button not working on macOS
+- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
+- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
+### Supporters
+#### Visionaries
+- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
+
+## 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.5
+### Fixed
+- Fixed an issue with ComfyUI-Impact-Subpack not being installed when using FaceDetailer in Inference
+
+>>>>>>> 9dc26575 (Merge pull request #911 from ionite34/fix-face-detailer-extension-install)
 ## v2.12.4
 ### Added
 - Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!

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; }