mirror of
https://github.com/unslothai/unsloth.git
synced 2026-08-27 09:42:36 +00:00
* Harden Windows pyenv interpreter handling * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix Windows managed Python recovery * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Tighten-installer-comments * Finish the -S probe hardening and run the new tests on Windows for PR #7763 Get-PythonPlatformTag still probed without -S. Its result is compared with -eq "win-amd64", so a sitecustomize banner reads as "unknown", the x64-over-ARM64 preference is lost and Windows on ARM settles for a native ARM64 interpreter. Test-IsCondaPython gets -S for the same reason. Neither query needs site, and base_prefix and get_platform() are unchanged by -S on 3.11, 3.12 and 3.13. The new test module parametrizes over pwsh and powershell, but cross-platform-parity-ci.yml is the only three-OS job and its paths filter and pytest list are hardcoded, so the 5.1 leg never ran. Added the file to both. Also match the py launcher branch to the PATH branch with -LiteralPath -PathType Leaf, and fix the failure message: the empty base home leaked into the Exit-InstallFailure text, and the ownership marker is written before the gate, so a plain re-run already replaces the environment. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: danielhanchen <unslothshared@gmail.com>
161 lines
6 KiB
Python
161 lines
6 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved.
|
|
|
|
"""Focused contracts for Windows Python wrapper and venv validation."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re
|
|
import shlex
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
INSTALL_PS1 = REPO_ROOT / "install.ps1"
|
|
POWERSHELLS = [shell for shell in ("pwsh", "powershell") if shutil.which(shell)]
|
|
|
|
|
|
def _extract(pattern: str, source: str) -> str:
|
|
match = re.search(pattern, source, flags = re.DOTALL)
|
|
assert match is not None, f"install.ps1 block not found: {pattern}"
|
|
return match.group(0)
|
|
|
|
|
|
def _run_powershell(shell: str, script: str, env: dict[str, str]) -> str:
|
|
result = subprocess.run(
|
|
[shell, "-NoProfile", "-NonInteractive", "-Command", script],
|
|
check = True,
|
|
capture_output = True,
|
|
text = True,
|
|
env = env,
|
|
timeout = 30,
|
|
)
|
|
return result.stdout.strip()
|
|
|
|
|
|
@pytest.mark.skipif(not POWERSHELLS, reason = "PowerShell is unavailable")
|
|
@pytest.mark.parametrize("shell", POWERSHELLS)
|
|
def test_path_python_wrapper_resolves_to_real_executable(tmp_path: Path, shell: str):
|
|
source = INSTALL_PS1.read_text(encoding = "utf-8")
|
|
finder = _extract(r" function Find-CompatiblePython \{.*?\n \}\n", source)
|
|
(tmp_path / "sitecustomize.py").write_text('print("STARTUP_BANNER")\n', encoding = "utf-8")
|
|
if os.name == "nt":
|
|
wrapper = tmp_path / "python.bat"
|
|
wrapper.write_text(f'@"{sys.executable}" %*\n', encoding = "utf-8")
|
|
else:
|
|
wrapper = tmp_path / "python-wrapper"
|
|
wrapper.write_text(
|
|
f'#!/bin/sh\nexec {shlex.quote(sys.executable)} "$@"\n', encoding = "utf-8"
|
|
)
|
|
wrapper.chmod(0o755)
|
|
|
|
script = f"""
|
|
$ErrorActionPreference = "Stop"
|
|
$PythonVersion = "3.13"
|
|
$script:CondaSkipPattern = '(?i)(conda|miniconda|anaconda)'
|
|
function Get-HostMachineArch {{ return "x86_64" }}
|
|
function Test-IsCondaPython {{ param([string]$Exe) return $false }}
|
|
function Get-PythonPlatformTag {{ param([string]$Exe) return "win-amd64" }}
|
|
function Get-Command {{
|
|
param([Parameter(Position = 0)][string]$Name,
|
|
[Parameter(ValueFromRemainingArguments = $true)]$Rest)
|
|
if ($Name -eq "python") {{
|
|
return @([pscustomobject]@{{ Source = $env:TEST_PYTHON_WRAPPER }})
|
|
}}
|
|
return @()
|
|
}}
|
|
{finder}
|
|
$found = Find-CompatiblePython
|
|
Write-Output $found.Path
|
|
"""
|
|
env = os.environ.copy()
|
|
env["TEST_PYTHON_WRAPPER"] = str(wrapper)
|
|
env["PYTHONPATH"] = str(tmp_path)
|
|
assert Path(_run_powershell(shell, script, env)).resolve() == Path(sys.executable).resolve()
|
|
|
|
|
|
@pytest.mark.skipif(not POWERSHELLS, reason = "PowerShell is unavailable")
|
|
@pytest.mark.parametrize("shell", POWERSHELLS)
|
|
def test_arch_probe_ignores_startup_output(tmp_path: Path, shell: str):
|
|
"""Startup output must not reach the arch tag.
|
|
|
|
The caller compares the tag with -eq "win-amd64", so a contaminated answer reads
|
|
as "unknown" and Windows on ARM silently settles for a native ARM64 interpreter.
|
|
"""
|
|
source = INSTALL_PS1.read_text(encoding = "utf-8")
|
|
probe = _extract(r" function Get-PythonPlatformTag \{.*?\n \}\n", source)
|
|
(tmp_path / "sitecustomize.py").write_text('print("STARTUP_BANNER")\n', encoding = "utf-8")
|
|
|
|
script = f"""
|
|
$ErrorActionPreference = "Stop"
|
|
{probe}
|
|
Write-Output (Get-PythonPlatformTag $env:TEST_PYTHON)
|
|
"""
|
|
env = os.environ.copy()
|
|
env["TEST_PYTHON"] = sys.executable
|
|
env["PYTHONPATH"] = str(tmp_path)
|
|
tag = _run_powershell(shell, script, env)
|
|
assert tag and "\n" not in tag and "startup_banner" not in tag, tag
|
|
|
|
|
|
@pytest.mark.skipif(not POWERSHELLS, reason = "PowerShell is unavailable")
|
|
@pytest.mark.parametrize("shell", POWERSHELLS)
|
|
def test_venv_base_home_comes_from_pyvenv_config(tmp_path: Path, shell: str):
|
|
source = INSTALL_PS1.read_text(encoding = "utf-8")
|
|
reader = _extract(r" function Get-VenvBaseHome \{.*?\n \}\n", source)
|
|
expected = tmp_path / "removed-base-python"
|
|
(tmp_path / "pyvenv.cfg").write_text(f"home = {expected}\n", encoding = "utf-8")
|
|
|
|
script = f"""
|
|
$ErrorActionPreference = "Stop"
|
|
{reader}
|
|
Write-Output (Get-VenvBaseHome -VenvRoot $env:TEST_VENV_ROOT)
|
|
"""
|
|
env = os.environ.copy()
|
|
env["TEST_VENV_ROOT"] = str(tmp_path)
|
|
assert _run_powershell(shell, script, env) == str(expected)
|
|
|
|
|
|
@pytest.mark.skipif(not POWERSHELLS, reason = "PowerShell is unavailable")
|
|
@pytest.mark.parametrize("shell", POWERSHELLS)
|
|
@pytest.mark.parametrize("case", ["missing", "unlaunchable", "working"])
|
|
def test_managed_python_readiness_probe(tmp_path: Path, shell: str, case: str):
|
|
source = INSTALL_PS1.read_text(encoding = "utf-8")
|
|
readiness = _extract(r" function Test-VenvPythonReady \{.*?\n \}\n", source)
|
|
python_exe = tmp_path / "broken-python.cmd"
|
|
expected = "False"
|
|
if case == "unlaunchable":
|
|
python_exe.write_text("@exit /b 17\n", encoding = "utf-8")
|
|
elif case == "working":
|
|
python_exe = Path(sys.executable)
|
|
expected = "True"
|
|
|
|
script = f"""
|
|
$ErrorActionPreference = "Stop"
|
|
{readiness}
|
|
Write-Output (Test-VenvPythonReady -PythonExe $env:TEST_MANAGED_PYTHON)
|
|
"""
|
|
env = os.environ.copy()
|
|
env["TEST_MANAGED_PYTHON"] = str(python_exe)
|
|
assert _run_powershell(shell, script, env) == expected
|
|
|
|
|
|
def test_readiness_gate_precedes_installs_and_names_both_interpreters():
|
|
source = INSTALL_PS1.read_text(encoding = "utf-8")
|
|
gate = source.index("if (-not (Test-VenvPythonReady -PythonExe $VenvPython))")
|
|
marker = source.index(
|
|
'[System.IO.File]::WriteAllText((Join-Path $VenvDir ".unsloth-studio-owned"), "")'
|
|
)
|
|
first_uv_pip = source.index("uv pip install --python $VenvPython")
|
|
gpu_detection = source.index("function Invoke-AmdSmiNoElevate")
|
|
|
|
assert marker < gate < gpu_detection < first_uv_pip
|
|
assert 'Write-Host " Managed Python: $VenvPython"' in source
|
|
assert 'Write-Host " Recorded base Python home: $recordedBaseHome"' in source
|
|
assert 'return (Exit-InstallFailure "Managed Python is unavailable' in source
|