Merge pull request #6802 from LMFDB/main

main -> web

Author: roed314

.github/workflows/matrix_includes.json

@@ -30,12 +30,12 @@
         "server": "devmirror"
     },
     {
-        "files": "lmfdb/tests/test_dynamic_knowls.py lmfdb/tests/test_root.py lmfdb/hecke_algebras/test_hecke_algebras.py lmfdb/tests/test_homepage.py lmfdb/elliptic_curves/test_ell_curves.py lmfdb/elliptic_curves/test_browse_page.py",
+        "files": "lmfdb/tests/test_dynamic_knowls.py lmfdb/tests/test_root.py lmfdb/hecke_algebras/test_hecke_algebras.py lmfdb/tests/test_homepage.py lmfdb/tests/test_random_redirects.py lmfdb/elliptic_curves/test_ell_curves.py lmfdb/elliptic_curves/test_browse_page.py",
         "folders": "elliptic_curves hecke_algebras tests",
         "server": "proddb"
     },
     {
-        "files": "lmfdb/tests/test_dynamic_knowls.py lmfdb/tests/test_root.py lmfdb/hecke_algebras/test_hecke_algebras.py lmfdb/tests/test_homepage.py lmfdb/elliptic_curves/test_ell_curves.py lmfdb/elliptic_curves/test_browse_page.py",
+        "files": "lmfdb/tests/test_dynamic_knowls.py lmfdb/tests/test_root.py lmfdb/hecke_algebras/test_hecke_algebras.py lmfdb/tests/test_homepage.py lmfdb/tests/test_random_redirects.py lmfdb/elliptic_curves/test_ell_curves.py lmfdb/elliptic_curves/test_browse_page.py",
         "folders": "elliptic_curves hecke_algebras tests",
         "server": "devmirror"
     },

.github/workflows/python-package.yml

@@ -90,7 +90,7 @@ jobs:
     - name: checking that we didn't miss any test files
       shell: bash -l {0}
       # If this fails you need to update the file list above and file count
-      run: test $(find lmfdb -name 'test_*.py' -or -name '*_test.py' | wc -l) -eq 40
+      run: test $(find lmfdb -name 'test_*.py' -or -name '*_test.py' | wc -l) -eq 41
 
     - name: Config LMFDB to run tests against proddb
       if: matrix.files != 'lint' && matrix.server == 'proddb'

lmfdb/bianchi_modular_forms/bianchi_modular_form.py

@@ -8,7 +8,7 @@
     to_dict, web_latex_ideal_fact, flash_error, comma, display_knowl,
     nf_string_to_label, parse_nf_string, parse_noop, parse_start, parse_count, parse_ints, parse_primes,
     SearchArray, TextBox, SelectBox, ExcludeOnlyBox, CountBox, SubsetBox, TextBoxWithSelect,
-    teXify_pol, search_wrap, Downloader)
+    teXify_pol, search_wrap, Downloader, redirect_no_cache)
 from lmfdb.utils.display_stats import StatsDisplay, totaler, proportioners
 from lmfdb.utils.interesting import interesting_knowls
 from lmfdb.utils.search_columns import SearchColumns, ProcessedCol, MultiProcessedCol
@@ -86,12 +86,13 @@ def index():
         return bianchi_modular_form_search(info)
 
 @bmf_page.route("/random")
+@redirect_no_cache
 def random_bmf():    # Random Bianchi modular form
     res = db.bmf_forms.random(projection=['field_label', 'level_label', 'label_suffix'])
-    return redirect(url_for(".render_bmf_webpage",
+    return url_for(".render_bmf_webpage",
                     field_label=res['field_label'],
                     level_label=res['level_label'],
-                    label_suffix=res['label_suffix']), 307)
+                    label_suffix=res['label_suffix'])
 
 @bmf_page.route("/interesting")
 def interesting():

lmfdb/characters/main.py

