816cb37963
Closes the residual left open by the previous commit for gateway-ready installs (#113017 review). _get_backend() and check_firecrawl_api_key() already use read_selection semantics, but _get_firecrawl_client() still keyed its "stored vendor selection: direct only" branch on selection_exists("web"), which is true for a lone per-capability key. So with only web.extract_backend set and the Nous Tool Gateway ready (no FIRECRAWL keys), the search ladder resolved to firecrawl via the managed slot and the client then refused it with a misleading "web is configured to use firecrawl (set via hermes tools)" error — the other capability still lost its normal cascade. The direct-only branch is now keyed on an explicit firecrawl selection (shared web.backend via read_selection, or a per-capability key that names firecrawl via _is_explicit_firecrawl_selection). A per-capability key naming another vendor is not a firecrawl selection, so a ladder-derived firecrawl resolves exactly like a never-configured install: direct when credentials exist, else managed. Explicit firecrawl selections keep their direct-only (keyless-unlocking) behaviour; "nous" is untouched. Test: test_ladder_derived_firecrawl_takes_managed_path_on_gateway_ready_install — red on the previous commit (ValueError), green with this change.
66 lines
2.9 KiB
Python
66 lines
2.9 KiB
Python
"""A per-capability web backend key must not reroute the other capability.
|
|
|
|
Regression for #113017: ``web.extract_backend: keenable`` (with no
|
|
``web.backend``) made ``_get_search_backend()`` resolve to ``firecrawl``
|
|
through the shared ``_get_backend()`` fallback, because
|
|
``selection_exists("web")`` counts per-capability keys as a stored selection.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
|
|
def _ladder_env(monkeypatch, raw_web):
|
|
from tools import web_tools
|
|
from tools import tool_backend_helpers as helpers
|
|
|
|
monkeypatch.setattr(web_tools, "_load_web_config", lambda: dict(raw_web))
|
|
monkeypatch.setattr(
|
|
helpers, "_raw_section",
|
|
lambda section: dict(raw_web) if section == "web" else None,
|
|
)
|
|
# No keyed backends, no gateway: the ladder can only reach ddgs.
|
|
for var in (
|
|
"TAVILY_API_KEY", "PERPLEXITY_API_KEY", "EXA_API_KEY",
|
|
"PARALLEL_API_KEY", "KEENABLE_API_KEY",
|
|
"FIRECRAWL_API_KEY", "FIRECRAWL_API_URL",
|
|
"BRAVE_SEARCH_API_KEY", "SEARXNG_URL",
|
|
):
|
|
monkeypatch.delenv(var, raising=False)
|
|
monkeypatch.setattr(web_tools, "_ddgs_package_importable", lambda: True)
|
|
monkeypatch.setattr(web_tools, "_is_tool_gateway_ready", lambda: False)
|
|
|
|
|
|
def test_extract_only_config_does_not_reroute_search(monkeypatch):
|
|
from tools import web_tools
|
|
|
|
_ladder_env(monkeypatch, {"extract_backend": "keenable"})
|
|
# Broken before the fix: search resolved to "firecrawl" through the shared fallback.
|
|
assert web_tools._get_search_backend() == "ddgs"
|
|
assert web_tools._get_extract_backend() == "keenable"
|
|
|
|
|
|
def test_managed_use_gateway_still_resolves_firecrawl(monkeypatch):
|
|
from tools import web_tools
|
|
|
|
_ladder_env(monkeypatch, {"use_gateway": True})
|
|
# Ladder would find ddgs if it ran — the managed selection must not reach it.
|
|
assert web_tools._get_backend() == "firecrawl"
|
|
|
|
|
|
def test_ladder_derived_firecrawl_takes_managed_path_on_gateway_ready_install(monkeypatch):
|
|
"""A lone per-capability key naming ANOTHER vendor must not force the direct-only firecrawl
|
|
branch: when the other capability's ladder lands on firecrawl via the managed slot, the client
|
|
resolves through the Tool Gateway exactly like a never-configured install."""
|
|
from types import SimpleNamespace
|
|
|
|
import plugins.web.firecrawl.provider as prov
|
|
|
|
_ladder_env(monkeypatch, {"extract_backend": "keenable"})
|
|
gw = SimpleNamespace(nous_user_token="tok", gateway_origin="https://gw.example")
|
|
monkeypatch.setattr(prov._gateway, "resolve_managed_tool_gateway", lambda *a, **k: gw)
|
|
monkeypatch.setattr(prov, "_wt", lambda: SimpleNamespace())
|
|
monkeypatch.setattr(prov, "Firecrawl", lambda **kwargs: SimpleNamespace(kwargs=kwargs), raising=False)
|
|
|
|
assert prov.check_firecrawl_api_key() is True
|
|
# Broken before the fix: ValueError "web is configured to use firecrawl (set via hermes tools)".
|
|
prov._get_firecrawl_client()
|