PP-129 OPDS 2 with acquisition links

api/controller.py

@@ -21,11 +21,12 @@
 from sqlalchemy import select
 from sqlalchemy.orm import eagerload
 from sqlalchemy.orm.exc import NoResultFound
+from werkzeug.datastructures import MIMEAccept
 
 from api.authentication.access_token import AccessTokenProvider
 from api.model.patron_auth import PatronAuthAccessToken
 from api.model.time_tracking import PlaytimeEntriesPost, PlaytimeEntriesPostResponse
-from api.opds2 import OPDS2NavigationsAnnotator, OPDS2PublicationsAnnotator
+from api.opds2 import OPDS2NavigationsAnnotator
 from api.saml.controller import SAMLController
 from core.analytics import Analytics
 from core.app_server import ApplicationVersionController
@@ -961,6 +962,7 @@ def feed(self, lane_identifier, feed_class=OPDSAcquisitionFeed):
         )
         return feed.as_response(
             max_age=int(max_age) if max_age else None,
+            mime_types=flask.request.accept_mimetypes,
         )
 
     def navigation(self, lane_identifier):
@@ -1161,7 +1163,7 @@ def search(self, lane_identifier, feed_class=OPDSAcquisitionFeed):
         # Run a search.
         annotator = self.manager.annotator(lane, facets)
         info = OpenSearchDocument.search_info(lane)
