mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-15 17:25:26 -04:00
Ashvin
23837f4571
When a download's tmux pane is gone, the status endpoint trusted only the HF-cache probe to tell completed from stopped. The probe derives its cache root from its own environment, but the download runner exports HF_HOME=<local_dir> (the #2722 fix), so custom-dir downloads land in <local_dir>/hub where the probe never looks - and ollama pulls don't touch the HF cache at all. Finished downloads were reported as stopped forever, and tasks already persisted as completed were demoted back to stopped on the next poll. This is the backend half of #3897, deliberately left out of the frontend fix in #4000. - honor the conclusive runner markers first: DOWNLOAD_OK -> completed (keeping the "Fetching 0 files" error guard), DOWNLOAD_FAILED -> error - pass the task's local_dir through to the cache probes so they check the cache the download actually wrote to, keeping the env-var fallback for default-cache downloads - move the probe scripts and marker classification into routes/cookbook_output.py (dependency-free) with behavioral tests Fixes #4017
76 lines
3.4 KiB
Python
76 lines
3.4 KiB
Python
"""Pure helpers for shaping cookbook task output for the status response.
|
|
|
|
Kept dependency-free (no FastAPI / SQLAlchemy imports) so the behavior can be
|
|
unit-tested without standing up the whole app.
|
|
"""
|
|
|
|
import re
|
|
|
|
_FETCHING_ZERO_FILES_RE = re.compile(r"Fetching\s+0\s+files", re.IGNORECASE)
|
|
|
|
# Probe scripts for the dead-session download check, run as
|
|
# `python3 -c <PROBE> <repo_id> <cache_root>` (locally or over SSH).
|
|
# cache_root is the task's custom download dir, '' for the default HF cache.
|
|
# It has to be passed explicitly: the download runner exports
|
|
# HF_HOME=<local_dir>, so that task's cache lives under <local_dir>/hub, and
|
|
# the probe process's own environment knows nothing about it.
|
|
HF_CACHE_COMPLETE_PROBE = (
|
|
"import os,sys;"
|
|
"repo=sys.argv[1];"
|
|
"root=os.path.expanduser(sys.argv[2]) if len(sys.argv)>2 and sys.argv[2] else '';"
|
|
"base=os.path.join(root,'hub') if root else (os.environ.get('HUGGINGFACE_HUB_CACHE') or os.path.join(os.environ.get('HF_HOME', os.path.expanduser('~/.cache/huggingface')), 'hub'));"
|
|
"d=os.path.join(base,'models--'+repo.replace('/','--'));"
|
|
"snap=os.path.join(d,'snapshots');"
|
|
"ok=os.path.isdir(snap) and any(os.path.isdir(os.path.join(snap,x)) and os.listdir(os.path.join(snap,x)) for x in os.listdir(snap));"
|
|
"inc=False;"
|
|
"blobs=os.path.join(d,'blobs');"
|
|
"inc=os.path.isdir(blobs) and any(x.endswith('.incomplete') for x in os.listdir(blobs));"
|
|
"sys.exit(0 if ok and not inc else 1)"
|
|
)
|
|
|
|
HF_CACHE_INCOMPLETE_PROBE = (
|
|
"import os,sys;"
|
|
"repo=sys.argv[1];"
|
|
"root=os.path.expanduser(sys.argv[2]) if len(sys.argv)>2 and sys.argv[2] else '';"
|
|
"base=os.path.join(root,'hub') if root else (os.environ.get('HUGGINGFACE_HUB_CACHE') or os.path.join(os.environ.get('HF_HOME', os.path.expanduser('~/.cache/huggingface')), 'hub'));"
|
|
"d=os.path.join(base,'models--'+repo.replace('/','--'));"
|
|
"blobs=os.path.join(d,'blobs');"
|
|
"inc=os.path.isdir(blobs) and any(x.endswith('.incomplete') for x in os.listdir(blobs));"
|
|
"sys.exit(0 if inc else 1)"
|
|
)
|
|
|
|
|
|
def classify_dead_download(full_snapshot: str):
|
|
"""Resolve a dead download session's status from its runner markers.
|
|
|
|
The runner prints DOWNLOAD_OK only after exiting 0 (and DOWNLOAD_FAILED
|
|
otherwise), so the markers stay trustworthy after the tmux pane is gone.
|
|
Returns (status, zero_files), or None when the snapshot carries no marker
|
|
and the caller has to fall back to the cache probe. Same precedence as
|
|
the live-session branch: DOWNLOAD_OK wins, except a "Fetching 0 files"
|
|
run is an error (nothing matched the include/quant pattern).
|
|
"""
|
|
if not full_snapshot:
|
|
return None
|
|
if "DOWNLOAD_OK" in full_snapshot:
|
|
if _FETCHING_ZERO_FILES_RE.search(full_snapshot):
|
|
return ("error", True)
|
|
return ("completed", False)
|
|
if "DOWNLOAD_FAILED" in full_snapshot:
|
|
return ("error", False)
|
|
return None
|
|
|
|
|
|
def error_aware_output_tail(full_snapshot: str, status: str) -> str:
|
|
"""Return the trailing slice of a task log for the status response.
|
|
|
|
Failed tasks return the last 50 lines so the "Copy last 50 lines" action
|
|
surfaces the actual error context (stack traces, build output). Running and
|
|
other non-error tasks keep the cheaper 12-line tail to limit the payload on
|
|
the 10s polling interval.
|
|
"""
|
|
if not full_snapshot:
|
|
return ""
|
|
tail_lines = 50 if status == "error" else 12
|
|
return "\n".join(full_snapshot.splitlines()[-tail_lines:])
|