codex 1.7.3__py3-none-any.whl → 1.7.3a0__py3-none-any.whl

codex/views/browser/filters/filter.py

@@ -13,6 +13,8 @@ LOG = get_logger(__name__)
 class BrowserFilterView(BrowserFilterBookmarkView):
     """Browser Filters."""
 
+    TARGET = ""
+
     def force_inner_joins(self, qs):
         """Force INNER JOINS to filter empty groups."""
         demote_tables = {"codex_library"}
@@ -26,10 +28,10 @@ class BrowserFilterView(BrowserFilterBookmarkView):
     def _get_query_filters(
         self,
         model,
-        page_mtime,
-        bookmark_filter,
         group=None,
         pks=None,
+        page_mtime=False,
+        bookmark_filter=True,
     ) -> Q:
         """Return all the filters except the group filter."""
         big_include_filter = Q()
@@ -52,16 +54,16 @@ class BrowserFilterView(BrowserFilterBookmarkView):
         model,
         group=None,
         pks=None,
-        page_mtime=False,  # noqa: FBT002
-        bookmark_filter=True,  # noqa: FBT002
+        page_mtime=False,
+        bookmark_filter=True,
     ) -> QuerySet:
         """Get a filtered queryset for the model."""
         query_filters = self._get_query_filters(
             model,
-            page_mtime=page_mtime,
-            bookmark_filter=bookmark_filter,
             group=group,
             pks=pks,
+            page_mtime=page_mtime,
+            bookmark_filter=bookmark_filter,
         )
         # Distinct necissary for folder view with search
         return model.objects.filter(query_filters).distinct()

codex/views/browser/filters/group.py

@@ -18,11 +18,10 @@ class GroupFilterView(BrowserParamsView):
 
     SESSION_KEY = BrowserParamsView.BROWSER_SESSION_KEY
 
-    TARGET = ""
-
-    def _get_rel_for_pks(self, group, page_mtime: bool):
+    def _get_rel_for_pks(self, group, page_mtime=False):
         """Get the relation from the model to the pks."""
-        target: str = self.TARGET
+        # XXX these TARGET refs might be better as subclass get rel methods.
+        target: str = self.TARGET  # type: ignore
         if target in _GROUP_REL_TARGETS:
             rel = FILTER_ONLY_GROUP_RELATION[group]
         elif target in _PK_REL_TARGETS or page_mtime:
@@ -37,7 +36,7 @@ class GroupFilterView(BrowserParamsView):
         rel += "__in"
         return rel
 
-    def get_group_filter(self, group=None, pks=None, page_mtime=False):  # noqa: FBT002
+    def get_group_filter(self, group=None, pks=None, page_mtime=False):
         """Get filter for the displayed group."""
         if group is None:
             group = self.kwargs["group"]

codex/views/browser/filters/search/field/expression.py

@@ -79,7 +79,8 @@ def _cast_value(rel, rel_class, value):
         value = parse(value)
         if rel_class == DateField and value:
             value = value.date()
-    # (CharField, TextField):
+    # elif rel_class in (CharField, TextField):
+    #    value = value
     return value
 
 

codex/views/browser/filters/search/field/optimize.py

@@ -1,5 +1,5 @@
 """Optimize Text Lookups."""
-# UNUSED CODE multiple like queries test better
+# XXX Unused XXX multiple like queries test better
 
 import re
 

codex/views/browser/filters/search/field/parse.py

@@ -22,7 +22,7 @@ if TYPE_CHECKING:
     from pyparsing.helpers import InfixNotationOperatorSpec
 
 _QUOTES_REXP = r"(?:\".*?\")"
