mirror of
https://github.com/unslothai/unsloth.git
synced 2026-07-25 07:33:59 +00:00
* Studio: use an isolated Node.js for the frontend build instead of replacing the system Node/npm * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Studio: address Node isolation review (no-Node probe crash, PATH refresh, OXC provisioning, venv python, runtime node resolver) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix/adjust Node isolation for PR #6533 * Studio Node: don't cache a negative node resolution; accept Node metadata in setup.sh ownership guard - node_runtime: memoize only a version-adequate executable so a Node installed by a separate-process 'studio update' is picked up without a backend restart. - setup.sh: _studio_owned_adoptable also accepts UNSLOTH_NODE_PREBUILT_INFO.json, matching the setup.ps1 Node ownership guard (custom-home parity). * Studio setup.ps1: skip OXC npm install gracefully when npm is absent Mirror setup.sh's `command -v npm` guard so a pip-installed Studio with no system Node skips the OXC runtime install (validator degrades at runtime) instead of exit 1 aborting the whole setup. Tighten test_node_probe_guard.ps1's probe regex so it only matches the two system-version probes, not this new npm guard. * Wire test_node_probe_guard.ps1 into Windows CI for PR #6533 * Harden isolated Node install and probes for PR #6533 - install_node_prebuilt.py: keep an existing, still-usable isolated Node when nodejs.org's dist index is unreachable instead of aborting the update on a transient outage (existing_install_usable + tolerant fetch). - install_node_prebuilt.py: pin NPM_CONFIG_PREFIX/npm_config_prefix and drop NODE_PATH in _run_node so any npm -g stays inside the isolated prefix; Windows npm otherwise writes to %APPDATA%\npm. - install_node_prebuilt.py: resolve tar hard-link targets against the archive root (symlink targets stay link-parent relative). - setup.ps1: wrap the system node/npm probes in try/catch so a present but broken shim degrades to the bundled Node instead of aborting setup. - setup.ps1: run the isolated Node install with the handed-off/venv Python (ReusedSetupPython); the main resolver runs later and bare python may be a Store stub this early. - setup.sh: log when the OXC validator runtime is skipped for missing npm, matching setup.ps1. - node_runtime.py: move the version-floor comment onto _version_meets_floor. - Tests for the offline-reuse and broken-shim paths. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Trim verbose comments across the Studio Node installer for PR #6533 Comments-only pass: collapse the multi-line section banners to single lines, drop comments that restate obvious code, and tighten the remaining docstrings and "why" notes without losing intent. No code changes (verified with an AST comment-only check on the Python files and a non-comment-diff scan on setup.sh and setup.ps1). Net 109 fewer lines; the install, decision, and probe-guard suites stay green. * Harden Node install from review: validated Python, version floor, legacy home, lock race For PR #6533, addressing the latest review pass: - setup.ps1: run the isolated Node install with the validated reused/venv Python. An incompatible reused interpreter (old venv, conda, stale UNSLOTH_SETUP_PYTHON) is no longer used; fall back to the resolved python instead. - setup.ps1: a STUDIO_HOME/UNSLOTH_STUDIO_HOME override equal to the legacy default now uses the legacy sibling node dir (~/.unsloth/node), matching the runtime resolver and setup.sh, so OXC can find the Node it installed. - install_node_prebuilt.py: reject an explicit --node-version below the floor (^20.19 || >=22.12 || >=23) instead of installing a Node the build cannot use. - install_node_prebuilt.py: atomically rename a stale install lock before unlinking so two concurrent runs without filelock cannot both acquire it. Tests added for the version floor (parametrized + explicit-below-floor rejection). Full install suite: 937 passed, 1 skipped; setup.ps1 parses; decision tests green. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Address latest review: armv7l + later-fetch offline reuse for PR #6533 - install_node_prebuilt.py: reject 32-bit ARM (armv7l) up front. Node 24 LTS ships no linux-armv7l build, so the old path failed late with a confusing "no sha256"; it now fails fast with a clear unsupported-architecture error. - install_node_prebuilt.py: extend the offline-reuse fallback to the SHASUMS and archive fetches. If index.json resolves a newer Node but a later download fails and a usable isolated Node is already on disk, keep it instead of aborting a non-force update. Tests added: armv7l/armhf are unsupported; a SHASUMS failure keeps an existing usable Node and re-raises when none is present. Full install suite: 941 passed. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add UNSLOTH_STUDIO_HOME node-dir tests (install side + resolver) for PR #6533 * Add regression tests pinning the reuse path read-only and isolating installer writes Lock in the two invariants behind the isolated-Node design: reusing a good system Node never mutates the user's Node/npm, and the installer's own npm calls only ever write inside its install_dir. - tests/studio/install/test_install_node_prebuilt_logic.py: assert _run_node redirects NPM_CONFIG_PREFIX/npm_config_prefix into install_dir and drops an inherited NODE_PATH; assert _ensure_npm_floor scopes the npm self-upgrade to install_dir (never -g against the system) and is a no-op once npm meets the floor. - tests/sh/test_system_node_readonly.sh (new, wired into studio-backend-ci.yml): the setup.sh NODE_SOURCE=system arm runs no global install and sets no NPM_CONFIG_PREFIX, with a positive control that the bundled arm does. - tests/studio/test_node_decision.ps1: symmetric structural guard that the prefix pin and the only global install (bun) live in the bundled branch, not the system arm. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: wasimysaid <wasimysdev@gmail.com>
185 lines
7.3 KiB
Python
185 lines
7.3 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
|
|
"""Tests for the runtime managed-Node resolver (studio/backend/utils/node_runtime.py).
|
|
|
|
The Studio frontend installer may provision an isolated Node under
|
|
``<UNSLOTH_HOME>/node`` that is never added to the user's PATH. The backend OXC
|
|
validator must still find a usable Node at runtime: a version-adequate system
|
|
Node, else the managed isolated one. These tests pin that resolution and the
|
|
version floor (kept in sync with the setup scripts' Node decision).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import importlib
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
# node_runtime imports sibling backend packages by top-level name, so put
|
|
# studio/backend on sys.path before importing it.
|
|
_BACKEND = Path(__file__).resolve().parents[3] / "studio" / "backend"
|
|
if str(_BACKEND) not in sys.path:
|
|
sys.path.insert(0, str(_BACKEND))
|
|
|
|
nr = importlib.import_module("utils.node_runtime")
|
|
|
|
|
|
@pytest.fixture(autouse = True)
|
|
def _clear_resolver_cache():
|
|
nr._reset_resolved_node()
|
|
yield
|
|
nr._reset_resolved_node()
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"version,expected",
|
|
[
|
|
("v20.19.0", True),
|
|
("v20.18.9", False),
|
|
("v21.7.0", False), # Node 21 (odd, non-LTS) is below the bar
|
|
("v22.12.0", True),
|
|
("v22.11.0", False),
|
|
("v23.0.0", True),
|
|
("v24.17.0", True),
|
|
("v18.20.0", False),
|
|
("not-a-version", False),
|
|
("", False),
|
|
],
|
|
)
|
|
def test_version_floor_matches_setup_bar(version, expected):
|
|
assert nr._version_meets_floor(version) is expected
|
|
|
|
|
|
def test_managed_binary_layout_is_host_aware(monkeypatch, tmp_path):
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
binary = nr.managed_node_binary()
|
|
if os.name == "nt":
|
|
assert binary == tmp_path / "node" / "node.exe"
|
|
else:
|
|
assert binary == tmp_path / "node" / "bin" / "node"
|
|
|
|
|
|
def test_managed_dir_uses_legacy_sibling_by_default(monkeypatch):
|
|
# No env override -> ~/.unsloth/node (sibling of ~/.unsloth/studio).
|
|
monkeypatch.delenv("UNSLOTH_STUDIO_HOME", raising = False)
|
|
monkeypatch.delenv("STUDIO_HOME", raising = False)
|
|
assert nr.managed_node_dir() == Path.home() / ".unsloth" / "node"
|
|
|
|
|
|
def _raise_oserror():
|
|
raise OSError("simulated degraded import environment")
|
|
|
|
|
|
def test_managed_dir_fallback_honors_override(monkeypatch, tmp_path):
|
|
# If utils.paths cannot be loaded / studio_root() fails, the resolver must
|
|
# still honor an explicit STUDIO_HOME override (not silently use legacy).
|
|
import utils.paths.storage_roots as sr
|
|
|
|
monkeypatch.setattr(sr, "studio_root", _raise_oserror)
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
assert nr.managed_node_dir() == tmp_path / "node"
|
|
|
|
|
|
def test_managed_dir_fallback_legacy_without_override(monkeypatch):
|
|
import utils.paths.storage_roots as sr
|
|
|
|
monkeypatch.setattr(sr, "studio_root", _raise_oserror)
|
|
monkeypatch.delenv("UNSLOTH_STUDIO_HOME", raising = False)
|
|
monkeypatch.delenv("STUDIO_HOME", raising = False)
|
|
assert nr.managed_node_dir() == Path.home() / ".unsloth" / "node"
|
|
|
|
|
|
def test_managed_dir_honors_studio_home_alias(monkeypatch, tmp_path):
|
|
monkeypatch.delenv("UNSLOTH_STUDIO_HOME", raising = False)
|
|
monkeypatch.setenv("STUDIO_HOME", str(tmp_path))
|
|
assert nr.managed_node_dir() == tmp_path / "node"
|
|
|
|
|
|
def test_managed_dir_unsloth_studio_home_wins_over_alias(monkeypatch, tmp_path):
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
monkeypatch.setenv("STUDIO_HOME", str(tmp_path / "other"))
|
|
assert nr.managed_node_dir() == tmp_path / "node"
|
|
|
|
|
|
def test_managed_dir_legacy_valued_override_uses_sibling(monkeypatch):
|
|
# An override set explicitly to the legacy default maps to the sibling
|
|
# ~/.unsloth/node (matching setup.sh / setup.ps1), not ~/.unsloth/studio/node.
|
|
legacy = Path.home() / ".unsloth" / "studio"
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(legacy))
|
|
assert nr.managed_node_dir() == Path.home() / ".unsloth" / "node"
|
|
|
|
|
|
def test_resolve_prefers_adequate_system_node(monkeypatch):
|
|
monkeypatch.setattr(
|
|
nr.shutil, "which", lambda name: "/usr/bin/node" if name == "node" else None
|
|
)
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: exe == "/usr/bin/node")
|
|
assert nr.resolve_node_executable() == "/usr/bin/node"
|
|
|
|
|
|
def test_resolve_falls_back_to_managed_when_no_system(monkeypatch, tmp_path):
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
managed = nr.managed_node_binary()
|
|
managed.parent.mkdir(parents = True, exist_ok = True)
|
|
managed.write_text("#!/bin/sh\necho v24.17.0\n")
|
|
monkeypatch.setattr(nr.shutil, "which", lambda name: None)
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: str(exe) == str(managed))
|
|
assert nr.resolve_node_executable() == str(managed)
|
|
|
|
|
|
def test_resolve_prefers_managed_over_unsuitable_system(monkeypatch, tmp_path):
|
|
# System node present but too old; managed isolated Node is adequate.
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
managed = nr.managed_node_binary()
|
|
managed.parent.mkdir(parents = True, exist_ok = True)
|
|
managed.write_text("fake")
|
|
monkeypatch.setattr(nr.shutil, "which", lambda name: "/old/node")
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: str(exe) == str(managed))
|
|
assert nr.resolve_node_executable() == str(managed)
|
|
|
|
|
|
def test_resolve_returns_old_system_as_last_resort(monkeypatch, tmp_path):
|
|
# Old system node, no managed install -> preserve pre-isolation behaviour.
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
monkeypatch.setattr(nr.shutil, "which", lambda name: "/old/node")
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: False)
|
|
assert nr.resolve_node_executable() == "/old/node"
|
|
|
|
|
|
def test_resolve_returns_none_when_nothing_available(monkeypatch, tmp_path):
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path)) # managed dir is empty
|
|
monkeypatch.setattr(nr.shutil, "which", lambda name: None)
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: False)
|
|
assert nr.resolve_node_executable() is None
|
|
|
|
|
|
def test_negative_result_is_not_cached(monkeypatch, tmp_path):
|
|
# A Node that appears after the first (empty) probe must be picked up without
|
|
# a restart, so None must not be memoized.
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
monkeypatch.setattr(nr.shutil, "which", lambda name: None)
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: False)
|
|
assert nr.resolve_node_executable() is None
|
|
|
|
managed = nr.managed_node_binary()
|
|
managed.parent.mkdir(parents = True, exist_ok = True)
|
|
managed.write_text("now-installed")
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: str(exe) == str(managed))
|
|
assert nr.resolve_node_executable() == str(managed)
|
|
|
|
|
|
def test_positive_result_is_cached(monkeypatch):
|
|
monkeypatch.setattr(nr.shutil, "which", lambda name: "/usr/bin/node")
|
|
monkeypatch.setattr(nr, "_node_version_ok", lambda exe: True)
|
|
assert nr.resolve_node_executable() == "/usr/bin/node"
|
|
|
|
# A cached positive result must not re-probe (shutil.which would now raise).
|
|
def _boom(name):
|
|
raise AssertionError("resolver re-probed despite a cached positive result")
|
|
|
|
monkeypatch.setattr(nr.shutil, "which", _boom)
|
|
assert nr.resolve_node_executable() == "/usr/bin/node"
|