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
65 lines
2.4 KiB
Python
65 lines
2.4 KiB
Python
"""Tests for the defensive subparser routing workaround (bpo-9338).
|
|
|
|
The main() function in hermes_cli/main.py sets subparsers.required=True
|
|
when argv contains a known subcommand name. This forces deterministic
|
|
routing on Python versions where argparse fails to match subcommand tokens
|
|
when the parent parser has nargs='?' optional arguments (--continue).
|
|
|
|
If the subcommand token is consumed as a flag value (e.g. `hermes -c model`
|
|
to resume a session named 'model'), the required=True parse raises
|
|
SystemExit and the code falls back to the default required=False behaviour.
|
|
"""
|
|
import argparse
|
|
import io
|
|
import sys
|
|
|
|
|
|
|
|
def _build_parser():
|
|
"""Build a minimal replica of the hermes top-level parser."""
|
|
parser = argparse.ArgumentParser(prog="hermes")
|
|
parser.add_argument("--version", "-V", action="store_true")
|
|
parser.add_argument("--resume", "-r", metavar="SESSION", default=None)
|
|
parser.add_argument(
|
|
"--continue", "-c",
|
|
dest="continue_last",
|
|
nargs="?",
|
|
const=True,
|
|
default=None,
|
|
metavar="SESSION_NAME",
|
|
)
|
|
parser.add_argument("--worktree", "-w", action="store_true", default=False)
|
|
parser.add_argument("--skills", "-s", action="append", default=None)
|
|
parser.add_argument("--yolo", action="store_true", default=False)
|
|
parser.add_argument("--pass-session-id", action="store_true", default=False)
|
|
|
|
subparsers = parser.add_subparsers(dest="command", help="Command to run")
|
|
chat_p = subparsers.add_parser("chat")
|
|
chat_p.add_argument("-q", "--query", default=None)
|
|
subparsers.add_parser("model")
|
|
subparsers.add_parser("gateway")
|
|
subparsers.add_parser("setup")
|
|
return parser, subparsers
|
|
|
|
|
|
def _safe_parse(parser, subparsers, argv):
|
|
"""Replica of the defensive parsing logic from main()."""
|
|
known_cmds = set(subparsers.choices.keys()) if hasattr(subparsers, "choices") else set()
|
|
has_cmd_token = any(t in known_cmds for t in argv if not t.startswith("-"))
|
|
|
|
if has_cmd_token:
|
|
subparsers.required = True
|
|
saved_stderr = sys.stderr
|
|
try:
|
|
sys.stderr = io.StringIO()
|
|
args = parser.parse_args(argv)
|
|
sys.stderr = saved_stderr
|
|
return args
|
|
except SystemExit:
|
|
sys.stderr = saved_stderr
|
|
subparsers.required = False
|
|
return parser.parse_args(argv)
|
|
else:
|
|
subparsers.required = False
|
|
return parser.parse_args(argv)
|
|
|