* Studio: detect an interrupted dependency install instead of launching a backend that cannot import An installer killed part-way leaves a venv with a working CLI but without studio.txt's dependencies. Nothing recorded that, so three separate places all reported it healthy: - the desktop preflight probed only `unsloth -h` (typer + rich) and a hardcoded desktop-capabilities dict, neither of which touches studio.backend, so it returned ManagedReady and spawned a backend that died on `import structlog`; - setup.sh's fast path compared the installed unsloth version against PyPI, which matches on a half-built venv because unsloth is installed early, so `unsloth studio update` printed "up to date" and repaired nothing; - start_managed_repair calls that update and then re-checks with the same blind probes, so Repair reported success without fixing anything. install_python_stack.py now clears a completion manifest before the dependency pass and writes it only after the final step. `unsloth studio verify-install` and desktop-capabilities' new studio_install_ok field read it, the preflight turns a false answer into ManagedStale so auto-repair runs, and setup.sh / setup.ps1 gain an escape hatch next to the existing anyio one. Separately, the wheel ships studio/ and studio.backend* but declared none of their dependencies, so `unsloth train`, `export`, `chat`, `inference` and `studio` all ended in a rich traceback after a plain pip install. structlog is the only hard module-level import that chain reaches once starlette's annotation-only import moves under TYPE_CHECKING, so it becomes a core dependency and the rest of the server stack becomes a [studio] extra mirroring studio.txt. The CLI import sites now report missing dependencies as a sentence with two remedies. Fixes #4701, #5260, #7147 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Match the trimmed comments merged on the pip branch * Put the install manifest in the preflight fingerprint for PR #7492 The capability cache keyed the venv on pyvenv.cfg, uv.lock, requirements.txt, the interpreter and site-packages/unsloth_cli/commands/studio.py, none of which a repair touches when it only reinstalls studio.txt. So an entry cached while the install was healthy stayed valid after the manifest was dropped, and the probe returned Ready on exactly the half-built venv this is meant to catch. * Address the review findings on PR #7492 Fail the install when the completion manifest cannot be written, instead of exiting 0 without the record every later check requires, which is a repair loop by construction. Compare the version of the package the manifest names, so `studio update --package X` does not read as a permanent version change. Read the manifest from the venv that owns it when the CLI runs outside the managed venv, and drop the dependency verdict in that case: the walk ran against the wrong interpreter and says nothing about that venv. Name the import that actually failed. `unsloth train` reaches torch through the same guard, and the studio extra does not carry it, so recommending that extra alone left the command failing in the same place. * Declare click, which typer stopped providing, for PR #7492 unsloth_cli/commands/start.py imports click at module scope and unsloth_cli/__init__.py imports that module, so every unsloth command needs it. typer carried click through 0.19 and dropped it in 0.27, and the declared floor is typer>=0.12.0, so a fresh resolve gets no click. On the published wheel it still arrives because huggingface_hub requires click<9,>=8.4.2, which is luck rather than a declaration. A wheel built from this branch's dependency list has neither, and every command dies at import. Verified: before, `unsloth --help` on a fresh venv raised ModuleNotFoundError for click; after, it exits 0. The drift test now covers it. * Keep a running backend from the previous app version manageable The manageability bump gated two unrelated things through one constant. For the managed CLI probe 2 is right: a CLI reporting 1 cannot answer studio_install_ok. For a RUNNING backend it is wrong, because a process already started cannot change what it reports, so bumping studio/backend/main.py in lockstep does not help one the previous app version spawned. That backend is proven ours by root id and ownership token, but lifecycle_control_block_reason returned Unmanageable, and that branch never calls adopt_verified_backend. has_owned_backend() stays false, so Repair falls into block_external_conflict, which finds the same process and refuses: the app could no longer stop a backend it owns the token for. The same regression in backend.rs turned a terminal-launched same-root server from AttachedReady into ExternalConflict. Split the constant: DESKTOP_BACKEND_MANAGEABILITY_VERSION = 1 for the two live-backend probes, DESKTOP_MANAGEABILITY_VERSION = 2 for the CLI probe. Every real gate (protocol, auth, ownership, desktop-login, MIN_DESKTOP_BACKEND_VERSION) is untouched, so an old backend still reaches OwnedStale, adopt, stop, repair. Also stop the installer when the stale manifest cannot be removed. Windows raises on a read-only or locked file, and the pass would then run behind a marker that still names this version and these digests, so a run killed part-way would verify as complete. * Answer for the managed venv, not the one the CLI happens to run in The guard matched ModuleNotFoundError.name, an import name, against missing_requirements(), which returns distribution names. So a missing PyJWT printed 'pip install jwt', and jwt, docx and fitz are each a real but unrelated PyPI project (fitz is a neuroimaging workflow tool), so following the advice installed the wrong package and left the backend just as broken. Map the import to its distribution before deciding, and never offer the import itself. install_state() verified the caller's own prefix. The wheel ships studio/, so a CLI installed outside the managed venv always finds its own copy of the helper first, and a healthy managed install reported studio_install_incomplete with a missing list copied from the wrong venv. Selecting the root is not enough: _installed_version() reads the running interpreter and req_root defaults to the caller's studio.txt, so both checks still answered for the wrong venv. Hand verify_install() that venv's own metadata, enumerated through Distribution.discover(context = ...path), which does not fall back to sys.path. The candidate order is untouched, so shadowed-tree detection is unchanged. setup.ps1 replaces pip, torch and triton before install_python_stack.py runs, so the manifest it drops is not dropped before the first mutation. A run killed in between kept a marker that still verifies while torch was half-replaced; drop it at the top of the dependency pass instead. setup.sh is unaffected, the stack is the first thing its pass runs, and a test now pins both. pip uninstall rewrites nothing that was fingerprinted, and cache_matches re-reads the cached studio_install_ok rather than re-checking, so a venv that lost a studio.txt package kept being served the healthy verdict. Fold a sorted hash of the installed dist-info names into the marker hash. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * A missing manifest helper is a torn install, not an old one studio/install_manifest.py ships in the same wheel as _studio_deps.py, so nothing legitimately has one without the other: a CLI predating both never reaches this code, and the desktop already calls such a CLI stale on desktop_manageability_version. Returning ok=true there reported a healthy install for a tree the package update had half replaced, and the preflight then launched a backend whose own run.py could be just as absent. Report it incomplete so repair runs. * Tighten comments across the install-detection changes * Validate Studio dependency readiness --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Lee Jackson <130007945+Imagineer99@users.noreply.github.com> Co-authored-by: Wasim Yousef Said <wasimysdev@gmail.com>
240 lines
8.7 KiB
Python
240 lines
8.7 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
|
|
|
|
"""Structured logging handlers and middleware.
|
|
|
|
LoggingMiddleware (request/response logging with timing),
|
|
filter_sensitive_data (structlog processor for sanitization), and
|
|
get_logger (factory for structured loggers).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re
|
|
import time
|
|
from typing import TYPE_CHECKING
|
|
|
|
import structlog
|
|
|
|
# Annotations only: a runtime import makes the ASGI stack a hard dependency of
|
|
# every CLI command.
|
|
if TYPE_CHECKING:
|
|
from starlette.types import ASGIApp, Message, Receive, Scope, Send
|
|
|
|
from utils.native_path_leases import redact_native_paths
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
def _env_int(name: str, default: int) -> int:
|
|
try:
|
|
raw = (os.environ.get(name) or "").strip()
|
|
return int(raw) if raw else default
|
|
except ValueError:
|
|
return default
|
|
|
|
|
|
# Collapse identical GET/2xx logs within the window (the SPA fans one invalidation
|
|
# into many list fetches). Mutations and errors always log. 0 = off.
|
|
_ACCESS_LOG_DEDUP_MS = _env_int("UNSLOTH_STUDIO_ACCESS_LOG_DEDUP_MS", 300)
|
|
# Liveness/UI polls whose line means only "still polling"; collapse to a longer
|
|
# heartbeat. First hit and errors still log. 0 = off.
|
|
_QUIET_POLL_DEDUP_MS = _env_int("UNSLOTH_STUDIO_ACCESS_LOG_POLL_DEDUP_MS", 10000)
|
|
_QUIET_POLL_PATHS = {
|
|
"/api/health",
|
|
"/api/auth/status",
|
|
"/api/inference/status",
|
|
"/api/inference/monitor",
|
|
# List polls the tabs refetch on a timer and on every tab switch.
|
|
"/api/train/runs",
|
|
"/api/models/checkpoints",
|
|
"/api/models/local",
|
|
"/api/rag/knowledge-bases",
|
|
# Legacy download polls emit no progress events (unlike /api/hub/*), so heartbeat them.
|
|
"/api/models/download-progress",
|
|
"/api/models/gguf-download-progress",
|
|
"/api/datasets/download-progress",
|
|
}
|
|
_DEDUP_MAP_MAX = 4096
|
|
_NATIVE_PATH_LEASE_RE = re.compile(
|
|
r"(?i)(\b(?:native_path_lease|nativePathLease)[\"']?\s*[:=]\s*[\"']?)[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+"
|
|
)
|
|
_EXCLUDED_PATHS = {
|
|
"/api/train/status",
|
|
"/api/train/metrics",
|
|
"/api/train/hardware",
|
|
"/api/system",
|
|
}
|
|
_EXCLUDED_SUFFIXES = (
|
|
".png",
|
|
".jpg",
|
|
".jpeg",
|
|
".svg",
|
|
".ico",
|
|
".woff",
|
|
".woff2",
|
|
".ttf",
|
|
)
|
|
# GET polls whose 2xx line carries no signal (their progress/phase events and the UI
|
|
# do), so drop it entirely; non-2xx still logs. Only /api/hub download polls emit
|
|
# events; the legacy /api/models and /api/datasets ones heartbeat via _QUIET_POLL_PATHS.
|
|
_QUIET_SUCCESS_PATHS = {
|
|
"/api/inference/load-progress",
|
|
"/api/llama/update-status",
|
|
"/api/export/logs",
|
|
"/api/export/status",
|
|
"/api/hub/download-status",
|
|
"/api/hub/download-progress",
|
|
"/api/hub/gguf-download-progress",
|
|
"/api/hub/active-downloads",
|
|
"/api/hub/transport-status",
|
|
"/api/hub/datasets/download-status",
|
|
"/api/hub/datasets/download-progress",
|
|
"/api/hub/datasets/active-downloads",
|
|
"/api/hub/datasets/transport-status",
|
|
}
|
|
# The token-refresh route. Its first 2xx means the client has obtained a valid
|
|
# session, so from then on chat 401s are real failures and must stay visible.
|
|
_AUTH_REFRESH_PATH = "/api/auth/refresh"
|
|
# High-frequency chat list polls; their 2xx is covered by generation/tool-call/stats
|
|
# events. Exact paths only, so detail/message reads (/threads/{id}, .../messages,
|
|
# /projects/{id}) keep their logs. The pre-auth 401 race also fires on these polls.
|
|
_CHAT_LIST_PATHS = {
|
|
"/api/chat/threads",
|
|
"/api/chat/projects",
|
|
}
|
|
|
|
|
|
def _is_quiet_success(method: str, path: str, status_code: int, pre_auth: bool) -> bool:
|
|
"""GET-only. Suppress a 2xx poll line that carries no signal, plus a chat list
|
|
poll's transient pre-auth 401 (only in the bootstrap window before the first
|
|
successful token refresh). Mutations, real (post-refresh) auth failures, and
|
|
all other errors always log."""
|
|
if method != "GET":
|
|
return False
|
|
if 200 <= status_code < 300:
|
|
return path in _QUIET_SUCCESS_PATHS or path in _CHAT_LIST_PATHS
|
|
return pre_auth and status_code == 401 and path in _CHAT_LIST_PATHS
|
|
|
|
|
|
class LoggingMiddleware:
|
|
"""ASGI request logger that avoids BaseHTTPMiddleware streaming wrappers."""
|
|
|
|
def __init__(self, app: ASGIApp) -> None:
|
|
self.app = app
|
|
# (method, path, query, status_code) -> monotonic ts of the last EMITTED log.
|
|
self._last_log: dict[tuple[str, str, bytes, int], float] = {}
|
|
# Flips True after the first successful /api/auth/refresh; before that, chat
|
|
# list-poll 401s are the transient bootstrap race and are suppressed.
|
|
self._auth_refreshed = False
|
|
|
|
def _is_redundant_repeat(
|
|
self, method: str, path: str, query: bytes, status_code: int, now: float
|
|
) -> bool:
|
|
"""True if an identical GET/2xx log fired < window ago (query string is part
|
|
of the identity). Non-GET/non-2xx never dedup; quiet-poll paths use the longer
|
|
heartbeat. Stamps only on emit, so steady polls still log."""
|
|
if method != "GET" or not (200 <= status_code < 300):
|
|
return False
|
|
window_ms = _QUIET_POLL_DEDUP_MS if path in _QUIET_POLL_PATHS else _ACCESS_LOG_DEDUP_MS
|
|
if window_ms <= 0:
|
|
return False
|
|
key = (method, path, query, status_code)
|
|
last = self._last_log.get(key)
|
|
if last is not None and (now - last) * 1000.0 < window_ms:
|
|
return True
|
|
self._last_log[key] = now
|
|
if len(self._last_log) > _DEDUP_MAP_MAX:
|
|
cutoff = now - (max(_ACCESS_LOG_DEDUP_MS, _QUIET_POLL_DEDUP_MS) / 1000.0)
|
|
self._last_log = {k: v for k, v in self._last_log.items() if v >= cutoff}
|
|
return False
|
|
|
|
async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
|
|
if scope["type"] != "http":
|
|
await self.app(scope, receive, send)
|
|
return
|
|
|
|
path = scope["path"]
|
|
excluded = (
|
|
path in _EXCLUDED_PATHS
|
|
or path.startswith("/assets/")
|
|
or path.endswith(_EXCLUDED_SUFFIXES)
|
|
)
|
|
start_time = time.perf_counter()
|
|
status_code = 500
|
|
|
|
async def send_wrapper(message: Message) -> None:
|
|
nonlocal status_code
|
|
if message["type"] == "http.response.start":
|
|
status_code = message["status"]
|
|
await send(message)
|
|
|
|
try:
|
|
await self.app(scope, receive, send_wrapper)
|
|
except Exception as exc:
|
|
logger.error(
|
|
"request_failed",
|
|
path = path,
|
|
method = scope["method"],
|
|
status_code = status_code,
|
|
error = str(exc),
|
|
process_time_ms = round((time.perf_counter() - start_time) * 1000, 2),
|
|
exc_info = True,
|
|
)
|
|
raise
|
|
else:
|
|
end_time = time.perf_counter()
|
|
if 200 <= status_code < 300 and path == _AUTH_REFRESH_PATH:
|
|
self._auth_refreshed = True
|
|
if (
|
|
not excluded
|
|
and not _is_quiet_success(
|
|
scope["method"], path, status_code, not self._auth_refreshed
|
|
)
|
|
and not self._is_redundant_repeat(
|
|
scope["method"], path, scope.get("query_string", b""), status_code, end_time
|
|
)
|
|
):
|
|
logger.info(
|
|
"request_completed",
|
|
method = scope["method"],
|
|
path = path,
|
|
status_code = status_code,
|
|
process_time_ms = round((end_time - start_time) * 1000, 2),
|
|
)
|
|
|
|
|
|
def filter_sensitive_data(logger, method_name, event_dict):
|
|
"""Structlog processor to redact native path leases from logs."""
|
|
|
|
def filter_value(value):
|
|
if isinstance(value, str):
|
|
try:
|
|
value = redact_native_paths(value)
|
|
except Exception:
|
|
pass
|
|
value = _NATIVE_PATH_LEASE_RE.sub(r"\1<redacted native path lease>", value)
|
|
return value
|
|
elif isinstance(value, dict):
|
|
return {
|
|
k: "<redacted native path lease>"
|
|
if str(k).replace("_", "").lower() == "nativepathlease"
|
|
else filter_value(v)
|
|
for k, v in value.items()
|
|
}
|
|
elif isinstance(value, list):
|
|
return [filter_value(item) for item in value]
|
|
return value
|
|
|
|
return {
|
|
k: "<redacted native path lease>"
|
|
if str(k).replace("_", "").lower() == "nativepathlease"
|
|
else filter_value(v)
|
|
for k, v in event_dict.items()
|
|
}
|
|
|
|
|
|
def get_logger(name: str) -> structlog.BoundLogger:
|
|
"""Get a bound structured logger for a module (name is usually __name__)."""
|
|
return structlog.get_logger(name)
|