mirror of
https://github.com/simonw/datasette.git
synced 2026-09-09 01:54:15 +02:00
0d962deb05The SQL time limit error embedded an HTML fragment (paragraph, textarea and script tags) as the error string in JSON responses. DatasetteError now accepts a plain_message which the exception handler prefers for JSON error bodies; the HTML error page keeps the rich message with the SQL textarea. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GrHZSypDfMnym1tM5XJAFZ
79 lines
2.2 KiB
Python
79 lines
2.2 KiB
Python
from datasette import hookimpl, Response
|
|
from .utils import add_cors_headers, error_body
|
|
from .utils.asgi import (
|
|
Base400,
|
|
)
|
|
from .views.base import DatasetteError
|
|
from markupsafe import Markup
|
|
import traceback
|
|
|
|
try:
|
|
import ipdb as pdb
|
|
except ImportError:
|
|
import pdb
|
|
|
|
try:
|
|
import rich
|
|
except ImportError:
|
|
rich = None
|
|
|
|
|
|
@hookimpl(trylast=True)
|
|
def handle_exception(datasette, request, exception):
|
|
async def inner():
|
|
if datasette.pdb:
|
|
pdb.post_mortem(exception.__traceback__)
|
|
|
|
if rich is not None:
|
|
rich.get_console().print_exception(show_locals=True)
|
|
|
|
title = None
|
|
plain_message = None
|
|
if isinstance(exception, Base400):
|
|
status = exception.status
|
|
info = {}
|
|
message = exception.args[0]
|
|
elif isinstance(exception, DatasetteError):
|
|
status = exception.status
|
|
info = exception.error_dict
|
|
message = exception.message
|
|
plain_message = exception.plain_message
|
|
if exception.message_is_html:
|
|
message = Markup(message)
|
|
title = exception.title
|
|
else:
|
|
status = 500
|
|
info = {}
|
|
message = str(exception)
|
|
traceback.print_exc()
|
|
templates = [f"{status}.html", "error.html"]
|
|
headers = {}
|
|
if datasette.cors:
|
|
add_cors_headers(headers)
|
|
if request.path.split("?")[0].endswith(".json"):
|
|
body = dict(info)
|
|
body.update(error_body(plain_message or message, status))
|
|
return Response.json(body, status=status, headers=headers)
|
|
info.update(
|
|
{
|
|
"ok": False,
|
|
"error": message,
|
|
"status": status,
|
|
"title": title,
|
|
}
|
|
)
|
|
environment = datasette.get_jinja_environment(request)
|
|
template = environment.select_template(templates)
|
|
return Response.html(
|
|
await template.render_async(
|
|
dict(
|
|
info,
|
|
urls=datasette.urls,
|
|
menu_links=lambda: [],
|
|
)
|
|
),
|
|
status=status,
|
|
headers=headers,
|
|
)
|
|
|
|
return inner
|