Skip to content

Catch errors in completeness framework #6879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndrewVSutherland merged 2 commits into from
Feb 22, 2026
+38 −31
Merged

Catch errors in completeness framework #6879

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8b1580
Catch errors in completeness framework
roed314 Feb 14, 2026
a3f18f0
Log using app.logger
roed314 Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 38 additions & 31 deletions lmfdb/utils/search_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from sage.misc.decorators import decorator_keywords
from sage.misc.cachefunc import cached_function

from lmfdb.app import ctx_proc_userdata, is_debug_mode
from lmfdb.app import app, ctx_proc_userdata, is_debug_mode
from lmfdb.utils.search_parsing import parse_start, parse_count, SearchParsingError
from lmfdb.utils.utilities import flash_error, flash_info, flash_success, to_dict
from lmfdb.utils.completeness import results_complete
Expand Down Expand Up @@ -271,36 +271,43 @@ def __call__(self, info):
# Display warning message if user searched on column(s) with null values
if query:
nulls = table.stats.null_counts()
complete, msg, caveat = results_complete(table.search_table, query, table._db, info.get("search_array"))
if complete:
flash_success("The results below are complete, since the LMFDB contains all " + msg)
elif nulls: # TODO: We already run a version of this inside results_complete. Should be combined
search_columns = table._columns_searched(query)
nulls = {col: cnt for col, cnt in nulls.items() if col in search_columns}
col_display = {}
if "search_array" in info:
for row in info["search_array"].refine_array:
if isinstance(row, (list, tuple)):
for item in row:
if hasattr(item, "name") and hasattr(item, "label"):
col_display[item.name] = item.label
for col, cnt in list(nulls.items()):
override = info["search_array"].null_column_explanations.get(col)
if override is False:
del nulls[col]
elif override:
nulls[col] = override
else:
nulls[col] = f"{col_display.get(col, col)} ({cnt} objects)"
else:
for col, cnt in list(nulls.items()):
nulls[col] = f"{col} ({cnt} objects)"
if nulls:
msg = 'Search results may be incomplete due to <a href="Completeness">uncomputed quantities</a>: '
msg += ", ".join(nulls.values())
flash_info(msg)
if caveat:
flash_info("The completeness " + caveat)
try:
complete, msg, caveat = results_complete(table.search_table, query, table._db, info.get("search_array"))
if complete:
flash_success("The results below are complete, since the LMFDB contains all " + msg)
elif nulls: # TODO: We already run a version of this inside results_complete. Should be combined
search_columns = table._columns_searched(query)
nulls = {col: cnt for col, cnt in nulls.items() if col in search_columns}
col_display = {}
if "search_array" in info:
for row in info["search_array"].refine_array:
if isinstance(row, (list, tuple)):
for item in row:
if hasattr(item, "name") and hasattr(item, "label"):
col_display[item.name] = item.label
for col, cnt in list(nulls.items()):
override = info["search_array"].null_column_explanations.get(col)
if override is False:
del nulls[col]
elif override:
nulls[col] = override
else:
nulls[col] = f"{col_display.get(col, col)} ({cnt} objects)"
else:
for col, cnt in list(nulls.items()):
nulls[col] = f"{col} ({cnt} objects)"
if nulls:
msg = 'Search results may be incomplete due to <a href="Completeness">uncomputed quantities</a>: '
msg += ", ".join(nulls.values())
flash_info(msg)
if caveat:
flash_info("The completeness " + caveat)
except Exception as err:
import traceback
msg = f"There was an error in the completeness checking code, so the search results below may or may not be complete: \n{err}"
flash_info(msg)
msg += "\n" + traceback.format_exc()
app.logger.warning(msg)
return render_template(template, info=info, title=title, **template_kwds)


Expand Down
Loading