mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-30 06:41:51 +00:00
Mirrors the architecture established by the web (#25182), browser (#25214), and video_gen (#25126) plugin migrations: * `tools/fal_common.py` — stateless atoms shared by both FAL-backed plugins (image_gen + video_gen). Holds the lazy `fal_client` import helper, `_ManagedFalSyncClient`, `_normalize_fal_queue_url_format`, `_extract_http_status`. Stateful pieces (`fal_client` module global, `_managed_fal_client*` cache, `_submit_fal_request`, `_resolve_managed_fal_gateway`, `_get_managed_fal_client`) intentionally stay on `tools.image_generation_tool` so the existing `monkeypatch.setattr(image_tool, ...)` patch sites keep working unchanged. * `plugins/video_gen/fal/__init__.py` — drops its inline `_load_fal_client` duplicate; consumes `tools.fal_common.import_fal_client`. * `plugins/image_gen/fal/{plugin.yaml,__init__.py}` — new plugin. `FalImageGenProvider` is a thin registration adapter that resolves the legacy module via `import tools.image_generation_tool as _it` and calls `_it.image_generate_tool` + `_it._resolve_fal_model` at call time. The 18-model catalog, `_build_fal_payload`, managed- gateway selection, and Clarity Upscaler chaining all remain in `tools.image_generation_tool` as the single source of truth — the plugin is a registration adapter, not a parallel implementation. * `tools/image_generation_tool.py::_dispatch_to_plugin_provider` — drops the `configured == "fal"` skip. Setting `image_gen.provider: fal` now routes through the registry like any other provider; the plugin re-enters this module's pipeline so behavior is identical. Unset `image_gen.provider` still falls through to the in-tree pipeline (preserves no-config-with-FAL_KEY UX from #15696). * `hermes_cli/tools_config.py` — drops the hardcoded "FAL.ai" row from `TOOL_CATEGORIES["image_gen"]["providers"]` (now injected by `_plugin_image_gen_providers` like every other backend) and the `getattr(provider, "name") == "fal"` skip that protected against duplication with the hardcoded row. The "Nous Subscription" row stays as a setup-flow entry — same shape browser kept "Nous Subscription (Browser Use cloud)" after #25214. * `tests/plugins/image_gen/test_fal_provider.py` — 14 cases covering the ABC surface, call-time indirection (verifying `monkeypatch.setattr(image_tool, "image_generate_tool", ...)` takes effect through the plugin), response-shape stamping, exception handling, and registry wiring. * `tests/plugins/image_gen/check_parity_vs_main.py` — subprocess harness mirroring `tests/plugins/browser/check_parity_vs_main.py`. Pins one path to origin/main, one to the worktree; runs six scenarios (unset, explicit-fal-no-creds, explicit-fal-with-creds, explicit-fal-with-model, typo provider, managed-gateway-only) and diffs the reduced shape `{dispatch_kind, provider_name, model}` per scenario. The only acceptable diff is "legacy_fal → plugin (fal)" for explicit-FAL paths — every other delta is flagged as a regression. * `tests/hermes_cli/test_image_gen_picker.py::test_fal_surfaced_alongside_other_plugins` — flips the previous `test_fal_skipped_to_avoid_duplicate` to match the new shape (FAL is a plugin now, no dedup needed). Verified: 195/195 tests across `tests/{tools/test_image_generation*,tools/test_managed_media_gateways,plugins/image_gen,plugins/video_gen,hermes_cli/test_image_gen_picker}.py` pass on this branch with no test patches modified outside the picker test that asserted the old skip behaviour. Fixes #26241
226 lines
8.7 KiB
Python
226 lines
8.7 KiB
Python
#!/usr/bin/env python3
|
|
"""Tests for the FAL.ai image generation plugin.
|
|
|
|
The plugin is a thin registration adapter — actual FAL pipeline logic
|
|
lives in ``tools.image_generation_tool`` and is exercised by
|
|
``tests/tools/test_image_generation.py``. These tests focus on:
|
|
|
|
* the ``ImageGenProvider`` ABC surface (name, models, schema)
|
|
* call-time indirection (``_it`` resolution at ``generate()`` time so
|
|
``monkeypatch.setattr(image_tool, ...)`` keeps working)
|
|
* response shape stamping (provider/prompt/aspect_ratio/model)
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Provider surface
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestFalImageGenProviderSurface:
|
|
def test_name(self):
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
assert FalImageGenProvider().name == "fal"
|
|
|
|
def test_display_name(self):
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
assert FalImageGenProvider().display_name == "FAL.ai"
|
|
|
|
def test_default_model_matches_legacy(self):
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
from tools.image_generation_tool import DEFAULT_MODEL
|
|
|
|
assert FalImageGenProvider().default_model() == DEFAULT_MODEL
|
|
|
|
def test_list_models_uses_legacy_catalog(self):
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
from tools.image_generation_tool import FAL_MODELS
|
|
|
|
provider = FalImageGenProvider()
|
|
models = provider.list_models()
|
|
ids = {m["id"] for m in models}
|
|
# Whatever FAL_MODELS ships, the provider mirrors verbatim.
|
|
assert ids == set(FAL_MODELS.keys())
|
|
# Spot-check the expected first-class fields are present.
|
|
for entry in models:
|
|
for field in ("id", "display", "speed", "strengths", "price"):
|
|
assert field in entry
|
|
|
|
def test_setup_schema_advertises_fal_key(self):
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
schema = FalImageGenProvider().get_setup_schema()
|
|
assert schema["name"] == "FAL.ai"
|
|
assert schema["badge"] == "paid"
|
|
env_keys = {entry["key"] for entry in schema.get("env_vars", [])}
|
|
assert "FAL_KEY" in env_keys
|
|
|
|
|
|
class TestFalImageGenProviderAvailability:
|
|
def test_is_available_when_legacy_check_passes(self, monkeypatch):
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
monkeypatch.setattr(image_tool, "check_fal_api_key", lambda: True)
|
|
assert FalImageGenProvider().is_available() is True
|
|
|
|
def test_is_available_false_when_legacy_check_fails(self, monkeypatch):
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
monkeypatch.setattr(image_tool, "check_fal_api_key", lambda: False)
|
|
assert FalImageGenProvider().is_available() is False
|
|
|
|
def test_is_available_handles_legacy_exception(self, monkeypatch):
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
def _boom():
|
|
raise RuntimeError("config broke")
|
|
|
|
monkeypatch.setattr(image_tool, "check_fal_api_key", _boom)
|
|
# Picker must not propagate exceptions — show as "not available".
|
|
assert FalImageGenProvider().is_available() is False
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# generate() — call-time indirection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestFalImageGenProviderGenerate:
|
|
def test_generate_delegates_to_legacy_image_generate_tool(self, monkeypatch):
|
|
"""Plugin must look up ``image_generate_tool`` at call time so
|
|
``monkeypatch.setattr(image_tool, "image_generate_tool", ...)``
|
|
takes effect."""
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
captured = {}
|
|
|
|
def fake_image_generate_tool(prompt, aspect_ratio, **kwargs):
|
|
captured["prompt"] = prompt
|
|
captured["aspect_ratio"] = aspect_ratio
|
|
captured["kwargs"] = kwargs
|
|
return json.dumps({"success": True, "image": "https://fake/image.png"})
|
|
|
|
monkeypatch.setattr(image_tool, "image_generate_tool", fake_image_generate_tool)
|
|
monkeypatch.setattr(image_tool, "_resolve_fal_model",
|
|
lambda: ("fal-ai/flux-2/klein/9b", {}))
|
|
|
|
result = FalImageGenProvider().generate(
|
|
"a serene mountain landscape",
|
|
aspect_ratio="square",
|
|
seed=42,
|
|
)
|
|
|
|
assert captured["prompt"] == "a serene mountain landscape"
|
|
assert captured["aspect_ratio"] == "square"
|
|
assert captured["kwargs"] == {"seed": 42}
|
|
assert result["success"] is True
|
|
assert result["image"] == "https://fake/image.png"
|
|
# Stamped fields for the unified response shape
|
|
assert result["provider"] == "fal"
|
|
assert result["prompt"] == "a serene mountain landscape"
|
|
assert result["aspect_ratio"] == "square"
|
|
assert result["model"] == "fal-ai/flux-2/klein/9b"
|
|
|
|
def test_generate_invalid_aspect_ratio_is_coerced(self, monkeypatch):
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
seen_aspect = {}
|
|
|
|
def fake(prompt, aspect_ratio, **kwargs):
|
|
seen_aspect["v"] = aspect_ratio
|
|
return json.dumps({"success": True, "image": "x"})
|
|
|
|
monkeypatch.setattr(image_tool, "image_generate_tool", fake)
|
|
monkeypatch.setattr(image_tool, "_resolve_fal_model",
|
|
lambda: ("fal-ai/flux-2/klein/9b", {}))
|
|
|
|
FalImageGenProvider().generate("p", aspect_ratio="not-a-real-ratio")
|
|
# ``resolve_aspect_ratio`` clamps to landscape.
|
|
assert seen_aspect["v"] == "landscape"
|
|
|
|
def test_generate_passthrough_drops_none_kwargs(self, monkeypatch):
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
seen = {}
|
|
|
|
def fake(prompt, aspect_ratio, **kwargs):
|
|
seen.update(kwargs)
|
|
return json.dumps({"success": True, "image": "x"})
|
|
|
|
monkeypatch.setattr(image_tool, "image_generate_tool", fake)
|
|
monkeypatch.setattr(image_tool, "_resolve_fal_model",
|
|
lambda: ("fal-ai/flux-2/klein/9b", {}))
|
|
|
|
FalImageGenProvider().generate(
|
|
"p",
|
|
aspect_ratio="landscape",
|
|
seed=None,
|
|
num_images=2,
|
|
guidance_scale=None,
|
|
)
|
|
|
|
# ``None`` values must not be forwarded — they'd override the
|
|
# model's defaults inside the legacy payload builder.
|
|
assert "seed" not in seen
|
|
assert "guidance_scale" not in seen
|
|
assert seen.get("num_images") == 2
|
|
|
|
def test_generate_catches_exception_from_legacy(self, monkeypatch):
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
def boom(*args, **kwargs):
|
|
raise RuntimeError("FAL endpoint exploded")
|
|
|
|
monkeypatch.setattr(image_tool, "image_generate_tool", boom)
|
|
|
|
result = FalImageGenProvider().generate("p")
|
|
assert result["success"] is False
|
|
assert "FAL image generation failed" in result["error"]
|
|
assert result["error_type"] == "RuntimeError"
|
|
assert result["provider"] == "fal"
|
|
|
|
def test_generate_invalid_json_response(self, monkeypatch):
|
|
import tools.image_generation_tool as image_tool
|
|
from plugins.image_gen.fal import FalImageGenProvider
|
|
|
|
monkeypatch.setattr(image_tool, "image_generate_tool", lambda **kw: "not-json")
|
|
monkeypatch.setattr(image_tool, "_resolve_fal_model",
|
|
lambda: ("fal-ai/flux-2/klein/9b", {}))
|
|
|
|
result = FalImageGenProvider().generate("p")
|
|
assert result["success"] is False
|
|
assert "Invalid JSON" in result["error"]
|
|
assert result["provider"] == "fal"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Registry wiring
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestFalImageGenPluginRegistration:
|
|
def test_register_wires_provider_into_registry(self):
|
|
from plugins.image_gen.fal import FalImageGenProvider, register
|
|
|
|
ctx = MagicMock()
|
|
register(ctx)
|
|
|
|
ctx.register_image_gen_provider.assert_called_once()
|
|
(registered,), _ = ctx.register_image_gen_provider.call_args
|
|
assert isinstance(registered, FalImageGenProvider)
|