mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-17 02:05:22 -04:00
Merge branch 'main' of github.com:pewdiepie-archdaemon/odysseus
# Conflicts: # static/js/cookbookRunning.js
This commit is contained in:
@@ -66,6 +66,23 @@ function _clearPillLabel(task) {
|
||||
return 'clear';
|
||||
}
|
||||
|
||||
// A pip dependency/driver install (payload._dep) reports success with the
|
||||
// runner's "=== Process exited with code 0 ===" sentinel and pip's
|
||||
// "Successfully installed" line — never the HuggingFace download markers
|
||||
// (DONE / 100% / /snapshots/ / DOWNLOAD_OK) that the download heuristics look
|
||||
// for. Without this, a clean install whose tmux pane has already gone away is
|
||||
// misread as crashed/stopped even though pip exited 0. Prefer the authoritative
|
||||
// exit-code sentinel; fall back to pip's success line when no sentinel was
|
||||
// captured (and there's no install error in the same output).
|
||||
function _depInstallSucceeded(output) {
|
||||
const text = String(output || '');
|
||||
if (!text) return false;
|
||||
const exitMatch = text.match(/=== Process exited with code (-?\d+) ===/);
|
||||
if (exitMatch) return Number(exitMatch[1]) === 0;
|
||||
return /\b(?:Successfully installed|Requirement already satisfied)\b/.test(text)
|
||||
&& !/\bERROR\b|No matching distribution|Could not find a version|Traceback \(most recent call last\)/.test(text);
|
||||
}
|
||||
|
||||
function _shouldOfferCrashReport(task) {
|
||||
if (!task) return false;
|
||||
if (task._unreachable && task.type === 'serve') return true;
|
||||
@@ -2495,9 +2512,15 @@ async function _reconnectTask(el, task) {
|
||||
&& /Successfully installed|Requirement already (?:satisfied|up-to-date)/i.test(lastOutput)
|
||||
&& !/error:|ERROR:/.test(lastOutput.slice(-1024));
|
||||
const serveLooksReady = task.type === 'serve' && _serveOutputLooksReady({ ...task, output: lastOutput });
|
||||
const looksSuccessful = task.type === 'download'
|
||||
? downloadLooksSuccessful
|
||||
: (_isPipTask ? pipLooksSuccessful : serveLooksReady);
|
||||
// Dependency installs are tracked as download tasks but finish with a
|
||||
// pip exit-0 sentinel, not HF download markers — check that too.
|
||||
// Standalone pip-* serves finish with pip's own success line, not
|
||||
// HF or "Uvicorn running on".
|
||||
const depInstallSucceeded = !!task.payload?._dep && _depInstallSucceeded(lastOutput);
|
||||
const looksSuccessful = depInstallSucceeded
|
||||
|| (task.type === 'download'
|
||||
? downloadLooksSuccessful
|
||||
: (_isPipTask ? pipLooksSuccessful : serveLooksReady));
|
||||
if (!lastOutput.trim() || !looksSuccessful) {
|
||||
_updateTask(task.sessionId, { status: 'crashed' });
|
||||
el.dataset.status = 'crashed';
|
||||
@@ -3411,11 +3434,18 @@ async function _pollBackgroundStatus() {
|
||||
const live = statusById.get(task.sessionId);
|
||||
if (!live) continue;
|
||||
const updates = {};
|
||||
// A finished dependency install whose tmux pane is gone is reported
|
||||
// "stopped" by the backend (its pip package is never in the HF cache the
|
||||
// dead-session check inspects). Recover "done" from the retained output's
|
||||
// exit-0 sentinel so a clean install isn't downgraded to crashed.
|
||||
const depDone = !!task.payload?._dep && _depInstallSucceeded(task.output);
|
||||
const nextStatus = live.status === 'completed'
|
||||
? 'done'
|
||||
: (live.status === 'error'
|
||||
? 'error'
|
||||
: (live.status === 'stopped' ? (task.type === 'download' ? 'crashed' : 'stopped') : null));
|
||||
: (live.status === 'stopped'
|
||||
? (depDone ? 'done' : (task.type === 'download' ? 'crashed' : 'stopped'))
|
||||
: null));
|
||||
if (nextStatus && task.status !== nextStatus) {
|
||||
updates.status = nextStatus;
|
||||
if (nextStatus === 'done' && task.payload?._dep) completedDeps.push(task);
|
||||
|
||||
Reference in New Issue
Block a user