@@ -6,7 +6,7 @@
 from lmfdb.utils import (
     to_dict, flash_error, SearchArray, YesNoBox, display_knowl, ParityBox,
     TextBox, CountBox, parse_bool, parse_ints, search_wrap, raw_typeset_poly,
-    StatsDisplay, totaler, proportioners, comma, flash_warning, Downloader)
+    StatsDisplay, totaler, proportioners, comma, flash_warning, Downloader, redirect_no_cache)
 from lmfdb.utils.interesting import interesting_knowls
 from lmfdb.utils.search_parsing import parse_range3
 from lmfdb.utils.search_columns import SearchColumns, MathCol, LinkCol, CheckCol, ProcessedCol, MultiProcessedCol
@@ -22,7 +22,6 @@
     WebSmallDirichletGroup,
     WebDBDirichletOrbit
 )
-from lmfdb.characters.ListCharacters import get_character_modulus
 from lmfdb.characters import characters_page
 from lmfdb import db
 
@@ -312,24 +311,6 @@ def dirichlet_character_search(info, query):
 @characters_page.route("/Dirichlet")
 @characters_page.route("/Dirichlet/")
 def render_DirichletNavigation():
-    try:
-        if 'modbrowse' in request.args:
-            arg = request.args['modbrowse']
-            arg = arg.split('-')
-            modulus_start = int(arg[0])
-            modulus_end = int(arg[1])
-            info = {'args': request.args}
-            info['title'] = 'Dirichlet characters of modulus ' + str(modulus_start) + '-' + str(modulus_end)
-            info['bread'] = bread('Modulus')
-            info['learnmore'] = learn()
-            headers, entries, rows, cols = get_character_modulus(modulus_start, modulus_end, limit=8)
-            info['entries'] = entries
-            info['rows'] = list(range(modulus_start, modulus_end + 1))
-            info['cols'] = sorted({r[1] for r in entries})
-            return render_template("ModulusList.html", **info)
-    except (ValueError, IndexError) as err:
-        flash_error("Error raised in parsing: %s", err)
-
     if request.args:
         # hidden_search_type for prev/next buttons
         info = to_dict(request.args, search_array=DirichSearchArray())
@@ -640,8 +621,9 @@ def ctx_dirchar():
 
 
 @characters_page.route('/Dirichlet/random')
+@redirect_no_cache
 def random_Dirichletwebpage():
-    return redirect(url_for('.render_DirichletNavigation', search_type="Random"))
+    return url_for('.render_DirichletNavigation', search_type="Random")
 
 
 @characters_page.route('/Dirichlet/interesting')

lmfdb/characters/templates/CharacterNavigate.html

@@ -12,7 +12,7 @@ <h2> Browse </h2>
 <table class="browse">
   <tr>
     <td>By {{ KNOWL('character.dirichlet.modulus', title="modulus") }}:</td>
-    <td>{% for rnge in info.modulus_list %} <a href="?modbrowse={{rnge}}">{{rnge}}</a>&nbsp;&nbsp; {% endfor %} $\cdots$</td>
+    <td>{% for rnge in info.modulus_list %} <a href="?modulus={{rnge}}">{{rnge}}</a>&nbsp;&nbsp; {% endfor %} $\cdots$</td>
   </tr><tr>
     <td>By {{ KNOWL('character.dirichlet.conductor', title="conductor") }}:</td>
     <td>{% for rnge in info.conductor_list %} <a href="?conductor={{rnge}}">{{rnge}}</a>&nbsp;&nbsp; {% endfor %} $\cdots$</td>

lmfdb/characters/test_characters.py

@@ -31,8 +31,8 @@ def test_even_odd(self):
         assert '>%s</t' % (parity_string(-1)) in W.get_data(as_text=True)
 
     def test_modbrowse(self):
