mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
* feat(plugins): pluggable image_gen backends + OpenAI provider
Adds a ImageGenProvider ABC so image generation backends register as
bundled plugins under `plugins/image_gen/<name>/`. The plugin scanner
gains three primitives to make this work generically:
- `kind:` manifest field (`standalone` | `backend` | `exclusive`).
Bundled `kind: backend` plugins auto-load — no `plugins.enabled`
incantation. User-installed backends stay opt-in.
- Path-derived keys: `plugins/image_gen/openai/` gets key
`image_gen/openai`, so a future `tts/openai` cannot collide.
- Depth-2 recursion into category namespaces (parent dirs without a
`plugin.yaml` of their own).
Includes `OpenAIImageGenProvider` as the first consumer (gpt-image-1.5
default, plus gpt-image-1, gpt-image-1-mini, DALL-E 3/2). Base64
responses save to `$HERMES_HOME/cache/images/`; URL responses pass
through.
FAL stays in-tree for this PR — a follow-up ports it into
`plugins/image_gen/fal/` so the in-tree `image_generation_tool.py`
slims down. The dispatch shim in `_handle_image_generate` only fires
when `image_gen.provider` is explicitly set to a non-FAL value, so
existing FAL setups are untouched.
- 41 unit tests (scanner recursion, kind parsing, gate logic,
registry, OpenAI payload shapes)
- E2E smoke verified: bundled plugin autoloads, registers, and
`_handle_image_generate` routes to OpenAI when configured
* fix(image_gen/openai): don't send response_format to gpt-image-*
The live API rejects it: 'Unknown parameter: response_format'
(verified 2026-04-21 with gpt-image-1.5). gpt-image-* models return
b64_json unconditionally, so the parameter was both unnecessary and
actively broken.
* feat(image_gen/openai): gpt-image-2 only, drop legacy catalog
gpt-image-2 is the latest/best OpenAI image model (released 2026-04-21)
and there's no reason to expose the older gpt-image-1.5 / gpt-image-1 /
dall-e-3 / dall-e-2 alongside it — slower, lower quality, or awkward
(dall-e-2 squares only). Trim the catalog down to a single model.
Live-verified end-to-end: landscape 1536x1024 render of a Moog-style
synth matches prompt exactly, 2.4MB PNG saved to cache.
* feat(image_gen/openai): expose gpt-image-2 as three quality tiers
Users pick speed/fidelity via the normal model picker instead of a
hidden quality knob. All three tier IDs resolve to the single underlying
gpt-image-2 API model with a different quality parameter:
gpt-image-2-low ~15s fast iteration
gpt-image-2-medium ~40s default
gpt-image-2-high ~2min highest fidelity
Live-measured on OpenAI's API today: 15.4s / 40.8s / 116.9s for the
same 1024x1024 prompt.
Config:
image_gen.openai.model: gpt-image-2-high
# or
image_gen.model: gpt-image-2-low
# or env var for scripts/tests
OPENAI_IMAGE_MODEL=gpt-image-2-medium
Live-verified end-to-end with the low tier: 18.8s landscape render of a
golden retriever in wildflowers, vision-confirmed exact match.
* feat(tools_config): plugin image_gen providers inject themselves into picker
'hermes tools' → Image Generation now shows plugin-registered backends
alongside Nous Subscription and FAL.ai without tools_config.py needing
to know about them. OpenAI appears as a third option today; future
backends appear automatically as they're added.
Mechanism:
- ImageGenProvider gains an optional get_setup_schema() hook
(name, badge, tag, env_vars). Default derived from display_name.
- tools_config._plugin_image_gen_providers() pulls the schemas from
every registered non-FAL plugin provider.
- _visible_providers() appends those rows when rendering the Image
Generation category.
- _configure_provider() handles the new image_gen_plugin_name marker:
writes image_gen.provider and routes to the plugin's list_models()
catalog for the model picker.
- _toolset_needs_configuration_prompt('image_gen') stops demanding a
FAL key when any plugin provider reports is_available().
FAL is skipped in the plugin path because it already has hardcoded
TOOL_CATEGORIES rows — when it gets ported to a plugin in a follow-up
PR the hardcoded rows go away and it surfaces through the same path
as OpenAI.
Verified live: picker shows Nous Subscription / FAL.ai / OpenAI.
Picking OpenAI prompts for OPENAI_API_KEY, then shows the
gpt-image-2-low/medium/high model picker sourced from the plugin.
397 tests pass across plugins/, tools_config, registry, and picker.
* fix(image_gen): close final gaps for plugin-backend parity with FAL
Two small places that still hardcoded FAL:
- hermes_cli/setup.py status line: an OpenAI-only setup showed
'Image Generation: missing FAL_KEY'. Now probes plugin providers
and reports '(OpenAI)' when one is_available() — or falls back to
'missing FAL_KEY or OPENAI_API_KEY' if nothing is configured.
- image_generate tool schema description: said 'using FAL.ai, default
FLUX 2 Klein 9B'. Rewrote provider-neutral — 'backend and model are
user-configured' — and notes the 'image' field can be a URL or an
absolute path, which the gateway delivers either way via
extract_local_files().
357 lines
13 KiB
Python
357 lines
13 KiB
Python
"""Tests for PR1 pluggable image gen: scanner recursion, kinds, path keys.
|
|
|
|
Covers ``_scan_directory`` recursion into category namespaces
|
|
(``plugins/image_gen/openai/``), ``kind`` parsing, path-derived registry
|
|
keys, and the new gate logic (bundled backends auto-load; user backends
|
|
still opt-in; exclusive kind skipped; unknown kinds → standalone warning).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
from typing import Any, Dict
|
|
|
|
import pytest
|
|
import yaml
|
|
|
|
from hermes_cli.plugins import PluginManager, PluginManifest
|
|
|
|
|
|
# ── Helpers ────────────────────────────────────────────────────────────────
|
|
|
|
|
|
def _write_plugin(
|
|
root: Path,
|
|
segments: list[str],
|
|
*,
|
|
manifest_extra: Dict[str, Any] | None = None,
|
|
register_body: str = "pass",
|
|
) -> Path:
|
|
"""Create a plugin dir at ``root/<segments...>/`` with plugin.yaml + __init__.py.
|
|
|
|
``segments`` lets tests build both flat (``["my-plugin"]``) and
|
|
category-namespaced (``["image_gen", "openai"]``) layouts.
|
|
"""
|
|
plugin_dir = root
|
|
for seg in segments:
|
|
plugin_dir = plugin_dir / seg
|
|
plugin_dir.mkdir(parents=True, exist_ok=True)
|
|
|
|
manifest = {
|
|
"name": segments[-1],
|
|
"version": "0.1.0",
|
|
"description": f"Test plugin {'/'.join(segments)}",
|
|
}
|
|
if manifest_extra:
|
|
manifest.update(manifest_extra)
|
|
(plugin_dir / "plugin.yaml").write_text(yaml.dump(manifest))
|
|
(plugin_dir / "__init__.py").write_text(
|
|
f"def register(ctx):\n {register_body}\n"
|
|
)
|
|
return plugin_dir
|
|
|
|
|
|
def _enable(hermes_home: Path, name: str) -> None:
|
|
"""Append ``name`` to ``plugins.enabled`` in ``<hermes_home>/config.yaml``."""
|
|
cfg_path = hermes_home / "config.yaml"
|
|
cfg: dict = {}
|
|
if cfg_path.exists():
|
|
try:
|
|
cfg = yaml.safe_load(cfg_path.read_text()) or {}
|
|
except Exception:
|
|
cfg = {}
|
|
plugins_cfg = cfg.setdefault("plugins", {})
|
|
enabled = plugins_cfg.setdefault("enabled", [])
|
|
if isinstance(enabled, list) and name not in enabled:
|
|
enabled.append(name)
|
|
cfg_path.write_text(yaml.safe_dump(cfg))
|
|
|
|
|
|
# ── Scanner recursion ──────────────────────────────────────────────────────
|
|
|
|
|
|
class TestCategoryNamespaceRecursion:
|
|
def test_category_namespace_discovered(self, tmp_path, monkeypatch):
|
|
"""``<root>/image_gen/openai/plugin.yaml`` is discovered with key
|
|
``image_gen/openai`` when the ``image_gen`` parent has no manifest."""
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
user_plugins = hermes_home / "plugins"
|
|
|
|
_write_plugin(user_plugins, ["image_gen", "openai"])
|
|
_enable(hermes_home, "image_gen/openai")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert "image_gen/openai" in mgr._plugins
|
|
loaded = mgr._plugins["image_gen/openai"]
|
|
assert loaded.manifest.key == "image_gen/openai"
|
|
assert loaded.manifest.name == "openai"
|
|
assert loaded.enabled is True
|
|
|
|
def test_flat_plugin_key_matches_name(self, tmp_path, monkeypatch):
|
|
"""Flat plugins keep their bare name as the key (back-compat)."""
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
user_plugins = hermes_home / "plugins"
|
|
|
|
_write_plugin(user_plugins, ["my-plugin"])
|
|
_enable(hermes_home, "my-plugin")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert "my-plugin" in mgr._plugins
|
|
assert mgr._plugins["my-plugin"].manifest.key == "my-plugin"
|
|
|
|
def test_depth_cap_two(self, tmp_path, monkeypatch):
|
|
"""Plugins nested three levels deep are not discovered.
|
|
|
|
``<root>/a/b/c/plugin.yaml`` should NOT be picked up — cap is
|
|
two segments.
|
|
"""
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
user_plugins = hermes_home / "plugins"
|
|
|
|
_write_plugin(user_plugins, ["a", "b", "c"])
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
non_bundled = [
|
|
k for k, p in mgr._plugins.items()
|
|
if p.manifest.source != "bundled"
|
|
]
|
|
assert non_bundled == []
|
|
|
|
def test_category_dir_with_manifest_is_leaf(self, tmp_path, monkeypatch):
|
|
"""If ``image_gen/plugin.yaml`` exists, ``image_gen`` itself IS the
|
|
plugin and its children are ignored."""
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
user_plugins = hermes_home / "plugins"
|
|
|
|
# parent has a manifest → stop recursing
|
|
_write_plugin(user_plugins, ["image_gen"])
|
|
# child also has a manifest — should NOT be found because we stop
|
|
# at the parent.
|
|
_write_plugin(user_plugins, ["image_gen", "openai"])
|
|
_enable(hermes_home, "image_gen")
|
|
_enable(hermes_home, "image_gen/openai")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
# The bundled plugins/image_gen/openai/ exists in the repo — filter
|
|
# it out so we're only asserting on the user-dir layout.
|
|
user_plugins_in_registry = {
|
|
k for k, p in mgr._plugins.items() if p.manifest.source != "bundled"
|
|
}
|
|
assert "image_gen" in user_plugins_in_registry
|
|
assert "image_gen/openai" not in user_plugins_in_registry
|
|
|
|
|
|
# ── Kind parsing ───────────────────────────────────────────────────────────
|
|
|
|
|
|
class TestKindField:
|
|
def test_default_kind_is_standalone(self, tmp_path, monkeypatch):
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
_write_plugin(hermes_home / "plugins", ["p1"])
|
|
_enable(hermes_home, "p1")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert mgr._plugins["p1"].manifest.kind == "standalone"
|
|
|
|
@pytest.mark.parametrize("kind", ["backend", "exclusive", "standalone"])
|
|
def test_valid_kinds_parsed(self, kind, tmp_path, monkeypatch):
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
_write_plugin(
|
|
hermes_home / "plugins",
|
|
["p1"],
|
|
manifest_extra={"kind": kind},
|
|
)
|
|
# Not all kinds auto-load, but manifest should parse.
|
|
_enable(hermes_home, "p1")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert "p1" in mgr._plugins
|
|
assert mgr._plugins["p1"].manifest.kind == kind
|
|
|
|
def test_unknown_kind_falls_back_to_standalone(self, tmp_path, monkeypatch, caplog):
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
_write_plugin(
|
|
hermes_home / "plugins",
|
|
["p1"],
|
|
manifest_extra={"kind": "bogus"},
|
|
)
|
|
_enable(hermes_home, "p1")
|
|
|
|
with caplog.at_level("WARNING"):
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert mgr._plugins["p1"].manifest.kind == "standalone"
|
|
assert any(
|
|
"unknown kind" in rec.getMessage() for rec in caplog.records
|
|
)
|
|
|
|
|
|
# ── Gate logic ─────────────────────────────────────────────────────────────
|
|
|
|
|
|
class TestBackendGate:
|
|
def test_user_backend_still_gated_by_enabled(self, tmp_path, monkeypatch):
|
|
"""User-installed ``kind: backend`` plugins still require opt-in —
|
|
they're not trusted by default."""
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
user_plugins = hermes_home / "plugins"
|
|
|
|
_write_plugin(
|
|
user_plugins,
|
|
["image_gen", "fancy"],
|
|
manifest_extra={"kind": "backend"},
|
|
)
|
|
# Do NOT opt in.
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
loaded = mgr._plugins["image_gen/fancy"]
|
|
assert loaded.enabled is False
|
|
assert "not enabled" in (loaded.error or "")
|
|
|
|
def test_user_backend_loads_when_enabled(self, tmp_path, monkeypatch):
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
user_plugins = hermes_home / "plugins"
|
|
|
|
_write_plugin(
|
|
user_plugins,
|
|
["image_gen", "fancy"],
|
|
manifest_extra={"kind": "backend"},
|
|
)
|
|
_enable(hermes_home, "image_gen/fancy")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert mgr._plugins["image_gen/fancy"].enabled is True
|
|
|
|
def test_exclusive_kind_skipped(self, tmp_path, monkeypatch):
|
|
"""``kind: exclusive`` plugins are recorded but not loaded — the
|
|
category's own discovery system handles them (memory today)."""
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
_write_plugin(
|
|
hermes_home / "plugins",
|
|
["some-backend"],
|
|
manifest_extra={"kind": "exclusive"},
|
|
)
|
|
_enable(hermes_home, "some-backend")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
loaded = mgr._plugins["some-backend"]
|
|
assert loaded.enabled is False
|
|
assert "exclusive" in (loaded.error or "")
|
|
|
|
|
|
# ── Bundled backend auto-load (integration with real bundled plugin) ────────
|
|
|
|
|
|
class TestBundledBackendAutoLoad:
|
|
def test_bundled_image_gen_openai_autoloads(self, tmp_path, monkeypatch):
|
|
"""The bundled ``plugins/image_gen/openai/`` plugin loads without
|
|
any opt-in — it's ``kind: backend`` and shipped in-repo."""
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert "image_gen/openai" in mgr._plugins
|
|
loaded = mgr._plugins["image_gen/openai"]
|
|
assert loaded.manifest.source == "bundled"
|
|
assert loaded.manifest.kind == "backend"
|
|
assert loaded.enabled is True, f"error: {loaded.error}"
|
|
|
|
|
|
# ── PluginContext.register_image_gen_provider ───────────────────────────────
|
|
|
|
|
|
class TestRegisterImageGenProvider:
|
|
def test_accepts_valid_provider(self, tmp_path, monkeypatch):
|
|
from agent import image_gen_registry
|
|
from agent.image_gen_provider import ImageGenProvider
|
|
|
|
image_gen_registry._reset_for_tests()
|
|
|
|
class FakeProvider(ImageGenProvider):
|
|
@property
|
|
def name(self) -> str:
|
|
return "fake-test"
|
|
|
|
def generate(self, prompt, aspect_ratio="landscape", **kw):
|
|
return {"success": True, "image": "test://fake"}
|
|
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
plugin_dir = _write_plugin(
|
|
hermes_home / "plugins",
|
|
["my-img-plugin"],
|
|
register_body=(
|
|
"from agent.image_gen_provider import ImageGenProvider\n"
|
|
" class P(ImageGenProvider):\n"
|
|
" @property\n"
|
|
" def name(self): return 'fake-ctx'\n"
|
|
" def generate(self, prompt, aspect_ratio='landscape', **kw):\n"
|
|
" return {'success': True, 'image': 'x://y'}\n"
|
|
" ctx.register_image_gen_provider(P())"
|
|
),
|
|
)
|
|
_enable(hermes_home, "my-img-plugin")
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert mgr._plugins["my-img-plugin"].enabled is True
|
|
assert image_gen_registry.get_provider("fake-ctx") is not None
|
|
|
|
image_gen_registry._reset_for_tests()
|
|
|
|
def test_rejects_non_provider(self, tmp_path, monkeypatch, caplog):
|
|
from agent import image_gen_registry
|
|
|
|
image_gen_registry._reset_for_tests()
|
|
|
|
import os
|
|
hermes_home = Path(os.environ["HERMES_HOME"]) # set by hermetic conftest fixture
|
|
_write_plugin(
|
|
hermes_home / "plugins",
|
|
["bad-img-plugin"],
|
|
register_body="ctx.register_image_gen_provider('not a provider')",
|
|
)
|
|
_enable(hermes_home, "bad-img-plugin")
|
|
|
|
with caplog.at_level("WARNING"):
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
# Plugin loaded (register returned normally) but nothing was
|
|
# registered in the provider registry.
|
|
assert mgr._plugins["bad-img-plugin"].enabled is True
|
|
assert image_gen_registry.get_provider("not a provider") is None
|
|
|
|
image_gen_registry._reset_for_tests()
|