-_OPERATORS_REXP = "and not|or not|and|or"
+_OPERATORS_REXP = "|".join(("and not", "or not", "and", "or"))
 _BEGIN_NOT_REXP = r"^\s*\(?\s*(?P<not>not)"
 _IMPLICIT_AND_REXP = (
     rf"{_QUOTES_REXP}|\ (?P<ok>{_OPERATORS_REXP})\ |(?P<bare>(?:\ not)?\ )\S"
@@ -183,5 +183,5 @@ def get_field_query(rel, rel_class, exp, model, many_to_many):
     bool_expr = _create_context_expression(context)
 
     parsed_result = bool_expr.parse_string(exp)
-    root_bool_operand: BoolOperand = parsed_result[0]  # type:ignore[reportAssignmentType]
+    root_bool_operand: BoolOperand = parsed_result[0]  # type:ignore
     return root_bool_operand.to_query()

codex/views/browser/filters/search/parse.py

@@ -149,7 +149,7 @@ class SearchFilterView(BrowserFTSFilter):
 
     def _preparse_search_query(self):
         """Preparse search fields out of query text."""
-        text = self.params.get("q")
+        text = self.params.get("q")  # type: ignore
         field_tokens = {}
         if not text:
             return field_tokens, text
@@ -177,7 +177,7 @@ class SearchFilterView(BrowserFTSFilter):
                 )
             else:
                 # AND and OR
