Merge pull request LykosAI#1226 from ionite34/fix-setuptools-error-reforge

Fix setuptools version to avoid runtime issues with CLIP imports

Author: mohnjiles

CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added enable/disable toggle for environment variables in Settings, allowing variables to be temporarily disabled without deleting them
 - Added single-instance window activation signaling so reopening the app restores and focuses the existing desktop window instead of launching a duplicate instance
 - Added notification system with localizable banner and markdown detail dialog UI
-- Added warning in data directory selector when an OneDrive folder is selected
+- Added warning in data directory selector when a OneDrive folder is selected
 - Added support in the Checkpoints page to distinguish standard updates from Early Access-only updates - thanks to @x0x0b!
 - Added torch index for Strix/Gorgon Point Ryzen AI APUs on Windows - thanks to @NeuralFault!
 ### Changed
@@ -19,22 +19,23 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Configured portable Git to suppress detached HEAD advice messages
 - Settings file saves are now atomic to prevent corruption from interrupted writes
 ### Fixed
-- Fixed [#1596](https://github.com/LykosAI/StabilityMatrix/issues/1596) - package installs and managed embedded Python startup being poisoned by inherited shell Python activation variables such as `PYTHONHOME`, `PYTHONPATH`, `VIRTUAL_ENV`, and Conda environment variables
 - Fixed the Package Manager "Add Package" teaching tip opening inopportunely while packages were still loading or after opening the add-package dialog
 - Fixed downloaded checkpoint going to StableDiffusion folder when a saved download preference existed, even for GGUF files that should always go to DiffusionModels
 - Fixed potential crash when adding metadata to malformed or non-PNG image data in Inference
 - Fixed non-Latin-1 characters (e.g. Japanese, Chinese, Korean, emoji) in image generation parameters being stored in PNG tEXt chunks, violating the PNG specification and causing character corruption (mojibake) in standard-compliant parsers. Non-Latin-1 content now uses spec-compliant iTXt chunks with proper UTF-8 encoding ([#1535](https://github.com/LykosAI/StabilityMatrix/issues/1535))
 - Fixed an issue where `Align Your Steps` scheduler and Unet Loader workflows ignored Regional Prompting (and other addon) conditioning modifiers.
-- Potentially fixed [#1578](https://github.com/LykosAI/StabilityMatrix/issues/1578) - `SocketException: Address already in use` on Linux startup by cleaning stale interprocess socket files and reactivating the existing window
 - Fixed bold text not rendering in markdown dialogs on Windows 11 due to Avalonia 11.3.x variable font regression with Segoe UI Variable Text
 - Fixed Japanese text appearing compressed/squished in markdown dialogs by ensuring the bundled NotoSansJP font is used for CTextBlock rendering
 - Fixed ContentDialog title and buttons not using the correct font for Japanese locale (NotoSansJP) when shown as overlay
 - Added missing `CBold` and `CItalic` inline styles to the markdown style sheet
-- Fixed download progress bar showing 100% immediately for fresh downloads due to missing Content-Length fallback when Content-Range header is absent
 - Fixed downloads failing with "The request message was already sent" when the server doesn't return Content-Length on the first attempt, caused by reusing a consumed HttpRequestMessage in the retry loop
 - Fixed downloads from sources that redirect to CivitAI/HuggingFace (e.g. CivArchive) failing with Unauthorized by resolving the redirect target URL and applying auth headers for the correct domain
 - Fixed dropdown menu overlayed in Inference UI Model Cards not being scrollable on Linux - thanks to @NeuralFault!
+- Fixed [#1598](https://github.com/LykosAI/StabilityMatrix/issues/1598) - download progress bar showing 100% immediately for fresh downloads due to missing Content-Length fallback when Content-Range header is absent
+- Fixed [#1597](https://github.com/LykosAI/StabilityMatrix/issues/1597) - reForge launch failing due to setuptools version
+- Fixed [#1596](https://github.com/LykosAI/StabilityMatrix/issues/1596) - package installs and managed embedded Python startup being poisoned by inherited shell Python activation variables such as `PYTHONHOME`, `PYTHONPATH`, `VIRTUAL_ENV`, and Conda environment variables
 - Fixed [#1590](https://github.com/LykosAI/StabilityMatrix/issues/1590) - Startup crash when settings file is corrupted. Settings files are now self-healing with automatic recovery from null bytes, truncated JSON, and missing brackets
+- Potentially fixed [#1578](https://github.com/LykosAI/StabilityMatrix/issues/1578) - `SocketException: Address already in use` on Linux startup by cleaning stale interprocess socket files and reactivating the existing window
 - Fixed [#1397](https://github.com/LykosAI/StabilityMatrix/issues/1397), [#610](https://github.com/LykosAI/StabilityMatrix/issues/610) - duplicate pip package entries in results - thanks to @e-nord!
 
 ## v2.16.0-dev.2

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -236,6 +236,8 @@ torchIndex is TorchIndex.Cuda
             [
                 "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",
             ],
+            // CLIP imports pkg_resources.packaging at runtime, which breaks with setuptools 70.x.
+            PostInstallPipArgs = ["setuptools==69.5.1"],
         };
 
         // 2. Execute the standardized installation process.

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -197,7 +197,8 @@ torchIndex is TorchIndex.Cuda
             [
                 "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",
             ],
-            PostInstallPipArgs = ["numpy==1.26.4"],
+            // CLIP imports pkg_resources.packaging at runtime, which breaks with setuptools 70.x.
+            PostInstallPipArgs = ["numpy==1.26.4", "setuptools==69.5.1"],
         };
 
         await StandardPipInstallProcessAsync(

StabilityMatrix.Core/Processes/ProcessRunner.cs

@@ -559,7 +559,7 @@ public static AnsiProcess StartAnsiProcess(
             CreateNoWindow = true,
         };
 
-        ApplyEnvironmentVariables(info, environmentVariables);
+        PrepareEnvironment(info, fileName, environmentVariables);
 
         if (workingDirectory != null)
         {