d63e380324
Every PLUGIN-COMPAT __getattr__ now calls hermes_cli.plugin_compat.warn_once(facade, name, target) before
resolving, emitting a HermesPluginCompatWarning (FutureWarning) once per process per name: old path, new
path, removal target. Importing a facade for its live API stays silent; only resolving a moved name warns.
COMPAT_MANIFEST.md documents the warning and how to silence it during migration.
Verified the runtime never routes through a pointer: every entry point (run_agent, cli, hermes_cli.main,
gateway.run, tui_gateway.server, web_server, model_tools + tool discovery, hermes_state, cron.scheduler,
browser_tool, mcp_tool, kanban, auth) imports clean and `hermes doctor` runs end to end with the warning
promoted to an error.
Also restores the check_compat_pointers CI step to .github/workflows/lint.yml, which a0be177aac dropped
when the compat layer was regenerated (the lint script itself was present; the workflow step was not).
hermes_cli/plugin_compat.py, tests/test_plugin_compat_warning.py and the two-line insert per facade are
part of the compat layer and go away with it.
69 lines
2.8 KiB
Python
69 lines
2.8 KiB
Python
"""SearXNG search via a user-hosted instance (``/search?format=json``).
|
|
|
|
Search-only — SearXNG aggregates upstream engines but does not fetch URLs.
|
|
Env: ``SEARXNG_URL=http://localhost:8080``.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import Any, Dict
|
|
|
|
from plugins.web._common import BaseWebSearchProvider, http_get_json, provider_env, search_fail, search_ok, setup_schema, titled_rows
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class SearXNGWebSearchProvider(BaseWebSearchProvider):
|
|
"""Search via a user-hosted SearXNG instance."""
|
|
|
|
NAME = "searxng"
|
|
DISPLAY_NAME = "SearXNG"
|
|
KEY_ENV = "SEARXNG_URL"
|
|
|
|
def search(self, query: str, limit: int = 5) -> Dict[str, Any]:
|
|
base_url = provider_env("SEARXNG_URL").rstrip("/")
|
|
if not base_url:
|
|
return search_fail("SEARXNG_URL is not set")
|
|
data, failure = http_get_json(
|
|
"SearXNG", f"{base_url}/search", params={"q": query, "format": "json", "pageno": 1},
|
|
headers={"Accept": "application/json"}, timeout=15, logger=logger, reach_target=f"SearXNG at {base_url}",
|
|
)
|
|
if failure is not None:
|
|
return failure
|
|
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 = titled_rows(sorted_results, "content")
|
|
logger.info("SearXNG search '%s': %d results (from %d raw, limit %d)", query, len(web_results), len(raw_results), limit)
|
|
return search_ok(web_results)
|
|
|
|
def get_setup_schema(self) -> Dict[str, Any]:
|
|
return setup_schema(
|
|
"SearXNG", "free · self-hosted", "Free, privacy-respecting metasearch. Point SEARXNG_URL at your instance.",
|
|
"SEARXNG_URL", "SearXNG instance URL (e.g. http://localhost:8080)", "https://searx.space/",
|
|
)
|
|
|
|
|
|
# ---- 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.
|
|
import os # noqa: F401,E402
|
|
|
|
|
|
_PLUGIN_COMPAT_LAZY = {
|
|
'WebSearchProvider': ('agent.web_search_provider', 'WebSearchProvider'),
|
|
}
|
|
|
|
|
|
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
|
|
from hermes_cli.plugin_compat import warn_once
|
|
warn_once(__name__, name, *target)
|
|
return getattr(importlib.import_module(target[0]), target[1])
|
|
# ---- END PLUGIN-COMPAT ----
|