rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check webapp is available or give useful error

Browse source
This commit is contained in:
Julian Stirling 2025-08-14 23:16:48 +01:00
parent bfdbbb9ad2
commit 44e24f42a6
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/openflexure_microscope_server/server/serve_static_files.py
View file

@ -8,6 +8,7 @@ from fastapi.staticfiles import StaticFiles
from fastapi import FastAPI from fastapi import FastAPI
THIS_DIR = os.path.dirname(os.path.abspath(__file__)) THIS_DIR = os.path.dirname(os.path.abspath(__file__))
STATIC_PATH = os.path.normpath(os.path.join(THIS_DIR, "..", "static"))
NO_CACHE_HEADERS = { NO_CACHE_HEADERS = {
"Cache-Control": "no-store, no-cache, must-revalidate, max-age=0", "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0",
@ -40,17 +41,17 @@ def add_static_files(app: FastAPI, scans_folder: Optional[str]) -> None:
app: The FastAPI app to add to, in this case the OpenFlexure server app: The FastAPI app to add to, in this case the OpenFlexure server
""" """
static_path = os.path.normpath(os.path.join(THIS_DIR, "..", "static")) check_static_dir()
@app.get("/", response_class=RedirectResponse) @app.get("/", response_class=RedirectResponse)
async def redirect_fastapi(): async def redirect_fastapi():
return "/index.html" return "/index.html"
# Mounting the webapp at / file by file to allow other endpoints to be created # Mounting the webapp at / file by file to allow other endpoints to be created
for fname in os.listdir(static_path): for fname in os.listdir(STATIC_PATH):
fpath = os.path.join(static_path, fname) fpath = os.path.join(STATIC_PATH, fname)
if os.path.isfile(fpath): if os.path.isfile(fpath):
add_static_file(app, fname, static_path) add_static_file(app, fname, STATIC_PATH)
elif os.path.isdir(fpath): elif os.path.isdir(fpath):
app.mount( app.mount(
f"/{fname}/", f"/{fname}/",
@ -68,3 +69,22 @@ def add_static_files(app: FastAPI, scans_folder: Optional[str]) -> None:
StaticFiles(directory=scans_folder), StaticFiles(directory=scans_folder),
name="scans", name="scans",
) )
def check_static_dir():
"""Check that the static dir exists and contains expected files and dirs."""
if not os.path.isdir(STATIC_PATH):
raise FileNotFoundError(
"The static directory does not exist. You will need to pull or compile the"
"web app."
)
expected = [
os.path.isdir(os.path.join(STATIC_PATH, "js")),
os.path.isdir(os.path.join(STATIC_PATH, "css")),
os.path.isfile(os.path.join(STATIC_PATH, "index.html")),
]
if not all(expected):
raise FileNotFoundError(
"The static directory does not contain a valid web app. You will need to "
"pull or compile the web app."
)