-        return feed_class.search(
+        response = feed_class.search(
             _db=self._db,
             title=info["name"],
             url=make_url(),
@@ -1172,6 +1174,9 @@ def search(self, lane_identifier, feed_class=OPDSAcquisitionFeed):
             pagination=pagination,
             facets=facets,
         )
+        if isinstance(response, ProblemDetail):
+            return response
+        return response.as_response(mime_types=flask.request.accept_mimetypes)
 
     def _qa_feed(
         self, feed_factory, feed_title, controller_name, facet_class, worklist_factory
@@ -1305,23 +1310,22 @@ def publications(self):
         params: FeedRequestParameters = self._parse_feed_request()
         if params.problem:
             return params.problem
-        annotator = OPDS2PublicationsAnnotator(
-            flask.request.url, params.facets, params.pagination, params.library
-        )
         lane = self.load_lane(None)
+        annotator = self.manager.annotator(lane, params.facets)
         max_age = flask.request.args.get("max_age")
-        feed = AcquisitonFeedOPDS2.publications(
+        feed = OPDSAcquisitionFeed.page(
             self._db,
+            lane.display_name,
+            flask.request.url,
             lane,
+            annotator,
             params.facets,
             params.pagination,
             self.search_engine,
-            annotator,
-            max_age=int(max_age) if max_age is not None else None,
         )
-
-        return Response(
-            str(feed), status=200, headers={"Content-Type": annotator.OPDS2_TYPE}
+        return feed.as_response(
+            mime_types=MIMEAccept([("application/opds+json", 1)]),  # Force the type
+            max_age=int(max_age) if max_age is not None else None,
         )
 
     def navigation(self):
@@ -1464,7 +1468,17 @@ def sync(self):
                 )
 
         # Then make the feed.
-        return OPDSAcquisitionFeed.active_loans_for(self.circulation, patron)
+        feed = OPDSAcquisitionFeed.active_loans_for(self.circulation, patron)
+        response = feed.as_response(
+            max_age=0,
+            private=True,
+            mime_types=flask.request.accept_mimetypes,
+        )
+
+        last_modified = patron.last_loan_activity_sync
+        if last_modified:
+            response.last_modified = last_modified
+        return response
 
     def borrow(self, identifier_type, identifier, mechanism_id=None):
         """Create a new loan or hold for a book.

core/feed_protocol/acquisition.py

@@ -475,7 +475,7 @@ def active_loans_for(
         patron: Patron,
         annotator: Optional[LibraryAnnotator] = None,
         **response_kwargs: Any,
-    ) -> OPDSFeedResponse:
+    ) -> OPDSAcquisitionFeed:
         """A patron specific feed that only contains the loans and holds of a patron"""
         db = Session.object_session(patron)
         active_loans_by_work = {}
@@ -516,12 +516,7 @@ def active_loans_for(
 
         feed = OPDSAcquisitionFeed("Active loans and holds", url, works, annotator)
         feed.generate_feed()
-        response = feed.as_response(max_age=0, private=True)
-
-        last_modified = patron.last_loan_activity_sync
-        if last_modified:
-            response.last_modified = last_modified
-        return response
+        return feed
 
     @classmethod
     def single_entry_loans_feed(
@@ -592,9 +587,12 @@ def single_entry_loans_feed(
 
         entry = cls.single_entry(work, annotator, even_if_no_license_pool=True)
 
-        # TODO: max_age and private response kwargs
         if isinstance(entry, WorkEntry) and entry.computed:
             return cls.entry_as_response(entry, **response_kwargs)
+        elif isinstance(entry, OPDSMessage):
+            return ProblemDetail(
+                entry.urn, status_code=entry.status_code, detail=entry.message
+            )
 
         return None
 
@@ -769,7 +767,7 @@ def search(
         pagination: Optional[Pagination] = None,
         facets: Optional[FacetsWithEntryPoint] = None,
         **response_kwargs: Any,
-    ) -> OPDSFeedResponse | ProblemDetail:
+    ) -> OPDSAcquisitionFeed | ProblemDetail:
         """Run a search against the given search engine and return
         the results as a Flask Response.
 
@@ -833,8 +831,7 @@ def make_link(ep: Type[EntryPoint]) -> str:
         # technically searching the this lane; you are searching the
         # library's entire collection, using _some_ of the constraints
         # imposed by this lane (notably language and audience).
-
-        return OPDSFeedResponse(response=feed.serialize(), **response_kwargs)
+        return feed
 
     @classmethod
     def from_query(

core/feed_protocol/annotator/base.py

@@ -204,7 +204,7 @@ def categories(cls, work: Work) -> Dict[str, List[Dict[str, str]]]:
         # Add the audience as a category of schema
         # http://schema.org/audience
         if work.audience:
-            audience_uri = "audience"
+            audience_uri = "http://schema.org/audience"
             categories[audience_uri] = [dict(term=work.audience, label=work.audience)]
 
         # Any book can have a target age, but the target age
@@ -294,6 +294,8 @@ def annotate_work_entry(
 
         if edition.subtitle:
             computed.subtitle = FeedEntryType(text=edition.subtitle)
+        if edition.sort_title:
+            computed.sort_title = FeedEntryType(text=edition.sort_title)
 
         author_entries = self.authors(edition)
         computed.contributors = author_entries.get("contributors", [])

core/feed_protocol/annotator/circulation.py

@@ -652,7 +652,12 @@ def acquisition_link(
         else:
             initial_type = None
             indirect_types = []
-        link = Acquisition(href=href, rel=rel, type=initial_type)
+        link = Acquisition(
+            href=href,
+            rel=rel,
+            type=initial_type,
+            is_loan=True if active_loan else False,
+        )
         indirect = cls.indirect_acquisition(indirect_types)
 
         if indirect is not None:
@@ -1342,7 +1347,12 @@ def borrow_link(
             _external=True,
         )
         rel = OPDSFeed.BORROW_REL
-        borrow_link = Acquisition(rel=rel, href=borrow_url, type=OPDSFeed.ENTRY_TYPE)
+        borrow_link = Acquisition(
+            rel=rel,
+            href=borrow_url,
+            type=OPDSFeed.ENTRY_TYPE,
+            is_hold=True if active_hold else False,
+        )
 
         indirect_acquisitions: List[IndirectAcquisition] = []
         for lpdm in fulfillment_mechanisms:

core/feed_protocol/navigation.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 from typing import Any, Optional
 
 from sqlalchemy.orm import Session
 from typing_extensions import Self
+from werkzeug.datastructures import MIMEAccept
 
 from core.feed_protocol.annotator.circulation import CirculationManagerAnnotator
 from core.feed_protocol.opds import BaseOPDSFeed
@@ -79,7 +82,11 @@ def add_entry(
         entry.links.append(Link(rel="subsection", href=url, type=type))
         self._feed.data_entries.append(entry)
 
-    def as_response(self, **kwargs: Any) -> OPDSFeedResponse:
-        response = super().as_response(**kwargs)
+    def as_response(
+        self,
+        mime_types: Optional[MIMEAccept] = None,
+        **kwargs: Any,
+    ) -> OPDSFeedResponse:
+        response = super().as_response(mime_types=mime_types, **kwargs)
         response.content_type = OPDSFeed.NAVIGATION_FEED_TYPE
         return response

core/feed_protocol/opds.py

@@ -1,48 +1,87 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, List, Optional
+from typing import Any, Dict, List, Optional, Type
+
+from werkzeug.datastructures import MIMEAccept
 
 from core.feed_protocol.base import FeedInterface
 from core.feed_protocol.serializer.opds import OPDS1Serializer
+from core.feed_protocol.serializer.opds2 import OPDS2Serializer
 from core.feed_protocol.types import FeedData, WorkEntry
 from core.util.flask_util import OPDSEntryResponse, OPDSFeedResponse
+from core.util.opds_writer import OPDSMessage
+
+
+def get_serializer(
+    mime_types: Optional[MIMEAccept],
+) -> OPDS1Serializer | OPDS2Serializer:
+    # Loop through and return whichever mimetype is encountered first
+    # Sort values by q-value first
+    serializers: Dict[str, Type[Any]] = {
+        "application/opds+json": OPDS2Serializer,
+        "application/atom+xml": OPDS1Serializer,
+    }
+    if mime_types:
+        match = mime_types.best_match(
+            serializers.keys(), default="application/atom+xml"
+        )
+        return serializers[match]()  # type: ignore[no-any-return]
+    # Default
+    return OPDS1Serializer()
 
 
 class BaseOPDSFeed(FeedInterface):
     def __init__(
-        self, title: str, url: str, precomposed_entries: Optional[List[Any]] = None
+        self,
+        title: str,
+        url: str,
+        precomposed_entries: Optional[List[OPDSMessage]] = None,
     ) -> None:
         self.url = url
         self.title = title
         self._precomposed_entries = precomposed_entries or []
         self._feed = FeedData()
-        self._serializer = OPDS1Serializer()
         self.log = logging.getLogger(self.__class__.__name__)
 
-    def serialize(self) -> bytes:
-        return self._serializer.serialize_feed(self._feed)
+    def serialize(self, mime_types: Optional[MIMEAccept] = None) -> bytes:
+        serializer = get_serializer(mime_types)
+        return serializer.serialize_feed(self._feed)
 
     def add_link(self, href: str, rel: Optional[str] = None, **kwargs: Any) -> None:
         self._feed.add_link(href, rel=rel, **kwargs)
 
-    def as_response(self, **kwargs: Any) -> OPDSFeedResponse:
+    def as_response(
+        self,
+        mime_types: Optional[MIMEAccept] = None,
+        **kwargs: Any,
+    ) -> OPDSFeedResponse:
         """Serialize the feed using the serializer protocol"""
+        serializer = get_serializer(mime_types)
         return OPDSFeedResponse(
-            self._serializer.serialize_feed(
+            serializer.serialize_feed(
                 self._feed, precomposed_entries=self._precomposed_entries
             ),
+            content_type=serializer.content_type(),
             **kwargs,
         )
 
     @classmethod
     def entry_as_response(
-        cls, entry: WorkEntry, **response_kwargs: Any
+        cls,
+        entry: WorkEntry,
+        mime_types: Optional[MIMEAccept] = None,
+        **response_kwargs: Any,
     ) -> OPDSEntryResponse:
         if not entry.computed:
             logging.getLogger().error(f"Entry data has not been generated for {entry}")
             raise ValueError(f"Entry data has not been generated")
-        serializer = OPDS1Serializer()
-        return OPDSEntryResponse(
-            response=serializer.serialize_work_entry(entry.computed), **response_kwargs
+        serializer = get_serializer(mime_types)
+        response = OPDSEntryResponse(
+            response=serializer.serialize_work_entry(entry.computed),
+            **response_kwargs,
         )
+        if isinstance(serializer, OPDS2Serializer):
+            # Only OPDS2 has the same content type for feed and entry
+            response.content_type = serializer.content_type()
+        return response

core/feed_protocol/serializer/opds.py

@@ -354,3 +354,6 @@ def _serialize_data_entry(self, entry: DataEntry) -> etree._Element:
     @classmethod
     def to_string(cls, element: etree._Element) -> bytes:
         return cast(bytes, etree.tostring(element))
+
+    def content_type(self) -> str:
+        return OPDSFeed.ACQUISITION_FEED_TYPE