Merge branch 'main' into copilot/fix-6652

Author: edgarcosta

lmfdb/api/api.py

@@ -6,7 +6,7 @@
 from psycopg2.extensions import QueryCanceledError
 from lmfdb import db
 from psycodict.encoding import Json
-from lmfdb.utils import flash_error
+from lmfdb.utils import flash_error, comma
 from lmfdb.utils.datetime_utils import utc_now_naive
 from flask import (render_template, request, url_for, current_app,
                    abort, redirect, Response)
@@ -137,11 +137,11 @@ def split_db(tablename):
                 'tablespace': tablespaces.get(tablename, ""),
             }
     dataSize = size - indexSize
-    info['ntables'] = len(table_sizes)
-    info['nobjects'] = nobjects
-    info['size'] = mb(size)
-    info['dataSize'] = mb(dataSize)
-    info['indexSize'] = mb(indexSize)
+    info['ntables'] = comma(len(table_sizes))
+    info['nobjects'] = comma(nobjects)
+    info['size'] = comma(mb(size))
+    info['dataSize'] = comma(mb(dataSize))
+    info['indexSize'] = comma(mb(indexSize))
     if info['sortby'] == 'name':
         sortedkeys = sorted(stats)
     elif info['sortby'] == 'objects' and info['groupby'] == 'db':

lmfdb/app.py

@@ -719,6 +719,7 @@ def WhiteListedRoutes():
         'Character/calc-jacobi/Dirichlet',
         'Character/calc-kloosterman/Dirichlet',
         'Character/calc-value/Dirichlet',
+        'datasets',
         'EllipticCurve',
         'Field',
         'GaloisGroup',
@@ -774,6 +775,7 @@ def WhiteListedRoutes():
         'news',
         'not_yet_implemented',
         'random',
+        'rcs',
         'robots.txt',
         'search',
         'sitemap',

lmfdb/artin_representations/main.py

@@ -245,9 +245,11 @@ def artin_postprocess(res, info, query):
     cache = knowl_cache(gp_labels)
     return [ArtinRepresentation(data=x, knowl_cache=cache) for x in res]
 
+
 class ArtinDownload(Downloader):
     table = db.artin_reps
     title = "Artin representations"
+
     def modify_query(self, info, query):
         query['Hide'] = 0
 

lmfdb/characters/utils.py

@@ -53,13 +53,13 @@ def url_character(**kwargs):
         return url_for('characters.render_characterNavigation')
     elif kwargs['type'] == 'Dirichlet':
         del kwargs['type']
-        if kwargs.get('calc',None):
+        if kwargs.get('calc'):
             return url_for('characters.dc_calc',**kwargs)
         else:
             return url_for('characters.render_Dirichletwebpage',**kwargs)
     elif kwargs['type'] == 'Hecke':
         del kwargs['type']
-        if kwargs.get('calc',None):
+        if kwargs.get('calc'):
             return url_for('characters.hc_calc',**kwargs)
         else:
             return url_for('characters.render_Heckewebpage',**kwargs)

lmfdb/characters/web_character.py

@@ -96,10 +96,10 @@ def valuefield_from_order(order):
 class WebCharObject():
     """ class for all characters and character groups """
     def __init__(self, **args):
-        self.type = args.get('type',None)
-        self.nflabel = args.get('number_field',None)
-        self.modlabel = args.get('modulus',None)
-        self.numlabel = args.get('number',None)
+        self.type = args.get('type')
+        self.nflabel = args.get('number_field')
+        self.modlabel = args.get('modulus')
+        self.numlabel = args.get('number')
         self.args = args
 
         self._compute()
@@ -558,14 +558,14 @@ class WebDBDirichlet(WebDirichlet):
     """
     def __init__(self, **kwargs):
         self.type = "Dirichlet"
-        self.modulus = kwargs.get('modulus', None)
+        self.modulus = kwargs.get('modulus')
         if self.modulus:
             self.modulus = int(self.modulus)
         self.modlabel = self.modulus
         if self.modulus == 1:
             self.number = 1
         else:
-            self.number = kwargs.get('number', None)
+            self.number = kwargs.get('number')
             if self.number:
                 self.number = int(self.number)
         self.numlabel = self.number
@@ -1108,11 +1108,11 @@ class WebDBDirichletOrbit(WebChar, WebDBDirichlet):
     def __init__(self, **kwargs):
         self.type = "Dirichlet"
         self.isorbit = True
-        self.modulus = kwargs.get('modulus', None)
+        self.modulus = kwargs.get('modulus')
         if self.modulus:
             self.modulus = int(self.modulus)
         self.modlabel = self.modulus
-        self.number = kwargs.get('number', None)
+        self.number = kwargs.get('number')
         if self.number:
             self.number = int(self.number)
         self.numlabel = self.number
@@ -1122,7 +1122,7 @@ def __init__(self, **kwargs):
             if self.number:
                 self.chi = ConreyCharacter(self.modulus, self.number)
         self.codelangs = ('pari', 'sage')
-        self.orbit_label = kwargs.get('orbit_label', None)  # this is what the user inserted, so might be banana
+        self.orbit_label = kwargs.get('orbit_label')  # this is what the user inserted, so might be banana
         self.label = "{}.{}".format(self.modulus, self.orbit_label)
         self.maxrows = 30
         self.rowtruncate = False

lmfdb/classical_modular_forms/code-form.yaml

@@ -43,23 +43,35 @@ dimensions-spaces:
     mfdim([N,k,chi],1) \\ Cusps
     mfdim([N,k,chi],0) \\ New
 
-initialize-newspace:
+initialize-newspace-common: &initialize-newspace-common
   comment: Compute space of new eigenforms
   pari: |
     [N,k,chi] = [{N},{k},Mod({conrey_index},{N})]
     mf = mfinit([N,k,chi],0)
     lf = mfeigenbasis(mf)
-  sage: |
-    from sage.modular.dirichlet import DirichletCharacter
-    H = DirichletGroup({N}, base_ring=CyclotomicField({sage_zeta_order}))
-    chi = DirichletCharacter(H, H._module({sage_genvalues}))
-    N = Newforms(chi, {k}, names="a")
   magma: |
     //Please install CHIMP (https://github.com/edgarcosta/CHIMP) if you want to run this code
     chi := DirichletCharacter("{N}.{conrey_index}");
     S:= CuspForms(chi, {k});
     N := Newforms(S);
 
+initialize-newspace-weight-1:
+  <<: *initialize-newspace-common
+  sage: |
+    from sage.modular.dirichlet import DirichletCharacter
+    H = DirichletGroup({N}, base_ring=CyclotomicField({sage_zeta_order}))
+    chi = DirichletCharacter(H, H._module({sage_genvalues}))
+    B = ModularForms(chi, 1).cuspidal_submodule().basis()
+    N = [B[i] for i in range(len(B))]
+
+initialize-newspace-weight-not-1:
+  <<: *initialize-newspace-common
+  sage: |
+    from sage.modular.dirichlet import DirichletCharacter
+    H = DirichletGroup({N}, base_ring=CyclotomicField({sage_zeta_order}))
+    chi = DirichletCharacter(H, H._module({sage_genvalues}))
+    N = Newforms(chi, {k}, names="a") 
+
 coeff-field:
   comment: Coefficient field, relative polynomial
   pari: |

lmfdb/classical_modular_forms/main.py

@@ -306,6 +306,33 @@ def parse_prec(info):
     return []
 
 
+def validate_format_parameter(format_param):
+    """
+    Validate the format parameter for newform display.
+
+    Args:
+        format_param: The format parameter to validate
+
+    Returns:
+        str: validated format parameter (defaults to 'embed' if None or invalid)
+
+    Side effects:
+        Flashes error message if format parameter is invalid
+    """
+    valid_formats = ['embed', 'analytic_embed', 'satake', 'satake_angle']
+
+    # Default to 'embed' if format is None
+    if format_param is None:
+        return 'embed'
+
+    # Check if format is valid
+    if format_param not in valid_formats:
+        flash_error("Invalid format parameter '%s'. Valid formats are: %s" % (format_param, ', '.join(valid_formats)))
+        format_param = 'embed'
+
+    return format_param
+
+
 def eta_quotient_texstring(etadata):
     r"""
     Returns a latex string representing an eta quotient.
@@ -357,7 +384,9 @@ def render_newform_webpage(label):
 
     info = to_dict(request.args)
     info['display_float'] = display_float
-    info['format'] = info.get('format', 'embed')
+
+    # Validate format parameter
+    info['format'] = validate_format_parameter(info.get('format'))
 
     if label in ETAQUOTIENTS:
         info['eta_quotient'] = eta_quotient_texstring(ETAQUOTIENTS[label])

lmfdb/classical_modular_forms/templates/cmf_newform_common.html

@@ -7,7 +7,11 @@
 
 <h2> {{KNOWL('cmf.newspace',title='Newspace')}} parameters </h2>
 
-{{ place_code('initialize-newspace')}}
+{% if newform.weight == 1 %}
+{{ place_code('initialize-newspace-weight-1')}}
+{% else %}
+{{ place_code('initialize-newspace-weight-not-1')}}
+{% endif %}
 
 <table>
   <tr>

lmfdb/classical_modular_forms/test_cmf.py

@@ -655,3 +655,29 @@ def test_character_values(self):
 </table>
 """
         assert (character_values_table in data)
+
+    def test_invalid_format_parameter(self):
+        """Test that invalid format parameters are handled gracefully"""
+        # Test invalid format 'txt' which was causing the original issue
+        page = self.tc.get('/ModularForm/GL2/Q/holomorphic/441/4/a/h/?format=txt')
+        data = page.get_data(as_text=True)
+        assert "Invalid format parameter" in data
+        assert "txt" in data
+        assert "Valid formats are:" in data
+
+        # Test another invalid format
+        page = self.tc.get('/ModularForm/GL2/Q/holomorphic/11/2/a/a/?format=invalid')
+        data = page.get_data(as_text=True)
+        assert "Invalid format parameter" in data
+        assert "invalid" in data
+
+        # Test that valid formats still work
+        page = self.tc.get('/ModularForm/GL2/Q/holomorphic/11/2/a/a/?format=embed')
+        data = page.get_data(as_text=True)
+        assert "Valid formats are:" not in data
+        assert "Invalid format parameter" not in data
+
+        page = self.tc.get('/ModularForm/GL2/Q/holomorphic/11/2/a/a/?format=satake')
+        data = page.get_data(as_text=True)
+        assert "Valid formats are:" not in data
+        assert "Invalid format parameter" not in data

lmfdb/ecnf/templates/ecnf-isoclass.html

@@ -41,30 +41,6 @@ <h2>  Base field   {{ cl.field.knowl()|safe }} </h2>
     {{ place_code('field', is_top_snippet=True) }}
 </div>
 
-<h2>Elliptic curves in class {{cl.short_class_label}} over   {{ cl.field_knowl|safe }}</h2>
-<p>
-Isogeny class {{cl.short_class_label}} contains
-{% if cl.class_size==1 %}
-only one elliptic curve.
-{% else %}
-{{cl.class_size}} curves linked by isogenies of
-{% if cl.one_deg %}degree {% else %}degrees dividing {% endif %}
-{{cl.class_deg}}.
-{% endif %}
-</p>
-<table>
-<tr>
-<th>{{ KNOWL('ec.curve_label',title = "Curve label") }}</th>
-<th>{{ KNOWL('ec.weierstrass_coeffs',  title='Weierstrass Coefficients') }}</th>
-</tr>
-{% for c in cl.curves %}
-<tr>
-<td> <a href={{c[1]}}>{{c[0]}}</a>
-<td> <a href={{c[1]}}>{{c[2]}}</a>
-</tr>
-{% endfor %}
-</table>
-
 <h2>{{ KNOWL('ec.rank',title='Rank') }}</h2>
 
 {% if cl.rk == "?" %}
@@ -97,6 +73,30 @@ <h2>{{ KNOWL('ec.isogeny_graph',title='Isogeny graph') }}</h2>
 <p>Not available.</p>
 {% endif %}
 
+<h2>Elliptic curves in class {{cl.short_class_label}} over   {{ cl.field_knowl|safe }}</h2>
+<p>
+Isogeny class {{cl.short_class_label}} contains
+{% if cl.class_size==1 %}
+only one elliptic curve.
+{% else %}
+{{cl.class_size}} curves linked by isogenies of
+{% if cl.one_deg %}degree {% else %}degrees dividing {% endif %}
+{{cl.class_deg}}.
+{% endif %}
+</p>
+<table>
+<tr>
+<th>{{ KNOWL('ec.curve_label',title = "Curve label") }}</th>
+<th>{{ KNOWL('ec.weierstrass_coeffs',  title='Weierstrass Coefficients') }}</th>
+</tr>
+{% for c in cl.curves %}
+<tr>
+<td> <a href={{c[1]}}>{{c[0]}}</a>
+<td> <a href={{c[1]}}>{{c[2]}}</a>
+</tr>
+{% endfor %}
+</table>
+
 {% if DEBUG %}
 <hr>
 <div>