mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-30 06:41:51 +00:00
66827f8947
Remove unused imports (F401) and duplicate/shadowed import redefinitions (F811) across the codebase using ruff's safe autofixes. No behavioral changes -- imports only. - ~1400 safe autofixes applied across 644 files (net -1072 lines) - __init__.py re-exports preserved (excluded from F401 removal so public re-export surfaces stay intact) - Re-exports that are imported or monkeypatched by tests but look unused in their defining module are kept with explicit # noqa: F401 (gateway/run.py load_dotenv; run_agent re-exports from agent.message_sanitization, agent.context_compressor, agent.retry_utils, agent.prompt_builder, agent.process_bootstrap, agent.codex_responses_adapter) - Unsafe F841 (unused-variable) fixes deliberately skipped -- those can change behavior when the RHS has side effects - ruff lints remain disabled in pyproject.toml (only PLW1514 is selected); this is a one-time cleanup, not a config change Verification: - python -m compileall: clean - pytest --collect-only: all 27161 tests collect (zero import errors) - core entry points import clean (run_agent, model_tools, cli, toolsets, hermes_state, batch_runner, gateway) - static scan: every name any test imports directly from an edited module still resolves
84 lines
3.2 KiB
Python
84 lines
3.2 KiB
Python
"""Tests for _resolve_path() — TERMINAL_CWD-aware path resolution in file_tools."""
|
|
|
|
import os
|
|
from pathlib import Path
|
|
from types import SimpleNamespace
|
|
|
|
|
|
|
|
class TestResolvePath:
|
|
"""Verify _resolve_path respects TERMINAL_CWD for worktree isolation."""
|
|
|
|
def test_relative_path_uses_terminal_cwd(self, monkeypatch, tmp_path):
|
|
"""Relative paths resolve against TERMINAL_CWD, not process CWD."""
|
|
monkeypatch.setenv("TERMINAL_CWD", str(tmp_path))
|
|
from tools.file_tools import _resolve_path
|
|
|
|
result = _resolve_path("foo/bar.py")
|
|
assert result == (tmp_path / "foo" / "bar.py")
|
|
|
|
def test_absolute_path_ignores_terminal_cwd(self, monkeypatch, tmp_path):
|
|
"""Absolute paths are unaffected by TERMINAL_CWD."""
|
|
monkeypatch.setenv("TERMINAL_CWD", str(tmp_path))
|
|
from tools.file_tools import _resolve_path
|
|
|
|
absolute = (tmp_path / "already-absolute.txt").resolve()
|
|
result = _resolve_path(str(absolute))
|
|
assert result == absolute
|
|
|
|
def test_falls_back_to_cwd_without_terminal_cwd(self, monkeypatch):
|
|
"""Without TERMINAL_CWD, falls back to os.getcwd()."""
|
|
monkeypatch.delenv("TERMINAL_CWD", raising=False)
|
|
from tools.file_tools import _resolve_path
|
|
|
|
result = _resolve_path("some_file.txt")
|
|
assert result == Path(os.getcwd()) / "some_file.txt"
|
|
|
|
def test_tilde_expansion(self, monkeypatch, tmp_path):
|
|
"""~ is expanded before TERMINAL_CWD join (already absolute)."""
|
|
monkeypatch.setenv("TERMINAL_CWD", str(tmp_path))
|
|
from tools.file_tools import _resolve_path
|
|
|
|
result = _resolve_path("~/notes.txt")
|
|
# After expanduser, ~/notes.txt becomes absolute → TERMINAL_CWD ignored
|
|
assert result == Path.home() / "notes.txt"
|
|
|
|
def test_result_is_resolved(self, monkeypatch, tmp_path):
|
|
"""Output path has no '..' components."""
|
|
monkeypatch.setenv("TERMINAL_CWD", str(tmp_path))
|
|
from tools.file_tools import _resolve_path
|
|
|
|
result = _resolve_path("a/../b/file.txt")
|
|
assert ".." not in str(result)
|
|
assert result == (tmp_path / "b" / "file.txt")
|
|
|
|
def test_relative_path_prefers_live_file_ops_cwd(self, monkeypatch, tmp_path):
|
|
"""Live env.cwd must win after the terminal session changes directory."""
|
|
start_dir = tmp_path / "start"
|
|
live_dir = tmp_path / "worktree"
|
|
start_dir.mkdir()
|
|
live_dir.mkdir()
|
|
monkeypatch.setenv("TERMINAL_CWD", str(start_dir))
|
|
|
|
from tools import file_tools
|
|
|
|
task_id = "live-cwd"
|
|
fake_ops = SimpleNamespace(
|
|
env=SimpleNamespace(cwd=str(live_dir)),
|
|
cwd=str(start_dir),
|
|
)
|
|
|
|
with file_tools._file_ops_lock:
|
|
previous = file_tools._file_ops_cache.get(task_id)
|
|
file_tools._file_ops_cache[task_id] = fake_ops
|
|
|
|
try:
|
|
result = file_tools._resolve_path("nested/file.txt", task_id=task_id)
|
|
finally:
|
|
with file_tools._file_ops_lock:
|
|
if previous is None:
|
|
file_tools._file_ops_cache.pop(task_id, None)
|
|
else:
|
|
file_tools._file_ops_cache[task_id] = previous
|
|
|
|
assert result == live_dir / "nested" / "file.txt"
|