Merge branch 'main' into chore/update-sqlalchemy-types

alembic/versions/20241127_c3458e1ef9aa_remove_unsafe_characters_summary.py

@@ -0,0 +1,32 @@
+"""Remove unsafe characters summary
+
+Revision ID: c3458e1ef9aa
+Revises: 272da5f400de
+Create Date: 2024-11-27 20:32:41.431147+00:00
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "c3458e1ef9aa"
+down_revision = "272da5f400de"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # Remove any characters that are not XML safe from the summary_text field. The code has been
+    # updated to filter out these characters, but this cleans up any existing data.
+    # https://www.postgresql.org/docs/current/functions-matching.html#FUNCTIONS-POSIX-REGEXP
+    op.execute(
+        "UPDATE works SET summary_text = regexp_replace("
+        "  summary_text, '[^\u0020-\uD7FF\u0009\u000A\u000D\uE000-\uFFFD\U00010000-\U0010FFFF]+', '', 'g'"
+        ") WHERE "
+        "summary_text ~ '[^\u0020-\uD7FF\u0009\u000A\u000D\uE000-\uFFFD\U00010000-\U0010FFFF]'"
+    )
+
+
+def downgrade() -> None:
+    # No need to do anything on downgrade.
+    pass

src/palace/manager/api/controller/opds_feed.py

@@ -34,6 +34,7 @@
     SearchFacets,
     WorkList,
 )
+from palace.manager.util.flask_util import OPDSFeedResponse
 from palace.manager.util.problem_detail import ProblemDetail
 
 
@@ -243,7 +244,7 @@ def crawlable_list_feed(self, list_name):
 
     def _crawlable_feed(
         self, title, url, worklist, annotator=None, feed_class=OPDSAcquisitionFeed
-    ):
+    ) -> OPDSFeedResponse | ProblemDetail:
         """Helper method to create a crawlable feed.
 
         :param title: The title to use for the feed.
@@ -270,6 +271,8 @@ def _crawlable_feed(
             worklist=worklist,
             base_class=CrawlableFacets,
         )
+        if isinstance(facets, ProblemDetail):
+            return facets
         annotator = annotator or self.manager.annotator(worklist, facets=facets)
 
         return feed_class.page(

src/palace/manager/api/lanes.py

@@ -1087,7 +1087,6 @@ def overview_facets(self, _db, facets):
         # the best recommendations are in the front.
         return Facets.default(
             self.get_library(_db),
-            collection=facets.COLLECTION_FULL,
             availability=facets.AVAILABLE_ALL,
             entrypoint=facets.entrypoint,
         )
@@ -1157,7 +1156,6 @@ def overview_facets(self, _db, facets):
         """
         return SeriesFacets.default(
             self.get_library(_db),
-            collection=facets.COLLECTION_FULL,
             availability=facets.AVAILABLE_ALL,
             entrypoint=facets.entrypoint,
         )
@@ -1225,7 +1223,6 @@ def overview_facets(self, _db, facets):
         """
         return ContributorFacets.default(
             self.get_library(_db),
-            collection=facets.COLLECTION_FULL,
             availability=facets.AVAILABLE_ALL,
             entrypoint=facets.entrypoint,
         )
@@ -1354,7 +1351,6 @@ class CrawlableFacets(Facets):
     SETTINGS = {
         Facets.ORDER_FACET_GROUP_NAME: Facets.ORDER_LAST_UPDATE,
         Facets.AVAILABILITY_FACET_GROUP_NAME: Facets.AVAILABLE_ALL,
-        Facets.COLLECTION_FACET_GROUP_NAME: Facets.COLLECTION_FULL,
         Facets.DISTRIBUTOR_FACETS_GROUP_NAME: Facets.DISTRIBUTOR_ALL,
         Facets.COLLECTION_NAME_FACETS_GROUP_NAME: Facets.COLLECTION_NAME_ALL,
     }

src/palace/manager/core/facets.py

@@ -8,15 +8,6 @@ class FacetConstants:
     ENTRY_POINT_REL = "http://librarysimplified.org/terms/rel/entrypoint"
     ENTRY_POINT_FACET_GROUP_NAME = "entrypoint"
 
-    # Subset the collection, roughly, by quality.
-    COLLECTION_FACET_GROUP_NAME = "collection"
-    COLLECTION_FULL = "full"
-    COLLECTION_FEATURED = "featured"
-    COLLECTION_FACETS = [
-        COLLECTION_FULL,
-        COLLECTION_FEATURED,
-    ]
-
     # Subset the collection by availability.
     AVAILABILITY_FACET_GROUP_NAME = "available"
     AVAILABLE_NOW = "now"
@@ -63,23 +54,20 @@ class FacetConstants:
     COLLECTION_NAME_ALL = "All"
 
     FACETS_BY_GROUP = {
-        COLLECTION_FACET_GROUP_NAME: COLLECTION_FACETS,
         AVAILABILITY_FACET_GROUP_NAME: AVAILABILITY_FACETS,
         ORDER_FACET_GROUP_NAME: ORDER_FACETS,
     }
 
     GROUP_DISPLAY_TITLES = {
         ORDER_FACET_GROUP_NAME: _("Sort by"),
         AVAILABILITY_FACET_GROUP_NAME: _("Availability"),
-        COLLECTION_FACET_GROUP_NAME: _("Collection"),
         DISTRIBUTOR_FACETS_GROUP_NAME: _("Distributor"),
         COLLECTION_NAME_FACETS_GROUP_NAME: _("Collection Name"),
     }
 
     GROUP_DESCRIPTIONS = {
         ORDER_FACET_GROUP_NAME: _("Allow patrons to sort by"),
         AVAILABILITY_FACET_GROUP_NAME: _("Allow patrons to filter availability to"),
-        COLLECTION_FACET_GROUP_NAME: _("Allow patrons to filter collection to"),
         DISTRIBUTOR_FACETS_GROUP_NAME: _("Allow patrons to filter by distributor"),
         COLLECTION_NAME_FACETS_GROUP_NAME: _(
             "Allow patrons to filter by collection name"
@@ -96,8 +84,6 @@ class FacetConstants:
         AVAILABLE_NOW: _("Available now"),
         AVAILABLE_ALL: _("All"),
         AVAILABLE_OPEN_ACCESS: _("Yours to keep"),
-        COLLECTION_FULL: _("Everything"),
-        COLLECTION_FEATURED: _("Popular Books"),
     }
 
     # For titles generated based on some runtime value
@@ -115,7 +101,6 @@ class FacetConstants:
             AVAILABLE_NOW,
             AVAILABLE_OPEN_ACCESS,
         ],
-        COLLECTION_FACET_GROUP_NAME: [COLLECTION_FULL, COLLECTION_FEATURED],
         DISTRIBUTOR_FACETS_GROUP_NAME: [DISTRIBUTOR_ALL],
         COLLECTION_NAME_FACETS_GROUP_NAME: [COLLECTION_NAME_ALL],
     }
