Merge remote-tracking branch 'upstream/main' into ai/t02-ecq-conductor-mult

# Conflicts:
#	lmfdb/tests/test_utils.py
#	lmfdb/utils/completeness.py

Author: roed314

lmfdb/app.py

@@ -788,7 +788,6 @@ def WhiteListedRoutes():
         'alive',
         'api',
         'bigpicture',
-        'callback_ajax',
         'citation',
         'contact',
         'editorial-board',

lmfdb/elliptic_curves/isog_class.py

@@ -175,7 +175,9 @@ def perm(i): return next(c for c in self.curves if c['Cnumber'] == i+1)['lmfdb_n
         if self.cm:
             # set CM field for Properties box.
             D = integer_squarefree_part(ZZ(self.cm))
-            coeffs = [(1-D)//4,-1,1] if D % 4 == 1 else [-D,0,1]
+            # int() everything so that the query list is not a mix of Sage Integers
+            # and Python ints, which psycopg cannot adapt
+            coeffs = [int((1-D)//4),-1,1] if D % 4 == 1 else [int(-D),0,1]
             lab = db.nf_fields.lucky({'coeffs': coeffs}, projection='label')
             self.CMfield = field_pretty(lab)
         else:

lmfdb/elliptic_curves/test_ell_curves.py

@@ -135,6 +135,16 @@ def test_isogeny_class(self):
         L = self.tc.get('/EllipticCurve/Q/11/a/')
         assert '[0, -1, 1, 0, 0]' in L.get_data(as_text=True)
 
+    def test_cm_isogeny_class(self):
+        # The CM field shown in the Properties box is looked up in nf_fields
+        # by coefficient list; this 500ed when that list mixed Sage Integers
+        # with Python ints (see #7129).  27.a and 32.a exercise the two
+        # branches computing the coefficient list.
+        L = self.tc.get('/EllipticCurve/Q/27/a/')
+        assert r'\Q(\sqrt{-3})' in L.get_data(as_text=True)
+        L = self.tc.get('/EllipticCurve/Q/32/a/')
+        assert r'\Q(\sqrt{-1})' in L.get_data(as_text=True)
+
     def test_dl_qexp(self):
         L = self.tc.get('/EllipticCurve/Q/download_qexp/66.c3/100')
         assert '0,1,1,1,1,-4,1,-2,1,1,-4,1,1,4,-2,-4,1,-2,1,0,-4,-2,1,-6,1,11,4,1,-2,10,-4,-8,1,1,-2,8,1,-2,0,4,-4,2,-2,4,1,-4,-6,-2,1,-3,11,-2,4,4,1,-4,-2,0,10,0,-4,-8,-8,-2,1,-16,1,-12,-2,-6,8,2,1,-6,-2,11,0,-2,4,10,-4,1,2,4,-2,8,4,10,1,10,-4,-8,-6,-8,-2,0,1,-2,-3,1,11' in L.get_data(as_text=True)

lmfdb/groups/abstract/main.py

@@ -796,7 +796,12 @@ def index():
         if search_type in legacy_searches:
             endpoint, new_search_type = legacy_searches[search_type]
             args = request.args.to_dict(flat=False)
-            args.pop("search_type", None)
+            # Drop both mode parameters: the destination route encodes the
+            # object type, and SearchWrapper falls back to hst when there is
+            # no explicit search_type, so a stale hidden hst would otherwise
+            # override the mode we just resolved.
+            for key in ("search_type", "hst"):
+                args.pop(key, None)
             if new_search_type is not None:
                 args["search_type"] = [new_search_type]
             return redirect(url_for(endpoint, **args), 307)

lmfdb/groups/abstract/test_browse_page.py

@@ -19,7 +19,9 @@ def test_index_page(self):
     def test_legacy_search_urls(self):
         r"""
         Check that old search URLs redirect to the new landing pages without
-        dropping their filters.
+        dropping their filters.  The hidden hst field records the previous
+        search mode, so it must not survive the redirect: SearchWrapper falls
+        back to hst when there is no explicit search_type.
         """
         cases = [
             ("/Groups/Abstract/?search_type=Subgroups&ambient=128.207",
@@ -34,11 +36,25 @@ def test_legacy_search_urls(self):
              {"dim": ["3"], "search_type": ["RandomComplexCharacter"]}),
             ("/Groups/Abstract/?search_type=ConjugacyClasses&group=12.4",
              "/Groups/Abstract/ConjugacyClasses", {"group": ["12.4"]}),
+            # The legacy mode may only be present in the hidden hst field.
+            ("/Groups/Abstract/?hst=Subgroups&ambient=128.207",
+             "/Groups/Abstract/Subgroups", {"ambient": ["128.207"]}),
+            ("/Groups/Abstract/?hst=RandomSubgroup&ambient=128.207",
+             "/Groups/Abstract/Subgroups",
+             {"ambient": ["128.207"], "search_type": ["RandomSubgroup"]}),
+            # An explicit search_type must keep winning over a stale hst.
+            ("/Groups/Abstract/?search_type=Subgroups&hst=RandomSubgroup&ambient=128.207",
+             "/Groups/Abstract/Subgroups", {"ambient": ["128.207"]}),
+            ("/Groups/Abstract/?search_type=ComplexCharacters&hst=RandomComplexCharacter&dim=3",
+             "/Groups/Abstract/ComplexCharacters", {"dim": ["3"]}),
+            # Repeated values of a non-routing parameter are preserved.
+            ("/Groups/Abstract/?search_type=Subgroups&order=8&order=16",
+             "/Groups/Abstract/Subgroups", {"order": ["8", "16"]}),
         ]
         for source, expected_path, expected_query in cases:
             response = self.tc.get(source)
-            target = urlsplit(response.location)
             assert response.status_code == 307
+            target = urlsplit(response.location)
             assert target.path == expected_path
             assert parse_qs(target.query) == expected_query
 

lmfdb/modular_curves/test_modular_curves.py

@@ -135,6 +135,9 @@ def test_cusp_orbits(self):
         assert "Cusp orbits" in L.get_data(as_text=True)
         assert r"$8^{6}\cdot16^{3}$" in L.get_data(as_text=True)
 
+        L = self.tc.get("/ModularCurve/Q/17.136.6.a.1", follow_redirects=True)
+        assert r"$8^{1}$" in L.get_data(as_text=True)
+
     def test_modcrv_label(self):
         L = self.tc.get("/ModularCurve/Q/48.576.21-48.bqz.1.2",follow_redirects=True)
         assert "Cummins and Pauli (CP) label" in L.get_data(as_text=True)

lmfdb/modular_curves/web_curve.py

@@ -39,8 +39,8 @@ def get_bread(tail=[]):
         tail = [(tail, " ")]
     return base + tail
 
-def showexp(c, wrap=True):
-    if c == 1:
+def showexp(c, wrap=True, include_one=False):
+    if c == 1 and not include_one:
         return ""
     elif wrap:
         return f"$^{{{c}}}$"
@@ -543,7 +543,7 @@ def cusp_widths_display(self):
     def cusp_orbits_display(self):
         if not self.cusp_orbits:
             return ""
-        return "$" + r"\cdot".join(f"{w}{showexp(n, wrap=False)}" for w, n in self.cusp_orbits) + "$"
+        return "$" + r"\cdot".join(f"{w}{showexp(n, wrap=False, include_one=True)}" for w, n in self.cusp_orbits) + "$"
 
     @lazy_attribute
     def cm_discriminant_list(self):

lmfdb/tests/generate_snippet_tests.py

@@ -39,6 +39,16 @@
 comment_dict = {'magma': '//', 'sage': '#', 'sage_gap': '#',
                          'gp': '\\\\', 'pari': '\\\\', 'oscar': '#', 'gap': '#'}
 
+# To ensure output is fully deterministic and the log files don't change between runs,
+# we set the random seed to 1 before each test run
+SEED = 1
+seed_dict = {'sage': f'set_random_seed({SEED}); gap.set_seed({SEED}); libgap.set_seed({SEED})',
+             'sage_gap': f'set_random_seed({SEED}); gap.set_seed({SEED}); libgap.set_seed({SEED})',
+             'magma': f'SetSeed({SEED});',
+             'oscar': f'import Random; Random.seed!({SEED}); Oscar.set_seed!({SEED}); Oscar.randseed!({SEED});',
+             'gap': f'Reset(GlobalMersenneTwister, {SEED}); Reset(GlobalRandomSource, {SEED});',
+             'gp': f'setrand({SEED});',
+             }
 
 def _setup_test_dir(yaml_file_path=None):
     """ Return dictionary with pair(s) 'yaml-file-path': 'test-file-path'.
@@ -55,7 +65,8 @@ def _setup_test_dir(yaml_file_path=None):
         raise Exception("Please run in same directory as test.sh")
 
     if yaml_file_path is None:
-        code_paths = lmfdb_dir.rglob("code*.yaml")
+        # Ensure snippet files are evaluated in the same order every time (for deterministic output)
+        code_paths = sorted(lmfdb_dir.rglob("code*.yaml"))
     else:
         code_paths = [Path(yaml_file_path)]
         assert code_paths[0].exists(), f"Specified path {yaml_file_path} does not exist"
@@ -150,6 +161,16 @@ def _eval_code_file(data, lang, proc, logfile):
     """
     cmt = comment_dict[lang]
     lines = [l for l in data.splitlines() if l != '' and cmt not in l[:len(cmt)+1]]
+
+    # Reset the random state before every snippet file (to ensure log files are generated deterministically)
+    seed_cmd = seed_dict.get(lang)
+    if seed_cmd is not None:
+        try:
+            proc.run_command(seed_cmd, timeout=60)
+        except Exception as exc:
+            # Raise error if unable to set the random seed
+            raise RuntimeError(f"Error: could not reset random state in {lang} with {seed_cmd!r}") from exc
+
     with logfile.open('w') as f:
         proc.child.logfile = f
         proc.run_command(cmt + " snippet evaluation file generated by generate_snippet_tests.py")
@@ -160,6 +181,8 @@ def _eval_code_file(data, lang, proc, logfile):
                 print("Timeout while running line:")
                 print(line)
 
+    proc.child.logfile = None
+
     # Matches ANSI escape sequences (colour codes etc.), see e.g. https://en.wikipedia.org/wiki/ANSI_escape_code
     # E.g. this sometimes occurs in the Gap snippet log files
     ANSI_ESCAPE_RE = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')

lmfdb/tests/snippet_tests/ecnf/code-81.1-CMa1-oscar.log

@@ -12,7 +12,8 @@ with equation
 julia> conductor(E)
 Ideal of maximal order of number field of degree 2 over QQ
   of norm 81
-with 9-normal generators [81, 9*_a - 9]
+  of minimum 9
+with 3-normal generators [9, 9*_a - 9]
 
 julia> norm(conductor(E))
 81

lmfdb/tests/snippet_tests/elliptic_curves/code-37.a1-magma.log

@@ -9,13 +9,13 @@ Mapping from: Abelian Group isomorphic to Z
 Defined on 1 generator (free) to Set of points of E with coordinates in Rational Field given by a rule [no inverse]
 true true
 magma> Generators(E);
-[ (0 : -1 : 1) ]
+[ (0 : 0 : 1) ]
 true true
 magma> TorsionSubgroup(E);
 Abelian Group of order 1
 magma> IntegralPoints(E);
-[ (-1 : 0 : 1), (0 : -1 : 1), (1 : -1 : 1), (2 : 2 : 1), (6 : -15 : 1) ]
-[ <(-1 : 0 : 1), 1>, <(0 : -1 : 1), 1>, <(1 : -1 : 1), 1>, <(2 : 2 : 1), 1>, <(6 : -15 : 1), 1> ]
+[ (-1 : -1 : 1), (0 : 0 : 1), (1 : 0 : 1), (2 : -3 : 1), (6 : 14 : 1) ]
+[ <(-1 : -1 : 1), 1>, <(0 : 0 : 1), 1>, <(1 : 0 : 1), 1>, <(2 : -3 : 1), 1>, <(6 : 14 : 1), 1> ]
 magma> Conductor(E);
 37
 magma> Discriminant(E);
@@ -42,7 +42,7 @@ magma> Order(TorsionSubgroup(E));
 1
 magma> MordellWeilShaInformation(E);
 [ 1, 1 ]
-[ (0 : -1 : 1) ]
+[ (0 : 0 : 1) ]
 [
 <2, [ 0, 0 ]>
 ]