mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +00:00
5fba236644
Six days after #23937 (608 fixes) the codebase had accumulated 241 new PLR6201 violations. Same mechanical `x in (...)` → `x in {...}` fix, same zero-risk profile: set lookup is O(1) vs O(n) for tuple and the two are semantically equivalent for hashable scalar membership tests. All 241 instances fixed via `ruff check --select PLR6201 --fix --unsafe-fixes`, zero remaining. Every changed value is a hashable scalar (str/int/None/enum/signal); no risk of unhashable runtime errors. No behavior change. Test plan: - 119 files changed, +244/-244 (net zero) — exactly one-line edits - `ruff check` clean afterward - Compile checks pass on the largest touched files (cli.py, run_agent.py, gateway/run.py, gateway/platforms/discord.py, model_tools.py) - Subset broad test run on tests/gateway/ tests/hermes_cli/ tests/agent/ tests/tools/: 18187 passed, 59 pre-existing failures (verified against origin/main with the same shape — identical failure count, identical category — all xdist test-order flakes unrelated to this change) Follows the same template as PR #23937 ([tracker: #23972](https://github.com/NousResearch/hermes-agent/issues/23972)).
106 lines
3.5 KiB
Python
106 lines
3.5 KiB
Python
"""Lazy dependency bootstrapper for non-Python runtime deps.
|
|
|
|
Detection and prompting live here in Python — not in install.sh — because:
|
|
1. shutil.which() works on every platform; install.sh needs bash.
|
|
2. Detection is instant; spawning bash for a "is node installed?" check is waste.
|
|
3. Python controls the UX (rich prompts, non-interactive fallback, TTY detection).
|
|
|
|
install.sh is still the *installation* backend because it has 1900 lines of
|
|
battle-tested OS detection and package-manager logic (apt/brew/pacman/dnf/
|
|
zypper/Termux/…). Reimplementing that in Python would be huge duplication.
|
|
|
|
Deps that degrade gracefully (ripgrep → grep fallback, ffmpeg → skip conversion)
|
|
don't need ensure_dependency wired in — only hard-fail sites do (TUI needs node,
|
|
browser tool needs agent-browser).
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
_DEP_CHECKS = {
|
|
"node": lambda: shutil.which("node") is not None,
|
|
"browser": lambda: (
|
|
shutil.which("agent-browser") is not None
|
|
or _has_system_browser()
|
|
or _has_hermes_agent_browser()
|
|
),
|
|
"ripgrep": lambda: shutil.which("rg") is not None,
|
|
"ffmpeg": lambda: shutil.which("ffmpeg") is not None,
|
|
}
|
|
|
|
_DEP_DESCRIPTIONS = {
|
|
"node": "Node.js (required for browser tools and TUI)",
|
|
"browser": "Browser engine (Chromium, for web browsing tools)",
|
|
"ripgrep": "ripgrep (fast file search)",
|
|
"ffmpeg": "ffmpeg (TTS voice messages)",
|
|
}
|
|
|
|
|
|
def _has_system_browser() -> bool:
|
|
for name in ("google-chrome", "google-chrome-stable", "chromium", "chromium-browser", "chrome"):
|
|
if shutil.which(name):
|
|
return True
|
|
return False
|
|
|
|
|
|
def _has_hermes_agent_browser() -> bool:
|
|
from hermes_constants import get_hermes_home
|
|
return (get_hermes_home() / "node_modules" / ".bin" / "agent-browser").is_file()
|
|
|
|
|
|
def _find_install_script(
|
|
package_dir: Path | None = None,
|
|
repo_root: Path | None = None,
|
|
) -> Path | None:
|
|
"""Locate install.sh — bundled in wheel or in git checkout."""
|
|
if package_dir is None:
|
|
package_dir = Path(__file__).parent
|
|
if repo_root is None:
|
|
repo_root = package_dir.parent
|
|
|
|
bundled = package_dir / "scripts" / "install.sh"
|
|
if bundled.is_file():
|
|
return bundled
|
|
repo = repo_root / "scripts" / "install.sh"
|
|
if repo.is_file():
|
|
return repo
|
|
return None
|
|
|
|
|
|
def ensure_dependency(dep: str, interactive: bool = True) -> bool:
|
|
"""Ensure a non-Python dependency is available. Returns True if available."""
|
|
check = _DEP_CHECKS.get(dep)
|
|
if check and check():
|
|
return True
|
|
|
|
script = _find_install_script()
|
|
if script is None:
|
|
if interactive:
|
|
desc = _DEP_DESCRIPTIONS.get(dep, dep)
|
|
print(f" {desc} is not installed and install.sh was not found.")
|
|
print(f" Install {dep} manually and try again.")
|
|
return False
|
|
|
|
if interactive and sys.stdin.isatty():
|
|
desc = _DEP_DESCRIPTIONS.get(dep, dep)
|
|
try:
|
|
reply = input(f"{desc} is not installed. Install now? [Y/n] ").strip().lower()
|
|
except (EOFError, KeyboardInterrupt):
|
|
return False
|
|
if reply not in {"", "y", "yes"}:
|
|
return False
|
|
|
|
result = subprocess.run(
|
|
["bash", str(script), "--ensure", dep],
|
|
env={**os.environ, "IS_INTERACTIVE": "false"},
|
|
)
|
|
if result.returncode != 0:
|
|
return False
|
|
|
|
if check:
|
|
return check()
|
|
return True
|