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.
62 lines
2.7 KiB
Python
62 lines
2.7 KiB
Python
"""Browser provider registry: cloud browser backends registered by plugins via
|
|
:meth:`PluginContext.register_browser_provider`, consumed by ``tools.browser_tool_cloud._get_cloud_provider``.
|
|
|
|
Active-provider precedence (see :func:`_resolve`): ``browser.cloud_provider`` in config.yaml wins
|
|
regardless of ``is_available()`` (so the dispatcher surfaces a typed "X_API_KEY is not set" error
|
|
instead of silently switching); else the legacy auto-detect walk ``browser-use`` → ``browserbase``
|
|
filtered by availability; else ``None`` (local browser mode). There is no capability split here —
|
|
every provider implements the full :class:`agent.browser_provider.BrowserProvider` lifecycle.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import Optional
|
|
|
|
from agent.browser_provider import BrowserProvider
|
|
from agent.provider_registry import ProviderRegistry, is_available_safe
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
_registry: ProviderRegistry[BrowserProvider] = ProviderRegistry(
|
|
label="Browser", provider_cls=BrowserProvider, logger=logger,
|
|
)
|
|
_registry.export(globals())
|
|
|
|
|
|
# Auto-detect order when ``browser.cloud_provider`` is unset (historic order: Browser Use first because
|
|
# it covers both the managed Nous gateway and the direct API key path; Browserbase as the older
|
|
# direct-credentials fallback). Firecrawl is deliberately absent — see :func:`_resolve`.
|
|
_LEGACY_PREFERENCE = ("browser-use", "browserbase")
|
|
|
|
|
|
def _resolve(configured: Optional[str]) -> Optional[BrowserProvider]:
|
|
"""Resolve the active browser provider (rules in the module docstring).
|
|
|
|
Intentionally NO "single-eligible shortcut" (unlike ``agent.web_search_registry._resolve``): only
|
|
``_LEGACY_PREFERENCE`` names are auto-eligible. Firecrawl shares its API key with the *web* extract
|
|
plugin, so a user with ``FIRECRAWL_API_KEY`` must never be routed to a paid cloud browser without
|
|
setting ``browser.cloud_provider``; the same gate applies to third-party browser-provider plugins.
|
|
"""
|
|
snapshot = _registry.merged()
|
|
if configured == "local":
|
|
return None
|
|
if configured:
|
|
provider = snapshot.get(configured)
|
|
if provider is not None:
|
|
return provider
|
|
logger.debug(
|
|
"browser cloud_provider '%s' configured but not registered; falling back to auto-detect",
|
|
configured,
|
|
)
|
|
for legacy in _LEGACY_PREFERENCE:
|
|
provider = snapshot.get(legacy)
|
|
if provider is not None and is_available_safe(
|
|
provider, logger,
|
|
"Browser provider %s.is_available() raised %s — treating as unavailable",
|
|
level=logging.WARNING, exc_info=True,
|
|
):
|
|
return provider
|
|
return None
|