refactor: Migrate work_search to an async-bridged implementation with highlight support and update request context access to site.get().

Author: RayBB

openlibrary/plugins/worksearch/code.py

@@ -1087,40 +1087,6 @@ def _prepare_work_search_query(
 
 
 # Note: these could share an "implementation" to keep a common interface but it creates a lot more complexity
-# Warning: when changing this please also change the async version
-@public
-def work_search(
-    query: dict,
-    sort: str | None = None,
-    page: int = 1,
-    offset: int = 0,
-    limit: int = 100,
-    fields: str = '*',
-    facet: bool = True,
-    highlight: bool = False,
-    spellcheck_count: int | None = None,
-    request_label: SolrRequestLabel = 'UNLABELLED',
-) -> dict:
-    prepared = _prepare_work_search_query(query, page, offset, limit)
-
-    resp = run_solr_query(
-        WorkSearchScheme(),
-        prepared.query,
-        rows=prepared.limit,
-        page=prepared.page,
-        sort=sort,
-        offset=prepared.offset,
-        fields=fields,
-        facet=facet,
-        highlight=highlight,
-        spellcheck_count=spellcheck_count,
-        request_label=request_label,
-    )
-
-    return _process_solr_search_response(resp, fields)
-
-
-# Warning: when changing this please also change the sync version
 @public
 async def work_search_async(
     query: dict,
@@ -1130,6 +1096,7 @@ async def work_search_async(
     limit: int = 100,
     fields: str | list[str] = '*',
     facet: bool = True,
+    highlight: bool = False,
     spellcheck_count: int | None = None,
     request_label: SolrRequestLabel = 'UNLABELLED',
     lang: str | None = None,
@@ -1145,13 +1112,19 @@ async def work_search_async(
         offset=prepared.offset,
         fields=fields,
         facet=facet,
+        highlight=highlight,
         spellcheck_count=spellcheck_count,
         request_label=request_label,
     )
 
     return _process_solr_search_response(resp, fields)
 
 
+work_search = async_bridge.wrap(work_search_async)
+work_search.__name__ = 'work_search'
+public(work_search)
+
+
 def validate_search_json_query(q: str | None) -> str | None:
     if q and len(q) < 3:
         return 'Query too short, must be at least 3 characters'

openlibrary/plugins/worksearch/schemes/works.py

@@ -7,7 +7,6 @@
 from typing import Any, cast
 
 import luqum.tree
-import web
 from typing_extensions import deprecated
 
 import infogami
@@ -35,7 +34,7 @@
     normalize_lcc_range,
     short_lcc_to_sortable_lcc,
 )
-from openlibrary.utils.request_context import req_context
+from openlibrary.utils.request_context import req_context, site
 
 logger = logging.getLogger("openlibrary.worksearch")
 re_author_key = re.compile(r'(OL\d+A)')
@@ -632,7 +631,7 @@ def add_non_solr_fields(
                 for ed_doc in doc.get('editions', {}).get('docs', [])
             ]
 
-        things = cast(list[Work | Edition], web.ctx.site.get_many(keys))
+        things = cast(list[Work | Edition], site.get().get_many(keys))
         key_to_thing = {t.key: t for t in things if t.key in keys}
 
         from openlibrary.book_providers import get_acquisitions