Teknium
2776813df3
The Sep 2026 decomposition (PR #102117) makes internal import paths a non-API: names now live in the focused modules that define them. This commit is the ONLY thing keeping the old paths alive, so external plugins have time to update. It is deliberately a single, unsquashed commit: git revert <this sha> removes every shim, stub and manifest at once on the announced date. Nothing in-tree may depend on these pointers: scripts/check_compat_pointers.py (wired into lint.yml) fails CI if it does. What it adds (see COMPAT_MANIFEST.md, compat_manifest.json): - 332 facade modules get one delimited `PLUGIN-COMPAT` block appended at the end of the file - 1,172 moved names resolved lazily via a module `__getattr__` (PEP 562) — never a top-level import, so no import cycles; facades that already had `__getattr__` get a chained one - 592 third-party/stdlib names the old modules used to expose, with their original import statements - 266 public definitions that had been deleted as unused, restored byte-for-byte from the pre-decomposition tree (+40 private helpers and 16 imports pulled in only because a restored definition needs them) - 3 deleted modules recreated as re-export stubs (gateway/startup_watchdog, hermes_cli/observability/ relay_runtime, tools/environments/modal_utils) - private names (`_x`) get no pointer: they were never API (3,792 skipped) Verified: all 335 touched modules import under a fresh HERMES_HOME and every manifest name resolves; the lint reports zero in-tree uses; ruff clean; targeted suites unchanged.
85 lines
3.5 KiB
Python
85 lines
3.5 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
|
|
|
|
|
|
# ---- BEGIN PLUGIN-COMPAT (revert-scheduled; see COMPAT_MANIFEST.md) ----
|
|
# Names external plugins imported from this module before the Sep 2026 decomposition.
|
|
# Internal code MUST NOT use these (scripts/check_compat_pointers.py fails CI if it does).
|
|
# The whole block is removed by reverting the commit that added it.
|
|
from typing import Dict # noqa: F401,E402
|
|
from typing import List # noqa: F401,E402
|
|
import threading # noqa: F401,E402
|
|
|
|
|
|
_PLUGIN_COMPAT_LAZY = {
|
|
'hermes_home_key': ('hermes_constants', 'hermes_home_key'),
|
|
}
|
|
|
|
|
|
def __getattr__(name): # PEP 562 — lazy so no import cycles
|
|
target = _PLUGIN_COMPAT_LAZY.get(name)
|
|
if target is None:
|
|
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
|
|
import importlib
|
|
return getattr(importlib.import_module(target[0]), target[1])
|
|
# ---- END PLUGIN-COMPAT ----
|