Skip to content

armgit / mwmbl

Public Imported from GitHub
0

An open source, non-profit web search engine

Merge main into combined-search-provider-features

Daoud Clarkee1bb55b1c44e
diff --cc mwmbl/tinysearchengine/combined_search.py
index b00d46d,8e5f756..5f6c81b
--- a/mwmbl/tinysearchengine/combined_search.py
+++ b/mwmbl/tinysearchengine/combined_search.py
@@@ -46,21 -44,22 +46,22 @@@ router = Router(tags=["Combined Search"
DESCRIPTION = (
- "Search the Mwmbl index and Staan in one request and return the ranked union.\n\n"
- "Every candidate - crawled by Mwmbl or returned by Staan - is scored by one "
- "Search the Mwmbl index, EUSP (European Search Perspective) and Wikipedia in one request and return the ranked "
- "union.\n\n"
- "Every candidate - crawled by Mwmbl, returned by EUSP, or fetched from Wikipedia - is "
- "scored by one learning-to-rank model trained on the pooled candidate set, then "
++ "Search the Mwmbl index and EUSP (European Search Perspective) in one request and "
++ "return the ranked union.\n\n"
++ "Every candidate - crawled by Mwmbl or returned by EUSP - is scored by one "
+ "learning-to-rank model trained on the pooled candidate set, then "
"diversified so a single domain cannot take the whole page. The response is the same "
"SearXNG-compatible shape as `/api/v2/search/`.\n\n"
"The `engine` field names the provider a result came from:\n"
"- `mwmbl` - organically crawled by the Mwmbl crawler\n"
- "- `staan` - returned by the Staan web-search API\n"
+ "- `eusp` - returned by the European Search Perspective (EUSP) web-search API\n"
- "- `wikipedia` - fetched from Wikipedia\n"
+ "- `wikipedia` - a Wikipedia page from the Mwmbl index\n"
"- `google`, `user` - originally suggested via Google, or submitted by a user\n\n"
"Authentication is required: a search-scoped API key in `X-API-Key`, or a JWT bearer "
"token. Obtain a key via `POST /api/v1/platform/api-keys/`. A per-user monthly quota "
"applies; `monthly_usage` and `monthly_limit` report it on every response.\n\n"
- "If Staan is down or unconfigured, the request loses its extra recall, not its "
- "A source that is down or unconfigured costs the request its extra recall, not its "
- "results: the remaining sources are ranked and returned as usual.\n\n"
++ "If EUSP is down or unconfigured, the request loses its extra recall, not its "
+ "results: the index's results are ranked and returned as usual.\n\n"
"**Query parameter:** `q` - the search query string (required)."
)
@@@ -83,7 -94,7 +84,7 @@@ def init_router(ranker) -> None
# Handled manually in the view so both an API key and a JWT work under an async
# view - the same reason Super Search does it this way.
auth=None,
- summary="Combined Search (Mwmbl + Staan)",
- summary="Combined Search (Mwmbl + EUSP + Wikipedia)",
++ summary="Combined Search (Mwmbl + EUSP)",
description=DESCRIPTION,
openapi_extra=OPENAPI_EXTRA,
)
diff --cc test/test_combined_search.py
index ff139fb,40e6500..006c38c
--- a/test/test_combined_search.py
+++ b/test/test_combined_search.py
@@@ -207,7 -217,7 +207,7 @@@ def test_each_result_names_the_provider
results = _get(client, api_key).json()["results"]
- assert [result["engine"] for result in results] == ["mwmbl", "wikipedia", "staan"]
- assert [result["engine"] for result in results] == ["mwmbl", "eusp", "wikipedia"]
++ assert [result["engine"] for result in results] == ["mwmbl", "wikipedia", "eusp"]
@pytest.mark.django_db