Comprehensive cleanup across 80 files based on automated (ruff, pyflakes, vulture)
and manual analysis of the entire codebase.
Changes by category:
Unused imports removed (~95 across 55 files):
- Removed genuinely unused imports from all major subsystems
- agent/, hermes_cli/, tools/, gateway/, plugins/, cron/
- Includes imports in try/except blocks that were truly unused
(vs availability checks which were left alone)
Unused variables removed (~25):
- Removed dead variables: connected, inner, channels, last_exc,
source, new_server_names, verify, pconfig, default_terminal,
result, pending_handled, temperature, loop
- Dropped unused argparse subparser assignments in hermes_cli/main.py
(12 instances of add_parser() where result was never used)
Dead code removed:
- run_agent.py: Removed dead ternary (None if False else None) and
surrounding unreachable branch in identity fallback
- run_agent.py: Removed write-only attribute _last_reported_tool
- hermes_cli/providers.py: Removed dead @property decorator on
module-level function (decorator has no effect outside a class)
- gateway/run.py: Removed unused MCP config load before reconnect
- gateway/platforms/slack.py: Removed dead SessionSource construction
Undefined name bugs fixed (would cause NameError at runtime):
- batch_runner.py: Added missing logger = logging.getLogger(__name__)
- tools/environments/daytona.py: Added missing Dict and Path imports
Unnecessary global statements removed (14):
- tools/terminal_tool.py: 5 functions declared global for dicts
they only mutated via .pop()/[key]=value (no rebinding)
- tools/browser_tool.py: cleanup thread loop only reads flag
- tools/rl_training_tool.py: 4 functions only do dict mutations
- tools/mcp_oauth.py: only reads the global
- hermes_time.py: only reads cached values
Inefficient patterns fixed:
- startswith/endswith tuple form: 15 instances of
x.startswith('a') or x.startswith('b') consolidated to
x.startswith(('a', 'b'))
- len(x)==0 / len(x)>0: 13 instances replaced with pythonic
truthiness checks (not x / bool(x))
- in dict.keys(): 5 instances simplified to in dict
- Redefined unused name: removed duplicate _strip_mdv2 import in
send_message_tool.py
Other fixes:
- hermes_cli/doctor.py: Replaced undefined logger.debug() with pass
- hermes_cli/config.py: Consolidated chained .endswith() calls
Test results: 3934 passed, 17 failed (all pre-existing on main),
19 skipped. Zero regressions.
230 lines
7.3 KiB
Python
230 lines
7.3 KiB
Python
"""Centralized logging setup for Hermes Agent.
|
|
|
|
Provides a single ``setup_logging()`` entry point that both the CLI and
|
|
gateway call early in their startup path. All log files live under
|
|
``~/.hermes/logs/`` (profile-aware via ``get_hermes_home()``).
|
|
|
|
Log files produced:
|
|
agent.log — INFO+, all agent/tool/session activity (the main log)
|
|
errors.log — WARNING+, errors and warnings only (quick triage)
|
|
|
|
Both files use ``RotatingFileHandler`` with ``RedactingFormatter`` so
|
|
secrets are never written to disk.
|
|
"""
|
|
|
|
import logging
|
|
from logging.handlers import RotatingFileHandler
|
|
from pathlib import Path
|
|
from typing import Optional
|
|
|
|
from hermes_constants import get_hermes_home
|
|
|
|
# Sentinel to track whether setup_logging() has already run. The function
|
|
# is idempotent — calling it twice is safe but the second call is a no-op
|
|
# unless ``force=True``.
|
|
_logging_initialized = False
|
|
|
|
# Default log format — includes timestamp, level, logger name, and message.
|
|
_LOG_FORMAT = "%(asctime)s %(levelname)s %(name)s: %(message)s"
|
|
_LOG_FORMAT_VERBOSE = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
|
|
|
|
# Third-party loggers that are noisy at DEBUG/INFO level.
|
|
_NOISY_LOGGERS = (
|
|
"openai",
|
|
"openai._base_client",
|
|
"httpx",
|
|
"httpcore",
|
|
"asyncio",
|
|
"hpack",
|
|
"hpack.hpack",
|
|
"grpc",
|
|
"modal",
|
|
"urllib3",
|
|
"urllib3.connectionpool",
|
|
"websockets",
|
|
"charset_normalizer",
|
|
"markdown_it",
|
|
)
|
|
|
|
|
|
def setup_logging(
|
|
*,
|
|
hermes_home: Optional[Path] = None,
|
|
log_level: Optional[str] = None,
|
|
max_size_mb: Optional[int] = None,
|
|
backup_count: Optional[int] = None,
|
|
mode: Optional[str] = None,
|
|
force: bool = False,
|
|
) -> Path:
|
|
"""Configure the Hermes logging subsystem.
|
|
|
|
Safe to call multiple times — the second call is a no-op unless
|
|
*force* is ``True``.
|
|
|
|
Parameters
|
|
----------
|
|
hermes_home
|
|
Override for the Hermes home directory. Falls back to
|
|
``get_hermes_home()`` (profile-aware).
|
|
log_level
|
|
Minimum level for the ``agent.log`` file handler. Accepts any
|
|
standard Python level name (``"DEBUG"``, ``"INFO"``, ``"WARNING"``).
|
|
Defaults to ``"INFO"`` or the value from config.yaml ``logging.level``.
|
|
max_size_mb
|
|
Maximum size of each log file in megabytes before rotation.
|
|
Defaults to 5 or the value from config.yaml ``logging.max_size_mb``.
|
|
backup_count
|
|
Number of rotated backup files to keep.
|
|
Defaults to 3 or the value from config.yaml ``logging.backup_count``.
|
|
mode
|
|
Hint for the caller context: ``"cli"``, ``"gateway"``, ``"cron"``.
|
|
Currently used only for log format tuning (gateway includes PID).
|
|
force
|
|
Re-run setup even if it has already been called.
|
|
|
|
Returns
|
|
-------
|
|
Path
|
|
The ``logs/`` directory where files are written.
|
|
"""
|
|
global _logging_initialized
|
|
if _logging_initialized and not force:
|
|
home = hermes_home or get_hermes_home()
|
|
return home / "logs"
|
|
|
|
home = hermes_home or get_hermes_home()
|
|
log_dir = home / "logs"
|
|
log_dir.mkdir(parents=True, exist_ok=True)
|
|
|
|
# Read config defaults (best-effort — config may not be loaded yet).
|
|
cfg_level, cfg_max_size, cfg_backup = _read_logging_config()
|
|
|
|
level_name = (log_level or cfg_level or "INFO").upper()
|
|
level = getattr(logging, level_name, logging.INFO)
|
|
max_bytes = (max_size_mb or cfg_max_size or 5) * 1024 * 1024
|
|
backups = backup_count or cfg_backup or 3
|
|
|
|
# Lazy import to avoid circular dependency at module load time.
|
|
from agent.redact import RedactingFormatter
|
|
|
|
root = logging.getLogger()
|
|
|
|
# --- agent.log (INFO+) — the main activity log -------------------------
|
|
_add_rotating_handler(
|
|
root,
|
|
log_dir / "agent.log",
|
|
level=level,
|
|
max_bytes=max_bytes,
|
|
backup_count=backups,
|
|
formatter=RedactingFormatter(_LOG_FORMAT),
|
|
)
|
|
|
|
# --- errors.log (WARNING+) — quick triage log --------------------------
|
|
_add_rotating_handler(
|
|
root,
|
|
log_dir / "errors.log",
|
|
level=logging.WARNING,
|
|
max_bytes=2 * 1024 * 1024,
|
|
backup_count=2,
|
|
formatter=RedactingFormatter(_LOG_FORMAT),
|
|
)
|
|
|
|
# Ensure root logger level is low enough for the handlers to fire.
|
|
if root.level == logging.NOTSET or root.level > level:
|
|
root.setLevel(level)
|
|
|
|
# Suppress noisy third-party loggers.
|
|
for name in _NOISY_LOGGERS:
|
|
logging.getLogger(name).setLevel(logging.WARNING)
|
|
|
|
_logging_initialized = True
|
|
return log_dir
|
|
|
|
|
|
def setup_verbose_logging() -> None:
|
|
"""Enable DEBUG-level console logging for ``--verbose`` / ``-v`` mode.
|
|
|
|
Called by ``AIAgent.__init__()`` when ``verbose_logging=True``.
|
|
"""
|
|
from agent.redact import RedactingFormatter
|
|
|
|
root = logging.getLogger()
|
|
|
|
# Avoid adding duplicate stream handlers.
|
|
for h in root.handlers:
|
|
if isinstance(h, logging.StreamHandler) and not isinstance(h, RotatingFileHandler):
|
|
if getattr(h, "_hermes_verbose", False):
|
|
return
|
|
|
|
handler = logging.StreamHandler()
|
|
handler.setLevel(logging.DEBUG)
|
|
handler.setFormatter(RedactingFormatter(_LOG_FORMAT_VERBOSE, datefmt="%H:%M:%S"))
|
|
handler._hermes_verbose = True # type: ignore[attr-defined]
|
|
root.addHandler(handler)
|
|
|
|
# Lower root logger level so DEBUG records reach all handlers.
|
|
if root.level > logging.DEBUG:
|
|
root.setLevel(logging.DEBUG)
|
|
|
|
# Keep third-party libraries at WARNING to reduce noise.
|
|
for name in _NOISY_LOGGERS:
|
|
logging.getLogger(name).setLevel(logging.WARNING)
|
|
# rex-deploy at INFO for sandbox status.
|
|
logging.getLogger("rex-deploy").setLevel(logging.INFO)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Internal helpers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _add_rotating_handler(
|
|
logger: logging.Logger,
|
|
path: Path,
|
|
*,
|
|
level: int,
|
|
max_bytes: int,
|
|
backup_count: int,
|
|
formatter: logging.Formatter,
|
|
) -> None:
|
|
"""Add a ``RotatingFileHandler`` to *logger*, skipping if one already
|
|
exists for the same resolved file path (idempotent).
|
|
"""
|
|
resolved = path.resolve()
|
|
for existing in logger.handlers:
|
|
if (
|
|
isinstance(existing, RotatingFileHandler)
|
|
and Path(getattr(existing, "baseFilename", "")).resolve() == resolved
|
|
):
|
|
return # already attached
|
|
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
handler = RotatingFileHandler(
|
|
str(path), maxBytes=max_bytes, backupCount=backup_count,
|
|
)
|
|
handler.setLevel(level)
|
|
handler.setFormatter(formatter)
|
|
logger.addHandler(handler)
|
|
|
|
|
|
def _read_logging_config():
|
|
"""Best-effort read of ``logging.*`` from config.yaml.
|
|
|
|
Returns ``(level, max_size_mb, backup_count)`` — any may be ``None``.
|
|
"""
|
|
try:
|
|
import yaml
|
|
config_path = get_hermes_home() / "config.yaml"
|
|
if config_path.exists():
|
|
with open(config_path, "r", encoding="utf-8") as f:
|
|
cfg = yaml.safe_load(f) or {}
|
|
log_cfg = cfg.get("logging", {})
|
|
if isinstance(log_cfg, dict):
|
|
return (
|
|
log_cfg.get("level"),
|
|
log_cfg.get("max_size_mb"),
|
|
log_cfg.get("backup_count"),
|
|
)
|
|
except Exception:
|
|
pass
|
|
return (None, None, None)
|