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

codex/migrations/0028_telemeter.py

@@ -1,16 +1,12 @@
 """Generated by Django 5.0.6 on 2024-07-02 21:01."""
 
-from typing import ClassVar
-
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     """Migrate db."""
 
-    dependencies: ClassVar[list] = [  # type: ignore
-        ("codex", "0027_import_order_and_covers"),
-    ]
+    dependencies = [("codex", "0027_import_order_and_covers")]
 
     operations = [
         migrations.AlterField(

codex/models/base.py

@@ -27,9 +27,11 @@ class BaseModel(Model):
     updated_at = DateTimeField(auto_now=True)
     objects = GroupByManager()
 
-    class Meta(ModelBase):  # type: ignore
+    class Meta(ModelBase):  # type: ignore[reportIncompatibleVariableOverride]
         """Without this a real table is created and joined to."""
 
+        # Model.Meta is not inheritable.
+
         abstract = True
         get_latest_by = "updated_at"
 

codex/models/bookmark.py

@@ -23,18 +23,15 @@ def cascade_if_user_null(
     sub_objs,
     using,  # noqa: ARG001
 ):
-    """Cascade only if the user field is null.
+    """
+    Cascade only if the user field is null.
 
     Do this to keep deleting ephemeral session data from Bookmark table.
     Adapted from:
     https://github.com/django/django/blob/master/django/db/models/deletion.py#L23
     """
-    null_user_sub_objs = []
-    for sub_obj in sub_objs:
-        # only cascade the ones with null user fields.
-        if sub_obj.user is None:
-            null_user_sub_objs.append(sub_obj)
-
+    # only cascade the ones with null user fields.
+    null_user_sub_objs = [sub_obj for sub_obj in sub_objs if sub_obj.user is None]
     if null_user_sub_objs:
         collector.collect(
             null_user_sub_objs,

codex/models/comic.py

@@ -263,7 +263,7 @@ class Comic(WatchedPathBrowserGroup):
 
     @classmethod
     def get_title(
-        cls, obj, volume=True, zero_pad=None, name=True, filename_fallback=False
+        cls, obj, volume: bool, name: bool, filename_fallback: bool, zero_pad=None
     ):
         """Create the comic title for display."""
         names = []
@@ -293,7 +293,7 @@ class Comic(WatchedPathBrowserGroup):
 
     def __str__(self):
         """Most common text representation for logging."""
-        return self.get_title(self, filename_fallback=True)
+        return self.get_title(self, volume=True, name=True, filename_fallback=True)
 
     def issue(self) -> str:
         """Combine issue parts for search."""

codex/models/functions.py

@@ -14,7 +14,10 @@ class JsonGroupArray(Aggregate):
     allow_distinct = True
     function = "JSON_GROUP_ARRAY"
     name = "JsonGroupArray"
-    output_field = JSONField()  # type: ignore
+
+    def __init__(self, *args, **kwargs):
+        """output_field is set in the constructor."""
+        super().__init__(*args, output_field=JSONField(), **kwargs)
 
 
 class GroupConcat(Aggregate):
@@ -25,7 +28,10 @@ class GroupConcat(Aggregate):
     allow_distinct = True
     function = "GROUP_CONCAT"
     name = "GroupConcat"
-    output_field = CharField()  # type: ignore
+
+    def __init__(self, *args, **kwargs):
+        """output_field is set in the constructor."""
+        super().__init__(*args, output_field=CharField(), **kwargs)
 
 
 @OneToOneField.register_lookup
@@ -36,8 +42,6 @@ class FTS5Match(Lookup):
 
     def as_sql(self, compiler, connection):
         """Generate MATCH sql."""
-        # lhs, lhs_params = self.process_lhs(compiler, connection)
-        # fts_table = lhs.split(".")[0]
         rhs, rhs_params = self.process_rhs(compiler, connection)
         # MATCH works on the table itself not the one_to_one rel.
         # Force the table name without substitutions by the optimizer
@@ -67,4 +71,7 @@ class ComicFTSRank(Func):
 
     function = "rank"
     template = '("codex_comicfts"."rank" * -1)'
-    output_field = FloatField()  # type: ignore
+
+    def __init__(self, *args, **kwargs):
+        """output_field is set in the constructor."""
+        super().__init__(*args, output_field=FloatField(), **kwargs)

codex/models/groups.py

@@ -136,7 +136,7 @@ class WatchedPathBrowserGroup(BrowserGroupModel, WatchedPath):
         super().presave()
         WatchedPath.presave(self)
 
-    class Meta(WatchedPath.Meta):  # type: ignore
+    class Meta(BrowserGroupModel.Meta, WatchedPath.Meta):
         """Use Mixin Meta."""
 
         abstract = True

codex/models/library.py

@@ -23,7 +23,7 @@ __all__ = ("Library", "validate_dir_exists")
 def validate_dir_exists(path):
     """Validate that a library exists."""
     if not Path(path).is_dir():
-        raise ValidationError(_(f"{path} is not a directory"), params={"path": path})
+        raise ValidationError(_("{path} is not a directory"), params={"path": path})
 
 
 class Library(BaseModel):

codex/models/paths.py

@@ -36,11 +36,11 @@ class WatchedPath(BaseModel):
         st[0] = st_record.st_mode
         st[1] = st_record.st_ino
         # st[2] = st_record.st_dev is ignored by diff
-        # st[3] = st_record.st_nlink
-        # st[4] = st_record.st_uid
-        # st[5] = st_record.st_gid
+        # st[3] = st_record.st_nlink ignored
+        # st[4] = st_record.st_uid ignored
+        # st[5] = st_record.st_gid ignored
         st[6] = st_record.st_size
-        # st[7] = st_record.st_atime
+        # st[7] = st_record.st_atime ignored
         st[8] = st_record.st_mtime
         self.stat = st
 

codex/models/query.py

@@ -45,7 +45,7 @@ class GroupByQuery(Query):
         self.force_group_by_table = ""
         self.force_group_by_fields = ()
 
-    def get_compiler(self, using=None, connection=None, elide_empty=True):
+    def get_compiler(self, using=None, connection=None, elide_empty=True):  # noqa: FBT002
         """Use the custom compiler instead of SQLCompiler."""
         if self.compiler == "SQLCompiler":
             if using is None and connection is None:
@@ -59,7 +59,11 @@ class GroupByQuery(Query):
             )
         else:
             # Normal super() operation.
-            compiler = super().get_compiler(using, connection, elide_empty)  # type: ignore
+            compiler = super().get_compiler(
+                using=using,
+                connection=connection,
+                elide_empty=elide_empty,  # type: ignore[reportCallIssue]
+            )
 
         return compiler
 
@@ -82,13 +86,13 @@ class GroupByQuerySet(QuerySet):
 
     def group_by(self, *fields, model=None):
         """Force group_by operator."""
-        obj = self._chain()  # type: ignore
+        obj = self._chain()  # type: ignore[reportAttributeAccessIssue]
         obj.query.set_force_group_by(fields, model=model)
         return obj
 
     def demote_joins(self, tables):
         """Force INNER JOINS."""
-        obj = self._chain()  # type: ignore
+        obj = self._chain()  # type: ignore[reportAttributeAccessIssue]
         obj.query.demote_joins(tables)
         return obj
 

codex/models/util.py

@@ -1,7 +1,7 @@
 """Utilities for models."""
 
 _ARTICLES = frozenset(
-    ("a", "an", "the")  # en    # noqa RUF005
+    ("a", "an", "the")  # en    # noqa: RUF005
     + ("un", "unos", "unas", "el", "los", "la", "las")  # es
     + ("un", "une", "le", "les", "la", "les", "l'")  # fr
     + ("o", "a", "os")  # pt

codex/permissions.py

@@ -8,7 +8,7 @@ from codex.models import Timestamp
 class HasAPIKeyOrIsAdminUser(BasePermission):
     """Does the request have the current api key."""
 
-    def has_permission(self, request, view):  # type: ignore
+    def has_permission(self, request, view):
         """Test the request api key against the database."""
         data = request.GET if request.method == "GET" else request.POST
         api_key = data.get("apiKey")

codex/run.py

@@ -63,7 +63,7 @@ def run():
         serve(
             application,
             HYPERCORN_CONFIG,
-            shutdown_trigger=SHUTDOWN_EVENT.wait,  # type: ignore
+            shutdown_trigger=SHUTDOWN_EVENT.wait,
         )
     )
     librarian.stop()

codex/serializers/admin/libraries.py

@@ -85,6 +85,4 @@ class AdminFolderSerializer(Serializer):
 
     def validate_show_hidden(self, show_hidden):
         """Snakecase the showHidden field."""
-        return (
-            show_hidden == "true" or self.initial_data.get("showHidden") == "true"  # type: ignore
-        )
+        return show_hidden == "true" or self.initial_data.get("showHidden") == "true"

codex/serializers/admin/stats.py

@@ -19,8 +19,8 @@ FILE_TYPES_CHOICES = ("CBZ", "CBR", "CBT", "PDF", "UNKNOWN")
 class StatsSystemSerializer(Serializer):
     """Platform System Information."""
 
-    name = CharField(required=False, read_only=True)
-    release = CharField(required=False, read_only=True)
+    name = CharField(read_only=True, required=False)
+    release = CharField(read_only=True, required=False)
 
 
 class StatsPlatformSerializer(Serializer):
@@ -42,7 +42,7 @@ class StatsConfigSerializer(Serializer):
     user_registered_count = IntegerField(required=False, read_only=True)
     auth_group_count = IntegerField(required=False, read_only=True)
     # Only for api
-    api_key = CharField(required=False, read_only=True)
+    api_key = CharField(read_only=True, required=False)
 
 
 class StatsSessionsSerializer(Serializer):
@@ -123,4 +123,4 @@ class AdminStatsRequestSerializer(Serializer):
 class APIKeySerializer(Serializer):
     """API Key."""
 
-    api_key = CharField(source="name")
+    api_key = CharField(source="name", read_only=True)

codex/serializers/admin/tasks.py

@@ -6,11 +6,21 @@ from rest_framework.serializers import (
     Serializer,
 )
 
-from codex.choices import ADMIN_TASKS
+from codex.choices.admin import ADMIN_TASK_GROUPS
+
+_ADMIN_TASK_CHOICES = tuple(
+    sorted(
+        [
+            item["value"]
+            for group in ADMIN_TASK_GROUPS["tasks"]
+            for item in group["tasks"]
+        ]
+    )
+)
 
 
 class AdminLibrarianTaskSerializer(Serializer):
     """Get tasks from front end."""
 
-    task = ChoiceField(choices=ADMIN_TASKS)
+    task = ChoiceField(choices=_ADMIN_TASK_CHOICES)
     library_id = IntegerField(required=False)

codex/serializers/auth.py

@@ -8,6 +8,8 @@ from rest_framework.serializers import (
 )
 
 from codex.models import AdminFlag
+from codex.serializers.fields.auth import TimezoneField
+from codex.serializers.fields.sanitized import SanitizedCharField
 from codex.serializers.models.base import BaseModelSerializer
 
 
@@ -49,7 +51,7 @@ class UserSerializer(BaseModelSerializer):
 class TimezoneSerializer(Serializer):
     """Serialize Timezone submission from front end."""
 
-    timezone = CharField(min_length=2)
+    timezone = TimezoneField(write_only=True)
 
 
 class UserCreateSerializer(BaseModelSerializer, TimezoneSerializer):
@@ -67,7 +69,7 @@ class UserLoginSerializer(UserCreateSerializer):
     """Serialize user login input."""
 
     # specify this so it doesn't trigger the username unique constraint.
-    username = CharField(min_length=2)
+    username = SanitizedCharField(min_length=2)
 
     class Meta(UserCreateSerializer.Meta):
         """Explicit meta inheritance required."""

codex/serializers/browser/choices.py

@@ -2,28 +2,106 @@
 
 from types import MappingProxyType
 
-from rest_framework.fields import ListField, SerializerMethodField
-from rest_framework.serializers import CharField, Serializer
+from rest_framework.fields import (
+    BooleanField,
+    CharField,
+    ListField,
+    SerializerMethodField,
+)
+from rest_framework.serializers import Serializer
 
-from codex.serializers.browser.filters import BrowserSettingsFilterSerializer
 from codex.serializers.fields import (
+    VuetifyBooleanField,
     VuetifyCharField,
+    VuetifyDecadeField,
+    VuetifyFloatField,
     VuetifyIntegerField,
 )
+from codex.serializers.fields.browser import BookmarkFilterField
 from codex.serializers.models.pycountry import CountrySerializer, LanguageSerializer
 
 
-class BrowserChoicesCharPkSerializer(Serializer):
+class BrowserFilterChoicesSerializer(Serializer):
+    """All dynamic filters."""
+
+    age_rating = BooleanField(read_only=True)
+    community_rating = BooleanField(read_only=True)
+    characters = BooleanField(read_only=True)
+    country = BooleanField(read_only=True)
+    critical_rating = BooleanField(read_only=True)
+    contributors = BooleanField(read_only=True)
+    decade = BooleanField(read_only=True)
+    genres = BooleanField(read_only=True)
+    file_type = BooleanField(read_only=True)
+    identifier_type = BooleanField(read_only=True)
+    monochrome = BooleanField(read_only=True)
+    language = BooleanField(read_only=True)
+    locations = BooleanField(read_only=True)
+    original_format = BooleanField(read_only=True)
+    reading_direction = BooleanField(read_only=True)
+    series_groups = BooleanField(read_only=True)
+    stories = BooleanField(read_only=True)
+    story_arcs = BooleanField(read_only=True)
+    tagger = BooleanField(read_only=True)
+    tags = BooleanField(read_only=True)
+    teams = BooleanField(read_only=True)
+    year = BooleanField(read_only=True)
+
+
+class BrowserSettingsFilterSerializer(Serializer):
+    """Filter values for settings."""
+
+    bookmark = BookmarkFilterField(required=False, read_only=True)
+    # Dynamic filters
+    age_rating = ListField(child=VuetifyCharField(), required=False, read_only=True)
+    characters = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    community_rating = ListField(
+        child=VuetifyFloatField(), required=False, read_only=True
+    )
+    country = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    contributors = ListField(
+        child=VuetifyIntegerField(), required=False, read_only=True
+    )
+    critical_rating = ListField(
+        child=VuetifyFloatField(), required=False, read_only=True
+    )
+    decade = ListField(child=VuetifyDecadeField(), required=False, read_only=True)
+    file_type = ListField(child=VuetifyCharField(), required=False, read_only=True)
+    genres = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    identifier_type = ListField(
+        child=VuetifyCharField(), required=False, read_only=True
+    )
+    language = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    locations = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    monochrome = ListField(child=VuetifyBooleanField(), required=False, read_only=True)
+    original_format = ListField(
+        child=VuetifyCharField(), required=False, read_only=True
+    )
+    reading_direction = ListField(
+        child=VuetifyCharField(), required=False, read_only=True
+    )
+    series_groups = ListField(
+        child=VuetifyIntegerField(), required=False, read_only=True
+    )
+    stories = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    story_arcs = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    tagger = ListField(child=VuetifyCharField(), required=False, read_only=True)
+    tags = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    teams = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    year = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+
+
+class BrowserChoicesIntegerPkSerializer(Serializer):
     """Named Model Serializer."""
 
-    pk = VuetifyCharField(read_only=True)
+    pk = VuetifyIntegerField(read_only=True)
     name = CharField(read_only=True)
 
 
-class BrowserChoicesIntegerPkSerializer(BrowserChoicesCharPkSerializer):
+class BrowserChoicesCharPkSerializer(BrowserChoicesIntegerPkSerializer):
     """Named Model Serailizer with pk = char hack for languages & countries."""
 
-    pk = VuetifyIntegerField(read_only=True)
+    pk = VuetifyCharField(read_only=True)
 
 
 _CHOICES_NAME_SERIALIZER_MAP = MappingProxyType(
@@ -50,9 +128,9 @@ class BrowserChoicesFilterSerializer(Serializer):
         if serializer_class:
             value = serializer_class(choices, many=True).data
         elif not serializer_class and field_name in _LIST_FIELDS:
-            field: ListField = (
+            field: ListField = (  # type: ignore[reportAssignmentType]
                 BrowserSettingsFilterSerializer().get_fields().get(field_name)
-            )  # type: ignore
+            )
             value = field.to_representation(choices)
         else:
             value = BrowserChoicesIntegerPkSerializer(choices, many=True).data

codex/serializers/browser/filters.py

@@ -1,68 +1,40 @@
 """Browser Settings Filter Serializers."""
 
-from rest_framework.serializers import BooleanField, ListField, Serializer
+from rest_framework.serializers import ListField, Serializer
 
 from codex.serializers.fields import (
-    BookmarkFilterField,
     VuetifyBooleanField,
-    VuetifyCharField,
     VuetifyDecadeField,
     VuetifyFloatField,
     VuetifyIntegerField,
 )
+from codex.serializers.fields.browser import BookmarkFilterField
 
 
-class BrowserFilterChoicesSerializer(Serializer):
-    """All dynamic filters."""
-
-    age_rating = BooleanField(read_only=True)
-    community_rating = BooleanField(read_only=True)
-    characters = BooleanField(read_only=True)
-    country = BooleanField(read_only=True)
-    critical_rating = BooleanField(read_only=True)
-    contributors = BooleanField(read_only=True)
-    decade = BooleanField(read_only=True)
-    genres = BooleanField(read_only=True)
-    file_type = BooleanField(read_only=True)
-    identifier_type = BooleanField(read_only=True)
-    monochrome = BooleanField(read_only=True)
-    language = BooleanField(read_only=True)
-    locations = BooleanField(read_only=True)
-    original_format = BooleanField(read_only=True)
-    reading_direction = BooleanField(read_only=True)
-    series_groups = BooleanField(read_only=True)
-    stories = BooleanField(read_only=True)
-    story_arcs = BooleanField(read_only=True)
-    tagger = BooleanField(read_only=True)
-    tags = BooleanField(read_only=True)
-    teams = BooleanField(read_only=True)
-    year = BooleanField(read_only=True)
-
-
-class BrowserSettingsFilterSerializer(Serializer):
+class BrowserSettingsFilterInputSerializer(Serializer):
     """Filter values for settings."""
 
     bookmark = BookmarkFilterField(required=False)
     # Dynamic filters
-    age_rating = ListField(child=VuetifyCharField(), required=False)
+    age_rating = ListField(child=VuetifyIntegerField(), required=False)
     characters = ListField(child=VuetifyIntegerField(), required=False)
     community_rating = ListField(child=VuetifyFloatField(), required=False)
     country = ListField(child=VuetifyIntegerField(), required=False)
     contributors = ListField(child=VuetifyIntegerField(), required=False)
     critical_rating = ListField(child=VuetifyFloatField(), required=False)
     decade = ListField(child=VuetifyDecadeField(), required=False)
-    file_type = ListField(child=VuetifyCharField(), required=False)
+    file_type = ListField(child=VuetifyIntegerField(), required=False)
     genres = ListField(child=VuetifyIntegerField(), required=False)
-    identifier_type = ListField(child=VuetifyCharField(), required=False)
+    identifier_type = ListField(child=VuetifyIntegerField(), required=False)
     language = ListField(child=VuetifyIntegerField(), required=False)
     locations = ListField(child=VuetifyIntegerField(), required=False)
     monochrome = ListField(child=VuetifyBooleanField(), required=False)
-    original_format = ListField(child=VuetifyCharField(), required=False)
-    reading_direction = ListField(child=VuetifyCharField(), required=False)
+    original_format = ListField(child=VuetifyIntegerField(), required=False)
+    reading_direction = ListField(child=VuetifyIntegerField(), required=False)
     series_groups = ListField(child=VuetifyIntegerField(), required=False)
     stories = ListField(child=VuetifyIntegerField(), required=False)
     story_arcs = ListField(child=VuetifyIntegerField(), required=False)
-    tagger = ListField(child=VuetifyCharField(), required=False)
+    tagger = ListField(child=VuetifyIntegerField(), required=False)
     tags = ListField(child=VuetifyIntegerField(), required=False)
     teams = ListField(child=VuetifyIntegerField(), required=False)
     year = ListField(child=VuetifyIntegerField(), required=False)

codex/serializers/browser/metadata.py

@@ -1,6 +1,7 @@
 """Codex Serializers for the metadata box."""
 
-from rest_framework.serializers import CharField, IntegerField, ListField, Serializer
+from rest_framework.fields import CharField
+from rest_framework.serializers import IntegerField, ListField, Serializer
 
 from codex.serializers.browser.mixins import BrowserAggregateSerializerMixin
 from codex.serializers.models.comic import ComicSerializer

codex/serializers/browser/mixins.py

@@ -5,7 +5,6 @@ from itertools import chain
 
 from rest_framework.serializers import (
     BooleanField,
-    CharField,
     DecimalField,
     IntegerField,
     ListField,
@@ -14,6 +13,7 @@ from rest_framework.serializers import (
 )
 
 from codex.logger.logging import get_logger
+from codex.serializers.fields.browser import TopGroupField
 from codex.util import max_none
 from codex.views.const import EPOCH_START
 
@@ -23,7 +23,7 @@ LOG = get_logger(__name__)
 class BrowserAggregateSerializerMixin(Serializer):
     """Mixin for browser, opds & metadata serializers."""
 
-    group = CharField(read_only=True, max_length=1)
+    group = TopGroupField(read_only=True)
     ids = ListField(child=IntegerField(), read_only=True)
 
     # Aggregate Annotations
@@ -64,5 +64,9 @@ class BrowserAggregateSerializerMixin(Serializer):
         )
         mtime = self._get_max_updated_at(EPOCH_START, updated_ats)
         if obj.bmua_is_max:
-            mtime: datetime = max_none(mtime, obj.bookmark_updated_at, EPOCH_START)  # type: ignore
+            mtime: datetime | None = max_none(
+                mtime, obj.bookmark_updated_at, EPOCH_START
+            )
+        if mtime is None:
+            return 0
         return int(mtime.timestamp() * 1000)

codex/serializers/browser/mtime.py

@@ -1,17 +1,15 @@
 """Group Mtimes."""
 
-from rest_framework.serializers import CharField, Serializer
+from rest_framework.serializers import Serializer
 
-from codex.serializers.browser.settings import BrowserSettingsFilterSerializer
+from codex.serializers.browser.settings import BrowserFilterChoicesInputSerilalizer
 from codex.serializers.fields import TimestampField
 from codex.serializers.route import SimpleRouteSerializer
 
 
-class GroupsMtimeSerializer(Serializer):
+class GroupsMtimeSerializer(BrowserFilterChoicesInputSerilalizer):
     """Groups Mtimes."""
 
-    filters = BrowserSettingsFilterSerializer(required=False)
-    q = CharField(allow_blank=True, required=False)
     groups = SimpleRouteSerializer(many=True, required=True)
 
 

codex/serializers/browser/page.py

@@ -1,17 +1,18 @@
 """Browser Page Serializer."""
 
-from rest_framework.serializers import (
+from rest_framework.fields import (
     BooleanField,
     CharField,
     DecimalField,
     IntegerField,
-    Serializer,
 )
+from rest_framework.serializers import Serializer
 
 from codex.serializers.browser.mixins import (
     BrowserAggregateSerializerMixin,
 )
-from codex.serializers.fields import BreadcrumbsField, TimestampField
+from codex.serializers.fields import TimestampField
+from codex.serializers.fields.browser import BreadcrumbsField, TopGroupField
 
 
 class BrowserCardSerializer(BrowserAggregateSerializerMixin):
@@ -57,7 +58,7 @@ class BrowserPageSerializer(Serializer):
     title = BrowserTitleSerializer(read_only=True)
     zero_pad = IntegerField(read_only=True)
     libraries_exist = BooleanField(read_only=True)
-    model_group = CharField(read_only=True)
+    model_group = TopGroupField(read_only=True)
     num_pages = IntegerField(read_only=True)
     groups = BrowserCardSerializer(allow_empty=True, read_only=True, many=True)
     books = BrowserCardSerializer(allow_empty=True, read_only=True, many=True)

codex/serializers/browser/settings.py

@@ -8,9 +8,10 @@ from rest_framework.serializers import (
     Serializer,
 )
 
-from codex.choices import BROWSER_ORDER_BY_CHOICES
-from codex.serializers.browser.filters import BrowserSettingsFilterSerializer
-from codex.serializers.fields import BreadcrumbsField, TimestampField, TopGroupField
+from codex.choices.browser import BROWSER_ORDER_BY_CHOICES
+from codex.serializers.browser.filters import BrowserSettingsFilterInputSerializer
+from codex.serializers.fields import TimestampField
+from codex.serializers.fields.browser import BreadcrumbsField, TopGroupField
 from codex.serializers.route import SimpleRouteSerializer
 
 
@@ -26,7 +27,8 @@ class BrowserSettingsShowGroupFlagsSerializer(Serializer):
 class BrowserFilterChoicesInputSerilalizer(Serializer):
     """Browser Settings for the filter choices response."""
 
-    filters = BrowserSettingsFilterSerializer(required=False)
+    filters = BrowserSettingsFilterInputSerializer(required=False)
+    # NOT Sanitized because so complex.
     q = CharField(allow_blank=True, required=False)
 
 
@@ -51,7 +53,6 @@ class BrowserCoverInputSerializer(BrowserCoverInputSerializerBase):
 class BrowserSettingsSerializerBase(BrowserCoverInputSerializerBase):
     """Base Serializer for Browser & OPDS Settings."""
 
-    # search_results_limit = IntegerField(required=False)
     top_group = TopGroupField(required=False)
 
 
@@ -64,7 +65,8 @@ class OPDSSettingsSerializer(BrowserSettingsSerializerBase):
 
 
 class BrowserSettingsSerializer(BrowserSettingsSerializerBase):
-    """Browser Settings that the user can change.
+    """
+    Browser Settings that the user can change.
 
     This is the only browse serializer that's submitted.
     """