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.
46 lines
1.9 KiB
Python
46 lines
1.9 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/",
|
|
)
|