Merge branch 'g2cnew' into g2cnew

Author: roed-math

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

@@ -126,6 +126,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/genus2_curves/main.py

@@ -303,6 +303,8 @@ def render_curve_webpage(label):
     try:
         g2c = WebG2C.by_label(label)
     except (KeyError, ValueError) as err:
+        print("intentially raising error for debugging")
+        raise err
         return abort(404, err.args)
     return render_template(
         "g2c_curve.html",

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/tests/test_utils.py

@@ -400,6 +400,8 @@ def test_complete(self):
                 ("artin_reps", {'GaloisLabel': '8T34', 'Conductor': {'$gte': 1, '$lte': 200}}),
                 ("gps_groups", {'order': {'$gte': 300, '$lte': 600}}),
                 ("ec_curvedata", {'rank': 6}),
+                ("ec_curvedata", {'conductor': 1000000007}),   # prime, but past the 300 million prime conductor bound
+                ("ec_curvedata", {'conductor': {'$in': [1000003, 1000000007]}}),   # all prime, but not all within the bound
                 ("hgcwa_passports", {'genus': 6}),
                 ("av_fq_isog", {'g': 6, 'q': 3}),
                 ("belyi_galmaps", {'deg': 8}),

lmfdb/utils/completeness.py

@@ -805,7 +805,11 @@ class PrimeBound(Bound):
     """
     def __call__(self, db, Ds):
         Ds = [self.cls(D) for D in Ds]
-        return all(D.is_finite() and all(is_prime(p) for p in D) for D in Ds)
+        # The bound is checked first, both because a value outside it is not certified
+        # complete however prime it is, and because it rules out large ranges without
+        # iterating over them.  ``is_finite`` is still needed: the bounds are typically
+        # unbounded below, so passing it does not make the set enumerable.
+        return super().__call__(db, Ds) and all(D.is_finite() and all(is_prime(p) for p in D) for D in Ds)
 
 
 class Smooth(ColTest):

lmfdb/utils/utilities.py

@@ -1,10 +1,8 @@
 import cmath
 import math
 import os
-import random
 import re
 import tempfile
-import time
 from copy import copy
 from itertools import islice
 from types import GeneratorType
@@ -35,7 +33,7 @@
 from sage.misc.functional import round
 from sage.structure.element import Element
 
-from lmfdb.app import app, is_beta, is_debug_mode, _url_source
+from lmfdb.app import is_beta, is_debug_mode, _url_source
 
 
 def integer_divisors(n):
@@ -802,124 +800,6 @@ def flash_success(msg, *args):
     flash(Markup(msg % tuple("<span style='color:black'>%s</span>" % escape(x) for x in args)), "success")
 
 
-################################################################################
-#  Ajax utilities
-################################################################################
-
-# LinkedList is used in Ajax below
-class LinkedList():
-    __slots__ = ('value', 'next', 'timestamp')
-
-    def __init__(self, value, nxt):
-        self.value = value
-        self.next = nxt
-        self.timestamp = time.time()
-
-    def append(self, value):
-        self.next = LinkedList(value, self)
-        return self.next
-
-
-class AjaxPool():
-    def __init__(self, size=1e4, expiration=3600):
-        self._size = size
-        self._key_list = self._head = LinkedList(None, None)
-        self._expiration = expiration
-        self._all = {}
-
-    def get(self, key, value=None):
-        return self._all.get(key, value)
-
-    def __contains__(self, key):
-        return key in self._all
-
-    def __setitem__(self, key, value):
-        self._key_list = self._key_list.append(key)
-        self._all[key] = value
-
-    def __getitem__(self, key):
-        res = self._all[key]
-        self.purge()
-        return res
-
-    def __delitem__(self, key):
-        del self._all[key]
-
-    def pop_key(self):
-        head = self._head
-        if head.next is None:
-            return None
-        else:
-            key = head.value
-            self._head = head.next
-            return key
-
-    def purge(self):
-        if self._size:
-            while len(self._all) > self._size:
-                key = self.pop_key()
-                if key in self._all:
-                    del self._all[key]
-        if self._expiration:
-            oldest = time.time() - self._expiration
-            while self._head.timestamp < oldest:
-                key = self.pop_key()
-                if key in self._all:
-                    del self._all[key]
-
-
-pending = AjaxPool()
-def ajax_url(callback, *args, **kwds):
-    if '_ajax_sticky' in kwds:
-        _ajax_sticky = kwds.pop('_ajax_sticky')
-    else:
-        _ajax_sticky = False
-    if not isinstance(args, tuple):
-        args = args,
-    nonce = hex(random.randint(0, 1 << 128))
-    pending[nonce] = callback, args, kwds, _ajax_sticky
-    return url_for('ajax_result', id=nonce)
-
-
-@app.route('/callback_ajax/<id>')
-def ajax_result(id):
-    if id in pending:
-        f, args, kwds, _ajax_sticky = pending[id]
-        if not _ajax_sticky:
-            del pending[id]
-        return f(*args, **kwds)
-    else:
-        return "<expired>"
-
-
-def ajax_more(callback, *arg_list, **kwds):
-    from .web_display import web_latex
-    inline = kwds.get('inline', True)
-    text = kwds.get('text', 'more')
-    nonce = hex(random.randint(0, 1 << 128))
-    if inline:
-        args = arg_list[0]
-        arg_list = arg_list[1:]
-        if isinstance(args, tuple):
-            res = callback(*arg_list)
-        elif isinstance(args, dict):
-            res = callback(**args)
-        else:
-            res = callback(args)
-        res = web_latex(res)
-    else:
-        res = ''
-    if arg_list:
-        url = ajax_url(ajax_more, callback, *arg_list, inline=True, text=text)
-        return """<span id='%(nonce)s'>%(res)s <a onclick="$('#%(nonce)s').load('%(url)s', function() { renderMathInElement($('#%(nonce)s').get(0),katexOpts);}); return false;" href="#">%(text)s</a></span>""" % locals()
-    else:
-        return res
-
-
-def image_src(G):
-    return ajax_url(image_callback, G, _ajax_sticky=True)
-
-
 def image_callback(G):
     P = G.plot()
     _, filename = tempfile.mkstemp('.png')