-                # Cannot do OR queries with MATCH, it decontextualizes MATCH somehow.
+                # XXX cannot do OR queries with MATCH, it decontextualizes MATCH somehow.
                 if preop == "or":
                     self.search_error = "OR preceding column tokens with operator expressions will act as AND"
                 include_q_list, exclude_q_list = self.get_search_field_filters(
@@ -227,9 +227,24 @@ class SearchFilterView(BrowserFTSFilter):
 
         return include_q, exclude_q, fts_q
 
+    def _is_search_results_limited(self) -> bool:
+        """Get search result limit from params."""
+        # user = self.request.user  # type: ignore
+        # if user and user.is_authenticated:
+        #    limited = bool(
+        #        self.params.get(  # type: ignore
+        #            "search_results_limit",
+        #            MAX_OBJ_PER_PAGE,
+        #        )
+        #    )
+        # else:
+        #    limited = True
+        # return limited
+        return True
+
     def get_search_limit(self):
         """Get search scores for choices and metadata."""
-        if not self.search_mode:
+        if not self.search_mode or not self._is_search_results_limited():
             return 0
-        page = self.kwargs.get("page", 1)
+        page = self.kwargs.get("page", 1)  # type: ignore
         return page * MAX_OBJ_PER_PAGE + 1

codex/views/browser/group_mtime.py

@@ -54,7 +54,7 @@ class BrowserGroupMtimeView(BrowserFilterView):
             args["distinct"] = True
         return agg_func(bmua_rel, **args)
 
-    def get_group_mtime(self, model, group=None, pks=None, page_mtime=False):  # noqa: FBT002
+    def get_group_mtime(self, model, group=None, pks=None, page_mtime=False):
         """Get a filtered mtime for browser pages and mtime checker."""
         qs = self.get_filtered_queryset(
             model,

codex/views/browser/metadata/copy_intersections.py

@@ -47,7 +47,7 @@ class MetadataCopyIntersectionsView(MetadataQueryIntersectionsView):
     @classmethod
     def _copy_m2m_intersections(cls, obj, m2m_intersections):
         """Copy the m2m intersections into the object."""
-        # It might even be faster to copy everything to a dict and not use the obj.
+        # XXX It might even be faster to copy everything to a dict and not use the obj.
         for key, qs in m2m_intersections.items():
             serializer_key = (
                 f"{PREFETCH_PREFIX}{key}"

codex/views/browser/metadata/metadata.py

@@ -63,7 +63,7 @@ class MetadataView(MetadataCopyIntersectionsView):
             obj = qs[0]
             if not obj:
                 reason = "Empty obj"
-                raise ValueError(reason)  # noqa: TRY301
+                raise ValueError(reason)  # noqa TRY301
         except (IndexError, ValueError) as exc:
             return self._raise_not_found(exc)
 

codex/views/browser/mtime.py

@@ -37,7 +37,7 @@ class MtimeView(BrowserGroupMtimeView):
         """Get max mtime for all groups."""
         max_mtime = None
 
-        for item in self.params["groups"]:
+        for item in self.params["groups"]:  # type: ignore
             mtime = self._get_group_mtime(item)
             max_mtime = max_none(max_mtime, mtime)
         return max_mtime

codex/views/browser/order_by.py

@@ -55,7 +55,7 @@ class BrowserOrderByView(BrowserGroupMtimeView):
                 order_fields_head += ["bookmark_updated_at"]
         return order_fields_head
 
-    def add_order_by(self, qs, order_key="", comic_sort_names=None):
+    def add_order_by(self, qs, order_key="", do_reverse=True, comic_sort_names=None):
         """Create the order_by list."""
         order_fields_head = ()
         if qs.model is Comic:
@@ -65,9 +65,11 @@ class BrowserOrderByView(BrowserGroupMtimeView):
 
         order_fields = (*order_fields_head, "pk")
 
-        prefix = "-" if self.params.get("order_reverse") else ""
+        prefix = "-" if do_reverse and self.params.get("order_reverse") else ""
+        order_by = []
         if prefix:
-            order_by = [prefix + field for field in order_fields]
+            for field in order_fields:
+                order_by.append(prefix + field)
         else:
             order_by = order_fields
 

codex/views/browser/params.py

@@ -58,7 +58,7 @@ class BrowserParamsView(SessionView):
             validated_data = serializer.validated_data
 
             if validated_data:
-                params.update(validated_data)
+                params.update(validated_data)  # type: ignore
             self._params = MappingProxyType(params)
             self.validate_settings()
         return self._params

codex/views/browser/settings.py

@@ -9,7 +9,7 @@ class BrowserSettingsView(SettingsView):
     """Get Browser Settings."""
 
     # Put Browser Settings is normally done through BrowserView.get()
-    serializer_class = BrowserSettingsSerializer
+    serializer_class = BrowserSettingsSerializer  # type: ignore
 
     SESSION_KEY = SettingsView.BROWSER_SESSION_KEY
 

codex/views/browser/validate.py

@@ -3,7 +3,6 @@
 from collections.abc import Mapping
 from copy import deepcopy
 from types import MappingProxyType
-from typing import Any
 
 from rest_framework.exceptions import NotFound
 
@@ -74,18 +73,17 @@ class BrowserValidateView(SearchFilterView):
         self, reason, route_mask=None, settings_mask: Mapping | None = None
     ):
         """Redirect the client to a valid group url."""
-        route: dict[str, Any] = mapping_to_dict(self.DEFAULT_ROUTE)  # type:ignore[reportAssignmentType]
+        route = mapping_to_dict(self.DEFAULT_ROUTE)
         if route_mask:
-            route["params"].update(route_mask)
-        settings: dict[str, Any] = deepcopy(mapping_to_dict(self.params))  # type: ignore[reportAssignmentType]
+            route["params"].update(route_mask)  # type: ignore
+        settings: dict = deepcopy(mapping_to_dict(self.params))  # type: ignore
         if settings_mask:
             settings.update(settings_mask)
         detail = {"route": route, "settings": settings, "reason": reason}
         raise SeeOtherRedirectError(detail=detail)
 
     def _get_valid_browse_top_groups(self):
-        """
-        Get valid top groups for the current settings.
+        """Get valid top groups for the current settings.
 
         Valid top groups are determined by the Browser Settings.
         """
@@ -120,8 +118,7 @@ class BrowserValidateView(SearchFilterView):
             self.raise_redirect(reason, route, settings_mask)
 
     def _get_valid_browse_nav_groups(self, valid_top_groups):
-        """
-        Get valid nav groups for the current settings.
+        """Get valid nav groups for the current settings.
 
         Valid nav groups are the top group and below that are also
         enabled in browser settings.

codex/views/const.py

@@ -76,6 +76,9 @@ METADATA_GROUP_RELATION = MappingProxyType(
     {
         **GROUP_NAME_MAP,
         COMIC_GROUP: "comic",
+        # Possible to list all groups in a non group view, but could get crazy.
+        # FOLDER_GROUP: "comic__folder",
+        # STORY_ARC_GROUP: "comic__story_arc_number__story_arc"
     }
 )
 CUSTOM_COVER_GROUP_RELATION = MappingProxyType(

codex/views/frontend.py

@@ -17,7 +17,7 @@ class IndexView(SessionView):
     SESSION_KEY = SessionView.BROWSER_SESSION_KEY
 
     permission_classes = (AllowAny,)
-    renderer_classes: ClassVar[list] = [TemplateHTMLRenderer]  # type: ignore[reportIncompatibleVariableOverride]
+    renderer_classes: ClassVar[list] = [TemplateHTMLRenderer]  # type: ignore
     template_name = "index.html"
 
     def _get_last_route(self):

codex/views/mixins.py

@@ -4,7 +4,6 @@ from django.db.models.expressions import F
 
 from codex.logger.logging import get_logger
 from codex.models.comic import Comic, Imprint, Volume
-from codex.views.browser.filters.filter import BrowserFilterView
 from codex.views.const import GROUP_NAME_MAP
 
 LOG = get_logger(__name__)
@@ -13,7 +12,7 @@ _GROUP_NAME_TARGETS = frozenset({"browser", "opds1", "opds2", "reader"})
 _VARIABLE_SHOW = "pi"
 
 
-class SharedAnnotationsMixin(BrowserFilterView):
+class SharedAnnotationsMixin:
     """Cross view annotation methods."""
 
     @staticmethod
@@ -55,7 +54,7 @@ class SharedAnnotationsMixin(BrowserFilterView):
     def annotate_group_names(cls, qs):
         """Annotate name fields by hoisting them up."""
         # Optimized to only lookup what is used on the frontend
-        target = cls.TARGET
+        target = cls.TARGET  # type: ignore
         if target not in _GROUP_NAME_TARGETS:
             return qs
         group_names = {}

codex/views/opds/authentication_v1.py

@@ -40,7 +40,7 @@ _DOC = MappingProxyType(
                 "labels": {"login": "Username", "password": "Password"},
             },
             {
-                # Out of spec type
+                # XXX Out of spec type
                 "type": "cookie",
                 "links": [
                     {

codex/views/opds/const.py

@@ -48,9 +48,9 @@ class MimeType:
 
     ATOM = "application/atom+xml"
     _PROFILE_CATALOG = "profile=opds-catalog"
-    NAV = f"{ATOM};{_PROFILE_CATALOG};kind=navigation"
-    ACQUISITION = f"{ATOM};{_PROFILE_CATALOG};kind=acquisition"
-    ENTRY_CATALOG = f"{ATOM};type=entry;{_PROFILE_CATALOG}"
+    NAV = ";".join((ATOM, _PROFILE_CATALOG, "kind=navigation"))
+    ACQUISITION = ";".join((ATOM, _PROFILE_CATALOG, "kind=acquisition"))
+    ENTRY_CATALOG = ";".join((ATOM, "type=entry", _PROFILE_CATALOG))
     AUTHENTICATION = "application/opds-authentication+json"
     OPENSEARCH = "application/opensearchdescription+xml"
     STREAM = "image/jpeg"
@@ -58,7 +58,7 @@ class MimeType:
     OPDS_PUB = "application/opds-publication+json"
     PROGRESSION = "application/vnd.readium.progression+json"
     BOOK = "http://schema.org/Book"
-    # COMIC = "https://schema.org/ComicStory" unused
+    # COMIC = "https://schema.org/ComicStory"
     JPEG = "image/jpeg"
     WEBP = "image/webp"
     HTML = "text/html"

codex/views/opds/util.py

@@ -31,7 +31,7 @@ def update_href_query_params(href, old_query_params, new_query_params=None):
     return href
 
 
-def get_contributor_people(comic_pks, roles, exclude):
+def get_contributor_people(comic_pks, roles, exclude=False):
     """Get contributors that are not authors."""
     people = ContributorPerson.objects.filter(
         contributor__comic__in=comic_pks,
@@ -43,7 +43,7 @@ def get_contributor_people(comic_pks, roles, exclude):
     return people.distinct().only("name")
 
 
-def get_contributors(comic_pks, roles, exclude):
+def get_contributors(comic_pks, roles, exclude=False):
     """Get credits that are not part of other roles."""
     contributors = Contributor.objects.filter(comic__in=comic_pks)
     if exclude:
@@ -78,7 +78,7 @@ def full_redirect_view(url_name):
         path = request.get_full_path()
         if path:
             parts = path.split("?")
-            if len(parts) >= 2:  # noqa: PLR2004
+            if len(parts) >= 2:  # noqa PLR2004
                 parts[0] = url
                 url = "?".join(parts)
 

codex/views/opds/v1/entry/entry.py

@@ -47,10 +47,8 @@ class OPDS1Entry(OPDS1EntryLinksMixin):
                 elif group == "c":
                     title = Comic.get_title(
                         self.obj,
-                        volume=True,
-                        name=True,
-                        filename_fallback=self.title_filename_fallback,
                         zero_pad=self.zero_pad,
+                        filename_fallback=self.title_filename_fallback,
                     )
                     parts.append(title)
 
@@ -135,7 +133,7 @@ class OPDS1Entry(OPDS1EntryLinksMixin):
         """Get Author names."""
         if not self.metadata:
             return []
-        people = get_contributor_people(self.obj.ids, AUTHOR_ROLES, exclude=False)
+        people = get_contributor_people(self.obj.ids, AUTHOR_ROLES)
         return self._add_url_to_obj(people, "contributors")
 
     @property

codex/views/opds/v1/entry/links.py

@@ -20,7 +20,7 @@ class OPDS1EntryLinksMixin:
     """OPDS v1 Entry Links Methods."""
 
     def __init__(
-        self, obj, query_params, data: OPDS1EntryData, title_filename_fallback: bool
+        self, obj, query_params, data: OPDS1EntryData, title_filename_fallback=False
     ):
         """Initialize params."""
         self.obj = obj
@@ -35,6 +35,7 @@ class OPDS1EntryLinksMixin:
     def _cover_link(self, rel):
         if self.fake:
             return None
+        # cover_pk = getattr(self.obj, "cover_pk", None)
         try:
             kwargs = {"group": self.obj.group, "pks": self.obj.ids}
             ts = floor(datetime.timestamp(self.obj.updated_at))
@@ -49,7 +50,7 @@ class OPDS1EntryLinksMixin:
         except Exception:
             LOG.exception("create thumb")
 
-    def _nav_href(self, metadata: bool):
+    def _nav_href(self, metadata=False):
         try:
             pks = sorted(self.obj.ids)
             kwargs = {"group": self.obj.group, "pks": pks, "page": 1}
@@ -71,7 +72,7 @@ class OPDS1EntryLinksMixin:
             LOG.exception(msg)
             raise
 
-    def _nav_link(self, metadata: bool):
+    def _nav_link(self, metadata=False):
         href = self._nav_href(metadata)
 
         group = self.obj.group
@@ -153,7 +154,7 @@ class OPDS1EntryLinksMixin:
 
             if self.obj.group == "c" and not self.fake:
                 result += self._links_comic()
-            elif nav := self._nav_link(metadata=False):
+            elif nav := self._nav_link():
                 result += [nav]
 
         except Exception:

codex/views/opds/v1/facets.py

@@ -169,14 +169,11 @@ class OPDS1FacetsView(BrowserView):
         )
         qps = {**self.request.GET}
         qps.update(query_params)
-        zero_pad: int = self.obj["zero_pad"]
+        zero_pad: int = self.obj["zero_pad"]  # type: ignore
         data = OPDS1EntryData(
-            self.opds_acquisition_groups,
-            zero_pad,
-            metadata=False,
-            mime_type_map=self.mime_type_map,
+            self.opds_acquisition_groups, zero_pad, False, self.mime_type_map
         )
-        return OPDS1Entry(entry_obj, qps, data, title_filename_fallback=False)
+        return OPDS1Entry(entry_obj, qps, data)
 
     def _is_facet_active(self, facet_group, facet):
         compare = [facet.value]
@@ -234,8 +231,7 @@ class OPDS1FacetsView(BrowserView):
                 facets += [facet_obj]
         return facets
 
-    def facets(self, entries: bool, root: bool):
-        # entries false, root true
+    def facets(self, entries=False, root=True):
         """Return facets."""
         facets = []
         group = self.kwargs.get("group")

codex/views/opds/v1/feed.py

@@ -75,7 +75,7 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
         """Create the feed title."""
         result = ""
         try:
-            browser_title: Mapping[str, Any] = self.obj.get("title", {})
+            browser_title: Mapping[str, Any] = self.obj.get("title")  # type: ignore
             if browser_title:
                 parent_name = browser_title.get("parent_name", "All")
                 pks = self.kwargs["pks"]
@@ -97,7 +97,7 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
         try:
             mtime = self.obj.get("mtime")
             if mtime:
-                datestr = mtime.isoformat()
+                datestr = mtime.isoformat()  # type: ignore
         except Exception:
             LOG.exception("Getting OPDS v1 updated")
         return datestr
@@ -124,13 +124,13 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
         """Get entries by key section."""
         entries = []
         if objs := self.obj.get(key):
-            zero_pad: int = self.obj["zero_pad"]
+            zero_pad: int = self.obj["zero_pad"]  # type: ignore
             data = OPDS1EntryData(
                 self.opds_acquisition_groups, zero_pad, metadata, self.mime_type_map
             )
             fallback = bool(self.admin_flags.get("folder_view"))
             import_pks = set()
-            for obj in objs:
+            for obj in objs:  # type: ignore
                 entry = OPDS1Entry(
                     obj,
                     self.request.GET,
@@ -157,7 +157,7 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
                     entries += self.add_top_links(RootTopLinks.ALL)
                 entries += self.facets(entries=True, root=at_root)
 
-            entries += self._get_entries_section("groups", metadata=False)
+            entries += self._get_entries_section("groups", False)
             metadata = self.request.GET.get("opdsMetadata", "").lower() not in FALSY
             entries += self._get_entries_section("books", metadata)
         except Exception:

codex/views/opds/v1/links.py

@@ -105,7 +105,7 @@ class RootTopLinks:
 class OPDS1LinksView(OPDS1FacetsView):
     """OPDS 1 Links methods."""
 
-    # overwritten in get_object method
+    # overwritten in get_object()
     DEFAULT_ROUTE = MappingProxyType(
         {
             **OPDS1FacetsView.DEFAULT_ROUTE,
@@ -143,7 +143,7 @@ class OPDS1LinksView(OPDS1FacetsView):
     def _root_links(self):
         """Navigation Root Links."""
         links = []
-        if up_route := self.get_last_route(name=True):
+        if up_route := self.get_last_route():
             links += [self._link(up_route, Rel.UP)]
         page = self.kwargs.get("page", 1)
         if page > 1:
@@ -179,7 +179,7 @@ class OPDS1LinksView(OPDS1FacetsView):
                 for top_link in TopLinks.ALL + RootTopLinks.ALL:
                     if not self.is_top_link_displayed(top_link):
                         links += [self._top_link(top_link)]
-                if facets := self.facets(entries=False, root=True):
+                if facets := self.facets():
                     links += facets
         except Exception:
             LOG.exception("Getting OPDS v1 links")
@@ -194,16 +194,11 @@ class OPDS1LinksView(OPDS1FacetsView):
             name=name,
             summary=top_link.desc,
         )
-        zero_pad: int = self.obj["zero_pad"]
+        zero_pad: int = self.obj["zero_pad"]  # type: ignore
         data = OPDS1EntryData(
-            self.opds_acquisition_groups,
-            zero_pad,
-            metadata=False,
-            mime_type_map=self.mime_type_map,
-        )
-        return OPDS1Entry(
-            entry_obj, top_link.query_params, data, title_filename_fallback=False
+            self.opds_acquisition_groups, zero_pad, False, self.mime_type_map
         )
+        return OPDS1Entry(entry_obj, top_link.query_params, data)
 
     def add_top_links(self, top_links):
         """Add a list of top links as entries if they should be enabled."""

codex/views/opds/v2/const.py

@@ -31,10 +31,7 @@ FACETS = (
         "Order Direction",
         "orderReverse",
         "⇕",
-        (
-            Facet(query_param_value=False, title="Ascending"),
-            Facet(query_param_value=True, title="Descending"),
-        ),
+        (Facet(False, "Ascending"), Facet(True, "Descending")),
     ),
     FacetGroup(
         "Top Group",
@@ -117,5 +114,5 @@ class LinksSectionData:
 
 
 TOP_NAV_GROUP_SECTION_DATA = LinksSectionData(group_kwarg=True)
-GROUPS_SECTION_DATA = LinksSectionData("Groups", Rel.SUB, group_kwarg=True)
+GROUPS_SECTION_DATA = LinksSectionData("Groups", Rel.SUB, True)
 FACETS_SECTION_DATA = LinksSectionData(rel=Rel.FACET, links_key="links")

codex/views/opds/v2/feed.py

@@ -56,9 +56,9 @@ class OPDS2FeedView(OPDSAuthMixin, OPDS2PublicationView):
 
     # def _detect_user_agent(self):
     #    """Hacks for individual clients."""
-    #    user_agent = self.request.headers.get("User-Agent") # noqa: ERA001
+    #    user_agent = self.request.headers.get("User-Agent")
     #    if not user_agent:
-    #        return # noqa: ERA001
+    #        return
 
     @staticmethod
     def _is_allowed(link_spec):
@@ -185,7 +185,7 @@ class OPDS2FeedView(OPDSAuthMixin, OPDS2PublicationView):
         title = self._title(title)
         number_of_items = total_count
         current_page = self.kwargs.get("page")
-        up_route = self.get_last_route(name=True)
+        up_route = self.get_last_route()
         links = self.get_links(up_route)
         facets = self._get_facets()
 

codex/views/opds/v2/progression.py

@@ -38,7 +38,7 @@ class OPDS2ProgressionView(
     @property
     def modified(self):
         """Get modified from bookmark."""
-        return self._obj.bookmark_updated_at  # type: ignore[reportAttributeAccessIssue]
+        return self._obj.bookmark_updated_at  # type: ignore
 
     @property
     def device(self):
@@ -49,21 +49,22 @@ class OPDS2ProgressionView(
     @property
     def title(self):
         """The locator title is the page number."""
-        return f"Page {self._obj.page}"  # type: ignore[reportAttributeAccessIssue]
+        return f"Page {self._obj.page}"  # type: ignore
 
     @property
     def _progression_href(self):
         """Build a Progression HRef."""
         acq_kwargs = {
             "pk": self._obj.pk,
-            "page": self._obj.page,  # type: ignore[reportAttributeAccessIssue]
+            "page": self._obj.page,  # type: ignore
         }
-        max_page = max_none(self._obj.page_count - 1, 0)  # type: ignore[reportAttributeAccessIssue]
+        max_page = max_none(self._obj.page_count - 1, 0)  # type: ignore
         data = HrefData(
             acq_kwargs,
             url_name="opds:bin:page",
             min_page=0,
-            max_page=max_page,
+            max_page=max_page,  # type: ignore
+            # absolute_query_params=True,
         )
         return self.href(data)
 
@@ -71,9 +72,9 @@ class OPDS2ProgressionView(
     def _locations(self):
         """Build the Locations object."""
         return {
-            "position": self._obj.page,  # type: ignore[reportAttributeAccessIssue]
-            "progression": self._obj.progress,  # type: ignore[reportAttributeAccessIssue]
-            "total_progression": self._obj.progress,  # type: ignore[reportAttributeAccessIssue]
+            "position": self._obj.page,  # type: ignore
+            "progression": self._obj.progress,  # type: ignore
+            "total_progression": self._obj.progress,  # type: ignore
         }
 
     @property