mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-18 04:41:56 +00:00
Deletes tools/web_providers/{brave_free,ddgs,searxng}.py — the three
providers that moved to plugins/web/ in prior commits. tools/web_tools.py
no longer imports them (registry dispatch as of d8735963f), so removing
them is purely a cleanup pass.
Also migrates the existing tests to the new import paths:
tests/tools/test_web_providers_brave_free.py
tests/tools/test_web_providers_ddgs.py
tests/tools/test_web_providers_searxng.py
Mechanical rewrites:
- `from tools.web_providers.X import YSearchProvider`
-> `from plugins.web.X.provider import YWebSearchProvider`
- `.is_configured()` -> `.is_available()` (legacy method -> new method)
- `.provider_name()` -> `.name` (legacy method -> new property)
- `from tools.web_providers.base import WebSearchProvider`
-> `from agent.web_search_provider import WebSearchProvider`
(the subclass-check asserts membership in the new plugin-facing ABC)
- `sys.modules.delitem("tools.web_providers.ddgs")` updated to point at
`plugins.web.ddgs.provider` (cache-busting for lazy ddgs imports)
The TestXBackendWiring / TestXSearchOnlyErrors classes (covering
_is_backend_available, _get_backend, check_web_api_key, and the
"search-only" error paths in web_extract/web_crawl) are untouched —
those still test web_tools.py's backend-selection logic, which continues
to recognize the names "brave-free" / "ddgs" / "searxng" even after the
modules behind them moved to plugins.
tools/web_providers/base.py is intentionally NOT deleted by this commit
— it's the parent ABC of the legacy modules and shares its name with
agent/web_search_provider.py::WebSearchProvider. Removing it surfaces the
naming collision (see PR description Finding 0); the real migration PR
deletes it in the same commit that drops the _WEB_PLUGIN_SKIPLIST
guards in hermes_cli/tools_config.py.
Test results:
bash scripts/run_tests.sh tests/tools/test_web_providers_*.py
-> 65 passed in 3.41s (all rewritten unit tests + unchanged integration tests)
bash scripts/run_tests.sh tests/tools/test_web_*.py
-> 141 passed in 4.70s (full web test set, post-deletion)
140 lines
4.2 KiB
Python
140 lines
4.2 KiB
Python
"""SearXNG search — plugin form.
|
|
|
|
Subclasses :class:`agent.web_search_provider.WebSearchProvider`. Same JSON
|
|
API call (``/search?format=json``), same result normalization. The legacy
|
|
in-tree module ``tools.web_providers.searxng`` was removed in the same
|
|
commit that moved this code under ``plugins/``; this file is now the
|
|
canonical implementation.
|
|
|
|
Search-only — SearXNG aggregates results from upstream engines but does not
|
|
fetch/extract arbitrary URLs. ``supports_extract()`` returns False.
|
|
|
|
Config keys this provider responds to::
|
|
|
|
web:
|
|
search_backend: "searxng" # explicit per-capability
|
|
backend: "searxng" # shared fallback
|
|
|
|
Env var::
|
|
|
|
SEARXNG_URL=http://localhost:8080
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import os
|
|
from typing import Any, Dict
|
|
|
|
from agent.web_search_provider import WebSearchProvider
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class SearXNGWebSearchProvider(WebSearchProvider):
|
|
"""Search via a user-hosted SearXNG instance."""
|
|
|
|
@property
|
|
def name(self) -> str:
|
|
return "searxng"
|
|
|
|
@property
|
|
def display_name(self) -> str:
|
|
return "SearXNG"
|
|
|
|
def is_available(self) -> bool:
|
|
"""Return True when ``SEARXNG_URL`` is set."""
|
|
return bool(os.getenv("SEARXNG_URL", "").strip())
|
|
|
|
def supports_search(self) -> bool:
|
|
return True
|
|
|
|
def supports_extract(self) -> bool:
|
|
return False
|
|
|
|
def search(self, query: str, limit: int = 5) -> Dict[str, Any]:
|
|
"""Execute a search against the configured SearXNG instance."""
|
|
import httpx
|
|
|
|
base_url = os.getenv("SEARXNG_URL", "").strip().rstrip("/")
|
|
if not base_url:
|
|
return {"success": False, "error": "SEARXNG_URL is not set"}
|
|
|
|
params: Dict[str, Any] = {
|
|
"q": query,
|
|
"format": "json",
|
|
"pageno": 1,
|
|
}
|
|
|
|
try:
|
|
resp = httpx.get(
|
|
f"{base_url}/search",
|
|
params=params,
|
|
timeout=15,
|
|
headers={"Accept": "application/json"},
|
|
)
|
|
resp.raise_for_status()
|
|
except httpx.HTTPStatusError as exc:
|
|
logger.warning("SearXNG HTTP error: %s", exc)
|
|
return {
|
|
"success": False,
|
|
"error": f"SearXNG returned HTTP {exc.response.status_code}",
|
|
}
|
|
except httpx.RequestError as exc:
|
|
logger.warning("SearXNG request error: %s", exc)
|
|
return {
|
|
"success": False,
|
|
"error": f"Could not reach SearXNG at {base_url}: {exc}",
|
|
}
|
|
|
|
try:
|
|
data = resp.json()
|
|
except Exception as exc: # noqa: BLE001
|
|
logger.warning("SearXNG response parse error: %s", exc)
|
|
return {
|
|
"success": False,
|
|
"error": "Could not parse SearXNG response as JSON",
|
|
}
|
|
|
|
raw_results = data.get("results", [])
|
|
|
|
# SearXNG may return a score field; sort descending and cap to limit.
|
|
sorted_results = sorted(
|
|
raw_results,
|
|
key=lambda r: float(r.get("score", 0)),
|
|
reverse=True,
|
|
)[:limit]
|
|
|
|
web_results = [
|
|
{
|
|
"title": str(r.get("title", "")),
|
|
"url": str(r.get("url", "")),
|
|
"description": str(r.get("content", "")),
|
|
"position": i + 1,
|
|
}
|
|
for i, r in enumerate(sorted_results)
|
|
]
|
|
|
|
logger.info(
|
|
"SearXNG search '%s': %d results (from %d raw, limit %d)",
|
|
query,
|
|
len(web_results),
|
|
len(raw_results),
|
|
limit,
|
|
)
|
|
|
|
return {"success": True, "data": {"web": web_results}}
|
|
|
|
def get_setup_schema(self) -> Dict[str, Any]:
|
|
return {
|
|
"name": "SearXNG",
|
|
"badge": "free · self-hosted",
|
|
"tag": "Free, privacy-respecting metasearch. Point SEARXNG_URL at your instance.",
|
|
"env_vars": [
|
|
{
|
|
"key": "SEARXNG_URL",
|
|
"prompt": "SearXNG instance URL (e.g. http://localhost:8080)",
|
|
"url": "https://searx.space/",
|
|
},
|
|
],
|
|
}
|