a5bd246865
* refactor(plugins): remove the Sep 2026 decomposition compat layer on schedule The PLUGIN-COMPAT layer (2776813df3+d63e380324+0a5164cebe) kept pre-#102117 import paths alive for external plugins until 2026-09-14. That window closed two weeks ago; since then the loader has already been skipping plugins that use the old paths. This removes the layer itself: - 328 appended `PLUGIN-COMPAT` blocks (lazy `__getattr__` pointer tables, re-exported third-party names, restored dead definitions) and the three re-export stub modules (gateway/startup_watchdog, hermes_cli/observability/relay_runtime, tools/environments/modal_utils) - COMPAT_MANIFEST.md, compat_manifest.json, scripts/check_compat_pointers.py and its lint step - the reporting surfaces: CLI banner notice, `hermes plugins compat`, the `hermes doctor` section, the post-update notice, the Desktop one-time dialog, the loader's pre-import skip and the `plugins.allow_deprecated_imports` escape hatch An external plugin that still imports an old path now fails to load with its ImportError as the reason in `hermes plugins list`, the same path as any broken plugin. hermes_cli/plugin_compat.py stays as three inert stubs (compat_report, removal_in_effect, summary_lines): an already-running pre-removal `hermes update` lazy-imports them after the checkout swap (tests/compat/old_updater_surface.json). In-tree fallout, both already dead: hermes_cli/setup.py::_check_espeak_ng (no callers; its `shutil` came from a compat block) and gateway/config.py::SessionResetPolicy ("retained solely for the scheduled plugin-compat window"). Two test_run_agent patches targeted the removed `run_agent.handle_function_call` pointer; they now patch `model_tools.handle_function_call`, the seam production reads, like every sibling test in that file. * chore: retrigger CI (zero-job startup_failure phantom) * test: drop resolution allowlist rows for the two deleted which() sites hermes_cli/setup.py::_check_espeak_ng (dead) and tools/skillevaluator_scan.py::scanner_available (a restored definition inside a PLUGIN-COMPAT block) no longer exist; the stale-row gate requires their allowlist entries go with them.
48 lines
1.9 KiB
Python
48 lines
1.9 KiB
Python
"""Image generation provider registry.
|
|
|
|
Populated by plugins at import-time via ``PluginContext.register_image_gen_provider()``;
|
|
the ``image_generate`` tool dispatches to :func:`get_active_provider`. Selection is
|
|
``image_gen.provider`` in config.yaml; when unset: the single *available* provider,
|
|
else ``fal`` if registered and available (legacy default), else ``None`` (the tool
|
|
points the user at ``hermes tools``).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import Optional
|
|
|
|
from agent.image_gen_provider import ImageGenProvider
|
|
from agent.provider_registry import ProviderRegistry, configured_provider_name, is_available_safe
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
_registry: ProviderRegistry[ImageGenProvider] = ProviderRegistry(
|
|
label="Image gen", provider_cls=ImageGenProvider, logger=logger,
|
|
)
|
|
_registry.export(globals())
|
|
|
|
|
|
def get_active_provider() -> Optional[ImageGenProvider]:
|
|
"""Resolve the currently-active provider. Availability semantics (mirrors
|
|
:mod:`agent.web_search_registry`): an explicitly configured provider is returned
|
|
even if ``is_available()`` is False, so the dispatcher surfaces a precise
|
|
"X_API_KEY is not set" error instead of silently switching backends; only the
|
|
unconfigured fallback path is filtered by availability."""
|
|
configured = configured_provider_name("image_gen", logger)
|
|
snapshot = _registry.merged()
|
|
if configured:
|
|
if snapshot.get(configured) is not None:
|
|
return snapshot[configured]
|
|
logger.debug("image_gen.provider='%s' configured but not registered; falling back", configured)
|
|
|
|
def _available(p: ImageGenProvider) -> bool:
|
|
return is_available_safe(p, logger, "image_gen provider %s.is_available() raised %s")
|
|
|
|
available = [p for p in snapshot.values() if _available(p)]
|
|
if len(available) == 1:
|
|
return available[0]
|
|
fal = snapshot.get("fal")
|
|
return fal if fal is not None and _available(fal) else None
|