-        W = self.tc.get('/Character/Dirichlet/?modbrowse=41-60')
-        assert 'Dirichlet/45/11' in W.get_data(as_text=True)
+        W = self.tc.get('/Character/Dirichlet/?modulus=41-60')
+        assert '46.d' in W.get_data(as_text=True)
 
     def test_search(self):
         W = self.tc.get('/Character/Dirichlet/?conductor=15&order=4')

lmfdb/elliptic_curves/elliptic_curve.py

@@ -190,7 +190,7 @@ def short_summary(self):
 
     @property
     def summary(self):
-        return r'Currently, the database includes ${}$ {} over $\Q$ in ${}$ {}, with {} at most ${}$.'.format(self.ncurves_c, self.ec_knowl, self.nclasses_c, self.cl_knowl, self.cond_knowl, self.max_N_c)
+        return r'Currently, the database includes {} {} over $\Q$ in {} {}, with {} at most {}.'.format(self.ncurves_c, self.ec_knowl, self.nclasses_c, self.cl_knowl, self.cond_knowl, self.max_N_c)
 
     table = db.ec_curvedata
     baseurl_func = ".rational_elliptic_curves"

lmfdb/galois_groups/main.py

@@ -9,7 +9,7 @@
 from lmfdb import db
 from lmfdb.app import app
 from lmfdb.utils import (
-    list_to_latex_matrix, flash_error, comma, latex_comma, to_dict, display_knowl,
+    list_to_latex_matrix, flash_error, comma, to_dict, display_knowl,
     clean_input, prep_ranges, parse_bool, parse_ints, parse_galgrp,
     SearchArray, TextBox, TextBoxNoEg, YesNoBox, ParityBox, CountBox,
     StatsDisplay, totaler, proportioners, prop_int_pretty, Downloader,
@@ -596,8 +596,8 @@ def __init__(self):
 
     @property
     def summary(self):
-        return r"The database currently contains $%s$ transitive subgroups of $S_n$, including all subgroups (up to conjugacy) for $n \le 47$ and $n \ne 32$.  Among the $2{,}801{,}324$ groups in degree $32$, all those with order less than $512$ or greater than $40{,}000{,}000{,}000$ are included." % latex_comma(self.ngroups)
+        return r"The database currently contains %s transitive subgroups of $S_n$, including all subgroups (up to conjugacy) for $n \le 47$ and $n \ne 32$.  Among the $2{,}801{,}324$ groups in degree $32$, all those with order less than $512$ or greater than $40{,}000{,}000{,}000$ are included." % comma(self.ngroups)
 
     @property
     def short_summary(self):
-        return r'The database current contains $%s$ groups, including all transitive subgroups of $S_n$ (up to conjugacy) for $n \le 47$ and $n \ne 32$.  Here are some <a href="%s">further statistics</a>.' % (latex_comma(self.ngroups), url_for(".statistics"))
+        return r'The database currently contains %s groups, including all transitive subgroups of $S_n$ (up to conjugacy) for $n \le 47$ and $n \ne 32$.  Here are some <a href="%s">further statistics</a>.' % (comma(self.ngroups), url_for(".statistics"))

lmfdb/groups/abstract/main.py

@@ -48,6 +48,7 @@
     pos_int_and_factor,
     sparse_cyclotomic_to_mathml,
     integer_to_mathml,
+    redirect_no_cache,
 )
 from lmfdb.utils.search_parsing import (parse_multiset, search_parser, collapse_ors)
 from lmfdb.utils.interesting import interesting_knowls
@@ -841,11 +842,10 @@ def dynamic_statistics():
 
 
 @abstract_page.route("/random")
+@redirect_no_cache
 def random_abstract_group():
     label = db.gps_groups.random(projection="label")
-    response = make_response(redirect(url_for(".by_label", label=label), 307))
-    response.headers["Cache-Control"] = "no-cache, no-store"
-    return response
+    return url_for(".by_label", label=label)
 
 
 @abstract_page.route("/interesting")