codex 1.7.3a2__py3-none-any.whl → 1.7.4__py3-none-any.whl

codex/views/opds/v2/publications.py

@@ -17,10 +17,10 @@ from codex.views.opds.v2.top_links import OPDS2TopLinksView
 _MD_CONTRIBUTOR_MAP = MappingProxyType(
     {
         "author": AUTHOR_ROLES,
-        # "translator": {},
+        # "translator": {}, unused
         "editor": {"Editor"},
         "artist": {"CoverArtist"},
-        # "illustrator": {},
+        # "illustrator": {}, unused, could use penciller
         "letterer": {"Letterer"},
         "penciller": {"Penciller"},
         "colorist": {"Colorist"},
@@ -42,7 +42,9 @@ class OPDS2PublicationView(OPDS2TopLinksView):
             "dynamicCovers": False,
             "ts": ts,
         }
-        href_data = HrefData(kwargs, query_params, True, "opds:bin:cover")
+        href_data = HrefData(
+            kwargs, query_params, absolute_query_params=True, url_name="opds:bin:cover"
+        )
         link_data = LinkData(
             Rel.THUMBNAIL,
             href_data,
@@ -65,15 +67,13 @@ class OPDS2PublicationView(OPDS2TopLinksView):
     @staticmethod
     def _add_contributors(md, pks, key, roles):
         """Add contributors to metadata."""
-        if contributors := get_contributors(pks, roles):
+        if contributors := get_contributors(pks, roles, exclude=False):
             md[key] = contributors
 
     def _publication_optional_metadata(self, md, obj):
         """Add optional Publication Metadtata."""
         if subtitle := obj.name:
             md["subtitle"] = subtitle
-        # if identifier := obj.get("guid")
-        #   md["identifier"] = identifier
         if desc := obj.summary:
             md["description"] = desc
         if lang := obj.language:
@@ -89,25 +89,21 @@ class OPDS2PublicationView(OPDS2TopLinksView):
         """Publication m2m metadata only on the metadata alternate link."""
         for key, roles in _MD_CONTRIBUTOR_MAP.items():
             self._add_contributors(md, obj.ids, key, roles)
-        if contributors := get_contributors(obj.ids, _CONTRIBUTOR_ROLES, True):
+        if contributors := get_contributors(obj.ids, _CONTRIBUTOR_ROLES, exclude=True):
             md["contributor"] = contributors
 
         if m2m_objs := get_m2m_objects(obj.ids):
-            # XXX Subjects can also have links
+            # Subjects can also have links
             # https://readium.org/webpub-manifest/schema/subject-object.schema.json
-            subjects = []
-            for subjs in m2m_objs.values():
-                for subj in subjs:
-                    subjects.append(subj.name)
-            md["subject"] = subjects
+            md["subject"] = [subj.name for subjs in m2m_objs.values() for subj in subjs]
 
     def _publication_metadata(self, obj, zero_pad):
         title = Comic.get_title(
             obj,
             volume=False,
             name=False,
-            zero_pad=zero_pad,
             filename_fallback=self.title_filename_fallback,
+            zero_pad=zero_pad,
         )
         md = {
             "type": MimeType.BOOK,
@@ -129,10 +125,6 @@ class OPDS2PublicationView(OPDS2TopLinksView):
         download_mime_type = MimeType.FILE_TYPE_MAP.get(obj.file_type, MimeType.OCTET)
         self_kwargs = {"pk": obj.pk, "page": 1}
 
-        # This would be for comic streaming which is not supported by OPDS 2 yet?
-        # self_href_data = HrefData(self_kwargs, absolute_query_params=True)
-        # self_link_data = LinkData(Rel.SELF, self_href_data, mime_type=MimeType.OPDS_PUB)
-
         alt_kwargs = self_kwargs
         alt_href_data = HrefData(
             alt_kwargs,
@@ -174,8 +166,6 @@ class OPDS2PublicationView(OPDS2TopLinksView):
             authenticate=auth_link,
         )
         links = [
-            # Comic streaming link (unsupported)
-            # self.link(self_link_data),
             self.link(alt_link_data),
             self.link(acq_link_data),
             self.link(prog_link_data),

codex/views/public.py

@@ -29,7 +29,7 @@ class AdminFlagsView(GenericAPIView, RetrieveModelMixin):
     def get_object(self):
         """Get admin flags."""
         flags = {}
-        for obj in self.get_queryset():  # type: ignore
+        for obj in self.get_queryset():
             name = ADMIN_FLAG_CHOICES[obj.key].lower().replace(" ", "_")
             if obj.key == AdminFlag.FlagChoices.BANNER_TEXT.value:
                 val = obj.value

codex/views/reader/books.py

@@ -95,7 +95,7 @@ class ReaderBooksView(SharedAnnotationsMixin, BookmarkAuthMixin, ReaderParamsVie
 
     def _get_comics_list(self):
         """Get the reader naviation group filter."""
-        arc: Mapping = self.params.get("arc", {})  # type: ignore
+        arc: Mapping = self.params.get("arc", {})
 
         arc_group = arc.get("group", "")
         if not GROUP_MODEL_MAP.get(arc_group):
@@ -170,7 +170,8 @@ class ReaderBooksView(SharedAnnotationsMixin, BookmarkAuthMixin, ReaderParamsVie
         return book
 
     def get_book_collection(self):
-        """Get the -1, +1 window around the current issue.
+        """
+        Get the -1, +1 window around the current issue.
 
         Uses iteration in python. There are some complicated ways of
         doing this with __gt[0] & __lt[0] in the db, but I think they

codex/views/reader/page.py

@@ -32,11 +32,11 @@ class IgnoreClientContentNegotiation(BaseContentNegotiation):
         """Select the first parser in the `.parser_classes` list."""
         return next(iter(parsers))
 
-    def select_renderer(  # type: ignore
+    def select_renderer(
         self,
         request,  # noqa: ARG002
         renderers,
-        _format_suffix="",
+        format_suffix="",  # noqa: ARG002, F841, RUF100
     ):
         """Select the first renderer in the `.renderer_classes` list."""
         renderer = next(iter(renderers))
@@ -48,7 +48,7 @@ class ReaderPageView(BookmarkAuthMixin, AuthFilterAPIView):
 
     X_MOZ_PRE_HEADERS = frozenset({"prefetch", "preload", "prerender", "subresource"})
     content_type = "image/jpeg"
-    content_negotiation_class = IgnoreClientContentNegotiation  # type: ignore
+    content_negotiation_class = IgnoreClientContentNegotiation  # type: ignore[reportAssignmentType]
 
     def _update_bookmark(self):
         """Update the bookmark if the bookmark param was passed."""

codex/views/reader/params.py

@@ -121,9 +121,9 @@ class ReaderParamsView(SessionView):
                 serializer = self.input_serializer_class(data=data)
                 serializer.is_valid(raise_exception=True)
 
-                params: dict = mapping_to_dict(_DEFAULT_PARAMS)  # type: ignore
+                params: dict[str, Any] = mapping_to_dict(_DEFAULT_PARAMS)  # type: ignore[reportAssignmentType]
                 if serializer.validated_data:
-                    params.update(serializer.validated_data)  # type: ignore
+                    params.update(serializer.validated_data)
                 self._ensure_arc_contains_comic(params)
                 self._ensure_arc(params)
 

codex/views/reader/reader.py

@@ -58,7 +58,7 @@ class ReaderView(ReaderArcsView):
             task = LazyImportComicsTask(frozenset(import_pks))
             LIBRARIAN_QUEUE.put(task)
 
-    def get_object(self):  # type: ignore
+    def get_object(self):
         """Get the previous and next comics in a group or story arc."""
         # Books
         books = self.get_book_collection()
@@ -82,13 +82,13 @@ class ReaderView(ReaderArcsView):
 
         arc = self.params.get("arc", {})
         if not arc.get("group"):
-            arc["group"] = current.arc_group  # type: ignore
+            arc["group"] = current.arc_group
         if not arc.get("pks"):
-            arc["pks"] = (current.arc_pk,)  # type: ignore
-        arc["index"] = current.arc_index  # type:ignore
-        arc["count"] = current.arc_count  # type: ignore
+            arc["pks"] = (current.arc_pk,)
+        arc["index"] = current.arc_index
+        arc["count"] = current.arc_count
 
-        close_route = self.get_last_route()
+        close_route = self.get_last_route(name=True)
 
         return {
             "books": books,

codex/views/reader/settings.py

@@ -7,6 +7,6 @@ from codex.views.settings import SettingsView
 class ReaderSettingsView(SettingsView):
     """Get Reader Settings."""
 
-    serializer_class = ReaderSettingsSerializer  # type: ignore
+    serializer_class = ReaderSettingsSerializer
 
     SESSION_KEY = "reader"

codex/views/session.py

@@ -3,6 +3,7 @@
 from abc import ABC
 from copy import deepcopy
 from types import MappingProxyType
+from typing import TYPE_CHECKING
 
 from codex.choices import BROWSER_DEFAULTS, READER_DEFAULTS
 from codex.logger.logging import get_logger
@@ -10,6 +11,9 @@ from codex.util import mapping_to_dict
 from codex.views.auth import AuthFilterGenericAPIView
 from codex.views.util import pop_name
 
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
 LOG = get_logger(__name__)
 
 CONTRIBUTOR_PERSON_UI_FIELD = "contributors"
@@ -78,13 +82,15 @@ class SessionView(AuthFilterGenericAPIView, ABC):
             default = self.SESSION_DEFAULTS[session_key][key]
         return session.get(key, default)
 
-    def get_last_route(self, name=True):
+    def get_last_route(self, name: bool):
         """Get the last route from the breadcrumbs."""
         breadcrumbs = self.get_from_session(
             "breadcrumbs", session_key=self.BROWSER_SESSION_KEY
         )
         if not breadcrumbs:
-            default_breadcrumbs: tuple[dict] = BROWSER_DEFAULTS["breadcrumbs"]  # type: ignore
+            default_breadcrumbs: tuple[
+                Mapping[str, str | tuple[int, ...] | int], ...
+            ] = BROWSER_DEFAULTS["breadcrumbs"]  # type: ignore[reportAssignmentType]
             breadcrumbs = default_breadcrumbs
         last_route = breadcrumbs[-1]
         if not name:

codex/views/settings.py

@@ -29,7 +29,7 @@ class SettingsView(SessionView, ABC):
         serializer = self.input_serializer_class(data=data)
         serializer.is_valid(raise_exception=True)
         validated_data = serializer.validated_data
-        only = validated_data.get("only") if validated_data else None  # type: ignore
+        only = validated_data.get("only") if validated_data else None
         params = self.load_params_from_session(only=only)
         params = self.validate_settings_get(validated_data, params)
         serializer = self.get_serializer(params)
@@ -38,7 +38,7 @@ class SettingsView(SessionView, ABC):
     @extend_schema(responses=None)
     def patch(self, *args, **kwargs):
         """Update session settings."""
-        data = self.request.data  # type: ignore
+        data = self.request.data
         serializer = self.get_serializer(data=data)
         serializer.is_valid(raise_exception=True)
         params = self.load_params_from_session()

codex/views/timezone.py

@@ -28,11 +28,11 @@ class TimezoneView(AuthGenericAPIView):
     @extend_schema(request=input_serializer_class)
     def put(self, *args, **kwargs):
         """Get the user info for the current user."""
-        data = self.request.data  # type: ignore
+        data = self.request.data
         serializer = self.input_serializer_class(data=data)
         serializer.is_valid(raise_exception=True)
         try:
-            timezone = serializer.validated_data.get("timezone")  # type: ignore
+            timezone = serializer.validated_data.get("timezone")
             self._save_timezone(timezone)
         except Exception as exc:
             reason = f"update user timezone {exc}"

codex/views/util.py

@@ -5,6 +5,7 @@ from collections.abc import Mapping
 from contextlib import suppress
 from dataclasses import asdict, dataclass
 from json.decoder import JSONDecodeError
+from typing import Any
 from urllib.parse import unquote_plus
 
 from djangorestframework_camel_case.settings import api_settings
@@ -43,7 +44,7 @@ class Route(dict):
     dict = asdict
 
 
-def reparse_json_query_params(query_params, keys) -> dict:
+def reparse_json_query_params(query_params, keys) -> dict[str, Any]:
     """Reparse JSON encoded query_params."""
     # It is an unbelievable amount of trouble to try to parse axios native bracket
     # encoded complex objects in python
@@ -57,7 +58,7 @@ def reparse_json_query_params(query_params, keys) -> dict:
             parsed_value = value
 
         parsed_dict[key] = parsed_value
-    return dict(underscoreize(parsed_dict, **api_settings.JSON_UNDERSCOREIZE))  # type:ignore
+    return dict(underscoreize(parsed_dict, **api_settings.JSON_UNDERSCOREIZE))  # type:ignore[reportReturnType]
 
 
 def pop_name(kwargs: Mapping):
@@ -67,11 +68,11 @@ def pop_name(kwargs: Mapping):
     return kwargs
 
 
-async def chunker(open_file, chunk_size=DEFAULT_CHUNK_SIZE):
+def chunker(open_file, chunk_size=DEFAULT_CHUNK_SIZE):
     """Asynchronous iterator for serving files."""
-    while True:
-        chunk = open_file.read(chunk_size)
-        if not chunk:
-            open_file.close()
-            break
-        yield chunk
+    with open_file:
+        while True:
+            if chunk := open_file.read(chunk_size):
+                yield chunk
+            else:
+                break

codex/views/version.py

@@ -15,7 +15,7 @@ class VersionView(AuthGenericAPIView):
 
     serializer_class = VersionsSerializer
 
-    def get_object(self) -> dict[str, str]:  # type: ignore
+    def get_object(self) -> dict[str, str]:
         """Get the versions."""
         ts = Timestamp.objects.get(key=Timestamp.TimestampChoices.CODEX_VERSION.value)
         if ts.version:

{codex-1.7.3a2.dist-info → codex-1.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codex
-Version: 1.7.3a2
+Version: 1.7.4
 Summary: A comic archive web server.
 Home-page: https://github.com/ajslater/codex
 License: GPL-3.0-only
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Multimedia :: Graphics :: Viewers
@@ -43,6 +44,7 @@ Requires-Dist: fnvhash (>=0.1,<0.2)
 Requires-Dist: humanfriendly (>=10.0,<11.0)
 Requires-Dist: humanize (>=4.0.0,<5.0.0)
 Requires-Dist: hypercorn[h3] (>=0.17.3,<0.18.0)
+Requires-Dist: nh3 (>=0.2.18,<0.3.0)
 Requires-Dist: psutil (>=6.0.0,<7.0.0)
 Requires-Dist: pyparsing (>=3.1.2,<4.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)