mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +00:00
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
176 lines
5 KiB
Python
176 lines
5 KiB
Python
"""Tests for the synchronous LSPService wrapper.
|
|
|
|
Drives the service through ``snapshot_baseline`` →
|
|
``get_diagnostics_sync`` against the mock LSP server, exercising the
|
|
delta filter that ``tools/file_operations._check_lint_delta`` relies
|
|
on.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from agent.lsp.manager import LSPService
|
|
from agent.lsp.servers import (
|
|
SERVERS,
|
|
ServerContext,
|
|
ServerDef,
|
|
SpawnSpec,
|
|
)
|
|
|
|
|
|
MOCK_SERVER = str(Path(__file__).parent / "_mock_lsp_server.py")
|
|
|
|
|
|
def _install_mock_server(monkeypatch, script: str = "errors", server_id: str = "pyright"):
|
|
"""Replace one registered server with a wrapper that spawns the mock.
|
|
|
|
We reuse ``pyright`` so .py files route to it. This keeps the
|
|
test free of any LSP toolchain dependency.
|
|
"""
|
|
target_index = next(i for i, s in enumerate(SERVERS) if s.server_id == server_id)
|
|
original = SERVERS[target_index]
|
|
|
|
def _spawn(root: str, ctx: ServerContext) -> SpawnSpec:
|
|
env = {"MOCK_LSP_SCRIPT": script}
|
|
return SpawnSpec(
|
|
command=[sys.executable, MOCK_SERVER],
|
|
workspace_root=root,
|
|
cwd=root,
|
|
env=env,
|
|
initialization_options={},
|
|
)
|
|
|
|
replacement = ServerDef(
|
|
server_id=server_id,
|
|
extensions=original.extensions,
|
|
resolve_root=lambda fp, ws: ws, # always use workspace root
|
|
build_spawn=_spawn,
|
|
seed_first_push=False,
|
|
description="mock " + server_id,
|
|
)
|
|
# Patch the SERVERS list element directly + restore on teardown.
|
|
SERVERS[target_index] = replacement
|
|
|
|
yield
|
|
|
|
SERVERS[target_index] = original
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_pyright(monkeypatch, tmp_path):
|
|
"""Install the mock as ``pyright`` and create a fake git workspace."""
|
|
repo = tmp_path / "repo"
|
|
repo.mkdir()
|
|
(repo / ".git").mkdir()
|
|
(repo / "pyproject.toml").write_text("") # so pyright's root resolver finds it
|
|
monkeypatch.chdir(str(repo))
|
|
gen = _install_mock_server(monkeypatch, "errors", "pyright")
|
|
next(gen)
|
|
yield repo
|
|
try:
|
|
next(gen)
|
|
except StopIteration:
|
|
pass
|
|
|
|
|
|
def test_service_returns_empty_when_disabled(tmp_path):
|
|
svc = LSPService(
|
|
enabled=False,
|
|
wait_mode="document",
|
|
wait_timeout=2.0,
|
|
install_strategy="auto",
|
|
)
|
|
assert not svc.is_active()
|
|
f = tmp_path / "x.py"
|
|
f.write_text("")
|
|
assert svc.get_diagnostics_sync(str(f)) == []
|
|
svc.shutdown()
|
|
|
|
|
|
def test_service_skips_files_outside_workspace(tmp_path):
|
|
"""Files outside any git worktree must not trigger LSP."""
|
|
svc = LSPService(
|
|
enabled=True,
|
|
wait_mode="document",
|
|
wait_timeout=2.0,
|
|
install_strategy="manual",
|
|
)
|
|
f = tmp_path / "x.py"
|
|
f.write_text("")
|
|
# No .git anywhere — service should report not enabled for this file.
|
|
assert not svc.enabled_for(str(f))
|
|
svc.shutdown()
|
|
|
|
|
|
def test_service_e2e_delta_filter(mock_pyright):
|
|
"""End-to-end: snapshot baseline → wait → delta returned."""
|
|
repo = mock_pyright
|
|
f = repo / "x.py"
|
|
f.write_text("print('hi')\n")
|
|
|
|
svc = LSPService(
|
|
enabled=True,
|
|
wait_mode="document",
|
|
wait_timeout=3.0,
|
|
install_strategy="manual",
|
|
)
|
|
try:
|
|
assert svc.enabled_for(str(f))
|
|
# Baseline first — server pushes 1 error.
|
|
svc.snapshot_baseline(str(f))
|
|
# Re-poll: same error is in baseline, so delta is empty.
|
|
new_diags = svc.get_diagnostics_sync(str(f))
|
|
assert new_diags == []
|
|
finally:
|
|
svc.shutdown()
|
|
|
|
|
|
def test_service_e2e_delta_filter_with_line_shift(mock_pyright):
|
|
"""End-to-end: an edit that shifts the diagnostic's line still
|
|
filters correctly when ``line_shift`` is supplied.
|
|
|
|
The mock LSP server emits a fixed error at line 0; for this test
|
|
we don't need to actually shift the server's output — we just
|
|
need to prove that supplying a line_shift through the API works
|
|
and doesn't break the existing delta path. The unit tests in
|
|
test_delta_key.py cover the shift semantics in detail.
|
|
"""
|
|
repo = mock_pyright
|
|
f = repo / "x.py"
|
|
f.write_text("print('hi')\n")
|
|
|
|
svc = LSPService(
|
|
enabled=True,
|
|
wait_mode="document",
|
|
wait_timeout=3.0,
|
|
install_strategy="manual",
|
|
)
|
|
try:
|
|
svc.snapshot_baseline(str(f))
|
|
# Identity shift — should behave exactly like no shift.
|
|
new_diags = svc.get_diagnostics_sync(str(f), line_shift=lambda L: L)
|
|
assert new_diags == []
|
|
finally:
|
|
svc.shutdown()
|
|
|
|
|
|
def test_service_status_includes_clients(mock_pyright):
|
|
repo = mock_pyright
|
|
f = repo / "x.py"
|
|
f.write_text("")
|
|
svc = LSPService(
|
|
enabled=True,
|
|
wait_mode="document",
|
|
wait_timeout=3.0,
|
|
install_strategy="manual",
|
|
)
|
|
try:
|
|
svc.get_diagnostics_sync(str(f))
|
|
info = svc.get_status()
|
|
assert info["enabled"] is True
|
|
assert any(c["server_id"] == "pyright" for c in info["clients"])
|
|
finally:
|
|
svc.shutdown()
|