(RUF012) Fixed mutable class Defaults- Task 1 #10278

openlibrary/i18n/messages.pot

@@ -94,6 +94,10 @@ msgstr ""
 msgid "Batch Imports"
 msgstr ""
 
+#: BatchImportNavigation.html batch_import.html
+msgid "New Batch Import"
+msgstr ""
+
 #: batch_import.html
 msgid ""
 "Attach a JSONL formatted document with import records or copy/paste the "
@@ -7146,6 +7150,10 @@ msgid ""
 "class=\"nostyle\" href=\"/help/faq/about#selling\">small commission</a>."
 msgstr ""
 
+#: BatchImportNavigation.html
+msgid "Pending Imports"
+msgstr ""
+
 #: BookByline.html
 #, python-format
 msgid "%(n)s other"

openlibrary/macros/BatchImportNavigation.html

@@ -0,0 +1,10 @@
+$def with ()
+
+<ul class="nav-bar">
+  <li class="$('selected' if ctx.path=='/new' else '')">
+    <a data-ol-link-track="BatchImportNav|Submit" href="/import/batch/new">$_("New Batch Import")</a>
+  </li>
+  <li class="$('selected' if ctx.path=='/pending' else '')">
+    <a data-ol-link-track="BatchImportNav|Pending" href="/import/batch/pending">$_("Pending Imports")</a>
+  </li>
+</ul>

openlibrary/plugins/worksearch/schemes/authors.py

@@ -1,15 +1,15 @@
 import logging
-from collections.abc import Callable
 from datetime import datetime
+from typing import ClassVar
 
 from openlibrary.plugins.worksearch.schemes import SearchScheme
 
 logger = logging.getLogger("openlibrary.worksearch")
 
 
 class AuthorSearchScheme(SearchScheme):
