* Studio: read model text as utf-8 so umlauts survive on Windows Chat rejects or mangles non-ASCII on Windows: "ä ö ü" in a prompt, a chat template, or a model path comes back as mojibake, or the load dies with UnicodeDecodeError. open() and Path.read_text() fall back to locale.getencoding() when no encoding is passed. On Windows that is the ANSI codepage (cp1252, cp932, cp1251, ... by system locale), never UTF-8. Hugging Face writes these files as raw UTF-8, so every read of one decodes with the wrong codec: - tokenizer_config.json, which holds the chat template. Templates routinely carry -> arrows, smart quotes and CJK, so this is the common path into chat - config.json and adapter_config.json - modules.json, Ollama manifests, and the .py sources the remote-code scanner reads before a model is allowed to load The llama-server and embedding-server stdout readers have the same problem via subprocess(text = True); they now decode utf-8 with errors = "replace" so a stray byte cannot kill a log reader. Encoding arguments only, no logic changes. tests/test_chat_text_encoding.py covers a config.json and a chat template holding umlauts, arrows and CJK, plus the remote-code scanner reading a source file with umlauts. Those pass anywhere the locale is already UTF-8, so a fourth test re-runs the readers under -X warn_default_encoding and fails on any platform if an encoding argument goes missing again. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Studio: name utf-8 explicitly on the remaining text I/O, with an AST guard (#7465) * Studio: name utf-8 explicitly on the remaining text I/O Follow-up to the model-text reads in #7467, covering the rest of the backend: system probes (nvidia-smi, amd-smi, powershell, git, node), package installers, /proc and /sys readers, and internal marker files (pid, install id, bootstrap password, Colab credentials). Same reason as #7467. open(), Path.read_text()/write_text() and subprocess(text = True) fall back to locale.getencoding(), which on Windows is the ANSI codepage rather than UTF-8. These paths are mostly ASCII today, so this is hardening, not a live bug. Encoding arguments only, no logic changes. Adds tests/test_text_io_encoding.py: an AST guard walking every backend source and asserting text I/O names its encoding, so the class of bug cannot creep back in one call at a time. 275 files. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Catch aliased subprocess and positional Path.open, migrate legacy JSONL The guard only matched a receiver literally named subprocess, so worker.py's `import subprocess as _sp` hid three text = True installs that decode pip output with the ANSI codepage. It also skipped any .open() with more than one positional argument, though Path.open takes buffering/encoding/errors/newline positionally. Resuming a scrape written by an older release is the other half: those JSONL lines are in the locale codepage, so the UTF-8 preload raised, the dedup keys were silently forgotten and duplicates were appended to a now mixed-encoding file. Decode with the locale codepage as fallback and rewrite as UTF-8 before the append handle opens, since Windows cannot replace a file it holds open. * Stream the JSONL preload and keep a torn line from relabelling the shard Reading the whole shard to migrate it was wrong twice over. These files reach gigabytes on a large scrape, so the preload now streams line by line and the rewrite streams through a temp file. Worse, one interrupted append used to condemn the file: the whole-file UTF-8 decode failed, every byte was retried as cp1252, and the rewrite persisted mojibake over records that were fine. A line now counts as legacy only if the locale codepage both decodes it and yields valid JSON, which a torn UTF-8 line does not. Damaged lines are skipped and copied through byte for byte. When the rewrite cannot be written at all, the append handle opens with the legacy encoding rather than mixing UTF-8 into the file. install_wheel takes run = subprocess.run as a parameter, so the guard cannot see it. Both wheel installs there now name their encoding. * Decide the shard's encoding from the file, not one line at a time Some byte strings parse both ways. cp1251 `Р°` is D0 B0, which is also valid UTF-8 for `а`, so a UTF-8-first parse quietly showed the wrong text instead of migrating it. A line now yields both readings, and the file decides. Any line that parses under the codepage but not as UTF-8 is unambiguous evidence, and ambiguous lines then follow that verdict, which is enough for any real shard: ordinary Cyrillic or Japanese prose is invalid UTF-8 several times per line. Keys for ambiguous lines are re-derived from the legacy reading during the rewrite. A shard is undecidable only if every line is ambiguous, and nothing can tell those apart. latin-1 is also tried after the locale codepage, so a scrape carried from Windows to a UTF-8 machine still has a reading rather than none. Requiring valid JSON, not just a decode, keeps that from claiming torn lines. * Weigh the whole shard, and never lose a record on the fallback path One structurally valid JSON line carrying a stray 0x96 parses as cp1252, so a single-line verdict let it relabel a healthy shard and mojibake every good record in it. Each line with non-ASCII bytes now votes: parsing only under the codepage is evidence for legacy, parsing as UTF-8 is evidence against, since codepage text rarely forms valid multibyte UTF-8. Ties leave the file alone. When the migration cannot be written the append handle uses the legacy codepage, and errors = "replace" quietly turned characters it cannot hold into question marks while write() still reported success. That path now escapes to \uXXXX instead, which is ASCII, so every codepage holds it and json.loads returns the exact characters. Nothing needs replacing, so errors = "strict" is safe. stream_installer runs sys.executable, so its output is now decoded as UTF-8 by utf8_child_env rather than read as the ANSI codepage. * Only rewrite a shard we can attribute, and append ASCII when we cannot latin-1 was doing too much work. It reads any byte, so it gave a moved shard a reading, but it is the right text only for cp1252: cp1251 Привет came back as Ïðèâåò and the rewrite made that permanent. The codepage is now trusted only when it is the locale's, and an untrusted reading is never written back. That leaves three cases where the file holds bytes UTF-8 cannot read and we are not converting it: no codepage to attribute it to, ambiguous lines outvoting the unambiguous ones, and a preload that could not read the file at all. All three used to append UTF-8 into it. They now append pure ASCII, which every ASCII-compatible codepage stores identically, so the file keeps decoding exactly as it did and no record is lost. Keys from the two readings are also kept apart. A damaged line in a healthy shard was marked seen through its codepage reading, so the retry that would have replaced the unreadable record was refused as a duplicate. * Let the flash-attn install stub take the kwargs the installer now passes _run_kwargs gained encoding and errors, so the one stub in this file that spelled its signature out rejected the call. The other four here already take **kwargs; this one now matches. * Do not let a stuck temp file mask the migration failure unlink() on the failure path could raise in its own right, on a stale .utf8.tmp directory or a temp another process holds. That escaped the constructor instead of returning False, so the caller never reached the ASCII append fallback that keeps the shard single-encoding. The pip fallback in install_wheel also spawns a Python child, so it gets utf8_child_env like the probe above it already had. The uv and nvidia-smi children are native binaries, where PYTHONIOENCODING would do nothing. * Stop converting legacy shards; the encoding that wrote them is unknowable trusted only ever meant that the bytes parse under this machine's codepage, which for a single-byte codepage is nearly always true. A cp1251 shard opened on a cp1252 Windows box decodes cleanly and would have been rewritten with Привет as Ïðèâåò. That is the fourth way this rewrite could corrupt a shard, and the common cause is that a file's encoding cannot be recovered from its bytes. So the rewrite is gone. The shard is left exactly as found, and appends are pure ASCII whenever it holds bytes UTF-8 cannot read, which is what actually delivered the no-mixed-encoding guarantee the rewrite was added for. Dedup keys still come from whichever reading parses, since ids are ASCII either way. This also removes the temp file, so there is no longer any file mode or ACL to carry across. * Scan the sandbox shim; it is shipped code, not a build artifact sandbox_site is on the sandboxed child's PYTHONPATH for every Python run (tools.py:332, 2660), so excluding it let two unannotated text calls through in code we ship. Both read and write the remap sidecar, which holds file paths. The exclusion list is meant for build output only, so the directory comes off it and the two calls name their encoding. * Force the worker's pip children to UTF-8, and read DBCS keys with a DBCS codec The three installer calls run sys.executable -m pip with an inherited environment, so the parent decoded UTF-8 while the child emitted the ANSI codepage. They now go through utf8_child_env like the other Python children. Two tests asserted no env kwarg was passed as a stand-in for no HIP flag being injected. They now assert the flag itself, which is the guarantee they were written for and does not depend on how the env is delivered. Separately, latin-1 cannot stand in for a double-byte codepage while recovering dedup keys: cp932 表 is 95 5C, and the trail byte reads as a JSON backslash, so the record failed to parse and its id was forgotten, appending a duplicate on resume. cp932, cp936, cp949 and cp950 are tried too. The reading is still only ever used for keys, which are ASCII and identical whichever codec parses. * Require more than one legacy line before trusting its dedup keys A shard whose valid records are all ASCII casts no UTF-8 votes, so a single damaged line won the vote by itself, its key was remembered, and the retry that would have replaced the unreadable record was refused. One such line is genuinely undecidable: a legacy record with one accented character and an ASCII record with one stray byte are the same shape. Reading it as damage costs a duplicate; reading it as legacy loses the record for good. Only one of those is recoverable, so it is now read as damage. A real legacy shard has a legacy line for every record carrying an umlaut, so its dedup is unaffected. * Append ASCII whenever the shard already holds non-ASCII bytes The gate asked whether any line was undecodable as UTF-8, which misses a shard where every legacy line happens to be valid UTF-8 too. A cp1251 shard of Р° records is bytes D0 B0 throughout, so appending 世界 as UTF-8 left a file where cp1251 reads the old records correctly and the new one as mojibake, and UTF-8 does the reverse. No single decoding recovered the whole scrape. The gate is now simply whether the shard holds any non-ASCII byte at all, which covers both cases and is easier to reason about: if what is already there reads differently under different encodings, do not add more bytes that do. Appending ASCII costs only \uXXXX escapes, which json.loads turns back into the exact characters, and it leaves the new record correct under either reading. * Skip the two Linux-gated flash-attn tests off Linux _should_try_runtime_flash_attn_install ends in sys.platform.startswith( "linux"), and the threshold test one line above already asserts exactly that, so the two tests that drive _ensure_flash_attn_for_long_context past the gate cannot pass anywhere else: the call returns before it reports a status. They were written on Linux and only surface once the suite actually runs on Windows or macOS, where both fail on an empty status list. This PR is about making the backend behave on Windows, so its own suite should be runnable there. * Fail closed when a KFD topology node does not decode This PR pins that read to utf-8, which turns an undecodable byte into UnicodeDecodeError. That is a ValueError, not an OSError, so it slips past the handler one line below and escapes a helper whose docstring promises to fail closed on any unreadable node. The caller would then lose the whole HIP-order map on a machine that has AMD GPUs, and the reason the helper fails closed is that dropping a node shifts every later ordinal and lets a similar-capacity GPU pass the total-size guard while showing another card's usage. Widening the handler is the same one-line change main already made in #7487, so the two agree and the eventual merge is clean. * Tighten the comments added in this branch * Treat an undecodable marker and undecodable metadata as malformed, not fatal Two more places where pinning the decode changed the failure mode. A UnicodeDecodeError is a ValueError, so neither `except OSError` nor `except (JSONDecodeError, OSError)` catches it, and both sites had a documented fallback that stopped being reached. An undecodable .transport marker used to read as an unknown value, and the caller then safely purged and restarted the partial download. It now aborts prepare_cache_for_transport instead, so the transfer fails rather than retrying. Undecodable .meta.json used to fall back to the file's own name, the same way invalid JSON does. It now aborts URI construction for the entire unstructured seed, so one corrupt byte in original_filename takes out the whole dataset. Both handlers are widened, matching the KFD fix earlier on this branch. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Widen two more decode guards, and pin the kernel installer's pipe Same shape as the ones already fixed here: the read was pinned to UTF-8 while the handler around it still only catches OSError, and UnicodeDecodeError is a ValueError. hf_cache_snapshot_dir answers whether a model is already on disk, and the offline embedding checks turn a raise into a 500. A torn refs/main used to decode into a nonsense commit and miss the snapshot dir; it now skips that cache root and keeps looking. _remove_pid_file runs first in _graceful_shutdown, so a corrupt studio.pid raising there abandoned the inference, export, training and tunnel children the rest of that function exists to kill. ssm_runtime's source-build path builds its subprocess kwargs in a dict and splats them through _run_with_heartbeat, so neither the encoding guard nor the earlier sweep saw the text = True in it: pip's output was still decoded with the Windows ANSI codepage, where a non-ASCII path or a compiler diagnostic mojibakes or raises over an install that was going fine. It now pins the same utf-8/replace pair install_wheel uses, and the HIP branch extends that env rather than replacing it. The guard learned the dict-literal shape and reddens on the old code (ssm_runtime.py:253). * Tighten the comments around the UTF-8 text I/O pins Collapse the multi-line rationales added with the encoding pins down to a line or two each, drop what the code already says, and use one wording for the repeated child-env note. * Do not let an unreadable bootstrap password stop startup, and narrow the kwargs guard ensure_default_admin calls _load_bootstrap_password for every existing admin and the lifespan calls that with no handler, so pinning the decode turned a damaged or pre-pin .bootstrap_password file into a backend that will not start. We write that file ourselves in UTF-8, so a byte that will not decode belongs to a file whose plaintext is worthless anyway; it now reads as no bootstrap password, the same answer as an absent file. A readable one still loads. The new kwargs check also judged every dict literal in the tree, so an unrelated payload carrying "text": True would have been reported as subprocess configuration with a misleading message, and a dict that fills in its encoding on a later line would have been reported too. It now only judges a dict that actually reaches a call, either splatted through a name or written at the call site, and treats a later kw["encoding"] assignment as satisfying it. The ssm_runtime shape it was written for is still caught, and a test pins both directions. * Stop reading a UTF-8 record a second time _read_line always parsed the line under the codepage as well, even when it had already read as UTF-8. Both callers take the UTF-8 reading when there is one and never look at the other, so on a healthy shard the second parse is pure waste, and this file reads all of one on every resume of a scrape it expects to reach gigabytes. Measured on 200,000 records, 76 MB: 1.96s before, 0.81s after, so the double reading was costing 2.8x. The early return is limited to a record, since the key lookup deliberately falls through to the codepage reading when UTF-8 yields something that is not one. A line UTF-8 cannot read still tries the codepage, latin-1 and the double-byte encodings as before, which is what the second reading is for. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Pin the scanned source fixture's line endings test_remote_code_scan_reads_non_ascii_sources compared a file's contents against the string it wrote, but wrote it in text mode, so Windows translated the line ends on the way out and the read back differed by a carriage return. That is the writer's doing, not the encoding the test is about, and it was the one failure on the Windows runner that belonged to this branch. The fixture now writes with newline = "" so the bytes on disk are the string on every platform. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Trim the newer comments to their point Shorten the widened-guard and state store notes added since the last pass, and collapse the line-ending note on the scanned source fixture. * Read the scraper checkpoint as UTF-8 only, never as a codepage A checkpoint holds nothing but base64 cursors and booleans, so one written by an older locale-encoded release is byte-identical to a UTF-8 one and already reads back. The codepage fallback can therefore only ever contribute non-ASCII: if a single-byte reading of the file were all ASCII, the UTF-8 read would have succeeded first. So the only file it changes the answer for is a damaged one, and there it turns a safe reset into a resume on a mojibaked cursor. GitHub answers that with INVALID_CURSOR_ARGUMENTS at HTTP 200, gh_client returns the partial document, and the scraper reads zero nodes and an empty pageInfo, which marks the stream done. Every later resume then skips it entirely. Reading UTF-8 only restores the earlier behaviour of dropping a checkpoint that will not decode, which re-scrapes from the first page while the writers dedup the replay. The shard scan below keeps its codepage reading; those records do carry non-ASCII. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Gate the remaining tilelang install tests to Linux _tilelang_platform_supported() returns False off Linux, so _ensure_tilelang_backend returns before the install and the subprocess mock these six assert on is never called. They fail on macOS runners for that reason alone. The rest of the file already carries this marker; these were missed. * Gate the Windows-incompatible worker and ROCm tests Two different gates, because the production code has two. The causal-conv1d and flash-linear-attention installers bail out on sys.platform == 'win32' alone and run everywhere else including macOS, so those cases get not_on_windows; marking them linux_only would skip tests that legitimately pass off Linux. The DRM and KFD readers return early unless platform.system() is Linux, and their fixtures build a fake sysfs tree needing PCI addresses like 0000:00:02.0 as directory names, which Windows cannot represent, so those get linux_only. The two visible-utilization cases failed for a different reason: on Windows get_visible_gpu_utilization takes the AMD adapter branch ahead of the torch fallback under test, and probing it imports torch, which the runner lacks. Stubbing that branch empty leaves every other platform unchanged. * Treat unparseable JSON nesting as a parse failure, and guard os.fdopen json.loads answers nesting it cannot descend with RecursionError, a RuntimeError, so _parse let it escape where the catch-all it replaced discarded the record. Both callers run _parse outside any further handler, so one damaged checkpoint or shard line aborted the scraper at startup. The encoding guard also missed os.fdopen, which is open() on a descriptor and takes the same locale default in text mode. It flags exactly the two text-mode calls that were left unencoded; the swap lock file's reader was already pinned to UTF-8 while its writer still used the codepage. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Write the non-ASCII source fixture without a 3.10-only argument Path.write_text() only grew newline in 3.10, and pyproject declares requires-python >=3.9, so this raised TypeError there. open() takes the same argument on every supported version and pins the bytes on disk the same way. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Tighten encoding comments * Follow subprocess calls through callable aliases in the encoding guard --------- Co-authored-by: Unsloth <michaelhan@Michaels-MacBook-Pro.local> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: danielhanchen <unslothshared@gmail.com> --------- Co-authored-by: Unsloth <michaelhan@Michaels-MacBook-Pro.local> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: danielhanchen <unslothshared@gmail.com>
465 lines
17 KiB
Python
465 lines
17 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
|
|
|
|
"""Free Cloudflare quick tunnel for Unsloth's 0.0.0.0 launches.
|
|
|
|
The raw http://<ip>:<port> is often unreachable (https-vs-http, blocked ports,
|
|
closed security groups); a cloudflared quick tunnel gives a free
|
|
https://*.trycloudflare.com URL that works anywhere, with no account or domain.
|
|
|
|
Best-effort throughout: any failure collapses to "no URL" and Unsloth keeps
|
|
running. Stdlib only (back-end imports are lazy) so it is safe to import early.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import platform
|
|
import re
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
import threading
|
|
import time
|
|
from pathlib import Path
|
|
from typing import Optional, Tuple
|
|
|
|
# cloudflared logs the quick-tunnel URL; match only the URL so we do not depend
|
|
# on the surrounding wording, which Cloudflare may change. The negative lookahead
|
|
# drops cloudflared's own API host, which appears in failure lines such as
|
|
# failed to request quick Tunnel: Post "https://api.trycloudflare.com/tunnel"
|
|
# and must never be mistaken for a usable tunnel URL.
|
|
_URL_RE = re.compile(r"https://(?!api\.)[A-Za-z0-9-]+\.trycloudflare\.com")
|
|
|
|
# cloudflared logs this once per edge connection it establishes. Until at least
|
|
# one appears the quick-tunnel URL returns Cloudflare error 1033 (HTTP 530), so
|
|
# we wait for it before advertising the URL.
|
|
_REGISTERED_MARKER = "Registered tunnel connection"
|
|
|
|
_RELEASE_BASE = "https://github.com/cloudflare/cloudflared/releases/latest/download"
|
|
|
|
_READY_TIMEOUT = 15.0 # seconds to wait for the URL + a registered edge connection
|
|
_DOWNLOAD_TIMEOUT = 60 # urlopen timeout for the one-time binary download
|
|
|
|
# A registered edge connection does not mean the hostname resolves yet, so the
|
|
# URL is fetched once before it is advertised.
|
|
_PUBLIC_PROBE_PATH = "/api/health"
|
|
_PUBLIC_PROBE_MARKER = "Unsloth UI Backend"
|
|
# One deadline for DNS propagation + the health probe, bounding the startup stall.
|
|
_PUBLIC_PROBE_TIMEOUT = 45.0
|
|
_PUBLIC_PROBE_ATTEMPT_TIMEOUT = 5.0
|
|
_PUBLIC_PROBE_RETRY_DELAY = 1.0
|
|
|
|
# Wait for the hostname via DoH first: an early OS lookup negative-caches the
|
|
# NXDOMAIN for up to 30 min.
|
|
_DNS_POLL_DELAY = 2.0
|
|
# Retry transient DoH failures, but give up fast when DoH is blocked outright.
|
|
_DNS_MAX_DOH_ERRORS = 3
|
|
_DOH_URL = "https://cloudflare-dns.com/dns-query?name={host}&type=A"
|
|
|
|
|
|
def _windows_hidden_kwargs() -> dict:
|
|
"""Suppress a child console window on Windows; no-op elsewhere."""
|
|
if sys.platform != "win32":
|
|
return {}
|
|
flags = getattr(subprocess, "CREATE_NO_WINDOW", 0)
|
|
return {"creationflags": flags} if flags else {}
|
|
|
|
|
|
def _lifetime_kwargs() -> dict:
|
|
"""Bind cloudflared to the parent's lifetime (Linux PDEATHSIG). Lazy +
|
|
best-effort so this module still loads standalone (storage_roots-style)."""
|
|
try:
|
|
from utils.process_lifetime import child_popen_kwargs
|
|
return child_popen_kwargs()
|
|
except Exception:
|
|
return {}
|
|
|
|
|
|
def _asset_name() -> Optional[Tuple[str, bool]]:
|
|
"""(release asset filename, is_tgz) for this OS/arch, or None if unsupported."""
|
|
system = platform.system().lower()
|
|
machine = platform.machine().lower()
|
|
is_x64 = machine in ("x86_64", "amd64", "x64")
|
|
is_arm64 = machine in ("aarch64", "arm64")
|
|
is_x86 = machine in ("i386", "i686", "x86")
|
|
if system == "linux":
|
|
if is_x64:
|
|
return ("cloudflared-linux-amd64", False)
|
|
if is_arm64:
|
|
return ("cloudflared-linux-arm64", False)
|
|
elif system == "darwin":
|
|
if is_arm64:
|
|
return ("cloudflared-darwin-arm64.tgz", True)
|
|
if is_x64:
|
|
return ("cloudflared-darwin-amd64.tgz", True)
|
|
elif system == "windows":
|
|
if is_x64:
|
|
return ("cloudflared-windows-amd64.exe", False)
|
|
if is_x86:
|
|
return ("cloudflared-windows-386.exe", False)
|
|
return None
|
|
|
|
|
|
def _cache_path() -> Optional[Path]:
|
|
"""studio_bin_root()/cloudflared(.exe), or None if the studio home is unresolvable."""
|
|
try:
|
|
from utils.paths.storage_roots import studio_bin_root # lazy: backend-only import
|
|
except Exception:
|
|
return None
|
|
name = "cloudflared.exe" if sys.platform == "win32" else "cloudflared"
|
|
return studio_bin_root() / name
|
|
|
|
|
|
def find_cloudflared() -> Optional[str]:
|
|
"""Locate an existing cloudflared: PATH first, then the Unsloth bin cache."""
|
|
on_path = shutil.which("cloudflared")
|
|
if on_path:
|
|
return on_path
|
|
cached = _cache_path()
|
|
if cached is not None and cached.is_file() and os.access(cached, os.X_OK):
|
|
return str(cached)
|
|
return None
|
|
|
|
|
|
def _download(url: str, dest: Path) -> bool:
|
|
"""Download url to dest via urllib (temp file + atomic rename). Best-effort -> bool."""
|
|
import tempfile
|
|
import urllib.request
|
|
|
|
tmp_path: Optional[Path] = None
|
|
try:
|
|
dest.parent.mkdir(parents = True, exist_ok = True)
|
|
with tempfile.NamedTemporaryFile(
|
|
prefix = dest.name + ".tmp-", dir = dest.parent, delete = False
|
|
) as handle:
|
|
tmp_path = Path(handle.name)
|
|
# GitHub's CDN 403s the default Python-urllib User-Agent.
|
|
req = urllib.request.Request(url, headers = {"User-Agent": "unsloth-studio"})
|
|
with urllib.request.urlopen(req, timeout = _DOWNLOAD_TIMEOUT) as response:
|
|
shutil.copyfileobj(response, handle)
|
|
if tmp_path.stat().st_size == 0:
|
|
raise RuntimeError("empty download")
|
|
os.replace(tmp_path, dest)
|
|
return True
|
|
except Exception:
|
|
if tmp_path is not None:
|
|
try:
|
|
tmp_path.unlink(missing_ok = True)
|
|
except Exception:
|
|
pass
|
|
return False
|
|
|
|
|
|
def _extract_tgz_member(tgz_path: Path, dest: Path) -> bool:
|
|
"""Extract just the `cloudflared` member from a darwin .tgz to dest.
|
|
|
|
Rejects absolute paths and `..` traversal so a hostile archive cannot write
|
|
outside dest. Best-effort -> bool.
|
|
"""
|
|
import tarfile
|
|
try:
|
|
with tarfile.open(tgz_path, "r:gz") as tar:
|
|
member = None
|
|
for m in tar.getmembers():
|
|
if not m.isfile() or os.path.basename(m.name) != "cloudflared":
|
|
continue
|
|
if m.name.startswith("/") or ".." in Path(m.name).parts:
|
|
continue
|
|
member = m
|
|
break
|
|
if member is None:
|
|
return False
|
|
src = tar.extractfile(member)
|
|
if src is None:
|
|
return False
|
|
with src, open(dest, "wb") as out:
|
|
shutil.copyfileobj(src, out)
|
|
return True
|
|
except Exception:
|
|
return False
|
|
|
|
|
|
def ensure_cloudflared() -> Optional[str]:
|
|
"""Return a cloudflared path, downloading + caching the binary once if missing."""
|
|
existing = find_cloudflared()
|
|
if existing:
|
|
return existing
|
|
asset = _asset_name()
|
|
cached = _cache_path()
|
|
if asset is None or cached is None:
|
|
return None
|
|
name, is_tgz = asset
|
|
url = f"{_RELEASE_BASE}/{name}"
|
|
try:
|
|
cached.parent.mkdir(parents = True, exist_ok = True)
|
|
if is_tgz:
|
|
tgz = cached.with_suffix(".tgz")
|
|
if not _download(url, tgz) or not _extract_tgz_member(tgz, cached):
|
|
tgz.unlink(missing_ok = True)
|
|
return None
|
|
tgz.unlink(missing_ok = True)
|
|
elif not _download(url, cached):
|
|
return None
|
|
if sys.platform != "win32":
|
|
os.chmod(cached, 0o755)
|
|
return str(cached)
|
|
except Exception:
|
|
return None
|
|
|
|
|
|
def _wait_for_dns(host: str, deadline: float) -> None:
|
|
import json
|
|
import urllib.request
|
|
|
|
errors = 0
|
|
while True:
|
|
answered = False
|
|
try:
|
|
req = urllib.request.Request(
|
|
_DOH_URL.format(host = host),
|
|
headers = {"Accept": "application/dns-json", "User-Agent": "unsloth-studio"},
|
|
)
|
|
with urllib.request.urlopen(req, timeout = 5) as response:
|
|
answered = bool(json.loads(response.read(65536)).get("Answer"))
|
|
errors = 0
|
|
except Exception:
|
|
errors += 1
|
|
if errors >= _DNS_MAX_DOH_ERRORS:
|
|
return
|
|
if answered:
|
|
return
|
|
remaining = deadline - time.monotonic()
|
|
if remaining <= 0:
|
|
return
|
|
time.sleep(min(_DNS_POLL_DELAY, remaining))
|
|
|
|
|
|
def verify_public_url(url: str, timeout: float = _PUBLIC_PROBE_TIMEOUT) -> bool:
|
|
import json
|
|
import urllib.request
|
|
from urllib.parse import urlsplit
|
|
|
|
deadline = time.monotonic() + timeout
|
|
host = urlsplit(url).hostname
|
|
if host:
|
|
_wait_for_dns(host, deadline)
|
|
|
|
probe_url = f"{url.rstrip('/')}{_PUBLIC_PROBE_PATH}"
|
|
while True:
|
|
try:
|
|
req = urllib.request.Request(probe_url, headers = {"User-Agent": "unsloth-studio"})
|
|
with urllib.request.urlopen(req, timeout = _PUBLIC_PROBE_ATTEMPT_TIMEOUT) as response:
|
|
body = response.read(4096)
|
|
if json.loads(body).get("service") == _PUBLIC_PROBE_MARKER:
|
|
return True
|
|
except Exception:
|
|
pass
|
|
remaining = deadline - time.monotonic()
|
|
if remaining <= 0:
|
|
return False
|
|
time.sleep(min(_PUBLIC_PROBE_RETRY_DELAY, remaining))
|
|
|
|
|
|
class CloudflareTunnel:
|
|
"""A cloudflared quick tunnel to http://localhost:<port>. Best-effort throughout.
|
|
|
|
Use localhost (not the wildcard bind) as the tunnel origin so cloudflared's
|
|
upstream stays local-only.
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
port: int,
|
|
binary: str,
|
|
protocol: Optional[str] = None,
|
|
):
|
|
self.port = port
|
|
self.binary = binary
|
|
# None lets cloudflared pick its default (quic, with its own http2
|
|
# fallback); set to "http2" to force it when quic is blocked.
|
|
self.protocol = protocol
|
|
self._proc: Optional[subprocess.Popen] = None
|
|
self._lock = threading.Lock()
|
|
self._stopped = False
|
|
self._url_event = threading.Event()
|
|
self._ready_event = threading.Event()
|
|
self.url: Optional[str] = None
|
|
self.ready = False
|
|
self.error: Optional[str] = None
|
|
|
|
def start(self) -> None:
|
|
cmd = [
|
|
self.binary,
|
|
"tunnel",
|
|
"--url",
|
|
f"http://localhost:{self.port}",
|
|
"--no-autoupdate",
|
|
]
|
|
if self.protocol:
|
|
cmd += ["--protocol", self.protocol]
|
|
with self._lock:
|
|
# A stop() that landed before us (e.g. a shutdown in the caller's
|
|
# register->start window) marks the tunnel stopped; spawning now would
|
|
# orphan a process nobody owns, so refuse.
|
|
if self._stopped:
|
|
return
|
|
proc = subprocess.Popen(
|
|
cmd,
|
|
stdout = subprocess.PIPE,
|
|
stderr = subprocess.STDOUT,
|
|
stdin = subprocess.DEVNULL,
|
|
text = True,
|
|
encoding = "utf-8",
|
|
errors = "replace",
|
|
bufsize = 1,
|
|
**_windows_hidden_kwargs(),
|
|
**_lifetime_kwargs(),
|
|
)
|
|
self._proc = proc
|
|
threading.Thread(
|
|
target = self._reader, args = (proc,), name = "cloudflared-reader", daemon = True
|
|
).start()
|
|
|
|
def _reader(self, proc: subprocess.Popen) -> None:
|
|
# Drain cloudflared's output: capture the first trycloudflare URL and the
|
|
# first edge-connection registration, and keep draining so it never
|
|
# blocks on a full pipe.
|
|
try:
|
|
if proc.stdout is not None:
|
|
for line in proc.stdout:
|
|
if self.url is None:
|
|
match = _URL_RE.search(line)
|
|
if match:
|
|
self.url = match.group(0)
|
|
self._url_event.set()
|
|
if not self.ready and _REGISTERED_MARKER in line:
|
|
self.ready = True
|
|
self._ready_event.set()
|
|
except Exception:
|
|
pass
|
|
finally:
|
|
# stdout closed -> cloudflared has exited. Record why, and unblock any
|
|
# waiters at once instead of letting them wait out the full timeout.
|
|
if self.url is None:
|
|
self.error = "cloudflared exited before emitting a tunnel URL"
|
|
elif not self.ready:
|
|
self.error = "cloudflared exited before the tunnel connection registered"
|
|
self._url_event.set()
|
|
self._ready_event.set()
|
|
|
|
def wait_for_ready(self, timeout: float = _READY_TIMEOUT) -> Optional[str]:
|
|
"""Block until the tunnel is actually serving -- the URL has been minted
|
|
*and* at least one edge connection has registered -- or until timeout.
|
|
|
|
Returns the URL only when ready, so callers never advertise a URL that
|
|
would return Cloudflare error 1033 (HTTP 530)."""
|
|
self._ready_event.wait(timeout)
|
|
return self.url if self.ready else None
|
|
|
|
def stop(self) -> None:
|
|
"""Terminate the tunnel. Idempotent and safe to call from a signal handler."""
|
|
with self._lock:
|
|
# Mark stopped so a start() racing behind us refuses to spawn.
|
|
self._stopped = True
|
|
proc, self._proc = self._proc, None
|
|
if proc is None:
|
|
return
|
|
try:
|
|
if proc.poll() is None:
|
|
proc.terminate()
|
|
try:
|
|
proc.wait(timeout = 5)
|
|
except subprocess.TimeoutExpired:
|
|
proc.kill()
|
|
try:
|
|
proc.wait(timeout = 5)
|
|
except Exception:
|
|
pass
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
# Single serving process per Unsloth launch, so one module-level tunnel handle is
|
|
# enough; the lock guards the start/stop/shutdown races.
|
|
_active_tunnel: Optional[CloudflareTunnel] = None
|
|
_active_lock = threading.Lock()
|
|
# Latched by stop_studio_tunnel so a shutdown landing *between* a start's retry
|
|
# attempts aborts the loop instead of starting a tunnel nobody will ever stop.
|
|
_shutdown_requested = False
|
|
|
|
|
|
def start_studio_tunnel(port: int, timeout: float = _READY_TIMEOUT) -> Optional[str]:
|
|
"""Start a quick tunnel and return its public URL once it is actually
|
|
serving, or None (best-effort).
|
|
|
|
Waits for cloudflared to both mint the URL and register an edge connection,
|
|
then fetches /api/health over the public URL, so the caller never advertises
|
|
a link that yields Cloudflare error 1033 (HTTP 530) or an unresolvable host.
|
|
If a URL is minted but no connection registers within the window (e.g. quic
|
|
is blocked on this network), retries once forcing the http2 protocol. On any
|
|
failure the tunnel is stopped and None is returned.
|
|
"""
|
|
global _active_tunnel, _shutdown_requested
|
|
binary = ensure_cloudflared()
|
|
if not binary:
|
|
return None
|
|
with _active_lock:
|
|
_shutdown_requested = False # fresh session
|
|
# Default protocol first (quic, with cloudflared's own http2 fallback); if a
|
|
# URL appears but no connection registers, quic is likely blocked -> retry
|
|
# once forcing http2.
|
|
for protocol in (None, "http2"):
|
|
# Create + register under the lock, and bail if a stop already landed
|
|
# (e.g. between this and the previous attempt) so we never start a tunnel
|
|
# after shutdown has run.
|
|
with _active_lock:
|
|
if _shutdown_requested:
|
|
_active_tunnel = None
|
|
return None
|
|
tunnel = CloudflareTunnel(port, binary, protocol = protocol)
|
|
prior, _active_tunnel = _active_tunnel, tunnel
|
|
if prior is not None:
|
|
prior.stop()
|
|
registered = False
|
|
try:
|
|
tunnel.start()
|
|
url = tunnel.wait_for_ready(timeout)
|
|
registered = url is not None
|
|
if url and not verify_public_url(url):
|
|
url = None
|
|
except Exception:
|
|
url = None
|
|
if url:
|
|
return url
|
|
saw_url = tunnel.url is not None
|
|
# Not ready: drop it, but only if we are still the active tunnel.
|
|
with _active_lock:
|
|
was_active = _active_tunnel is tunnel
|
|
if was_active:
|
|
_active_tunnel = None
|
|
tunnel.stop()
|
|
# A concurrent shutdown or start took over while we waited; retrying would
|
|
# spawn a tunnel nobody owns (orphaned after shutdown), so bail instead.
|
|
if not was_active:
|
|
return None
|
|
# No URL at all is an API/network failure, not a protocol one; forcing
|
|
# http2 will not help, so do not burn another window on it.
|
|
if not saw_url:
|
|
return None
|
|
# probe failure after registering is DNS propagation; http2 would not help
|
|
if registered:
|
|
return None
|
|
return None
|
|
|
|
|
|
def stop_studio_tunnel() -> None:
|
|
"""Terminate the active tunnel, if any. Idempotent."""
|
|
global _active_tunnel, _shutdown_requested
|
|
with _active_lock:
|
|
# Latch so an in-flight start_studio_tunnel won't start a fresh tunnel
|
|
# (e.g. its http2 retry) after we have already torn down.
|
|
_shutdown_requested = True
|
|
tunnel, _active_tunnel = _active_tunnel, None
|
|
if tunnel is not None:
|
|
tunnel.stop()
|