mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-30 06:41:51 +00:00
The web_crawl_tool() function was an orphan — no model schema registered it, no skill or CLI command called it, and the agent had no way to invoke it. PR #32608 proposed wiring it up as a model-callable tool; we've decided not to expose crawl as a separate capability since web_search + web_extract cover the use cases we want models to have. Removed: - tools/web_tools.py: web_crawl_tool() (~230 LOC) - plugins/web/firecrawl/provider.py: supports_crawl() + crawl() - plugins/web/tavily/provider.py: supports_crawl() + crawl() - plugins/web/xai/provider.py: supports_crawl() override - agent/web_search_provider.py: supports_crawl() + crawl() ABC methods - agent/web_search_registry.py: get_active_crawl_provider() + the 'crawl' branch in _resolve() - agent/display.py: web_crawl tool-progress rendering - hermes_cli/config.py: 'web_crawl' from TAVILY_API_KEY.tools - tools/website_policy.py: stale comment reference - Tests: removed TestWebCrawlTavily class, the two website-policy web_crawl tests, the searxng/ddgs/brave-free crawl-error tests, the integration test_web_crawl method, and the test_unconfigured_crawl_emits_top_level_error test. Trimmed the capability-flag parametrize list and the WebSearchProvider ABC conformance tests. - Docs: trimmed the Crawl column from capability tables in both EN and zh-Hans, updated the developer-guide ABC table. Net: 25 files, +115/-1067. Closes #33762 (the schema-text bug only existed if #32608 landed). Supersedes #32608.
245 lines
8.9 KiB
Python
245 lines
8.9 KiB
Python
"""
|
|
Web Search Provider Registry
|
|
============================
|
|
|
|
Central map of registered web providers. Populated by plugins at import-time
|
|
via :meth:`PluginContext.register_web_search_provider`; consumed by the
|
|
``web_search`` and ``web_extract`` tool wrappers in :mod:`tools.web_tools` to
|
|
dispatch each call to the active backend.
|
|
|
|
Active selection
|
|
----------------
|
|
The active provider is chosen by configuration with this precedence:
|
|
|
|
1. ``web.search_backend`` / ``web.extract_backend``
|
|
(per-capability override).
|
|
2. ``web.backend`` (shared fallback).
|
|
3. If exactly one capability-eligible provider is registered AND available,
|
|
use it.
|
|
4. Legacy preference order — ``firecrawl`` → ``parallel`` → ``tavily`` →
|
|
``exa`` → ``searxng`` → ``brave-free`` → ``ddgs`` — filtered by
|
|
availability. Matches the historic ``tools.web_tools._get_backend()``
|
|
candidate order so installs that never set a config key keep landing
|
|
on the same provider they did before the plugin migration.
|
|
5. Otherwise ``None`` — the tool surfaces a helpful error pointing at
|
|
``hermes tools``.
|
|
|
|
The capability filter (``supports_search`` / ``supports_extract``) is
|
|
applied at every step so a search-only provider (``brave-free``)
|
|
configured as ``web.extract_backend`` correctly falls through to an
|
|
extract-capable backend.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import threading
|
|
from typing import Dict, List, Optional
|
|
|
|
from agent.web_search_provider import WebSearchProvider
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
_providers: Dict[str, WebSearchProvider] = {}
|
|
_lock = threading.Lock()
|
|
|
|
|
|
def register_provider(provider: WebSearchProvider) -> None:
|
|
"""Register a web search/extract provider.
|
|
|
|
Re-registration (same ``name``) overwrites the previous entry and logs
|
|
a debug message — makes hot-reload scenarios (tests, dev loops) behave
|
|
predictably.
|
|
"""
|
|
if not isinstance(provider, WebSearchProvider):
|
|
raise TypeError(
|
|
f"register_provider() expects a WebSearchProvider instance, "
|
|
f"got {type(provider).__name__}"
|
|
)
|
|
name = provider.name
|
|
if not isinstance(name, str) or not name.strip():
|
|
raise ValueError("Web provider .name must be a non-empty string")
|
|
with _lock:
|
|
existing = _providers.get(name)
|
|
_providers[name] = provider
|
|
if existing is not None:
|
|
logger.debug(
|
|
"Web provider '%s' re-registered (was %r)",
|
|
name, type(existing).__name__,
|
|
)
|
|
else:
|
|
logger.debug(
|
|
"Registered web provider '%s' (%s)",
|
|
name, type(provider).__name__,
|
|
)
|
|
|
|
|
|
def list_providers() -> List[WebSearchProvider]:
|
|
"""Return all registered providers, sorted by name."""
|
|
with _lock:
|
|
items = list(_providers.values())
|
|
return sorted(items, key=lambda p: p.name)
|
|
|
|
|
|
def get_provider(name: str) -> Optional[WebSearchProvider]:
|
|
"""Return the provider registered under *name*, or None."""
|
|
if not isinstance(name, str):
|
|
return None
|
|
with _lock:
|
|
return _providers.get(name.strip())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Active-provider resolution
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _read_config_key(*path: str) -> Optional[str]:
|
|
"""Resolve a dotted config key from ``config.yaml``. Returns None on miss."""
|
|
try:
|
|
from hermes_cli.config import load_config
|
|
|
|
cfg = load_config()
|
|
cur = cfg
|
|
for segment in path:
|
|
if not isinstance(cur, dict):
|
|
return None
|
|
cur = cur.get(segment)
|
|
if isinstance(cur, str) and cur.strip():
|
|
return cur.strip()
|
|
except Exception as exc:
|
|
logger.debug("Could not read config %s: %s", ".".join(path), exc)
|
|
return None
|
|
|
|
|
|
# Legacy preference order — preserves behaviour for users who set no
|
|
# ``web.backend`` / ``web.<capability>_backend`` config key at all. Matches
|
|
# the historic candidate order in :func:`tools.web_tools._get_backend`
|
|
# (paid providers first so existing paid setups don't get downgraded to
|
|
# a free tier on upgrade). Filtered by ``is_available()`` at walk time so
|
|
# we don't surface a provider the user has no credentials for.
|
|
_LEGACY_PREFERENCE = (
|
|
"firecrawl",
|
|
"parallel",
|
|
"tavily",
|
|
"exa",
|
|
"searxng",
|
|
"brave-free",
|
|
"ddgs",
|
|
)
|
|
|
|
|
|
def _resolve(configured: Optional[str], *, capability: str) -> Optional[WebSearchProvider]:
|
|
"""Resolve the active provider for a capability ("search" | "extract").
|
|
|
|
Resolution rules (in order):
|
|
|
|
1. **Explicit config wins, ignoring availability.** If
|
|
``web.{capability}_backend`` or ``web.backend`` names a registered
|
|
provider that supports *capability*, return it even if its
|
|
:meth:`is_available` returns False — the dispatcher will surface a
|
|
precise "X_API_KEY is not set" error to the user instead of silently
|
|
routing somewhere else. Matches legacy
|
|
:func:`tools.web_tools._get_backend` behavior for configured names.
|
|
|
|
2. **Single-provider shortcut.** When only one registered provider
|
|
supports *capability* AND ``is_available()`` reports True, return it.
|
|
|
|
3. **Legacy preference walk, filtered by availability.** Walk the
|
|
:data:`_LEGACY_PREFERENCE` order (firecrawl → parallel → tavily →
|
|
exa → searxng → brave-free → ddgs) looking for a provider whose
|
|
``supports_<capability>()`` is True AND whose ``is_available()`` is
|
|
True. Matches the historic ``tools.web_tools._get_backend()``
|
|
candidate order so users with credentials but no explicit config
|
|
key keep landing on the same provider as pre-migration. This is
|
|
the path that fires when no config key is set — pick the
|
|
highest-priority backend the user actually has credentials for.
|
|
|
|
Returns None when no provider is configured AND no available provider
|
|
matches the legacy preference; the dispatcher then returns a "set up a
|
|
provider" error to the user.
|
|
"""
|
|
with _lock:
|
|
snapshot = dict(_providers)
|
|
|
|
def _capable(p: WebSearchProvider) -> bool:
|
|
if capability == "search":
|
|
return bool(p.supports_search())
|
|
if capability == "extract":
|
|
return bool(p.supports_extract())
|
|
return False
|
|
|
|
def _is_available_safe(p: WebSearchProvider) -> bool:
|
|
"""Wrap ``is_available()`` so a buggy provider doesn't kill resolution."""
|
|
try:
|
|
return bool(p.is_available())
|
|
except Exception as exc: # noqa: BLE001
|
|
logger.debug("provider %s.is_available() raised %s", p.name, exc)
|
|
return False
|
|
|
|
# 1. Explicit config wins — return regardless of is_available() so the
|
|
# user gets a precise downstream error message rather than a silent
|
|
# backend switch. Matches _get_backend() in web_tools.py.
|
|
if configured:
|
|
provider = snapshot.get(configured)
|
|
if provider is not None and _capable(provider):
|
|
return provider
|
|
if provider is None:
|
|
logger.debug(
|
|
"web backend '%s' configured but not registered; falling back",
|
|
configured,
|
|
)
|
|
else:
|
|
logger.debug(
|
|
"web backend '%s' configured but does not support '%s'; falling back",
|
|
configured, capability,
|
|
)
|
|
|
|
# 2. + 3. Fallback path — filter by availability so we don't surface
|
|
# a provider the user has no credentials for. Without this filter,
|
|
# a registered-but-unconfigured provider could end up "active" on
|
|
# a fresh install with no API keys at all.
|
|
eligible = [
|
|
p for p in snapshot.values()
|
|
if _capable(p) and _is_available_safe(p)
|
|
]
|
|
if len(eligible) == 1:
|
|
return eligible[0]
|
|
|
|
for legacy in _LEGACY_PREFERENCE:
|
|
provider = snapshot.get(legacy)
|
|
if (
|
|
provider is not None
|
|
and _capable(provider)
|
|
and _is_available_safe(provider)
|
|
):
|
|
return provider
|
|
|
|
return None
|
|
|
|
|
|
def get_active_search_provider() -> Optional[WebSearchProvider]:
|
|
"""Resolve the currently-active web search provider.
|
|
|
|
Reads ``web.search_backend`` (preferred) or ``web.backend`` (shared
|
|
fallback) from config.yaml; falls back per the module docstring.
|
|
"""
|
|
explicit = _read_config_key("web", "search_backend") or _read_config_key("web", "backend")
|
|
return _resolve(explicit, capability="search")
|
|
|
|
|
|
def get_active_extract_provider() -> Optional[WebSearchProvider]:
|
|
"""Resolve the currently-active web extract provider.
|
|
|
|
Reads ``web.extract_backend`` (preferred) or ``web.backend`` (shared
|
|
fallback) from config.yaml; falls back per the module docstring.
|
|
"""
|
|
explicit = _read_config_key("web", "extract_backend") or _read_config_key("web", "backend")
|
|
return _resolve(explicit, capability="extract")
|
|
|
|
|
|
def _reset_for_tests() -> None:
|
|
"""Clear the registry. **Test-only.**"""
|
|
with _lock:
|
|
_providers.clear()
|