Merge pull request #6727 from LMFDB/main

main -> web

Author: roed314

lmfdb/app.py

@@ -410,7 +410,6 @@ def statshealth():
     else:
         abort(503)
 
-
 @app.route("/info")
 def info():
     output = ""

lmfdb/knowledge/knowl.py

@@ -53,7 +53,7 @@
 # We need to convert knowl
 link_finder_re = re.compile(r"""(KNOWL(_INC)?\(|kid\s*=|knowl\s*=|th_wrap\s*\()\s*['"]([^'"]+)['"]|""")
 define_fixer = re.compile(r"""\{\{\s*KNOWL(_INC)?\s*\(\s*['"]([^'"]+)['"]\s*,\s*(title\s*=\s*)?([']([^']+)[']|["]([^"]+)["]\s*)\)\s*\}\}""")
-defines_finder_re = re.compile(r"""\*\*([^\*]+)\*\*""")
+defines_finder_re = re.compile(r"""\*\*([^\*]+)\*\*|\{\{\s*DEFINES\s*\(\s*['"]([^'"]+)['"]""")
 # this one is different from the hashtag regex in main.py,
 # because of the match-group ( ... )
 hashtag_keywords = re.compile(r'#[a-zA-Z][a-zA-Z0-9-_]{1,}\b')
@@ -131,7 +131,7 @@ def normalize_define(term):
 
 
 def extract_defines(content):
-    return sorted({x.strip() for x in defines_finder_re.findall(content)})
+    return sorted({(x or y).strip() for x,y in defines_finder_re.findall(content)})
 
 # We don't use the PostgresTable from psycodict.database
 # since it's aimed at constructing queries for mathematical objects
@@ -790,6 +790,79 @@ def knowl_title(kid):
 def knowl_exists(kid):
     return knowldb.knowl_exists(kid)
 
