Skip to content

Commit aab84b1

Browse files
authored
Merge pull request LykosAI#1227 from ionite34/backport/main/pr-1226
[dev to main] backport: Fix setuptools version to avoid runtime issues with CLIP imports (1226)
2 parents 5aa4780 + 582f43d commit aab84b1

4 files changed

Lines changed: 9 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
2121
- Fixed Japanese text appearing compressed/squished in markdown dialogs by ensuring the bundled NotoSansJP font is used for CTextBlock rendering
2222
- Fixed ContentDialog title and buttons not using the correct font for Japanese locale (NotoSansJP) when shown as overlay
2323
- Added missing `CBold` and `CItalic` inline styles to the markdown style sheet
24-
- Fixed download progress bar showing 100% immediately for fresh downloads due to missing Content-Length fallback when Content-Range header is absent
2524
- 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
2625
- 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
2726
- Fixed dropdown menu overlayed in Inference UI Model Cards not being scrollable on Linux - thanks to @NeuralFault!
27+
- 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
28+
- Fixed [#1597](https://github.com/LykosAI/StabilityMatrix/issues/1597) - reForge launch failing due to setuptools version
29+
- 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
2830
- 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
31+
- 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
2932
- 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!
3033
- 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
3134
- 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

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ torchIndex is TorchIndex.Cuda
236236
[
237237
"https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",
238238
],
239+
// CLIP imports pkg_resources.packaging at runtime, which breaks with setuptools 70.x.
240+
PostInstallPipArgs = ["setuptools==69.5.1"],
239241
};
240242

241243
// 2. Execute the standardized installation process.

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ torchIndex is TorchIndex.Cuda
197197
[
198198
"https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",
199199
],
200-
PostInstallPipArgs = ["numpy==1.26.4"],
200+
// CLIP imports pkg_resources.packaging at runtime, which breaks with setuptools 70.x.
201+
PostInstallPipArgs = ["numpy==1.26.4", "setuptools==69.5.1"],
201202
};
202203

203204
await StandardPipInstallProcessAsync(

StabilityMatrix.Core/Processes/ProcessRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ public static AnsiProcess StartAnsiProcess(
559559
CreateNoWindow = true,
560560
};
561561

562-
ApplyEnvironmentVariables(info, environmentVariables);
562+
PrepareEnvironment(info, fileName, environmentVariables);
563563

564564
if (workingDirectory != null)
565565
{

0 commit comments

Comments
 (0)