mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-30 06:41:51 +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
255 lines
10 KiB
Python
255 lines
10 KiB
Python
"""Tool-surface routing matrix: every (provider, model, modality) combo.
|
||
|
||
This is the integration test for the question Teknium asked: regardless
|
||
of which provider+model the user picks and whether they pass an
|
||
image_url or not, does the tool surface route correctly to the right
|
||
endpoint with the right payload shape?
|
||
|
||
Drives ``_handle_video_generate(args)`` end-to-end — config write →
|
||
config read → registry lookup → provider.generate() → outbound HTTP/SDK
|
||
call. Stubs fal_client and httpx so we observe routing without hitting
|
||
the network.
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
import asyncio
|
||
import json
|
||
import types
|
||
from typing import Any, Dict, List
|
||
|
||
import pytest
|
||
import yaml
|
||
|
||
|
||
@pytest.fixture(autouse=True)
|
||
def _reset_registry():
|
||
from agent import video_gen_registry
|
||
video_gen_registry._reset_for_tests()
|
||
yield
|
||
video_gen_registry._reset_for_tests()
|
||
|
||
|
||
@pytest.fixture
|
||
def matrix_env(tmp_path, monkeypatch):
|
||
"""Set up HERMES_HOME, stub fal_client + httpx, force plugin discovery."""
|
||
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
||
monkeypatch.setenv("FAL_KEY", "test-key")
|
||
monkeypatch.setenv("XAI_API_KEY", "test-key")
|
||
|
||
fal_calls: List[Dict[str, Any]] = []
|
||
xai_calls: List[Dict[str, Any]] = []
|
||
|
||
# fal_client stub
|
||
fake_fal = types.ModuleType("fal_client")
|
||
def _subscribe(endpoint, arguments=None, with_logs=False):
|
||
fal_calls.append({"endpoint": endpoint, "arguments": arguments})
|
||
return {"video": {"url": f"https://fake-fal/{endpoint.replace('/','_')}.mp4"}}
|
||
fake_fal.subscribe = _subscribe # type: ignore
|
||
monkeypatch.setitem(__import__("sys").modules, "fal_client", fake_fal)
|
||
|
||
# httpx stub for xAI
|
||
import httpx
|
||
class _Resp:
|
||
def __init__(self, p, s=200):
|
||
self.status_code = s
|
||
self._p = p
|
||
self.text = json.dumps(p)
|
||
def raise_for_status(self):
|
||
if self.status_code >= 400:
|
||
raise httpx.HTTPStatusError("err", request=None, response=self) # type: ignore
|
||
def json(self):
|
||
return self._p
|
||
class _Client:
|
||
async def __aenter__(self): return self
|
||
async def __aexit__(self, *a): return None
|
||
async def post(self, url, headers=None, json=None, timeout=None):
|
||
xai_calls.append({"url": url, "json": json})
|
||
return _Resp({"request_id": "req-1"})
|
||
async def get(self, url, headers=None, timeout=None):
|
||
return _Resp({
|
||
"status": "done",
|
||
"video": {"url": "https://xai-cdn/out.mp4", "duration": 8},
|
||
"model": "grok-imagine-video",
|
||
})
|
||
import plugins.video_gen.xai as xai_plugin
|
||
monkeypatch.setattr(xai_plugin.httpx, "AsyncClient", lambda: _Client())
|
||
async def _no_sleep(*a, **k): return None
|
||
monkeypatch.setattr(asyncio, "sleep", _no_sleep)
|
||
|
||
# Reset FAL plugin's lazy fal_client cache so it picks up the stub
|
||
from plugins.video_gen import fal as fal_plugin
|
||
fal_plugin._fal_client = None
|
||
|
||
# Force discovery
|
||
from hermes_cli.plugins import _ensure_plugins_discovered
|
||
_ensure_plugins_discovered(force=True)
|
||
|
||
return tmp_path, fal_calls, xai_calls
|
||
|
||
|
||
def _invoke_tool(home, cfg: dict, args: dict) -> dict:
|
||
"""Write config, invoke the registered tool handler, return parsed JSON."""
|
||
(home / "config.yaml").write_text(yaml.safe_dump(cfg))
|
||
import hermes_cli.config as cfg_mod
|
||
if hasattr(cfg_mod, "_invalidate_load_config_cache"):
|
||
cfg_mod._invalidate_load_config_cache()
|
||
|
||
from tools.registry import discover_builtin_tools, registry
|
||
if "video_generate" not in registry._tools:
|
||
discover_builtin_tools()
|
||
handler = registry._tools["video_generate"].handler
|
||
return json.loads(handler(args))
|
||
|
||
|
||
# ─────────────────────────────────────────────────────────────────────────
|
||
# FAL: every family × {text-only, text+image}
|
||
# ─────────────────────────────────────────────────────────────────────────
|
||
|
||
# We parametrize over the catalog so the test discovers new families
|
||
# automatically. If someone adds 'sora-2' to FAL_FAMILIES, this matrix
|
||
# picks it up — no test changes needed beyond confirming the endpoints.
|
||
def _all_fal_families():
|
||
from plugins.video_gen.fal import FAL_FAMILIES
|
||
return list(FAL_FAMILIES.keys())
|
||
|
||
|
||
@pytest.mark.parametrize("family_id", _all_fal_families())
|
||
def test_fal_text_only_routes_to_text_endpoint(matrix_env, family_id):
|
||
home, fal_calls, _ = matrix_env
|
||
from plugins.video_gen.fal import FAL_FAMILIES
|
||
|
||
result = _invoke_tool(
|
||
home,
|
||
{"video_gen": {"provider": "fal", "model": family_id}},
|
||
{"prompt": "a dog running"},
|
||
)
|
||
|
||
assert result["success"] is True, f"{family_id}: {result.get('error')}"
|
||
assert result["modality"] == "text"
|
||
assert result["provider"] == "fal"
|
||
|
||
# Outbound endpoint must be the family's text endpoint
|
||
assert len(fal_calls) == 1
|
||
endpoint = fal_calls[0]["endpoint"]
|
||
assert endpoint == FAL_FAMILIES[family_id]["text_endpoint"]
|
||
|
||
# Payload must NOT contain any image-shaped key
|
||
payload = fal_calls[0]["arguments"] or {}
|
||
image_keys = [k for k in payload if "image" in k and "url" in k]
|
||
assert not image_keys, f"{family_id} text-only leaked image keys: {image_keys}"
|
||
|
||
|
||
@pytest.mark.parametrize("family_id", _all_fal_families())
|
||
def test_fal_text_plus_image_routes_to_image_endpoint(matrix_env, family_id):
|
||
home, fal_calls, _ = matrix_env
|
||
from plugins.video_gen.fal import FAL_FAMILIES
|
||
|
||
result = _invoke_tool(
|
||
home,
|
||
{"video_gen": {"provider": "fal", "model": family_id}},
|
||
{"prompt": "animate this dog", "image_url": "https://example.com/dog.png"},
|
||
)
|
||
|
||
assert result["success"] is True, f"{family_id}: {result.get('error')}"
|
||
assert result["modality"] == "image"
|
||
assert result["provider"] == "fal"
|
||
|
||
# Outbound endpoint must be the family's image endpoint
|
||
assert len(fal_calls) == 1
|
||
endpoint = fal_calls[0]["endpoint"]
|
||
assert endpoint == FAL_FAMILIES[family_id]["image_endpoint"]
|
||
|
||
# Payload must contain the right image key (may be image_url or
|
||
# start_image_url depending on the family's image_param_key)
|
||
payload = fal_calls[0]["arguments"] or {}
|
||
expected_image_key = FAL_FAMILIES[family_id].get("image_param_key") or "image_url"
|
||
assert payload.get(expected_image_key) == "https://example.com/dog.png", (
|
||
f"{family_id} text+image missing {expected_image_key} in payload "
|
||
f"(keys: {sorted(payload.keys())})"
|
||
)
|
||
|
||
|
||
# ─────────────────────────────────────────────────────────────────────────
|
||
# xAI: text-only / text+image both go to /videos/generations
|
||
# (xAI uses one endpoint with an optional 'image' field, not separate URLs)
|
||
# ─────────────────────────────────────────────────────────────────────────
|
||
|
||
def test_xai_text_only_via_tool_surface(matrix_env):
|
||
home, _, xai_calls = matrix_env
|
||
|
||
result = _invoke_tool(
|
||
home,
|
||
{"video_gen": {"provider": "xai"}},
|
||
{"prompt": "a dog running"},
|
||
)
|
||
assert result["success"] is True
|
||
assert result["modality"] == "text"
|
||
assert result["provider"] == "xai"
|
||
|
||
assert len(xai_calls) == 1
|
||
assert xai_calls[0]["url"].endswith("/videos/generations")
|
||
payload = xai_calls[0]["json"] or {}
|
||
assert "image" not in payload
|
||
assert "reference_images" not in payload
|
||
|
||
|
||
def test_xai_text_plus_image_via_tool_surface(matrix_env):
|
||
home, _, xai_calls = matrix_env
|
||
|
||
result = _invoke_tool(
|
||
home,
|
||
{"video_gen": {"provider": "xai"}},
|
||
{"prompt": "animate this", "image_url": "https://example.com/img.png"},
|
||
)
|
||
assert result["success"] is True
|
||
assert result["modality"] == "image"
|
||
assert result["provider"] == "xai"
|
||
|
||
assert len(xai_calls) == 1
|
||
assert xai_calls[0]["url"].endswith("/videos/generations")
|
||
payload = xai_calls[0]["json"] or {}
|
||
assert payload["image"] == {"url": "https://example.com/img.png"}
|
||
|
||
|
||
# ─────────────────────────────────────────────────────────────────────────
|
||
# tool-level `model` arg overrides config
|
||
# ─────────────────────────────────────────────────────────────────────────
|
||
|
||
def test_tool_model_arg_overrides_config(matrix_env):
|
||
"""When the tool call passes model=, it wins over video_gen.model in config."""
|
||
home, fal_calls, _ = matrix_env
|
||
|
||
# Config picks pixverse-v6, but tool call says veo3.1
|
||
result = _invoke_tool(
|
||
home,
|
||
{"video_gen": {"provider": "fal", "model": "pixverse-v6"}},
|
||
{"prompt": "a dog", "model": "veo3.1"},
|
||
)
|
||
|
||
assert result["success"] is True
|
||
assert result["model"] == "veo3.1"
|
||
# Outbound endpoint reflects the override, not config
|
||
assert fal_calls[0]["endpoint"] == "fal-ai/veo3.1"
|
||
|
||
|
||
def test_tool_model_arg_with_image_url_routes_to_override_image_endpoint(matrix_env):
|
||
"""model= override on text+image goes to the override family's image endpoint."""
|
||
home, fal_calls, _ = matrix_env
|
||
|
||
result = _invoke_tool(
|
||
home,
|
||
{"video_gen": {"provider": "fal", "model": "pixverse-v6"}},
|
||
{
|
||
"prompt": "animate this",
|
||
"image_url": "https://example.com/i.png",
|
||
"model": "kling-v3-4k",
|
||
},
|
||
)
|
||
|
||
assert result["success"] is True
|
||
assert result["model"] == "kling-v3-4k"
|
||
assert fal_calls[0]["endpoint"] == "fal-ai/kling-video/v3/4k/image-to-video"
|
||
# Kling 4K uses start_image_url
|
||
assert fal_calls[0]["arguments"].get("start_image_url") == "https://example.com/i.png"
|
||
assert "image_url" not in fal_calls[0]["arguments"]
|