-    universe = ['type:author']
-    all_fields = {
+    universe: ClassVar[list] = ['type:author']
+    all_fields: ClassVar[set] = {
         'key',
         'name',
         'alternate_names',
@@ -19,10 +19,10 @@ class AuthorSearchScheme(SearchScheme):
         'top_subjects',
         'work_count',
     }
-    non_solr_fields: set[str] = set()
-    facet_fields: set[str] = set()
-    field_name_map: dict[str, str] = {}
-    sorts = {
+    non_solr_fields: ClassVar[set] = set()
+    facet_fields: ClassVar[set] = set()
+    field_name_map: ClassVar[dict] = {}
+    sorts: ClassVar[dict] = {
         'work_count desc': 'work_count desc',
         # Random
         'random': 'random_1 asc',
@@ -31,7 +31,7 @@ class AuthorSearchScheme(SearchScheme):
         'random.hourly': lambda: f'random_{datetime.now():%Y%m%dT%H} asc',
         'random.daily': lambda: f'random_{datetime.now():%Y%m%d} asc',
     }
-    default_fetched_fields = {
+    default_fetched_fields: ClassVar[set] = {  # Annotated with ClassVar
         'key',
         'name',
         'birth_date',
@@ -40,7 +40,9 @@ class AuthorSearchScheme(SearchScheme):
         'top_subjects',
         'work_count',
     }
-    facet_rewrites: dict[tuple[str, str], str | Callable[[], str]] = {}
+    facet_rewrites: ClassVar[dict] = {  # Annotated with ClassVar
+        ('public_scan', 'true'): 'ebook_access:public'
+    }
 
     def q_to_solr_params(
         self,

openlibrary/plugins/worksearch/schemes/subjects.py

@@ -1,24 +1,24 @@
 import logging
-from collections.abc import Callable
 from datetime import datetime
+from typing import ClassVar
 
 from openlibrary.plugins.worksearch.schemes import SearchScheme
 
 logger = logging.getLogger("openlibrary.worksearch")
 
 
 class SubjectSearchScheme(SearchScheme):
-    universe = ['type:subject']
-    all_fields = {
+    universe: ClassVar[list] = ['type:subject']
+    all_fields: ClassVar[set] = {
         'key',
         'name',
         'subject_type',
         'work_count',
     }
-    non_solr_fields: set[str] = set()
-    facet_fields: set[str] = set()
-    field_name_map: dict[str, str] = {}
-    sorts = {
+    non_solr_fields: ClassVar[set] = set()
+    facet_fields: ClassVar[set] = set()
+    field_name_map: ClassVar[dict] = {}
+    sorts: ClassVar[dict] = {
         'work_count desc': 'work_count desc',
         # Random
         'random': 'random_1 asc',
@@ -27,19 +27,16 @@ class SubjectSearchScheme(SearchScheme):
         'random.hourly': lambda: f'random_{datetime.now():%Y%m%dT%H} asc',
         'random.daily': lambda: f'random_{datetime.now():%Y%m%d} asc',
     }
-    default_fetched_fields = {
+    default_fetched_fields: ClassVar[set] = {
         'key',
         'name',
         'subject_type',
         'work_count',
     }
-    facet_rewrites: dict[tuple[str, str], str | Callable[[], str]] = {}
+    facet_rewrites: ClassVar[dict] = {('public_scan', 'true'): 'ebook_access:public'}
 
     def q_to_solr_params(
-        self,
-        q: str,
-        solr_fields: set[str],
-        cur_solr_params: list[tuple[str, str]],
+        self, q: str, solr_fields: set[str], cur_solr_params: list[tuple[str, str]]
     ) -> list[tuple[str, str]]:
         return [
             ('q', q),

openlibrary/plugins/worksearch/schemes/works.py

@@ -4,7 +4,7 @@
 from collections.abc import Callable
 from copy import deepcopy
 from datetime import datetime
-from typing import Any, cast
+from typing import Any, ClassVar, cast
 
 import luqum.tree
 import web
@@ -39,8 +39,8 @@
 
 
 class WorkSearchScheme(SearchScheme):
-    universe = ['type:work']
-    all_fields = {
+    universe = ClassVar[list]
+    all_fields: ClassVar[set] = {
         "key",
         "redirects",
         "title",
@@ -95,11 +95,11 @@ class WorkSearchScheme(SearchScheme):
         "ddc_sort",
         "osp_count",
     }
-    non_solr_fields = {
+    non_solr_fields: ClassVar[set] = {
         'description',
         'providers',
     }
-    facet_fields = {
+    facet_fields: ClassVar[set] = {
         "has_fulltext",
         "author_facet",
         "language",
@@ -111,7 +111,7 @@ class WorkSearchScheme(SearchScheme):
         "time_facet",
         "public_scan_b",
     }
-    field_name_map = {
+    field_name_map: ClassVar[dict] = {
         'author': 'author_name',
         'authors': 'author_name',
         'by': 'author_name',
@@ -126,7 +126,7 @@ class WorkSearchScheme(SearchScheme):
         # plain string at the next opportunity, which will make it much more usable.
         '_ia_collection': 'ia_collection_s',
     }
-    sorts = {
+    sorts: ClassVar[dict] = {
         'editions': 'edition_count desc',
         'old': 'def(first_publish_year, 9999) asc',
         'new': 'first_publish_year desc',
@@ -165,7 +165,7 @@ class WorkSearchScheme(SearchScheme):
         'random.hourly': lambda: f'random_{datetime.now():%Y%m%dT%H} asc',
         'random.daily': lambda: f'random_{datetime.now():%Y%m%d} asc',
     }
-    default_fetched_fields = {
+    default_fetched_fields: ClassVar[set] = {
         'key',
         'author_name',
         'author_key',
@@ -192,7 +192,7 @@ class WorkSearchScheme(SearchScheme):
         'id_cita_press',
         'id_wikisource',
     }
-    facet_rewrites = {
+    facet_rewrites: ClassVar[dict] = {
         ('public_scan', 'true'): 'ebook_access:public',
         ('public_scan', 'false'): '-ebook_access:public',
         ('print_disabled', 'true'): 'ebook_access:printdisabled',

openlibrary/templates/batch_import.html

@@ -3,9 +3,10 @@
 $var title: $_("Batch Imports")
 
 <div id="contentHead">
- <h1>$_("Batch Imports")</h1>
+ <h1>$_("New Batch Import")</h1>
 </div>
 <div id="contentBody" class="batchImport">
+  $:macros.BatchImportNavigation()
     <p>$_('Attach a JSONL formatted document with import records or copy/paste the JSONL text into the textarea.')</p>
     <p>$:_('See the <a href=\"https://github.com/internetarchive/openlibrary-client/tree/master/olclient/schemata\">olclient import schemata</a> for more.')</p>
     <form method="POST" enctype="multipart/form-data" action="">

openlibrary/templates/batch_import_pending_view.html

@@ -5,6 +5,7 @@
   <h1>$_("Pending Batch Imports")</h1>
 </div>
 <div id="contentBody" class="batchImportPendingStatus">
+  $:macros.BatchImportNavigation()
   <table class="changeHistory">
     <thead>
       <tr>