mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-30 01:41:43 +00:00
refactor(restructure): rewrite all imports for hermes_agent package
Rewrite all import statements, patch() targets, sys.modules keys, importlib.import_module() strings, and subprocess -m references to use hermes_agent.* paths. Strip sys.path.insert hacks from production code (rely on editable install). Update COMPONENT_PREFIXES for logger filtering. Fix 3 hardcoded getLogger() calls to use __name__. Update transport and tool registry discovery paths. Update plugin module path strings. Add legacy process-name patterns for gateway PID detection. Add main() to skills_sync for console_script entry point. Fix _get_bundled_dir() path traversal after move. Part of #14182, #14183
This commit is contained in:
alt-glitch
parent
65ca3ba93b
commit
4b16341975
898 changed files with 12494 additions and 12019 deletions
|
|
@ -2,7 +2,7 @@
|
|||
from argparse import Namespace
|
||||
from unittest.mock import patch
|
||||
|
||||
from hermes_cli.tools_config import tools_disable_enable_command
|
||||
from hermes_agent.cli.tools_config import tools_disable_enable_command
|
||||
|
||||
|
||||
# ── Built-in toolset disable ────────────────────────────────────────────────
|
||||
|
|
@ -12,8 +12,8 @@ class TestToolsDisableBuiltin:
|
|||
|
||||
def test_disable_removes_toolset_from_platform(self):
|
||||
config = {"platform_toolsets": {"cli": ["web", "memory", "terminal"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(Namespace(tools_action="disable", names=["web"], platform="cli"))
|
||||
saved = mock_save.call_args[0][0]
|
||||
assert "web" not in saved["platform_toolsets"]["cli"]
|
||||
|
|
@ -21,8 +21,8 @@ class TestToolsDisableBuiltin:
|
|||
|
||||
def test_disable_multiple_toolsets(self):
|
||||
config = {"platform_toolsets": {"cli": ["web", "memory", "terminal"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(Namespace(tools_action="disable", names=["web", "memory"], platform="cli"))
|
||||
saved = mock_save.call_args[0][0]
|
||||
assert "web" not in saved["platform_toolsets"]["cli"]
|
||||
|
|
@ -31,8 +31,8 @@ class TestToolsDisableBuiltin:
|
|||
|
||||
def test_disable_already_absent_is_idempotent(self):
|
||||
config = {"platform_toolsets": {"cli": ["memory"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(Namespace(tools_action="disable", names=["web"], platform="cli"))
|
||||
saved = mock_save.call_args[0][0]
|
||||
assert "web" not in saved["platform_toolsets"]["cli"]
|
||||
|
|
@ -45,16 +45,16 @@ class TestToolsEnableBuiltin:
|
|||
|
||||
def test_enable_adds_toolset_to_platform(self):
|
||||
config = {"platform_toolsets": {"cli": ["memory"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(Namespace(tools_action="enable", names=["web"], platform="cli"))
|
||||
saved = mock_save.call_args[0][0]
|
||||
assert "web" in saved["platform_toolsets"]["cli"]
|
||||
|
||||
def test_enable_already_present_is_idempotent(self):
|
||||
config = {"platform_toolsets": {"cli": ["web"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(Namespace(tools_action="enable", names=["web"], platform="cli"))
|
||||
saved = mock_save.call_args[0][0]
|
||||
assert saved["platform_toolsets"]["cli"].count("web") == 1
|
||||
|
|
@ -67,8 +67,8 @@ class TestToolsDisableMcp:
|
|||
|
||||
def test_disable_adds_to_exclude_list(self):
|
||||
config = {"mcp_servers": {"github": {"command": "npx"}}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="disable", names=["github:create_issue"], platform="cli")
|
||||
)
|
||||
|
|
@ -77,8 +77,8 @@ class TestToolsDisableMcp:
|
|||
|
||||
def test_disable_already_excluded_is_idempotent(self):
|
||||
config = {"mcp_servers": {"github": {"tools": {"exclude": ["create_issue"]}}}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="disable", names=["github:create_issue"], platform="cli")
|
||||
)
|
||||
|
|
@ -87,8 +87,8 @@ class TestToolsDisableMcp:
|
|||
|
||||
def test_disable_unknown_server_prints_error(self, capsys):
|
||||
config = {"mcp_servers": {}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config"):
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config"):
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="disable", names=["unknown:tool"], platform="cli")
|
||||
)
|
||||
|
|
@ -103,8 +103,8 @@ class TestToolsEnableMcp:
|
|||
|
||||
def test_enable_removes_from_exclude_list(self):
|
||||
config = {"mcp_servers": {"github": {"tools": {"exclude": ["create_issue", "delete_branch"]}}}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="enable", names=["github:create_issue"], platform="cli")
|
||||
)
|
||||
|
|
@ -123,8 +123,8 @@ class TestToolsMixedTargets:
|
|||
"platform_toolsets": {"cli": ["web", "memory"]},
|
||||
"mcp_servers": {"github": {"command": "npx"}},
|
||||
}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(Namespace(
|
||||
tools_action="disable",
|
||||
names=["web", "github:create_issue"],
|
||||
|
|
@ -139,8 +139,8 @@ class TestToolsMixedTargets:
|
|||
"platform_toolsets": {"cli": ["web", "memory"]},
|
||||
"mcp_servers": {"exa": {"url": "https://mcp.exa.ai/mcp"}},
|
||||
}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(Namespace(
|
||||
tools_action="disable",
|
||||
names=["web"],
|
||||
|
|
@ -159,7 +159,7 @@ class TestToolsList:
|
|||
|
||||
def test_list_shows_enabled_toolsets(self, capsys):
|
||||
config = {"platform_toolsets": {"cli": ["web", "memory"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config):
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config):
|
||||
tools_disable_enable_command(Namespace(tools_action="list", platform="cli"))
|
||||
out = capsys.readouterr().out
|
||||
assert "web" in out
|
||||
|
|
@ -169,7 +169,7 @@ class TestToolsList:
|
|||
config = {
|
||||
"mcp_servers": {"github": {"tools": {"exclude": ["create_issue"]}}},
|
||||
}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config):
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config):
|
||||
tools_disable_enable_command(Namespace(tools_action="list", platform="cli"))
|
||||
out = capsys.readouterr().out
|
||||
assert "github" in out
|
||||
|
|
@ -183,8 +183,8 @@ class TestToolsValidation:
|
|||
|
||||
def test_unknown_platform_prints_error(self, capsys):
|
||||
config = {}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config"):
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config"):
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="disable", names=["web"], platform="invalid_platform")
|
||||
)
|
||||
|
|
@ -193,8 +193,8 @@ class TestToolsValidation:
|
|||
|
||||
def test_unknown_toolset_prints_error(self, capsys):
|
||||
config = {"platform_toolsets": {"cli": ["web"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config"):
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config"):
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="disable", names=["nonexistent_toolset"], platform="cli")
|
||||
)
|
||||
|
|
@ -203,8 +203,8 @@ class TestToolsValidation:
|
|||
|
||||
def test_unknown_toolset_does_not_corrupt_config(self):
|
||||
config = {"platform_toolsets": {"cli": ["web", "memory"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="disable", names=["nonexistent_toolset"], platform="cli")
|
||||
)
|
||||
|
|
@ -214,8 +214,8 @@ class TestToolsValidation:
|
|||
|
||||
def test_mixed_valid_and_invalid_applies_valid_only(self):
|
||||
config = {"platform_toolsets": {"cli": ["web", "memory"]}}
|
||||
with patch("hermes_cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_cli.tools_config.save_config") as mock_save:
|
||||
with patch("hermes_agent.cli.tools_config.load_config", return_value=config), \
|
||||
patch("hermes_agent.cli.tools_config.save_config") as mock_save:
|
||||
tools_disable_enable_command(
|
||||
Namespace(tools_action="disable", names=["web", "bad_toolset"], platform="cli")
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue