Merge pull request #6349 from LMFDB/main

main -> dev

Author: edgarcosta

lmfdb/artin_representations/math_classes.py

@@ -424,7 +424,7 @@ def GaloisLabel(self):
         return self._data['GaloisLabel']
 
     def group(self):
-        n, t = [int(z) for z in self._data['GaloisLabel'].split("T")]
+        n, t = (int(z) for z in self._data['GaloisLabel'].split("T"))
         return group_display_short(n, t)
 
     def pretty_galois_knowl(self):

lmfdb/classical_modular_forms/download.py

@@ -492,13 +492,13 @@ def _magma_MakeCharacters(self, newform, hecke_nf):
             self.explain.append(explain)
             out += [
                 explain,
-                'function MakeCharacter_%d_%s_Hecke(Kf)' % (newform.level, newform.char_orbit_label),
+                'function MakeCharacter_%d_%s_Hecke( : Kf := None)' % (newform.level, newform.char_orbit_label),
                     '    ' + magma.assign('N', level).rstrip('\n'), # level
                     '    ' + magma.assign('order', order).rstrip('\n'), # order of the character
                     '    ' + magma.assign('char_gens', char_gens).rstrip('\n'), # generators
                     '    ' + magma.assign('char_values', char_values).rstrip('\n'), # chi(gens[i]) = zeta_n^exp[i]
                     '    assert UnitGenerators(DirichletGroup(N)) eq char_gens;',
-                    '    values := ConvertToHeckeField(char_values : pass_field := true, Kf := Kf); // the value of chi on the gens as elements in the Hecke field',
+                    '    values := ConvertToHeckeField(char_values : pass_field := ISA(Type(Kf), Fld), Kf := Kf); // the value of chi on the gens as elements in the Hecke field',
                     '    F := Universe(values);// the Hecke field',
                     '    chi := DirichletCharacterFromValuesOnUnitGenerators(DirichletGroup(N,F),values);',
                     '    return chi;',
@@ -557,7 +557,7 @@ def _magma_qexpCoeffs(self, newform, hecke_nf):
             '    ' + magma.assign('weight', newform.weight).rstrip('\n'),
             '    ' + magma.assign('raw_aps', hecke_nf['ap']).rstrip('\n'),
             '    aps := ConvertToHeckeField(raw_aps);',
-            '    chi := MakeCharacter_%d_%s_Hecke(Universe(aps));' % (newform.level, newform.char_orbit_label),
+            '    chi := MakeCharacter_%d_%s_Hecke( : Kf := Universe(aps));' % (newform.level, newform.char_orbit_label),
             '    return ExtendMultiplicatively(weight, aps, chi);',
             'end function;',
             ]

lmfdb/groups/abstract/web_groups.py

@@ -1977,7 +1977,7 @@ def pad(X, m):
                         st_latex += "1"
                     else:
                         st_latex += "0"
-                    if (i+1)%d == 0:
+                    if (i + 1) % d == 0:
                         st_latex += r' \\ '
                     else:
                         st_latex += ' & '

lmfdb/knowledge/knowl.py

@@ -1,10 +1,10 @@
 # the basic knowledge object, with database awareness, …
 
-from datetime import datetime, timedelta
 from collections import defaultdict
-import time
+from datetime import datetime, timedelta
+import re
 import subprocess
-import sys
+import time
 
 from psycodict.base import PostgresBase
 from psycodict import DelayCommit
@@ -17,7 +17,7 @@
 from psycopg2.sql import SQL, Identifier, Placeholder
 from sage.all import cached_function
 
-import re
+
 text_keywords = re.compile(r"\b[a-zA-Z0-9-]{3,}\b")
 top_knowl_re = re.compile(r"(.*)\.top$")
 comment_knowl_re = re.compile(r"(.*)\.(\d+)\.comment$")
@@ -582,11 +582,8 @@ def code_references(self, knowl):
         matches = []
         for kid in kids:
             try:
-                if sys.version_info[0] == 3:
-                    matches.extend(subprocess.check_output(['git', 'grep', '--full-name', '--line-number', '--context', '2', """['"]%s['"]""" % (kid.replace('.',r'\.'))],encoding='utf-8').split('\n--\n'))
-                else:
-                    matches.extend(subprocess.check_output(['git', 'grep', '--full-name', '--line-number', '--context', '2', """['"]%s['"]""" % (kid.replace('.',r'\.'))]).split('\n--\n'))
-            except subprocess.CalledProcessError: # no matches
+                matches.extend(subprocess.check_output(['git', 'grep', '--full-name', '--line-number', '--context', '2', """['"]%s['"]""" % (kid.replace('.',r'\.'))],encoding='utf-8').split('\n--\n'))
+            except subprocess.CalledProcessError:  # no matches
                 pass
         return [self._process_git_grep(match) for match in matches]
 
@@ -600,11 +597,8 @@ def check_sed_safety(self, knowlid):
         - -1 if the knowl is referenced but cannot be safely replaced.
         """
         try:
-            if sys.version_info[0] == 3:
-                matches = subprocess.check_output(['git', 'grep', """['"]%s['"]""" % (knowlid.replace('.',r'\.'))],encoding='utf-8').split('\n')
-            else:
-                matches = subprocess.check_output(['git', 'grep', """['"]%s['"]""" % (knowlid.replace('.',r'\.'))]).split('\n')
-        except subprocess.CalledProcessError: # no matches
+            matches = subprocess.check_output(['git', 'grep', """['"]%s['"]""" % (knowlid.replace('.',r'\.'))],encoding='utf-8').split('\n')
+        except subprocess.CalledProcessError:  # no matches
             return 0
 
         easy_matches = subprocess.check_output(['git', 'grep', knowlid.replace('.',r'\.')],encoding='utf-8').split('\n')
@@ -705,10 +699,7 @@ def broken_links_code(self):
         ids that show up in an expression of the form ``KNOWL('BAD_ID')``.
         """
         all_kids = {k['id'] for k in self.get_all_knowls(['id'])}
-        if sys.version_info[0] == 3:
-            matches = subprocess.check_output(['git', 'grep', '-E', '--full-name', '--line-number', '--context', '2', link_finder_re.pattern],encoding='utf-8').split('\n--\n')
-        else:
-            matches = subprocess.check_output(['git', 'grep', '-E', '--full-name', '--line-number', '--context', '2', link_finder_re.pattern]).split('\n--\n')
+        matches = subprocess.check_output(['git', 'grep', '-E', '--full-name', '--line-number', '--context', '2', link_finder_re.pattern],encoding='utf-8').split('\n--\n')
         results = []
         for match in matches:
             lines = match.split('\n')

lmfdb/lfunctions/main.py

@@ -44,7 +44,7 @@
 from lmfdb.classical_modular_forms.main import set_Trn, process_an_constraints
 from lmfdb.artin_representations.main import parse_artin_label
 from lmfdb.utils.search_parsing import (
-    parse_bool, parse_ints, parse_floats, parse_noop, parse_mod1,
+    parse_bool, parse_ints, parse_ints_to_list, parse_floats, parse_noop, parse_mod1,
     parse_element_of, parse_not_element_of, search_parser)
 from lmfdb.utils import (
     to_dict, signtocolour, rgbtohex, key_for_numerically_sort, display_float,
@@ -349,6 +349,14 @@ def common_parse(info, query):
                  download_col="instance_urls")],
     db_cols=['algebraic', 'analytic_conductor', 'bad_primes', 'central_character', 'conductor', 'degree', 'instance_urls', 'label', 'motivic_weight', 'mu_real', 'mu_imag', 'nu_real_doubled', 'nu_imag', 'order_of_vanishing', 'primitive', 'rational', 'root_analytic_conductor', 'root_angle', 'self_dual', 'z1'])
 
+euler_factor_columns = SearchColumns([
+    MultiProcessedCol("label", "lfunction.label", "Label",
+                         ["label", "url"],
+                         lambda label, url: '<a href="%s">%s</a>' % (url, label),
+                      download_col="label")] +
+    [MathCol("euler%s" % p, "lfunction.euler_factor", r"$F_%s(T)$" % p, default=False) for p in prime_range(100)],
+    db_cols=1)
+
 class LfuncDownload(Downloader):
     table = db.lfunc_search
     def postprocess(self, rec, info, query):
@@ -419,7 +427,8 @@ def parse_euler(inp, query, qfield, p=None, d=None):
              table=db.lfunc_search,
              title="L-function Euler product search",
              err_title="L-function search input error",
-             shortcuts={'jump':jump_box},
+             columns=euler_factor_columns,
+             shortcuts={'jump':jump_box, 'download': LfuncDownload()},
              postprocess=process_euler,
              learnmore=learnmore_list,
              bread=lambda: get_bread(breads=[("Search results", " ")]))
@@ -435,6 +444,8 @@ def euler_search(info, query):
         flash_error("To search on <span style='color:black'>Euler factors</span>, you must specify one <span style='color:black'>degree</span>.")
         info['err'] = ''
         raise ValueError("To search on Euler factors, you must specify one degree")
+    p_range = parse_ints_to_list(info['n'])
+    info["showcol"] = ".".join(["euler%s" % p for p in prime_range(100) if p in p_range])
     for p in prime_range(100):
         parse_euler(info, query, 'euler_constraints', qfield='euler%s' % p, p=p, d=d)
 

lmfdb/local_fields/main.py

@@ -116,6 +116,22 @@ def lf_display_knowl(label, name=None):
 def local_algebra_display_knowl(labels):
     return '<a title = "{0} [lf.algebra.data]" knowl="lf.algebra.data" kwargs="labels={0}">{0}</a>' % (labels)
 
+def eisensteinformlatex(pol, unram):
+    # pol=coeffs,  unram =string
+    R = PolynomialRing(QQ, 'y')
+    Rx = PolynomialRing(R, 'x')
+    unram2 = R(unram.replace('t', 'y'))
+    unram = latex(Rx(unram.replace('t', 'x')))
+    pol = R(pol)
+    l = []
+    while pol != 0:
+        qr = pol.quo_rem(unram2)
+        l.append(qr[1])
+        pol = qr[0]
+    newpol = latex(Rx(l))
+    newpol = newpol.replace('x', '(' + unram + ')')
+    newpol = newpol.replace('y', 'x')
+    return newpol
 
 def plot_polygon(verts, polys, inds, p):
     verts = [tuple(pt) for pt in verts]
@@ -316,6 +332,7 @@ def intcol(j):
         return 'not computed'
     return f'${j}$'
 
+
 lf_columns = SearchColumns([
     LinkCol("label", "lf.field.label", "Label", url_for_label),
     MathCol("n", "lf.degree", "$n$", short_title="degree", default=False),
@@ -460,14 +477,19 @@ def render_field_webpage(args):
         else:
             wild_inertia = 'Not computed'
 
+        if data['f'] == 1 or data['e'] == 1:
+            thepolynomial = raw_typeset(polynomial)
+        else:
+            eform = '$' + eisensteinformlatex(data['coeffs'], data['unram']) + '$'
+            thepolynomial = raw_typeset(polynomial, eform)
         info.update({
-                    'polynomial': raw_typeset(polynomial),
+                    'polynomial': thepolynomial,
                     'n': data['n'],
                     'p': p,
                     'c': data['c'],
                     'e': data['e'],
                     'f': data['f'],
-                    'rf': lf_display_knowl( rflabel, name=printquad(data['rf'], p)),
+                    'rf': lf_display_knowl(rflabel, name=printquad(data['rf'], p)),
                     'base': lf_display_knowl(str(p)+'.1.0.1', name='$%s$' % Qp),
                     'hw': data['hw'],
                     'visible': show_slopes(data['visible']),
@@ -505,7 +527,7 @@ def render_field_webpage(args):
             friends.append(('Discriminant root field', rffriend))
         if data['is_completion']:
             friends.append(('Number fields with this completion',
-                url_for('number_fields.number_field_render_webpage')+"?completions={}".format(label) ))
+                url_for('number_fields.number_field_render_webpage')+"?completions={}".format(label)))
         downloads = [('Underlying data', url_for('.lf_data', label=label))]
 
         bread = get_bread([(label, ' ')])

lmfdb/nfutils/psort.py

@@ -170,7 +170,7 @@ def prime_label(P):
 def prime_from_label(K, lab):
     """Return the prime of K from a label, or 0 is there is no such prime
     """
-    n, j = [ZZ(c) for c in lab.split(".")]
+    n, j = (ZZ(c) for c in lab.split("."))
     p, f = n.factor()[0]
     make_keys(K,p)
     d = K.psort_dict[p]
@@ -316,15 +316,17 @@ def ppower_norm_ideal_key(Q):
     """
     return (Q.norm(), ppower_norm_ideal_index(Q))
 
+
 def ppower_norm_ideal_label(Q):
     r""" return the label of an ideal of prime-power norm.
     """
     return "{}.{}".format(Q.norm(),ppower_norm_ideal_index(Q))
 
+
 def ppower_norm_ideal_from_label(K,lab):
     r""" return the ideal of prime-power norm from its label.
     """
-    n, i = [int(c) for c in lab.split(".")]
+    n, i = (int(c) for c in lab.split("."))
     p, f = ZZ(n).factor()[0]
     make_keys(K,p)
     PP = K.primes_dict[p]
@@ -369,12 +371,14 @@ def ideal_label(I):
     """
     return "{}.{}".format(I.norm(),ideal_norm_index(I))
 
+
 def ideal_from_label(K,lab):
     r""" Return the ideal with a given label.
     """
-    n, j = [int(c) for c in lab.split(".")]
+    n, j = (int(c) for c in lab.split("."))
     return ideals_of_norm(K,ZZ(n))[j-1]
 
+
 def ideals_iterator(K,minnorm=1,maxnorm=Infinity):
     r""" Return an iterator over all ideals of norm n up to maxnorm (sorted).
     """

lmfdb/number_fields/number_field.py

@@ -913,6 +913,10 @@ def number_field_search(info, query):
             opts = multiquad
         if "degree" in info:
             opts = {n: opts[n] for n in integer_options(info["degree"], contained_in=list(opts), lower_bound=1, upper_bound=47) if n in opts}
+        # Catch if signature is specified
+        # We already parsed it, which sets degree to a single value
+        if "signature" in info:
+            opts = {n: opts[n] for n in integer_options(str(query["degree"]), contained_in=list(opts), lower_bound=1, upper_bound=47) if n in opts}
         if "galois_label" in query:
             # Added by parse_galgrp, so we intersect with opts
             if isinstance(query["galois_label"], dict):

lmfdb/users/main.py

@@ -319,7 +319,6 @@ def admin():
 @app.route("/restartserver")
 @admin_required
 def restart():
-    import sys
     from subprocess import Popen, PIPE
     from urllib.parse import urlparse
     urlparts = urlparse(request.url)
@@ -330,14 +329,12 @@ def restart():
     else:
         command = None
     if command:
-        if sys.version_info[0] == 3:
-            out = Popen(command, stdout=PIPE, encoding='utf-8').communicate()[0]
-        else:
-            out = Popen(command, stdout=PIPE).communicate()[0]
+        out = Popen(command, stdout=PIPE, encoding='utf-8').communicate()[0]
         return out.replace('\n', '<br>')
     else:
         return "Only supported in beta.lmfdb.org, prodweb1.lmfdb.xyz, and prodweb2.lmfdb.xyz"
 
+
 class Reviewer(Uploader):
     """
     This uploader is used to collect UploadSection objects from different sections of the LMFDB that use them.
@@ -346,6 +343,7 @@ def __init__(self):
         from lmfdb.modular_curves.upload import Points, PointCompleteness, GonalityBounds, Models, UniversalEC, MultiKnowl
         super().__init__([Points(), PointCompleteness(), GonalityBounds(), Models(), UniversalEC(), MultiKnowl()])
 
+
 @login_page.route("/uploads", methods=["GET", "POST"])
 @login_required
 def review_uploads():