mirror of
https://github.com/unslothai/unsloth.git
synced 2026-07-28 00:53:56 +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>
130 lines
4.9 KiB
Python
130 lines
4.9 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
|
|
|
|
"""Resolve a usable Node.js executable at runtime.
|
|
|
|
The installer provisions an isolated Node under ``<UNSLOTH_HOME>/node`` but only
|
|
puts it on PATH for the *setup* process, never the user's shell. So backend code
|
|
that shells out to ``node`` at runtime (the OXC validator) cannot rely on PATH.
|
|
``resolve_node_executable`` prefers a version-adequate system Node, else the
|
|
managed isolated Node (same floor the installer applies: ^20.19 || >=22.12 || >=23).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re
|
|
import shutil
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
from utils.subprocess_compat import windows_hidden_subprocess_kwargs
|
|
|
|
_NODE_VERSION_PROBE_TIMEOUT_SECONDS = 10
|
|
|
|
|
|
# Keep in sync with the setup scripts' Node floor: Get-NodeDecision (setup.ps1) /
|
|
# decide_node_source (setup.sh). Vite 8 needs Node ^20.19 || >=22.12 || >=23.
|
|
def _version_meets_floor(version: str) -> bool:
|
|
"""True iff a ``node -v`` string clears the installer's version bar."""
|
|
match = re.match(r"v?(\d+)\.(\d+)", version.strip())
|
|
if not match:
|
|
return False
|
|
major, minor = int(match.group(1)), int(match.group(2))
|
|
return (major == 20 and minor >= 19) or (major == 22 and minor >= 12) or major >= 23
|
|
|
|
|
|
def managed_node_dir() -> Path:
|
|
"""Isolated Node install dir. Mirrors ``_find_llama_server_binary``: shares a
|
|
parent with llama.cpp -- ``<STUDIO_HOME>`` in custom mode, else legacy ``~/.unsloth``."""
|
|
legacy_node = Path.home() / ".unsloth" / "node"
|
|
try:
|
|
# Lazy import (mirrors _find_llama_server_binary) so this module stays
|
|
# importable even if utils.paths cannot be loaded.
|
|
from utils.paths.storage_roots import studio_root
|
|
|
|
resolved = studio_root()
|
|
legacy_studio = Path.home() / ".unsloth" / "studio"
|
|
try:
|
|
is_legacy = resolved.resolve() == legacy_studio.resolve()
|
|
except (OSError, ValueError):
|
|
is_legacy = resolved == legacy_studio
|
|
return legacy_node if is_legacy else (resolved / "node")
|
|
except (ImportError, OSError, ValueError):
|
|
# Degraded env (utils.paths unavailable): still honor an explicit
|
|
# STUDIO_HOME override before the legacy default, mirroring studio_root().
|
|
override = (
|
|
os.environ.get("UNSLOTH_STUDIO_HOME") or os.environ.get("STUDIO_HOME") or ""
|
|
).strip()
|
|
if override:
|
|
try:
|
|
return Path(override).expanduser().resolve() / "node"
|
|
except (OSError, ValueError):
|
|
return Path(override).expanduser() / "node"
|
|
return legacy_node
|
|
|
|
|
|
def managed_node_binary() -> Path:
|
|
"""Node executable in the isolated install: ``<dir>/node.exe`` on Windows, ``<dir>/bin/node`` else."""
|
|
node_dir = managed_node_dir()
|
|
if os.name == "nt":
|
|
return node_dir / "node.exe"
|
|
return node_dir / "bin" / "node"
|
|
|
|
|
|
def _node_version_ok(executable: str) -> bool:
|
|
"""Run ``<executable> -v`` and check it clears the floor; False on any error."""
|
|
try:
|
|
result = subprocess.run(
|
|
[executable, "-v"],
|
|
capture_output = True,
|
|
text = True,
|
|
timeout = _NODE_VERSION_PROBE_TIMEOUT_SECONDS,
|
|
**windows_hidden_subprocess_kwargs(),
|
|
)
|
|
except (OSError, ValueError, subprocess.SubprocessError):
|
|
return False
|
|
if result.returncode != 0:
|
|
return False
|
|
return _version_meets_floor(result.stdout)
|
|
|
|
|
|
# Memoize ONLY a confirmed version-adequate executable: the installer runs in a
|
|
# separate process and may finish after the first probe here, so a negative /
|
|
# last-resort result must not be cached (it would stick until a backend restart).
|
|
_resolved_node: str | None = None
|
|
|
|
|
|
def _reset_resolved_node() -> None:
|
|
"""Clear the memoized executable (used by tests)."""
|
|
global _resolved_node
|
|
_resolved_node = None
|
|
|
|
|
|
def resolve_node_executable() -> str | None:
|
|
"""Resolve a usable node executable, or None.
|
|
|
|
Order: version-adequate system ``node`` on PATH; else the managed isolated
|
|
Node if adequate; else bare ``node`` (may be None). Only an adequate result
|
|
is memoized, so a Node installed after the first probe is picked up live.
|
|
"""
|
|
global _resolved_node
|
|
if _resolved_node is not None:
|
|
return _resolved_node
|
|
|
|
system_node = shutil.which("node")
|
|
if system_node and _node_version_ok(system_node):
|
|
_resolved_node = system_node
|
|
return _resolved_node
|
|
|
|
managed = managed_node_binary()
|
|
try:
|
|
managed_present = managed.is_file()
|
|
except OSError:
|
|
managed_present = False
|
|
if managed_present and _node_version_ok(str(managed)):
|
|
_resolved_node = str(managed)
|
|
return _resolved_node
|
|
|
|
# Last-resort system node (may be None), NOT cached so a later install is picked up.
|
|
return system_node
|