mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-09-12 19:28:31 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2cf9fa9a2 |
+1
-49
@@ -934,16 +934,6 @@ def _install_requirements(plugin_dir: Path, plugin_id: str):
|
|||||||
if not req_file.exists():
|
if not req_file.exists():
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# Packaged/distributed hosts (e.g. slopsmith-desktop) set
|
|
||||||
# SLOPSMITH_SKIP_PLUGIN_INSTALL to skip the blocking startup pip install:
|
|
||||||
# heavy optional deps (torch/whisperx/demucs) would otherwise download for
|
|
||||||
# minutes and hang the backend past the host app's readiness window. The
|
|
||||||
# plugin still loads and degrades gracefully when its optional deps are
|
|
||||||
# absent.
|
|
||||||
if os.environ.get("SLOPSMITH_SKIP_PLUGIN_INSTALL", "").strip().lower() not in ("", "0", "false", "no"):
|
|
||||||
log.info("Skipping requirement install for plugin %r (SLOPSMITH_SKIP_PLUGIN_INSTALL set)", plugin_id)
|
|
||||||
return True
|
|
||||||
|
|
||||||
_PIP_TARGET.mkdir(parents=True, exist_ok=True)
|
_PIP_TARGET.mkdir(parents=True, exist_ok=True)
|
||||||
pip_target = str(_PIP_TARGET)
|
pip_target = str(_PIP_TARGET)
|
||||||
|
|
||||||
@@ -956,32 +946,9 @@ def _install_requirements(plugin_dir: Path, plugin_id: str):
|
|||||||
# (PYTHONHASHSEED), so the marker would never match on restart and
|
# (PYTHONHASHSEED), so the marker would never match on restart and
|
||||||
# pip would re-resolve every plugin's requirements on every boot.
|
# pip would re-resolve every plugin's requirements on every boot.
|
||||||
marker = _PIP_TARGET / f".installed_{plugin_id}"
|
marker = _PIP_TARGET / f".installed_{plugin_id}"
|
||||||
fail_marker = _PIP_TARGET / f".failed_{plugin_id}"
|
|
||||||
req_hash = hashlib.sha256(req_file.read_bytes()).hexdigest()
|
req_hash = hashlib.sha256(req_file.read_bytes()).hexdigest()
|
||||||
|
if marker.exists() and marker.read_text().strip() == req_hash:
|
||||||
def _marker_matches(m):
|
|
||||||
# Tolerate an unreadable/transiently-broken marker (permissions, I/O):
|
|
||||||
# treat it as "no match" and fall through to a normal install attempt
|
|
||||||
# rather than letting read_text() raise out of this function.
|
|
||||||
try:
|
|
||||||
return m.exists() and m.read_text().strip() == req_hash
|
|
||||||
except OSError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
if _marker_matches(marker):
|
|
||||||
return True # Already installed, same requirements
|
return True # Already installed, same requirements
|
||||||
# A previous install of these exact requirements already failed. Don't
|
|
||||||
# re-attempt on every boot: that re-blocks startup for the full pip timeout
|
|
||||||
# each launch. Retry only when requirements.txt changes (new hash) or the
|
|
||||||
# .failed_ marker is cleared.
|
|
||||||
if _marker_matches(fail_marker):
|
|
||||||
return False
|
|
||||||
|
|
||||||
def _record_failure():
|
|
||||||
try:
|
|
||||||
fail_marker.write_text(req_hash)
|
|
||||||
except OSError:
|
|
||||||
pass # read-only target: nothing to persist
|
|
||||||
|
|
||||||
log.info("Installing requirements for plugin %r (this can take a while for large deps)...", plugin_id)
|
log.info("Installing requirements for plugin %r (this can take a while for large deps)...", plugin_id)
|
||||||
try:
|
try:
|
||||||
@@ -993,20 +960,7 @@ def _install_requirements(plugin_dir: Path, plugin_id: str):
|
|||||||
capture_output=True, text=True, timeout=1800,
|
capture_output=True, text=True, timeout=1800,
|
||||||
)
|
)
|
||||||
if result.returncode == 0:
|
if result.returncode == 0:
|
||||||
# Persisting markers is best-effort and must NOT fall through to the
|
|
||||||
# outer `except` (which would call _record_failure() and make a
|
|
||||||
# SUCCESSFUL install look like a sticky failure). The two writes are
|
|
||||||
# independent: clearing a stale .failed_ marker must still happen
|
|
||||||
# even if writing the success marker fails — otherwise a real
|
|
||||||
# success would stay recorded as a failure on the next boot.
|
|
||||||
try:
|
|
||||||
marker.write_text(req_hash)
|
marker.write_text(req_hash)
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
fail_marker.unlink() # clear any stale failure record
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
log.info("Requirements installed for plugin %r", plugin_id)
|
log.info("Requirements installed for plugin %r", plugin_id)
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
@@ -1020,7 +974,6 @@ def _install_requirements(plugin_dir: Path, plugin_id: str):
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
log.warning("Plugin %r: failed to install requirements: %s", plugin_id, result.stderr[:300])
|
log.warning("Plugin %r: failed to install requirements: %s", plugin_id, result.stderr[:300])
|
||||||
_record_failure()
|
|
||||||
return False
|
return False
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
err_lower = str(e).lower()
|
err_lower = str(e).lower()
|
||||||
@@ -1033,7 +986,6 @@ def _install_requirements(plugin_dir: Path, plugin_id: str):
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
log.warning("Plugin %r: error installing requirements: %s", plugin_id, e)
|
log.warning("Plugin %r: error installing requirements: %s", plugin_id, e)
|
||||||
_record_failure()
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+6
-1
@@ -145,7 +145,12 @@
|
|||||||
function renderTopbar() {
|
function renderTopbar() {
|
||||||
const bar = document.getElementById('v3-topbar');
|
const bar = document.getElementById('v3-topbar');
|
||||||
if (!bar) return;
|
if (!bar) return;
|
||||||
bar.className = 'sticky top-0 z-20 bg-fb-sidebar/80 backdrop-blur';
|
// z-30 (not z-20): the global topbar must stack above per-screen sticky
|
||||||
|
// bars — notably the v3 Songs filter/search bar, which is also
|
||||||
|
// `sticky top-0 z-20 backdrop-blur` and, being later in source order,
|
||||||
|
// otherwise wins the z-index tie and paints over the topbar's instrument
|
||||||
|
// selector / tuner dropdowns (slopsmith#857 regression).
|
||||||
|
bar.className = 'sticky top-0 z-30 bg-fb-sidebar/80 backdrop-blur';
|
||||||
bar.innerHTML =
|
bar.innerHTML =
|
||||||
// Row 1 — top utility bar: search.
|
// Row 1 — top utility bar: search.
|
||||||
'<div class="flex items-center gap-4 px-4 md:px-8 pt-4">' +
|
'<div class="flex items-center gap-4 px-4 md:px-8 pt-4">' +
|
||||||
|
|||||||
Reference in New Issue
Block a user