+def external_definition_link(site, xid):
+    if xid.count("@") == 1:
+        xid, fragment = xid.split("@")
+    else:
+        fragment = None
+    # If you add options here, you also need to update the knowl lmfdb.external_definitions
+    if site == "arxiv":
+        # example xid="1809.10195"
+        return f"https://arxiv.org/abs/{xid}", f"arXiv:{xid}", fragment
+    if site == "doi":
+        # example xid="10.2140/obs.2019.2.393"
+        return f"https://doi.org/{xid}", xid, fragment
+    if site == "groupprops":
+        # example xid="Alternating_group"
+        return f"https://groupprops.subwiki.org/wiki/{xid}", "groupprops:" + xid, fragment
+    if site == "href":
+        # href contains both the link and text for displaying
+        if not xid or xid[0] != "{" or xid[-1] != "}" or xid.count("}{") != 1:
+            raise ValueError("Improperly formated href")
+        url, disp = xid[1:-1].split("}{")
+        return url.strip(), disp, fragment
+    if site == "mathlib":
+        # example xid="NumberTheory/ModularForms/Basic.html#UpperHalfPlane.J"
+        if "#" in xid:
+            disp = "mathlib:" + xid.split("#")[-1]
+        else:
+            disp = "mathlib:" + xid
+        return f"https://leanprover-community.github.io/mathlib4_docs/Mathlib/{xid}", disp, fragment
+    if site == "mathworld":
+        # example xid=HeckeOperator
+        return f"https://mathworld.wolfram.com/{xid}.html", "mathworld:" + xid, fragment
+    if site == "mr":
+        # example xid="0439848"
+        return f"https://www.ams.org/mathscinet-getitem?mr={xid}", "MR:" + xid, fragment
+    if site == "nlab":
+        # example xid="number field"
+        return f"https://ncatlab.org/nlab/show/{xid}", "nlab:" + xid, fragment
+    if site == "stacks":
+        # example xid="020C"
+        return f"https://stacks.math.columbia.edu/tag/{xid}", "stacks:" + xid, fragment
+    if site == "wikidata":
+        # example xid="Q83478"
+        return f"https://www.wikidata.org/wiki/{xid}", "wikidata:" + xid, fragment
+    if site == "wikipedia":
+        # example xid="Group_(mathematics)"
+        return f"https://en.wikipedia.org/wiki/{xid}", "wiki:" + xid, fragment
+    if site == "zbl":
+        # example="0339.14028"
+        return f"https://zbmath.org/?q={xid}", "zbl:" + xid, fragment
+    raise ValueError("Unknown external site")
+
+def knowl_definition(title,
+                     clarification_kid=None,
+                     kwargs={}):
+    from lmfdb.utils.web_display import display_knowl
+    if clarification_kid is None:
+        if not kwargs:
+            return f"<strong>{title}</strong>"
+        if len(kwargs) == 1:
+            try:
+                site, xid = list(kwargs.items())[0]
+                url, disp, fragment = external_definition_link(site, xid)
+                link = f'<a href="{url}"><strong>{title}</strong></a>'
+                if fragment:
+                    link += f" ({fragment})"
+                return link
+            except ValueError:
+                pass
+        return display_knowl("lmfdb.external_definitions", title, kwargs=kwargs, strong=True)
+    else:
+        return display_knowl(clarification_kid, title, strong=True)
+
+
 @cached_function
 def knowl_url_prefix():
     """

lmfdb/knowledge/main.py

@@ -23,7 +23,7 @@
                    request, url_for)
 from markupsafe import Markup
 from flask_login import login_required, current_user
-from .knowl import Knowl, knowldb, knowl_title, knowl_exists, knowl_url_prefix, utc_now_naive
+from .knowl import Knowl, knowldb, knowl_title, knowl_exists, knowl_url_prefix, knowl_definition, external_definition_link, utc_now_naive
 from lmfdb.users import admin_required, knowl_reviewer_required
 from lmfdb.users.pwdmanager import userdb
 from lmfdb.utils import to_dict, code_snippet_knowl
@@ -170,47 +170,33 @@ def ref_to_link(txt):
     thecite = thecite.replace("\\", "")  # \href --> href
 
     refs = thecite.split(",")
-    ans = ""
+    ans = []
 
     # print "refs",refs
 
     for ref in refs:
         ref = ref.strip()    # because \cite{A, B, C,D} can have spaces
-        this_link = ""
-        if ref.startswith("href"):
-            the_link = re.sub(r".*{([^}]+)}{.*", r"\1", ref)
-            click_on = re.sub(r".*}{([^}]+)}\s*", r"\1", ref)
-            this_link = '{{ LINK_EXT("' + click_on + '","' + the_link + '") | safe}}'
-        elif ref.startswith("doi"):
-            ref = ref.replace(":", "")  # could be doi:: or doi: or doi
-            the_doi = ref[3:]    # remove the "doi"
-            this_link = '{{ LINK_EXT("DOI:' + the_doi + '","https://doi.org/' + the_doi + '")| safe }}'
-        elif ref.lower().startswith("mr"):
-            ref = ref.replace(":", "")
-            the_mr = ref[2:]    # remove the "MR"
-            this_link = '{{ LINK_EXT("MR:' + the_mr + '", '
-            this_link += '"https://mathscinet.ams.org/mathscinet-getitem?mr='
-            this_link += the_mr + '") | safe}}'
-        elif ref.lower().startswith("arxiv"):
-            ref = ref.replace(":", "")
-            the_arx = ref[5:]    # remove the "arXiv"
-            this_link = '{{ LINK_EXT("arXiv:' + the_arx + '", '
-            this_link += '"https://arxiv.org/abs/'
-            this_link += the_arx + '")| safe}}'
-        elif ref.lower().startswith("zbl"):
-            ref = ref.replace(":", "")
-            the_zbl = ref[3:]    # remove the "Zbl"
-            this_link = '{{ LINK_EXT("Zbl:' + the_zbl + '", '
-            this_link += '"https://zbmath.org/?q=an:'
-            this_link += the_zbl + '")| safe}}'
-
-        if this_link:
-            if ans:
-                ans += ", "
-            ans += this_link
-
-    return '[' + ans + ']' + everythingelse
-
+        # Special case for href (no colon by design) and for MR (no colon in many existing cases)
+        for site in ["href", "mr"]:
+            if ref.lower().startswith(site):
+                xid = ref[len(site):].lstrip(":")
+                break
+        else:
+            pieces = ref.split(":")
+            if len(pieces) != 2:
+                # Improperly formatted ref
+                continue
+            site, xid = pieces
+            site = site.lower()
+        try:
+            url, disp, fragment = external_definition_link(site, xid)
+        except ValueError:
+            continue
+        link = f'{{{{ LINK_EXT("{disp}", "{url}") | safe}}}}'
+        if fragment:
+            link += f" ({fragment})"
+        ans.append(link)
+    return "[" + ", ".join(ans) + "]" + everythingelse
 
 def md_latex_accents(text):
     r"""
@@ -249,7 +235,12 @@ def md_preprocess(text):
 
 @app.context_processor
 def ctx_knowledge():
-    return {'Knowl': Knowl, 'knowl_title': knowl_title, 'knowl_url_prefix': knowl_url_prefix, "KNOWL_EXISTS": knowl_exists}
+    return {'Knowl': Knowl,
+            'knowl_title': knowl_title,
+            'knowl_url_prefix': knowl_url_prefix,
+            "KNOWL_EXISTS": knowl_exists,
+            "knowl_definition": knowl_definition,
+            "external_definition_link": external_definition_link}
 
 
 @app.template_filter("render_knowl")
@@ -263,6 +254,7 @@ def render_knowl_in_template(knowl_content, **kwargs):
   {%% from "knowl-defs.html" import KNOWL with context %%}
   {%% from "knowl-defs.html" import KNOWL_LINK with context %%}
   {%% from "knowl-defs.html" import KNOWL_INC with context %%}
+  {%% from "knowl-defs.html" import DEFINES with context %%}
   {%% from "knowl-defs.html" import TEXT_DATA with context %%}
   {%% from "knowl-defs.html" import LINK_EXT with context %%}
 
@@ -799,6 +791,7 @@ def render_knowl(ID, footer=None, kwargs=None,
   {%% from "knowl-defs.html" import KNOWL with context %%}
   {%% from "knowl-defs.html" import KNOWL_LINK with context %%}
   {%% from "knowl-defs.html" import KNOWL_INC with context %%}
+  {%% from "knowl-defs.html" import DEFINES with context %%}
   {%% from "knowl-defs.html" import TEXT_DATA with context %%}
   {%% from "knowl-defs.html" import LINK_EXT with context %%}