Skip to content

Nicer formatting of fallback, allow HTML code to be changed from 500 #129

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
rwb27 merged 5 commits into from
Jul 7, 2025
Merged

Nicer formatting of fallback, allow HTML code to be changed from 500 #129

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf0d987
Nicer formatting of fallback, returns 206 (partial) instead of 500
JohemianKnapsody Jul 2, 2025
2bba47c
Close style tag
JohemianKnapsody Jul 2, 2025
5387c97
Switch fallback status code to 218
JohemianKnapsody Jul 2, 2025
bbb1f71
Add attribute to fallback server for setting HTML code
julianstirling Jul 6, 2025
c0a3eb6
Move HTML style to the page head
julianstirling Jul 6, 2025
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
13 changes: 10 additions & 3 deletions src/labthings_fastapi/server/fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@
self.labthings_server = None
self.labthings_error = None
self.log_history = None
self.html_code = 500


app = FallbackApp()

ERROR_PAGE = """
<!DOCTYPE html>
<html>
<head>
<head lang="en">
<title>LabThings</title>
<style>
pre {
white-space: pre-wrap;
overflow-wrap: anywhere;
}
</style>
</head>
<body>
<h1>LabThings Could't Load</h1>
Expand All @@ -44,7 +51,7 @@

@app.get("/")
async def root():
error_message = f"{app.labthings_error!r}"
error_message = f"{app.labthings_error}"
# use traceback.format_exception to get full traceback as list
# this ends in newlines, but needs joining to be a single string
error_w_trace = "".join(format_exception(app.labthings_error))
Expand All @@ -65,9 +72,9 @@
logging_info = f" <p>Logging info</p>\n <pre>{app.log_history}</pre>"

content = content.replace("{{logginginfo}}", logging_info)
return HTMLResponse(content=content, status_code=500)
return HTMLResponse(content=content, status_code=app.html_code)


@app.get("/{path:path}")
async def redirect_to_root(path: str):
return RedirectResponse(url="/")

Check warning on line 80 in src/labthings_fastapi/server/fallback.py

View workflow job for this annotation

GitHub Actions / coverage 

80 line is not covered with tests