Skip to content

Fix: (Ai-Toolkit) Modify GetEnvVars to support Python version handling #1726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NeuralFault wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −6
Open

Fix: (Ai-Toolkit) Modify GetEnvVars to support Python version handling #1726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28ce85
Modify GetEnvVars to support Python version handling
NeuralFault Aug 29, 2026
5fb14e5
Correct missed call sites
NeuralFault Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions StabilityMatrix.Core/Models/Packages/AiToolkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public override async Task InstallPackage(
pythonVersion: options.PythonOptions.PythonVersion
)
.ConfigureAwait(false);
venvRunner.UpdateEnvironmentVariables(GetEnvVars);
venvRunner.UpdateEnvironmentVariables(env => GetEnvVars(env, venvRunner.Version));

var isLegacyNvidia =
SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu();
Expand Down Expand Up @@ -117,7 +117,7 @@ await StandardPipInstallProcessAsync(
progress?.Report(new ProgressReport(-1f, "Installing AI Toolkit UI...", isIndeterminate: true));

var uiDirectory = new DirectoryPath(installLocation, "ui");
var envVars = GetEnvVars(venvRunner.EnvironmentVariables);
var envVars = GetEnvVars(venvRunner.EnvironmentVariables, venvRunner.Version);
await PrerequisiteHelper
.RunNpm("install", uiDirectory, progress?.AsProcessOutputHandler(), envVars)
.ConfigureAwait(false);
Expand All @@ -139,15 +139,15 @@ public override async Task RunPackage(
{
await SetupVenv(installLocation, pythonVersion: PyVersion.Parse(installedPackage.PythonVersion))
.ConfigureAwait(false);
VenvRunner.UpdateEnvironmentVariables(GetEnvVars);
VenvRunner.UpdateEnvironmentVariables(env => GetEnvVars(env, VenvRunner.Version));

if (await WarnIfNvidiaDriverBelowCu130MinimumAsync(VenvRunner, onConsoleOutput).ConfigureAwait(false))
{
return;
}

var uiDirectory = new DirectoryPath(installLocation, "ui");
var envVars = GetEnvVars(VenvRunner.EnvironmentVariables);
var envVars = GetEnvVars(VenvRunner.EnvironmentVariables, VenvRunner.Version);
npmProcess = PrerequisiteHelper.RunNpmDetached(
"run start",
uiDirectory,
Expand Down Expand Up @@ -199,13 +199,18 @@ await npmProcess
npmProcess = null;
}

private ImmutableDictionary<string, string> GetEnvVars(ImmutableDictionary<string, string> env)
private ImmutableDictionary<string, string> GetEnvVars(ImmutableDictionary<string, string> env, PyVersion pythonVersion)
{
// Keep distutils importable for setuptools-based builds and training jobs. Must be
// "local" (setuptools' bundled copy): any other value falls back to stdlib distutils,
// which no longer exists on Python 3.12+ and breaks source builds (e.g. the pinned
// diffusers git commit in ai-toolkit's requirements).
env = env.SetItem("SETUPTOOLS_USE_DISTUTILS", "local");
// An older pre-2.16.3 pre-existing install may still run 3.11, where stdlib distutils
// is present and "local" re-arms the _distutils_hack shim, which crashes
// when pip loads before setuptools (pypa/setuptools#3621). See StabilityMatrix #1725.
// Use "stdlib" on Python < 3.12 and "local" on 3.12+, based on the venv's real version.
var useLocalDistutils = pythonVersion >= new PyVersion(3, 12, 0);
env = env.SetItem("SETUPTOOLS_USE_DISTUTILS", useLocalDistutils ? "local" : "stdlib");

var pathBuilder = new EnvPathBuilder();

Expand Down
Loading