@@ -125,7 +110,6 @@ class FacetConstants:
     DEFAULT_FACET = {
         ORDER_FACET_GROUP_NAME: ORDER_AUTHOR,
         AVAILABILITY_FACET_GROUP_NAME: AVAILABLE_ALL,
-        COLLECTION_FACET_GROUP_NAME: COLLECTION_FULL,
         DISTRIBUTOR_FACETS_GROUP_NAME: DISTRIBUTOR_ALL,
         COLLECTION_NAME_FACETS_GROUP_NAME: COLLECTION_NAME_ALL,
     }

src/palace/manager/integration/configuration/library.py

@@ -234,35 +234,7 @@ class LibrarySettings(BaseSettings):
             skip=True,
         ),
     )
-    facets_enabled_collection: list[str] = FormField(
-        FacetConstants.DEFAULT_ENABLED_FACETS[
-            FacetConstants.COLLECTION_FACET_GROUP_NAME
-        ],
-        form=LibraryConfFormItem(
-            label="Allow patrons to filter collection to",
-            type=ConfigurationFormItemType.MENU,
-            options={
-                facet: FacetConstants.FACET_DISPLAY_TITLES[facet]
-                for facet in FacetConstants.COLLECTION_FACETS
-            },
-            category="Lanes & Filters",
-            paired="facets_default_collection",
-            level=Level.SYS_ADMIN_OR_MANAGER,
-        ),
-    )
-    facets_default_collection: str = FormField(
-        FacetConstants.COLLECTION_FULL,
-        form=LibraryConfFormItem(
-            label="Default Collection",
-            type=ConfigurationFormItemType.SELECT,
-            options={
-                facet: FacetConstants.FACET_DISPLAY_TITLES[facet]
-                for facet in FacetConstants.COLLECTION_FACETS
-            },
-            category="Lanes & Filters",
-            skip=True,
-        ),
-    )
+
     library_description: str | None = FormField(
         None,
         form=LibraryConfFormItem(

src/palace/manager/search/external_search.py

@@ -1829,14 +1829,6 @@ def build(self, _chain_filters=None):
                 Bool(must=[not_open_access, licensed, not_available])
             )
 
-        if self.subcollection == FacetConstants.COLLECTION_FEATURED:
-            # Exclude books with a quality of less than the library's
-            # minimum featured quality.
-            range_query = self._match_range(
-                "quality", "gte", self.minimum_featured_quality
-            )
-            f = chain(f, Bool(must=range_query))
-
         if self.identifiers:
             # Check every identifier for a match.
             clauses = []