* 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.
101 lines
4.3 KiB
Python
101 lines
4.3 KiB
Python
"""Parallel.ai web search (sync ``Parallel`` SDK) + async extract (``AsyncParallel``).
|
|
|
|
Env: ``PARALLEL_API_KEY`` (https://parallel.ai), optional
|
|
``PARALLEL_SEARCH_MODE`` = agentic (default) | fast | one-shot.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import logging
|
|
import os
|
|
from typing import Any, Dict, List
|
|
|
|
from plugins.web._common import (
|
|
SEARCH_LIMIT_CAP, BaseWebSearchProvider, cached_sdk_client, document, keyless_extract, keyless_search,
|
|
keyless_variant_schema, page_error, provider_env, run_extract_async, run_search, search_ok, use_keyless, web_hit,
|
|
)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
_MISSING_KEY = "PARALLEL_API_KEY environment variable not set. Get your API key at https://parallel.ai"
|
|
|
|
|
|
def _client(slot: str, cls_name: str) -> Any:
|
|
def _factory(api_key: str) -> Any:
|
|
import parallel # deliberately lazy
|
|
return getattr(parallel, cls_name)(api_key=api_key)
|
|
|
|
# Mirrors the lazy-deps pattern used by the legacy implementation.
|
|
# Swallows benign ImportError from the pm helper itself; if the
|
|
# SDK is genuinely missing the subsequent ``from parallel import ...``
|
|
# raises ImportError that the caller can handle.
|
|
try:
|
|
from pm import ensure_import as _lazy_ensure
|
|
|
|
_lazy_ensure("parallel-web")
|
|
except ImportError:
|
|
pass
|
|
except Exception as exc: # noqa: BLE001 — surface install hint as ImportError
|
|
raise ImportError(str(exc))
|
|
return cached_sdk_client(slot, "PARALLEL_API_KEY", _MISSING_KEY, "parallel-web", _factory)
|
|
|
|
|
|
def _get_sync_client() -> Any:
|
|
return _client("_parallel_client", "Parallel")
|
|
|
|
|
|
def _get_async_client() -> Any:
|
|
return _client("_async_parallel_client", "AsyncParallel")
|
|
|
|
|
|
def _resolve_search_mode() -> str:
|
|
mode = os.getenv("PARALLEL_SEARCH_MODE", "agentic").lower().strip()
|
|
return mode if mode in {"fast", "one-shot", "agentic"} else "agentic"
|
|
|
|
|
|
class ParallelWebSearchProvider(BaseWebSearchProvider):
|
|
"""Parallel.ai search + async extract provider."""
|
|
|
|
NAME = "parallel"
|
|
DISPLAY_NAME = "Parallel"
|
|
KEY_ENV = "PARALLEL_API_KEY"
|
|
EXTRACT = True
|
|
KEYLESS = True
|
|
|
|
def search(self, query: str, limit: int = 5) -> Dict[str, Any]:
|
|
def _body() -> Dict[str, Any]:
|
|
if use_keyless("parallel", provider_env("PARALLEL_API_KEY")):
|
|
return keyless_search("Parallel", "parallel", query, limit, logger)
|
|
mode = _resolve_search_mode()
|
|
logger.info("Parallel search: '%s' (mode=%s, limit=%d)", query, mode, limit)
|
|
response = _get_sync_client().beta.search(search_queries=[query], objective=query, mode=mode, max_results=min(limit, SEARCH_LIMIT_CAP))
|
|
return search_ok([
|
|
web_hit(r.url or "", r.title or "", " ".join(r.excerpts or []), i + 1)
|
|
for i, r in enumerate(response.results or [])
|
|
])
|
|
|
|
return run_search("Parallel", logger, _body, sdk=True)
|
|
|
|
async def extract(self, urls: List[str], **kwargs: Any) -> List[Dict[str, Any]]:
|
|
async def _body() -> List[Dict[str, Any]]:
|
|
if use_keyless("parallel", provider_env("PARALLEL_API_KEY")):
|
|
# Keyless ring is blocking HTTP — hop off the event loop.
|
|
return await asyncio.to_thread(keyless_extract, "Parallel", "parallel", urls, logger)
|
|
logger.info("Parallel extract: %d URL(s)", len(urls))
|
|
response = await _get_async_client().beta.extract(urls=urls, full_content=True)
|
|
results = [document(r.url or "", r.title or "", r.full_content or "\n\n".join(r.excerpts or [])) for r in response.results or []]
|
|
return results + [
|
|
{**page_error(e.url or "", e.content or e.error_type or "extraction failed"), "metadata": {"sourceURL": e.url or ""}}
|
|
for e in response.errors or []
|
|
]
|
|
|
|
return await run_extract_async("Parallel", logger, urls, _body, sdk=True)
|
|
|
|
def get_setup_schema(self) -> Dict[str, Any]:
|
|
return keyless_variant_schema(
|
|
"Parallel", "PARALLEL_API_KEY", "https://parallel.ai",
|
|
free_tag="Objective-tuned search + page extraction on Parallel's anonymous free tier. Rate-limited under burst load.",
|
|
paid_tag="Objective-tuned search + parallel page extraction via the Parallel SDK. Unthrottled, guaranteed service.",
|
|
)
|