mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +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
142 lines
5.1 KiB
Python
142 lines
5.1 KiB
Python
"""Tests for the ``lsp_diagnostics`` field on WriteResult / PatchResult.
|
|
|
|
The field exists so the agent can read syntax errors (``lint``) and
|
|
semantic errors (``lsp_diagnostics``) as separate signals rather than
|
|
having LSP output prepended to the lint string.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import patch
|
|
|
|
|
|
from tools.environments.local import LocalEnvironment
|
|
from tools.file_operations import (
|
|
PatchResult,
|
|
ShellFileOperations,
|
|
WriteResult,
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Dataclass shape
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_writeresult_lsp_diagnostics_optional():
|
|
r = WriteResult()
|
|
assert r.lsp_diagnostics is None
|
|
|
|
|
|
def test_writeresult_to_dict_omits_field_when_none():
|
|
r = WriteResult(bytes_written=10)
|
|
assert "lsp_diagnostics" not in r.to_dict()
|
|
|
|
|
|
def test_writeresult_to_dict_includes_field_when_set():
|
|
r = WriteResult(bytes_written=10, lsp_diagnostics="<diagnostics>...</diagnostics>")
|
|
d = r.to_dict()
|
|
assert d["lsp_diagnostics"] == "<diagnostics>...</diagnostics>"
|
|
|
|
|
|
def test_patchresult_to_dict_includes_field_when_set():
|
|
r = PatchResult(success=True, lsp_diagnostics="ERROR [1:1] thing")
|
|
d = r.to_dict()
|
|
assert d["lsp_diagnostics"] == "ERROR [1:1] thing"
|
|
|
|
|
|
def test_patchresult_to_dict_omits_field_when_none():
|
|
r = PatchResult(success=True)
|
|
assert "lsp_diagnostics" not in r.to_dict()
|
|
|
|
|
|
def test_patchresult_to_dict_omits_field_when_empty_string():
|
|
"""Empty string counts as falsy — agent shouldn't see an empty field."""
|
|
r = PatchResult(success=True, lsp_diagnostics="")
|
|
assert "lsp_diagnostics" not in r.to_dict()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Channel separation: lint and lsp_diagnostics stay independent
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_lint_and_lsp_diagnostics_are_separate_channels():
|
|
"""A WriteResult can carry BOTH a syntax-error lint AND an LSP
|
|
diagnostic block. They belong in separate fields."""
|
|
r = WriteResult(
|
|
bytes_written=42,
|
|
lint={"status": "error", "output": "SyntaxError: ..."},
|
|
lsp_diagnostics="<diagnostics>ERROR [1:5] type mismatch</diagnostics>",
|
|
)
|
|
d = r.to_dict()
|
|
assert "lint" in d
|
|
assert "lsp_diagnostics" in d
|
|
assert d["lint"]["output"] == "SyntaxError: ..."
|
|
assert "type mismatch" in d["lsp_diagnostics"]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# write_file populates the field via _maybe_lsp_diagnostics
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_write_file_populates_lsp_diagnostics_when_layer_returns_block(tmp_path):
|
|
"""When the LSP layer returns a non-empty block, write_file puts it
|
|
into the ``lsp_diagnostics`` field — NOT into ``lint.output``."""
|
|
fops = ShellFileOperations(LocalEnvironment(cwd=str(tmp_path)))
|
|
target = tmp_path / "x.py"
|
|
|
|
block = "<diagnostics file=\"x.py\">\nERROR [1:1] problem\n</diagnostics>"
|
|
|
|
with patch.object(fops, "_maybe_lsp_diagnostics", return_value=block):
|
|
res = fops.write_file(str(target), "x = 1\n")
|
|
|
|
assert res.lsp_diagnostics == block
|
|
# Lint is the syntax check, which is clean for "x = 1" — must NOT
|
|
# have the LSP block folded into it.
|
|
assert res.lint == {"status": "ok", "output": ""}
|
|
|
|
|
|
def test_write_file_lsp_diagnostics_none_when_layer_returns_empty(tmp_path):
|
|
fops = ShellFileOperations(LocalEnvironment(cwd=str(tmp_path)))
|
|
target = tmp_path / "x.py"
|
|
|
|
with patch.object(fops, "_maybe_lsp_diagnostics", return_value=""):
|
|
res = fops.write_file(str(target), "x = 1\n")
|
|
|
|
assert res.lsp_diagnostics is None
|
|
|
|
|
|
def test_write_file_skips_lsp_when_syntax_failed(tmp_path):
|
|
"""If the syntax check finds errors, the LSP layer should not be
|
|
consulted (a file that won't parse won't yield meaningful semantic
|
|
diagnostics)."""
|
|
fops = ShellFileOperations(LocalEnvironment(cwd=str(tmp_path)))
|
|
target = tmp_path / "broken.py"
|
|
|
|
with patch.object(fops, "_maybe_lsp_diagnostics") as mock_lsp:
|
|
res = fops.write_file(str(target), "def x(:\n") # syntax error
|
|
assert mock_lsp.call_count == 0
|
|
assert res.lsp_diagnostics is None
|
|
assert res.lint["status"] == "error"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# patch_replace propagates the field from the inner write_file
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_patch_replace_propagates_lsp_diagnostics(tmp_path):
|
|
"""patch_replace's internal write_file populates lsp_diagnostics —
|
|
the outer PatchResult must carry it forward."""
|
|
fops = ShellFileOperations(LocalEnvironment(cwd=str(tmp_path)))
|
|
target = tmp_path / "x.py"
|
|
target.write_text("x = 1\n")
|
|
|
|
block = "<diagnostics>ERROR [1:5] semantic issue</diagnostics>"
|
|
|
|
with patch.object(fops, "_maybe_lsp_diagnostics", return_value=block):
|
|
res = fops.patch_replace(str(target), "x = 1", "x = 2")
|
|
|
|
assert res.success is True
|
|
assert res.lsp_diagnostics == block
|