Merge pull request #796 from ionite34/backport/main/pr-795

[dev to main] backport: Fix RuinedFooocus requirements parsing & add CLIP link for forge/a1111 (795)
LykosAI · Aug 21, 2024 · bcbdd54 · bcbdd54
2 parents 82f142b + a5eff18
commit bcbdd54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,13 +9,15 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Added
 - Added Flux & AuraFlow types to CivitAI Browser
 - Added unet folder links for ComfyUI thanks to jeremydk
+- Added CLIP folder links for Forge
 ### Changed
 - Updated Brazilian Portuguese translations thanks to thiagojramos
 ### Fixed
-- Fixed CivitAI model browser not loading search results
+- Fixed [#840](https://github.com/LykosAI/StabilityMatrix/issues/840) - CivitAI model browser not loading search results
 - Fixed SwarmUI settings being overwritten on launch
-- Fixed Forge output folder links pointing to the incorrect folder
+- Fixed [#832](https://github.com/LykosAI/StabilityMatrix/issues/832) [#847](https://github.com/LykosAI/StabilityMatrix/issues/847) - Forge output folder links pointing to the incorrect folder
 - Fixed errors when downloading models with invalid characters in the file name
+- Fixed error when installing RuinedFooocus on nvidia GPUs
 ### Supporters
 #### Pioneers
 - A big shoutout to our Pioneer-tier patrons: **tankfox**, **tanangular**, **Mr. Unknown**, and **Szir777**! We deeply appreciate your ongoing support!

diff --git a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs
@@ -67,7 +67,8 @@ IPrerequisiteHelper prerequisiteHelper
             [SharedFolderType.IpAdapter] = new[] { "models/controlnet/IpAdapter" },
             [SharedFolderType.InvokeIpAdapters15] = new[] { "models/controlnet/DiffusersIpAdapters" },
             [SharedFolderType.InvokeIpAdaptersXl] = new[] { "models/controlnet/DiffusersIpAdaptersXL" },
-            [SharedFolderType.SVD] = new[] { "models/svd" }
+            [SharedFolderType.SVD] = new[] { "models/svd" },
+            [SharedFolderType.CLIP] = new[] { "models/text_encoder" }
         };
 
     public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>

diff --git a/StabilityMatrix.Core/Models/Packages/RuinedFooocus.cs b/StabilityMatrix.Core/Models/Packages/RuinedFooocus.cs
@@ -124,15 +124,9 @@ public override async Task InstallPackage(
 
             await venvRunner
                 .PipInstall(
-                    new PipInstallArgs()
-                        .WithTorch("==2.1.2")
-                        .WithTorchVision("==0.16.2")
-                        .WithXFormers("==0.0.23.post1")
-                        .WithTorchExtraIndex("cu121")
-                        .WithParsedFromRequirementsTxt(
-                            await requirements.ReadAllTextAsync().ConfigureAwait(false),
-                            excludePattern: "torch"
-                        ),
+                    new PipInstallArgs().WithParsedFromRequirementsTxt(
+                        await requirements.ReadAllTextAsync().ConfigureAwait(false)
+                    ),
                     onConsoleOutput
                 )
                 .ConfigureAwait(false);