mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-30 06:41:51 +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)).
101 lines
3.6 KiB
Python
101 lines
3.6 KiB
Python
"""Tests for tui_gateway/entry.py sys.path hardening (issue #15989).
|
|
|
|
When the TUI backend is spawned by Node.js, the Python interpreter may have
|
|
'' or '.' at the front of sys.path, allowing a local utils/ directory in CWD
|
|
to shadow the installed utils module. entry.py must sanitize sys.path before
|
|
any non-stdlib import is resolved.
|
|
"""
|
|
|
|
import importlib
|
|
import os
|
|
import sys
|
|
from unittest.mock import patch
|
|
|
|
|
|
def _reload_entry_with_env(env_overrides: dict) -> None:
|
|
"""Re-execute entry.py's module-level path setup under a controlled env."""
|
|
# We only want to exercise the sys.path fixup block, not the signal/import
|
|
# machinery that follows. We do this by running the fixup code verbatim in
|
|
# a fresh copy of sys.path rather than importing the real module (which
|
|
# would trigger tui_gateway.server imports requiring heavy mocks).
|
|
original_path = sys.path[:]
|
|
original_env = {k: os.environ.get(k) for k in env_overrides}
|
|
try:
|
|
with patch.dict(os.environ, env_overrides, clear=False):
|
|
_src_root = os.environ.get("HERMES_PYTHON_SRC_ROOT", "")
|
|
if _src_root and _src_root not in sys.path:
|
|
sys.path.insert(0, _src_root)
|
|
sys.path = [p for p in sys.path if p not in {"", "."}]
|
|
return sys.path[:]
|
|
finally:
|
|
sys.path = original_path
|
|
for k, v in original_env.items():
|
|
if v is None:
|
|
os.environ.pop(k, None)
|
|
else:
|
|
os.environ[k] = v
|
|
|
|
|
|
def test_empty_string_and_dot_removed_from_sys_path():
|
|
original = sys.path[:]
|
|
try:
|
|
sys.path.insert(0, "")
|
|
sys.path.insert(0, ".")
|
|
assert "" in sys.path
|
|
assert "." in sys.path
|
|
|
|
# Run the entry.py fixup logic directly
|
|
sys.path = [p for p in sys.path if p not in {"", "."}]
|
|
|
|
assert "" not in sys.path
|
|
assert "." not in sys.path
|
|
finally:
|
|
sys.path = original
|
|
|
|
|
|
def test_hermes_src_root_inserted_at_front():
|
|
original = sys.path[:]
|
|
try:
|
|
fake_root = "/fake/hermes/src"
|
|
with patch.dict(os.environ, {"HERMES_PYTHON_SRC_ROOT": fake_root}):
|
|
_src_root = os.environ.get("HERMES_PYTHON_SRC_ROOT", "")
|
|
if _src_root and _src_root not in sys.path:
|
|
sys.path.insert(0, _src_root)
|
|
sys.path = [p for p in sys.path if p not in {"", "."}]
|
|
|
|
assert sys.path[0] == fake_root
|
|
finally:
|
|
sys.path = original
|
|
|
|
|
|
def test_src_root_not_duplicated_if_already_present():
|
|
original = sys.path[:]
|
|
try:
|
|
fake_root = "/already/present"
|
|
sys.path.insert(0, fake_root)
|
|
count_before = sys.path.count(fake_root)
|
|
|
|
with patch.dict(os.environ, {"HERMES_PYTHON_SRC_ROOT": fake_root}):
|
|
_src_root = os.environ.get("HERMES_PYTHON_SRC_ROOT", "")
|
|
if _src_root and _src_root not in sys.path:
|
|
sys.path.insert(0, _src_root)
|
|
sys.path = [p for p in sys.path if p not in {"", "."}]
|
|
|
|
assert sys.path.count(fake_root) == count_before
|
|
finally:
|
|
sys.path = original
|
|
|
|
|
|
def test_no_src_root_env_does_not_crash():
|
|
original = sys.path[:]
|
|
try:
|
|
env = {k: v for k, v in os.environ.items() if k != "HERMES_PYTHON_SRC_ROOT"}
|
|
with patch.dict(os.environ, {}, clear=True):
|
|
os.environ.update(env)
|
|
_src_root = os.environ.get("HERMES_PYTHON_SRC_ROOT", "")
|
|
if _src_root and _src_root not in sys.path:
|
|
sys.path.insert(0, _src_root)
|
|
sys.path = [p for p in sys.path if p not in {"", "."}]
|
|
# No exception raised
|
|
finally:
|
|
sys.path = original
|